Merge branch 'master' of 121.41.102.225:Nidong/jiufang into hw

src/views/BidSystem/ProductDeOrder/deorderdetail.vue

@@ -1809,7 +1809,7 @@ export default {
               (v) => v.type_id == 1 || v.type_id == 2
             );
             item.partsWoodTableData.map((v, k) => {
-              const temp_arr = item.detail.filter((w) => w.id == v.id);
+              const temp_arr = res.data.detail.filter((w) => w.id == v.id);
               v.wool_long = "";
               v.wool_wide = "";
               if (temp_arr.length > 0) {
@@ -2257,7 +2257,7 @@ export default {
               },
             });
             if (result.code == 200) {
-              element.part_id = result.data.id;
+              element.part_id_save = result.data.id;
               // 工艺路线保存 partsProcessLineTableData
               let bool = true;
               // element.partsProcessRouteList.forEach((ele) => {
@@ -2283,7 +2283,7 @@ export default {
                   method: "post",
                   url: "/api/order_area_explode_process",
                   data: {
-                    parts_id: element.part_id,
+                    parts_id: element.part_id_save,
                     price: element.process_price || 0,
                     properties,
                     title: element.processCombination,
@@ -2293,7 +2293,7 @@ export default {
                 });
                 if (res.code == 200) {
                   element.route_id = res.data.id;
-                  element.part_id = result.data.id;
+                  element.part_id_save = result.data.id;
                 } else {
                   return;
                 }
@@ -2319,7 +2319,7 @@ export default {
                 method: "post",
                 url: "/api/order_area_explode_process",
                 data: {
-                  parts_id: element.part_id,
+                  parts_id: element.part_id_save,
                   price: element.process_price || 0,
                   properties,
                   title: element.processCombination || "",

src/views/ProductionOrderList/ProductionsOrder/Decorationlist.vue

@@ -1237,46 +1237,46 @@ export default {
         //   PTK_DrawText_TrueType:
         //     "100,180,45,0,微软雅黑,1,700,0,0,0," + printContent_l3,
         // });
-        const printContent_l1 = `项目名称：${content.client_name}`;
+        const printContent_l1 = `项目：${content.client_name}`;
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
-            "110,30,45,0,微软雅黑,1,700,0,0,0," + printContent_l1,
+            "100,40,45,0,微软雅黑,1,700,0,0,0," + printContent_l1,
         });
-        const printContent_l1_2 = `楼层区域：${content.house}-${content.layer}${content.position}`;
+        const printContent_l1_2 = `区域：${content.house}-${content.layer}${content.position}`;
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
-            "410,30,45,0,微软雅黑,1,700,0,0,0," + printContent_l1_2,
+            "420,40,45,0,微软雅黑,1,700,0,0,0," + printContent_l1_2,
         });
         const printContent_l2 = `房号：${content.number_detail}`;
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
-            "110,80,45,0,微软雅黑,1,700,0,0,0," + printContent_l2,
+            "100,90,45,0,微软雅黑,1,700,0,0,0," + printContent_l2,
         });
-        const printContent_l2_2 = `图号：${content.url_number}`;
+        const printContent_l2_2 = `产品：${content.product_title}`;
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
-            "610,80,45,0,微软雅黑,1,700,0,0,0," + printContent_l2_2,
+            "420,90,45,0,微软雅黑,1,700,0,0,0," + printContent_l2_2,
         });
-        const printContent_l3 = `产品名称：${content.product_title}`;
+        const printContent_l3 = `图号：${content.url_number}`;
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
-            "110,130,45,0,微软雅黑,1,700,0,0,0," + printContent_l3,
+            "100,140,45,0,微软雅黑,1,700,0,0,0," + printContent_l3,
         });
         const printContent_l3_2 = `木皮：${content.color_title}`;
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
-            "810,130,45,0,微软雅黑,1,700,0,0,0," + printContent_l3_2,
+            "420,140,45,0,微软雅黑,1,700,0,0,0," + printContent_l3_2,
         });
 
         const printContent_l4 = `部件：${content.part_title}`;
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
-            "110,180,45,0,微软雅黑,1,700,0,0,0," + printContent_l4,
+            "100,190,45,0,微软雅黑,1,700,0,0,0," + printContent_l4,
         });
         const printContent_l4_2 = `尺寸：${content.measure}`;
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
-            "1010,180,45,0,微软雅黑,1,700,0,0,0," + printContent_l4_2,
+            "420,190,45,0,微软雅黑,1,700,0,0,0," + printContent_l4_2,
         });
         printparamsJsonArray.push({
           PTK_RWRFIDLabel: