diff --git a/src/views/driving_inspections/driving_log/drivingLog_info.vue b/src/views/driving_inspections/driving_log/drivingLog_info.vue index 529ce8d..2f4eec0 100644 --- a/src/views/driving_inspections/driving_log/drivingLog_info.vue +++ b/src/views/driving_inspections/driving_log/drivingLog_info.vue @@ -46,14 +46,56 @@ 收车地点 {{ data.info.DESTINATION_NAME }} - + + + 行车安全问询 + + + + + + + + + + + + + + + + + + + +
承诺记录
承诺项{{ item2.INQUIRYCONTENT }} + 合格 + 不合格 + 不涉及 +
检查人 + +
检查时间{{ item1.SIGN_TIME }}
+ + {{ item.CHECKTYPE_NAME }}检查 @@ -70,6 +112,10 @@ {{ item2.CHECKITEMNAME }} 检查项说明 {{ item2.REMARKS }} + + 合格 + 不合格 + 检查人 @@ -84,11 +130,11 @@ /> 检查时间 - {{ item1.SIGN_TIME }} + {{ item1.SIGN_TIME }} - + 检查照片 - +
diff --git a/src/views/driving_inspections/driving_type/index.vue b/src/views/driving_inspections/driving_type/index.vue index cf463d2..46ef296 100644 --- a/src/views/driving_inspections/driving_type/index.vue +++ b/src/views/driving_inspections/driving_type/index.vue @@ -54,6 +54,9 @@ {{ row.CHECKTYPE_NAME }} + {{ + row.CHECKTYPE_NAME + }} diff --git a/src/views/electronic_waybill_management/waybill_registration/view.vue b/src/views/electronic_waybill_management/waybill_registration/view.vue index fbdf5d4..b395d8e 100644 --- a/src/views/electronic_waybill_management/waybill_registration/view.vue +++ b/src/views/electronic_waybill_management/waybill_registration/view.vue @@ -53,7 +53,7 @@ {{ data.info.ORIGIN_NAME }} - {{ data.info.SHIPPINGADDRESS }} + {{ data.info.SHIPPING_ADDR}} {{ data.info.STARTADMINISTRATIVEAREA }} @@ -62,7 +62,7 @@ {{ data.info.DESTINATION_NAME }} - {{ data.info.DESTINATIONADDRESS }} + {{ data.info.DESTINATION_ADDR }} {{ data.info.ENDDMINISTRATIVEAREA }} diff --git a/src/views/mechanical_files/insure/add.vue b/src/views/mechanical_files/insure/add.vue index f84c5f0..3d69d60 100644 --- a/src/views/mechanical_files/insure/add.vue +++ b/src/views/mechanical_files/insure/add.vue @@ -356,17 +356,37 @@ const data = reactive({ }); const insureType = async (rule, insureType, callback) => { - if (insureType) { - data.info = await getInsureList(); - data.info.varList.forEach((item) => { - if(item.VEHICLE === data.busInfo.ID) { - if(insureType === item.INSURANCE_COVERAGE) { - callback(new Error("该保险已被此车辆重复选择")); + if(!INSURE_ID) { + if (insureType) { + data.info = await getInsureList(); + data.info.varList.forEach((item) => { + if(item.VEHICLE === data.busInfo.ID) { + if(insureType === item.INSURANCE_COVERAGE) { + callback(new Error("该保险已被此车辆重复选择")); + } } + }); + } else { + callback(); + } + }else{ + if (insureType) { + const resData = await getInsureView({ INSURE_ID }) + if(insureType === resData.pd.INSURANCE_COVERAGE) { + callback(); + }else{ + data.info = await getInsureList(); + data.info.varList.forEach((item) => { + if(item.VEHICLE === data.busInfo.ID) { + if(insureType === item.INSURANCE_COVERAGE) { + callback(new Error("该保险已被此车辆重复选择")); + } + } + }); } - }); - } else { - callback(); + } else { + callback(); + } } };