|
@@ -131,7 +131,7 @@
|
131
|
131
|
min-width="180"
|
132
|
132
|
>
|
133
|
133
|
<template slot-scope="scope">
|
134
|
|
- <span v-if="scope.row.item_name!=''"> {{ scope.row.item_name }} {{ scope.row.item_name_addition }}</span>
|
|
134
|
+ <span v-if="scope.row.item_name!=''"> {{ scope.row.item_name }} {{ scope.row.item_name_addition }}</span>
|
135
|
135
|
</template>
|
136
|
136
|
</el-table-column>
|
137
|
137
|
|
|
@@ -192,7 +192,7 @@
|
192
|
192
|
<el-col :span="7" :key="index">
|
193
|
193
|
<div style=" margin: 5px;">
|
194
|
194
|
<el-row :gutter="20">
|
195
|
|
- <el-col :span="8" style="width: 100%;height: 150px;">
|
|
195
|
+ <el-col :span="8" style="width: 100%;">
|
196
|
196
|
<div style="width: 100%;height: 150px;" >
|
197
|
197
|
<div @click="imgClicks(item.value)">
|
198
|
198
|
<el-tooltip
|
|
@@ -448,7 +448,7 @@
|
448
|
448
|
<div slot="footer" class="dialog-footer">
|
449
|
449
|
<el-upload
|
450
|
450
|
:data="uploadData"
|
451
|
|
- :multiple="false"
|
|
451
|
+ :multiple="true"
|
452
|
452
|
action="https://upload.qiniup.com"
|
453
|
453
|
:show-file-list="false"
|
454
|
454
|
:on-error="handleAvatarError"
|
|
@@ -815,12 +815,12 @@ export default {
|
815
|
815
|
this.dialogRemindFormVisible = true
|
816
|
816
|
// this.temp_remind_cycle = this.
|
817
|
817
|
|
818
|
|
- },openPic() {
|
|
818
|
+ },
|
|
819
|
+ openPic() {
|
819
|
820
|
if (this.project == null) {
|
820
|
821
|
this.$message.error('请先选择项目')
|
821
|
822
|
return false
|
822
|
823
|
}
|
823
|
|
-
|
824
|
824
|
this.form.pic_method = 'add'
|
825
|
825
|
this.formTitle = '新增' + this.project.project_name
|
826
|
826
|
this.form.project_id = this.project.project_id
|
|
@@ -1297,22 +1297,22 @@ export default {
|
1297
|
1297
|
var items = this.project.inspection_reference
|
1298
|
1298
|
console.log("i5ems2323232wo",items)
|
1299
|
1299
|
for (var index in items) {
|
1300
|
|
-
|
|
1300
|
+
|
1301
|
1301
|
console.log("obj",items[index])
|
1302
|
1302
|
// console.log("inspectionsMap",inspectionsMap[items[index].item_id])
|
1303
|
1303
|
var item = {}
|
1304
|
|
-
|
|
1304
|
+
|
1305
|
1305
|
for (var key in items[index]) {
|
1306
|
1306
|
// console.log("key",key,items[index][key])
|
1307
|
1307
|
// console.log("item[key]",item[key])
|
1308
|
1308
|
item[key] = items[index][key]
|
1309
|
1309
|
}
|
1310
|
|
-
|
|
1310
|
+
|
1311
|
1311
|
if (item.item_id > 0) {
|
1312
|
|
-
|
|
1312
|
+
|
1313
|
1313
|
if (typeof(inspectionsMap[parseInt(items[index].item_id)]) == "undefined") {
|
1314
|
|
-
|
1315
|
|
-
|
|
1314
|
+
|
|
1315
|
+
|
1316
|
1316
|
|
1317
|
1317
|
if(this.org_id == 10121 || this.org_id == 0 ){
|
1318
|
1318
|
item.value = inspectionsMap[items[index].id].inspect_value
|
|
@@ -1323,13 +1323,13 @@ export default {
|
1323
|
1323
|
}
|
1324
|
1324
|
|
1325
|
1325
|
} else {
|
1326
|
|
-
|
|
1326
|
+
|
1327
|
1327
|
item.value = inspectionsMap[items[index].item_id].inspect_value
|
1328
|
1328
|
item.item_name = inspectionsMap[items[index].item_id].item_name
|
1329
|
1329
|
|
1330
|
1330
|
}
|
1331
|
1331
|
} else {
|
1332
|
|
-
|
|
1332
|
+
|
1333
|
1333
|
item.value = inspectionsMap[items[index].id].inspect_value
|
1334
|
1334
|
item.item_name = inspectionsMap[items[index].id].item_name
|
1335
|
1335
|
|
|
@@ -1351,7 +1351,7 @@ export default {
|
1351
|
1351
|
if(item.item_name!=""){
|
1352
|
1352
|
this.items.push(item)
|
1353
|
1353
|
}
|
1354
|
|
-
|
|
1354
|
+
|
1355
|
1355
|
console.log("items232232332wo",this.items)
|
1356
|
1356
|
|
1357
|
1357
|
if(item.value.indexOf("http") >= 0){
|