1

src/views/BidSystem/ProductDeOrder/deorderdetail.vue

@@ -279,7 +279,7 @@
               clearable
               filterable
               :disabled="type == 2"
-              @on-change="(e) => handlePartsNameSelect(partsItem, e)"
+              @on-change="(e) => handleProcessSelect(partsItem, e)"
               style="width: 150px"
             >
               <OptionGroup
@@ -1646,6 +1646,8 @@ export default {
                 if (element.part_id == ele.part_id) {
                   element.process_ids = ele.process_ids;
                   element.route_id = ele.route_id;
+                  element.produce_list = ele.produce_list;
+                  element.process_list = ele.process_list;
                 }
               });
             });
@@ -1672,6 +1674,7 @@ export default {
               element.ProcessAttrList = JSON.parse(
                 JSON.stringify(this.tempProcessAttrList)
               ); //工艺属性列表
+
               this.axios("/api/parts_detail", {
                 params: { id: element.part_id },
               }).then((re) => {
@@ -1819,74 +1822,80 @@ export default {
     // 选择工艺组合名称
     handleProcessRouteSelect(item, val) {
       if (val) {
-        item.ProcessAttrList.map((level0) => {
-          level0.cld &&
-            level0.cld.length > 0 &&
-            level0.cld.map((level1) => {
-              level1.list &&
-                level1.list.length > 0 &&
-                level1.list.map((level2) => {
-                  level2.display = true;
-                });
-            });
-        });
-        if (val.label != val.value) {
-          item.isAddProcessRoute = false;
-          this.axios({
-            method: "get",
-            url: "/api/process_route_detail",
-            params: {
-              id: val.value,
-            },
-          }).then((res) => {
-            this.info = res.data;
-            this.info.bps = this.temp_info_bps;
-            item.process_price = res.data.price;
-            this.selectTags = res.data.produce_list;
-            const selectTagsId = this.selectTags.map((item) => item.id);
-            item.ProcessAttrList = res.data.list;
-            item.process_name = res.data.technological_route_title;
-            item.properties = res.data.pp_id.split(","); ///存在问题
-            this.info.bps.forEach((v) => {
-              v.cld &&
-                v.cld.length > 0 &&
-                v.cld.forEach((z) => {
-                  z.show = selectTagsId.includes(z.id);
-                  z.cld &&
-                    z.cld.length > 0 &&
-                    z.cld.forEach((elem) => {
-                      elem.show = selectTagsId.includes(elem.id);
-                      elem.cld &&
-                        elem.cld.length > 0 &&
-                        elem.cld.forEach((ele) => {
-                          ele.show = selectTagsId.includes(ele.id);
-                          ele.cld &&
-                            ele.cld.length > 0 &&
-                            ele.cld.forEach((el) => {
-                              el.show = selectTagsId.includes(el.id);
-                            });
-                        });
-                    });
-                });
-            });
-            item.ProcessAttrList.map((level0) => {
-              level0.cld &&
-                level0.cld.length > 0 &&
-                level0.cld.map((level1) => {
-                  level1.list &&
-                    level1.list.length > 0 &&
-                    level1.list.map((level2) => {
-                      level2.display = level2.show;
-                    });
-                });
+        // item.ProcessAttrList.map((level0) => {
+        //   level0.cld &&
+        //     level0.cld.length > 0 &&
+        //     level0.cld.map((level1) => {
+        //       level1.list &&
+        //         level1.list.length > 0 &&
+        //         level1.list.map((level2) => {
+        //           level2.display = true;
+        //         });
+        //     });
+        // });
+        // if (val.label != val.value) {
+        item.isAddProcessRoute = false;
+        this.axios({
+          method: "get",
+          url: "/api/process_route_detail",
+          params: {
+            id: val.value,
+          },
+        }).then((res) => {
+          this.info = res.data;
+          this.info.bps = this.temp_info_bps;
+          item.process_price = res.data.price;
+          this.selectTags = res.data.produce_list;
+          const selectTagsId = this.selectTags.map((item) => item.id);
+          item.ProcessAttrList = res.data.list;
+          console.log("item.ProcessAttrList :>> ", item.ProcessAttrList);
+          console.log("item.process_list :>> ", item.process_list);
+          item.process_list.map((v) => {
+            item.ProcessAttrList.map((c) => {
+              if (c.name == v.name) {
+                c.selected_value = v.id * 1;
+              }
             });
-            item.partsProcessLineTableData = this.selectTags;
           });
-        } else {
-          item.isAddProcessRoute = true;
-        }
+          item.process_name = res.data.technological_route_title;
+          item.properties = res.data.pp_id.split(","); ///存在问题
+          this.info.bps.forEach((v) => {
+            v.cld &&
+              v.cld.length > 0 &&
+              v.cld.forEach((z) => {
+                z.show = selectTagsId.includes(z.id);
+                z.cld &&
+                  z.cld.length > 0 &&
+                  z.cld.forEach((elem) => {
+                    elem.show = selectTagsId.includes(elem.id);
+                    elem.cld &&
+                      elem.cld.length > 0 &&
+                      elem.cld.forEach((ele) => {
+                        ele.show = selectTagsId.includes(ele.id);
+                        ele.cld &&
+                          ele.cld.length > 0 &&
+                          ele.cld.forEach((el) => {
+                            el.show = selectTagsId.includes(el.id);
+                          });
+                      });
+                  });
+              });
+          });
+          if (item.produce_list && item.produce_list.length > 0) {
+            item.produce_list.map((v) => (v.wages = v.price));
+            item.partsProcessLineTableData = item.produce_list;
+          } else {
+            item.partsProcessLineTableData = this.selectTags;
+          }
+        });
+        // } else {
+        //   item.isAddProcessRoute = true;
+        // }
       }
     },
+    handleProcessSelect(){
+      
+    },
     handleProcessLineShow(item, index) {
       item.isShowProcessLine
         ? (document.getElementsByClassName("parts_content_lineTable")[
@@ -2248,7 +2257,8 @@ export default {
               //   }
               // });
               let properties = element.ProcessAttrList.map((v) => {
-                return { type_id: v.type_id, value: v.selected_value };
+                console.log('v :>> ', v);
+                return { name: v.name, value: v.selected_value||'' };
               });
               // element.partsProcessLineTableData.forEach(async (el, idx) => {
               //   if (idx == element.length - 1) {
@@ -2287,7 +2297,7 @@ export default {
             //   }
             // });
             let properties = element.ProcessAttrList.map((v) => {
-              return { type_id: v.type_id, value: v.selected_value };
+              return { name: v.name, value: v.selected_value||'' };
             });
             if (bool) {
               let res = await this.axios({

src/views/ProductionOrderList/ProductionsOrder/Decorationlist.vue

@@ -1064,26 +1064,26 @@ export default {
       });
       printparamsJsonArray.push({ PTK_SetLabelWidth: 873 });
       contents.map((content) => {
-        const printContent_l1 = `项目：${content.client_name} 图号：${content.url_number} 区域：${content.house}号楼-${content.layer}层${content.number_detail}`;
+        const printContent_l1 = `单号：${content.order_no}        型号：${content.product_title} `;
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
-            "1100,250,50,0,微软雅黑,1,700,0,0,0," + printContent_l1,
+            "100,20,45,0,微软雅黑,1,700,0,0,0," + printContent_l1,
         });
-        const printContent_l2 = `产品：${content.product_title} 部件：${content.part_title} `;
+        const printContent_l2 = `尺寸：${content.measure}  颜色：${content.color_title} `;
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
-            "1100,200,50,0,微软雅黑,1,700,0,0,0," + printContent_l2,
+            "100,100,45,0,微软雅黑,1,700,0,0,0," + printContent_l2,
         });
-        const printContent_l3 = `材料：${content.process} `;
+        const printContent_l3 = `工艺：${content.process_title}    部件：${content.part_title}`;
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
-            "1100,150,50,0,微软雅黑,1,700,0,0,0," + printContent_l3,
-        });
-        const printContent_l4 = `尺寸：${content.measure} 位置：${content.position} `;
-        printparamsJsonArray.push({
-          PTK_DrawText_TrueType:
-            "10,10,50,0,微软雅黑,1,700,0,0,0," + printContent_l4,
+            "100,180,45,0,微软雅黑,1,700,0,0,0," + printContent_l3,
         });
+        // const printContent_l4 = `工艺：${content.process_title} `;
+        // printparamsJsonArray.push({
+        //   PTK_DrawText_TrueType:
+        //     "100,170,45,0,微软雅黑,1,700,0,0,0," + printContent_l4,
+        // });
         printparamsJsonArray.push({
           PTK_RWRFIDLabel:
             "1,0,0," + content.chip.length / 2 + ",1," + content.chip,

vue.config.js

@@ -1,6 +1,6 @@
 const axios_default_ip =
     process.env.NODE_ENV == 'dev' ?
-    'http://124.71.176.88:882' :
+    'http://121.41.102.225:82' :
     process.env.NODE_ENV == 'test-prd' ?
     'http://124.71.176.88:882' //测试服
     :