|
|
@@ -333,8 +333,16 @@
|
|
|
</el-form>
|
|
|
|
|
|
<parentList
|
|
|
- :classType="pageName == 'solidWasteRecord' ? '2' : '1'"
|
|
|
- :type="pageName == 'solidWasteRecord' ? '19' : '17'"
|
|
|
+ :classType="
|
|
|
+ pageName == 'solidWasteRecord' || pageName == 'QualityInspection'
|
|
|
+ ? '2'
|
|
|
+ : '1'
|
|
|
+ "
|
|
|
+ :type="
|
|
|
+ pageName == 'solidWasteRecord' || pageName == 'QualityInspection'
|
|
|
+ ? '19'
|
|
|
+ : '17'
|
|
|
+ "
|
|
|
ref="parentListRef"
|
|
|
@changeParent="changeParent"
|
|
|
>
|
|
|
@@ -404,7 +412,7 @@
|
|
|
checkValidityUnit: '',
|
|
|
conclusion: null,
|
|
|
isTempRecord: this.isTempRecord,
|
|
|
- unloadCheckStatus: '',
|
|
|
+ unloadCheckStatus: 1,
|
|
|
vehiclePhotoUrl: '',
|
|
|
detailList: [],
|
|
|
deviceId: 0,
|
|
|
@@ -508,6 +516,9 @@
|
|
|
trigger: 'blur'
|
|
|
}
|
|
|
],
|
|
|
+ vehiclePhotoUrl: [
|
|
|
+ { required: true, message: '请选择', trigger: 'blur' }
|
|
|
+ ],
|
|
|
contactName: [
|
|
|
{ required: true, message: '请选择', trigger: 'blur' },
|
|
|
{ required: true, message: '请选择', trigger: 'change' }
|
|
|
@@ -695,7 +706,7 @@
|
|
|
});
|
|
|
// this.$util.assignObject(this.addForm, data);
|
|
|
Object.assign(this.addForm, data);
|
|
|
- console.log('this.addForm', this.addForm);
|
|
|
+ this.addForm.unloadCheckStatus = this.addForm.unloadCheckStatus || 1;
|
|
|
|
|
|
// 处理数据
|
|
|
this.addForm.executeUsersIds = this.addForm.executeUsers
|
|
|
@@ -770,7 +781,7 @@
|
|
|
if (num1) {
|
|
|
num = (62 / 600) * num1;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
this.$set(
|
|
|
this.addForm.detailList[index],
|
|
|
'num',
|
