1

src/views/BasicSettings/PartSettings/list.vue

@@ -175,12 +175,12 @@ export default {
         });
     },
     changeSize(e) {
-      this.searchData.pageSize = e;
-      this.initData();
+      this.searchData.page_size = e;
+      this.initData(this.searchData);
     },
     changePage(e) {
-      this.searchData.pageIndex = e;
-      this.initData();
+      this.searchData.page_index = e;
+      this.initData(this.searchData);
     },
     handleSet(row, type) {
       // 1复制   2编辑   3查看   4删除   5新增

src/views/OrderMannage/BusinessOrderlist/edit.vue

@@ -2739,7 +2739,7 @@ export default {
             if (!elem.is_metal) {
               // elem.part_detail = elem.sub_part;
               if (!elem.part_detail) {
-                elem.part_detail = elem.sub_part;
+                elem.part_detail = elem.sub_part || [];
               }
               elem.part_detail.map((el) => {
                 el.material_num = el.material_detail_num;
@@ -3167,6 +3167,7 @@ export default {
                       const temp = this.wood_title_count.filter(
                         (item) => item.title == el.material_detail_title
                       );
+                      console.log(`temp`, temp);
                       if (temp && temp.length > 0) {
                         // 匹配规格是否已存在
                         const _temp = temp[0].measure_str.filter(
@@ -3854,11 +3855,7 @@ export default {
           flag = true;
         }
       });
-      if (flag) {
-        return;
-      } else {
-        this.handleTableAdd();
-      }
+      !flag && this.handleTableAdd();
     },
     handleTableAdd() {
       if (this.info.custom_id) {
@@ -4264,8 +4261,9 @@ export default {
     },
     changeEditMetal(row, rowIndex, $event, scope) {
       row.ext_id = row.product_id;
-      row.title = this.metalList.filter((v) => v.id == $event.value)[0].title;
-      row.unit = this.metalList.filter((v) => v.id == $event.value)[0].unit;
+      const match_id = $event.value.split("_")[0];
+      row.title = this.metalList.filter((v) => v.id == match_id)[0].title;
+      row.unit = this.metalList.filter((v) => v.id == match_id)[0].unit;
     },
     changeEditMetalNum(e, row) {
       row.price = (1 * e.target.value * row.single_price).toFixed(2);
@@ -4421,9 +4419,7 @@ export default {
             (row.ext_price * 1 || 0);
           row.price = row.price.toFixed(2);
           row.selected_ids = [];
-          // row.part = [];
-          // row.part = res.data.part;
-          res.data.part.forEach((element, index) => {
+          res.data.part.forEach((element) => {
             // 选择不是附加项目的，
             if (!element.is_metal) {
               // 选择不是线条、或者基础档案中要默认为空的部件
@@ -4431,7 +4427,7 @@ export default {
               element.isChoosed = true;
               element.title = element.part_title;
               element.process = JSON.parse(JSON.stringify(this.bpp_list));
-              element.process.forEach((elem, index) => {
+              element.process.forEach((elem) => {
                 for (const key in res.data.process.title) {
                   const ele = res.data.process.title[key];
                   if (elem.name == ele) {
@@ -4457,7 +4453,7 @@ export default {
                 element.change_id = element.change[0].id;
               }
               if (isCopied && element.title.indexOf("线条") != -1) {
-                element = Object.assign(element, this.copiedLinePart);
+                element = Object.assign(this.copiedLinePart, element);
               }
               element.part_detail = element.sub_part;
               //展示非拆分部件
@@ -4504,6 +4500,7 @@ export default {
             element.value = "";
             element.measureCalc = element.e_title;
           });
+          console.log(`row`, row);
           this.tableData.splice(rowIndex, 1, row);
           this.handleClearExtInfo(row, this.pre_bp_id, res.data.bp_id);
           row.get_first_data = false;
@@ -4511,7 +4508,6 @@ export default {
           // this.$forceUpdate();
         });
       }
-      // row.part=[]
     },
     changeEditProduct($event) {
       if ($event) {
@@ -4825,7 +4821,6 @@ export default {
         })
         .then((res) => {
           this.modalData.part.map((part) => {
-            console.log(`part`, part);
             if (part.part_id === 25) {
               res.data.sub_part.map((v) => {
                 v.material_detail_id =