wangyifang
/
patrol-maintain-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

up

Browse Source
master
lion 3 years ago
parent 193955d7d6
commit 9dbd680231
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File

2
src/views/common/index.vue
Unescape View File

@ -40,7 +40,7 @@
<div v-if="scope.row[column.field] == item.id"> <div v-if="scope.row[column.field] == item.id">
{{item.name}} {{item.name}}
</div> </div>
</div> </div>
</div> </div>
<div v-else-if="column.type=='ask_type_id'"> <div v-else-if="column.type=='ask_type_id'">

16
src/views/rain/inspection/inspection.vue
Unescape View File

@ -37,7 +37,7 @@
style="margin-left: 10px;">审核</Button> style="margin-left: 10px;">审核</Button>
<Button v-if="scope.row['status']==1" ghost size="small" @click="show(scope.row)" type="primary" <Button v-if="scope.row['status']==1" ghost size="small" @click="show(scope.row)" type="primary"
style="margin-left: 10px;">办结</Button> style="margin-left: 10px;">办结</Button>
<Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button> <Button ghost size="small" v-if="scope.row['status']==0||scope.row['status']==1" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
</div> </div>
<div v-else-if="column.type=='type'"> <div v-else-if="column.type=='type'">
<el-tag v-if="scope.row[column.field]==1">日常雨水设施</el-tag> <el-tag v-if="scope.row[column.field]==1">日常雨水设施</el-tag>
@ -235,7 +235,7 @@
<el-table-column prop="type_name" label="操作结果"> <el-table-column prop="type_name" label="操作结果">
</el-table-column> </el-table-column>
<el-table-column prop="admin_id" label="操作人" width="180"> <el-table-column prop="adminName" label="操作人" width="180">
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -388,7 +388,7 @@
<el-table-column prop="type_name" label="操作结果"> <el-table-column prop="type_name" label="操作结果">
</el-table-column> </el-table-column>
<el-table-column prop="admin_id" label="操作人" width="180"> <el-table-column prop="adminName" label="操作人" width="180">
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -921,7 +921,13 @@
// this.$set(that.form,res) // this.$set(that.form,res)
that.rainType = result.type; that.rainType = result.type;
that.nowstatus = result.status; that.nowstatus = result.status;
that.rainMaintainLogs = result.rain_maintain_logs;
if(result.rain_inspection_logs){
for(var k of result.rain_inspection_logs){
k.adminName = k.admin?k.admin.name : ""
}
}
that.rainMaintainLogs = result.rain_inspection_logs;
that.end_types = result.end_type that.end_types = result.end_type
if (that.rainType == 1) { if (that.rainType == 1) {
that.rainTitle = "日常雨水设施" that.rainTitle = "日常雨水设施"
@ -957,7 +963,7 @@
case 2: case 2:
that.form = result.building_site_info; that.form = result.building_site_info;
let building_site = result.building_site_info.building_site let building_site = result.building_site_info.building_site
that.form.building_site_id = that.form.building_site_id =building_site.id
that.form.address = building_site.address that.form.address = building_site.address
that.form.latitude=building_site.latitude that.form.latitude=building_site.latitude
that.form.longitude=building_site.longitude that.form.longitude=building_site.longitude

13
src/views/rain/maintain/maintain.vue
Unescape View File

@ -37,7 +37,7 @@
style="margin-left: 10px;">审核</Button> style="margin-left: 10px;">审核</Button>
<Button v-if="scope.row['status']==1" ghost size="small" @click="show(scope.row)" type="primary" <Button v-if="scope.row['status']==1" ghost size="small" @click="show(scope.row)" type="primary"
style="margin-left: 10px;">办结</Button> style="margin-left: 10px;">办结</Button>
<Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button> <Button ghost size="small" v-if="scope.row['status']==0||scope.row['status']==1" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
</div> </div>
<div v-else-if="column.type=='type'"> <div v-else-if="column.type=='type'">
<el-tag v-if="scope.row[column.field]==1">雨水管道疏挖</el-tag> <el-tag v-if="scope.row[column.field]==1">雨水管道疏挖</el-tag>
@ -216,7 +216,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="admin_id" prop="adminName"
label="操作人" label="操作人"
width="180"> width="180">
</el-table-column> </el-table-column>
@ -344,7 +344,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="admin_id" prop="adminName"
label="操作人" label="操作人"
width="180"> width="180">
</el-table-column> </el-table-column>
@ -438,7 +438,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="admin_id" prop="adminName"
label="操作人" label="操作人"
width="180"> width="180">
</el-table-column> </el-table-column>
@ -938,6 +938,11 @@
that.rainType = result.type; that.rainType = result.type;
that.nowstatus = result.status; that.nowstatus = result.status;
that.formdetail.id = result.id that.formdetail.id = result.id
if(result.rain_maintain_logs){
for(var k of result.rain_maintain_logs){
k.adminName = k.admin?k.admin.name : ""
}
}
that.rainMaintainLogs = result.rain_maintain_logs; that.rainMaintainLogs = result.rain_maintain_logs;
that.end_types = result.end_type that.end_types = result.end_type
if(that.rainType==1){ if(that.rainType==1){

Write Preview
Loading…
Cancel
Save