|
@@ -69,7 +69,7 @@
|
|
<Input
|
|
<Input
|
|
type="text"
|
|
type="text"
|
|
size="small"
|
|
size="small"
|
|
- :disabled="$route.query.type==2"
|
|
|
|
|
|
+ :disabled="$route.query.type == 2"
|
|
v-model="formData.order_no"
|
|
v-model="formData.order_no"
|
|
placeholder="请输入订单编号"
|
|
placeholder="请输入订单编号"
|
|
style="width: 200px"
|
|
style="width: 200px"
|
|
@@ -2239,8 +2239,8 @@ export default {
|
|
handleAddPDTConfirm() {
|
|
handleAddPDTConfirm() {
|
|
this.tempPDTList.forEach((element) => {
|
|
this.tempPDTList.forEach((element) => {
|
|
element.addPDTProcessAttrList.forEach((el) => {
|
|
element.addPDTProcessAttrList.forEach((el) => {
|
|
- element.process_property += el.showValue + ",";
|
|
|
|
- element.process_properties += el.showId + ",";
|
|
|
|
|
|
+ element.process_property += el.showValue ? el.showValue + "," : "";
|
|
|
|
+ element.process_properties += el.showId ? el.showId + "," : "";
|
|
});
|
|
});
|
|
element.process_property = element.process_property.substring(
|
|
element.process_property = element.process_property.substring(
|
|
0,
|
|
0,
|
|
@@ -2387,8 +2387,8 @@ export default {
|
|
element.value = this.PDTEdit[element.e_title];
|
|
element.value = this.PDTEdit[element.e_title];
|
|
});
|
|
});
|
|
this.PDTEdit.addPDTProcessAttrList.forEach((el) => {
|
|
this.PDTEdit.addPDTProcessAttrList.forEach((el) => {
|
|
- this.PDTEdit.process_property += el.showValue + ",";
|
|
|
|
- this.PDTEdit.process_properties += el.showId + ",";
|
|
|
|
|
|
+ this.PDTEdit.process_property += el.showValue ? el.showValue + "," : "";
|
|
|
|
+ this.PDTEdit.process_properties += el.showId ? el.showId + "," : "";
|
|
});
|
|
});
|
|
this.PDTEdit.process_property = this.PDTEdit.process_property.substring(
|
|
this.PDTEdit.process_property = this.PDTEdit.process_property.substring(
|
|
0,
|
|
0,
|
|
@@ -2672,7 +2672,7 @@ export default {
|
|
// p.process_properties = p.process_properties.replace(/,/g, "");
|
|
// p.process_properties = p.process_properties.replace(/,/g, "");
|
|
});
|
|
});
|
|
});
|
|
});
|
|
- this.formData.list = [...this.formData.list,...res.data.list];
|
|
|
|
|
|
+ this.formData.list = [...this.formData.list, ...res.data.list];
|
|
this.areaSpecValueList = res.data.head.area;
|
|
this.areaSpecValueList = res.data.head.area;
|
|
this.productSpecValueList = res.data.head.product;
|
|
this.productSpecValueList = res.data.head.product;
|
|
this.handleAddInputConfirm();
|
|
this.handleAddInputConfirm();
|