Andy vor 4 Jahren
Ursprung
Commit
725482b61d

+ 2 - 2
src/views/BidSystem/ProductDeOrder/deorderdetail.vue

@@ -1809,7 +1809,7 @@ export default {
               (v) => v.type_id == 1 || v.type_id == 2
               (v) => v.type_id == 1 || v.type_id == 2
             );
             );
             item.partsWoodTableData.map((v, k) => {
             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_long = "";
               v.wool_wide = "";
               v.wool_wide = "";
               if (temp_arr.length > 0) {
               if (temp_arr.length > 0) {
@@ -2319,7 +2319,7 @@ export default {
                 method: "post",
                 method: "post",
                 url: "/api/order_area_explode_process",
                 url: "/api/order_area_explode_process",
                 data: {
                 data: {
-                  parts_id: element.part_id,
+                  parts_id: element.part_id_save,
                   price: element.process_price || 0,
                   price: element.process_price || 0,
                   properties,
                   properties,
                   title: element.processCombination || "",
                   title: element.processCombination || "",

Datei-Diff unterdrückt, da er zu groß ist
+ 272 - 464
src/views/OrderMannage/BusinessOrderlist/edit.vue


+ 12 - 12
src/views/ProductionOrderList/ProductionsOrder/Decorationlist.vue

@@ -1233,46 +1233,46 @@ export default {
         //   PTK_DrawText_TrueType:
         //   PTK_DrawText_TrueType:
         //     "100,180,45,0,微软雅黑,1,700,0,0,0," + printContent_l3,
         //     "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({
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
           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({
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
           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}`;
         const printContent_l2 = `房号:${content.number_detail}`;
         printparamsJsonArray.push({
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
           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({
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
           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({
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
           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}`;
         const printContent_l3_2 = `木皮:${content.color_title}`;
         printparamsJsonArray.push({
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
           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}`;
         const printContent_l4 = `部件:${content.part_title}`;
         printparamsJsonArray.push({
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
           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}`;
         const printContent_l4_2 = `尺寸:${content.measure}`;
         printparamsJsonArray.push({
         printparamsJsonArray.push({
           PTK_DrawText_TrueType:
           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({
         printparamsJsonArray.push({
           PTK_RWRFIDLabel:
           PTK_RWRFIDLabel:

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.