Merge branch 'master' into dev_heat_transfer_printing

src/server/entity/function.js

@@ -631,7 +631,8 @@ export default {
         headers: { "jwt-token": token },
         headers: { "jwt-token": token },
         params: {
         params: {
           id: params.id,
           id: params.id,
-          status: params.status
+          status: params.status,
+          type: params.type
         }
         }
       });
       });
       res.send(data);
       res.send(data);

src/views/design/head/index.vue

@@ -288,7 +288,7 @@ export default {
           // OP 非btn：扫码入库校验库存
           // OP 非btn：扫码入库校验库存
           const { code, data: resData } = await this.$api.post(
           const { code, data: resData } = await this.$api.post(
             pathMap.scanProduce[this.orderType],
             pathMap.scanProduce[this.orderType],
-            { id: params.id, status: params.data.status }
+            { id: params.id, status: params.data.status, type: "app" }
           );
           );
           if (code === 301) {
           if (code === 301) {
             this.$confirm(
             this.$confirm(
@@ -650,18 +650,17 @@ export default {
           console.error("setData 执行失败", err);
           console.error("setData 执行失败", err);
         }
         }
       }
       }
-
-      // if (this.detail && !this.isAutoFinish && this.desktopDevice == 3) {
-      //   //惠立彩判断是否全部图片都已经打印完成
-      //   const canCallApi =
-      //     this.detail.saveImgList?.every(el => el.power) ?? false;
-      //   if (canCallApi) {
-      //     bus.$emit("busEmit", {
-      //       value: this.detail.newId,
-      //       type: "completeFail"
-      //     });
-      //   }
-      // }
+      if (
+        this.detail &&
+        Object.keys(this.detail).length > 0 &&
+        this.orderType === "GC"
+      ) {
+        try {
+          await this.setData(this.detail);
+        } catch (err) {
+          console.error("setData 执行失败", err);
+        }
+      }
 
 
       //判断生产单号是否为空
       //判断生产单号是否为空
       if (this.productionNo === "")
       if (this.productionNo === "")

src/views/design/main/index.vue

@@ -775,7 +775,7 @@ export default {
         console.log("files.title", files[i]);
         console.log("files.title", files[i]);
         const title = files[i].title;
         const title = files[i].title;
         const matchKey = keyMap[title] || title;
         const matchKey = keyMap[title] || title;
-        const templateSize = size[matchKey];
+        const templateSize = size?.[matchKey];
 
 
         if (size && !isCut) {
         if (size && !isCut) {
           //带黄点模判断是否是cp类，cp类按照newMmToPxFn方法重新计算宽高
           //带黄点模判断是否是cp类，cp类按照newMmToPxFn方法重新计算宽高