Andy 3 vuotta sitten
vanhempi
commit
69e68547ef

+ 6 - 6
src/views/BidSystem/ContractList/edit.vue

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

+ 2 - 2
src/views/BidSystem/DeepeningOrder/detail.vue

@@ -1581,8 +1581,8 @@ export default {
         element.process_property = "";
         element.process_properties = "";
         element.addPDTProcessAttrList.forEach((el, i) => {
-          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(
           0,

+ 11 - 12
src/views/BidSystem/DeepeningOrder/info.vue

@@ -1295,21 +1295,20 @@ export default {
       this.tempPDTList.forEach((element) => {
         // element.measure = `${element.length ? element.length : 0}*${element.width ? element.width : 0}*${element.height ? element.height : 0}`
         element.addPDTProcessAttrList.forEach((el, i) => {
-          if (i == element.tempMeasureList.length - 1) {
-            element.process_property += el.showValue;
-            element.process_properties += el.showId;
-          } else {
-            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(
+          0,
+          element.process_property.length - 1
+        );
         element.tempMeasureList.forEach((el, i) => {
-          if (i == element.tempMeasureList.length - 1) {
-            element.measure += `${el.e_title}${el.value}`;
-          } else {
-            element.measure += `${el.e_title}${el.value}*`;
-          }
+          element.measure += `${el.e_title}${el.value}*`;
         });
+        element.measure = element.measure.substring(
+          0,
+          element.measure.length - 1
+        );
       });
       console.log("this.tempPDTList :>> ", this.tempPDTList);
       this.axios({

+ 7 - 23
src/views/BidSystem/ProductDeOrder/deorderdetail.vue

@@ -1072,15 +1072,7 @@ export default {
                 print_num: "",
               },
             ], //木板表格
-            partsMetalseData: [
-              {
-                spare_parts: "",
-                number: "",
-                company: "",
-                price: "",
-                total_price: "",
-              },
-            ], //五金表格
+            partsMetalseData: [], //五金表格
             partsNameList: [{ id: "", title: "" }], //部件名称列表
             partsProcessRouteList: [{ id: "", title: "" }], //工艺组合名称列表
             checkBox: [],
@@ -1474,7 +1466,7 @@ export default {
               isAddPart: true, //是否为新增部件
               isAddProcessRoute: true, //是否为新增工艺组合
               long: "",
-              width: "",
+              wide: "",
               thick: "",
               parts_type: "", //部件分类名称
               pay_state: "", //标签
@@ -1508,15 +1500,7 @@ export default {
                   print_num: "",
                 },
               ], //木板表格
-              partsMetalseData: [
-                {
-                  spare_parts: "",
-                  number: "",
-                  company: "",
-                  price: "",
-                  total_price: "",
-                },
-              ], //五金表格
+              partsMetalseData: [], //五金表格
               partsNameList: [{ id: "", title: "" }], //部件名称列表
               partsProcessRouteList: [{ id: "", title: "" }], //工艺组合名称列表
               checkBox: [],
@@ -1783,10 +1767,10 @@ export default {
             item.partsWoodTableData = res.data.detail.filter(
               (v) => v.type_id == 1 || v.type_id == 2
             );
-            item.partsWoodTableData.map(
-              (v) => (v.wool_long = ""),
-              (v.wool_wide = "")
-            );
+            item.partsWoodTableData.map((v) => {
+              v.wool_long = "";
+              v.wool_wide = "";
+            });
             item.partsMetalseData = res.data.detail.filter(
               (v) => v.type_id == 5
             );