fix:新派单流程

src/server/routes/index.js

@@ -21,7 +21,7 @@ router.post("/commitApply", fn.commitApply);
 // 下载素材到本地
 
 router.post("/downloadByDesignId", fn.downloadByDesignId);
-// 获取 生产单号返回素材地址
+// 获取 操作单号返回素材地址
 autoRegisterRouter(
   router,
   "downloadBySubOrderNumber",
@@ -55,7 +55,7 @@ router.post("/saveImgByUrl", fn.saveImgByUrl);
 //复制文件夹下文件
 router.post("/copySingleImageFn", fn.copySingleImageFn);
 
-// 根据生产单号查询详情
+// 根据操作单号查询详情
 autoRegisterRouter(router, "findByPodProductionNo", fn.findByPodProductionNo);
 
 export { router as default };

src/views/design/detail/index.vue

@@ -38,7 +38,7 @@ export default {
   methods: {
     changeStatus() {
       if (!this.detail || Object.keys(this.detail).length <= 1) {
-        return this.$message.warning("请扫码生产单号");
+        return this.$message.warning("请扫码操作单号");
       }
       this.$confirm(
         `确定${this.type === 1 ? "生产完成" : "确定发货"}？`,
@@ -89,7 +89,7 @@ export default {
     },
     downloadAllWe(data, designId) {
       if (!this.detail || Object.keys(this.detail).length <= 1) {
-        return this.$message.warning("请扫码生产单号");
+        return this.$message.warning("请扫码操作单号");
       }
       let params = {
         productionNo: this.detail.podProductionNo,
@@ -135,7 +135,7 @@ export default {
           text = "";
           break;
         case "weight_search_error":
-          text = "请录入生产单号";
+          text = "请录入操作单号";
           break;
         case "weight_success":
           text = "";
@@ -324,8 +324,8 @@ export default {
 
             <div class="div-content">
               <div :title="detail.podProductionNo" class="div-item">
-                <span>生产单号</span>
-                <p>{{ detail.factorySubOrderNumber }}</p>
+                <span>工厂订单号</span>
+                <p>{{ detail.factoryOrderNumber }}</p>
                 <p
                   style="margin-left: 5px"
                   v-if="detail.podProductionNo"

src/views/design/head/index.vue

@@ -230,7 +230,7 @@ export default {
       }
     },
     async setData(data) {
-      if (!data) return this.$message.warning("请扫描生产单号");
+      if (!data) return this.$message.warning("请扫描操作单号");
       const params = {
         ...this.detail,
       };
@@ -259,7 +259,7 @@ export default {
     },
     async sureData() {
       if (!this.detail || Object.keys(this.detail).length <= 1) {
-        return this.$message.warning("请扫描生产单号");
+        return this.$message.warning("请扫描操作单号");
       }
       this.$confirm(`确定生产完成？`, "提示", {
         confirmButtonText: "确定",
@@ -475,7 +475,7 @@ export default {
         }
       }
 
-      // 根据生产单号查找 素材图片 下载到本地 然后返回本地地址去显示
+      // 根据操作单号查找 素材图片 下载到本地 然后返回本地地址去显示
       if (!imageResList.length && !bool) {
         try {
           let newType = "XD";
@@ -593,9 +593,9 @@ export default {
         }
       }
 
-      //判断生产单号是否为空
+      //判断操作单号是否为空
       if (this.productionNo === "")
-        return this.$message.warning("请录入生产单号");
+        return this.$message.warning("请录入操作单号");
 
       const today = moment(new Date()).format("YYYY-MM-DD");
 
@@ -611,7 +611,7 @@ export default {
         });
       }
 
-      //判断生产单号是US CN GC(老pod),并设置 setOrderType
+      //判断操作单号是US CN GC(老pod),并设置 setOrderType
       if (this.productionNo.includes("_")) {
         const parts = this.productionNo.split("_");
         const pscPart = parts.find((part) => part.includes("PSC"));
@@ -638,7 +638,7 @@ export default {
       }
       this.templateProductionNo = this.productionNo;
       try {
-        //查询当前生产单号是否在本地数据
+        //查询当前操作单号是否在本地数据
         let localItem = null;
 
         let findByPodProductionNo;
@@ -666,7 +666,7 @@ export default {
         }
 
         this.detail = findByPodProductionNo.data;
-        //赋值当前扫码为生产单号的标识
+        //赋值当前扫码为操作单号的标识
         if (!this.detail["newId"]) {
           this.detail["newId"] = this.productionNo;
         }
@@ -687,7 +687,7 @@ export default {
         console.log(err);
         if (!err.data) {
           this.$message.error(
-            "未使用英文输入法输入/扫码，或该生产单号未拣胚或已完成",
+            "未使用英文输入法输入/扫码，或该操作单号未拣胚或已完成",
           );
         }
         this.productionNo = "";
@@ -1090,7 +1090,7 @@ export default {
           @keyup.enter.native="getDataInfo"
           style="width: 40%;"
           size="medium"
-          placeholder="请扫描生产单号"
+          placeholder="请扫描操作单号"
           ref="searchRef"
           v-model="productionNo"
         ></el-input>
@@ -1195,7 +1195,7 @@ export default {
         style="font-size: 16px;  line-height: 1.6; padding: 10px 0;font-weight: bold;color: #333;"
       >
         <div v-if="showforcedProduc">
-          此单素材屈于历史不规范素材，无法直接打印。请更换打印设备
+          此单素材属于历史不规范素材，无法直接打印。请更换打印设备
         </div>
         <div v-else>
           <div>

src/views/design/main/index.vue

@@ -1468,32 +1468,31 @@ export default {
             生产单信息
           </div>
           <div class="div-content">
-            <div :title="detail.podProductionNo" class="div-item">
-              <div class="item-label">生产单号：</div>
+            <div :title="detail.factoryOrderNumber" class="div-item">
+              <div class="item-label">工厂订单号：</div>
               <div class="item-value">
-                {{ detail.factorySubOrderNumber }}
-                <div
-                  style="margin-left: 5px"
-                  v-if="detail.podProductionNo"
+                {{ detail.factoryOrderNumber }}
+                <span
+                  v-if="detail.factoryOrderNumber"
                   :style="{
                     color: detail.customizedQuantity > 1 ? 'red' : '#67C23A',
                   }"
                 >
                   {{ detail.customizedQuantity > 1 ? "多" : "单" }}
+                </span>
               </div>
             </div>
+            <div :title="detail.operationNo" class="div-item">
+              <div class="item-label">工厂操作单号：</div>
+              <div class="item-value">{{ detail.operationNo }}</div>
             </div>
-            <div :title="detail.factorySubOrderNumber" class="div-item">
-              <div class="item-label">工厂单号：</div>
-              <div class="item-value">{{ detail.factorySubOrderNumber }}</div>
-            </div>
-            <div :title="detail.processName" class="div-item">
+            <div :title="detail.craftName" class="div-item">
               <div class="item-label">生产工艺：</div>
-              <div class="item-value">{{ detail.processName }}</div>
+              <div class="item-value">{{ detail.craftName }}</div>
             </div>
-            <div :title="detail.baseSku" class="div-item">
-              <div class="item-label">基版：</div>
-              <div class="item-value">{{ detail.baseSku }}</div>
+            <div :title="detail.thirdSkuCode" class="div-item">
+              <div class="item-label">库存sku：</div>
+              <div class="item-value">{{ detail.thirdSkuCode }}</div>
             </div>
             <div :title="detail.size" class="div-item">
               <div class="item-label">尺寸：</div>
@@ -1503,18 +1502,20 @@ export default {
               <div class="item-label">变体SKU：</div>
               <div class="item-value">{{ detail.variantSku }}</div>
             </div>
-            <div :title="detail.num" class="div-item">
+            <div :title="detail.quantity" class="div-item">
               <div class="item-label">数量：</div>
-              <div class="item-value">{{ detail.num }}</div>
+              <div class="item-value">{{ detail.quantity }}</div>
             </div>
-            <div :title="detail.supplierItemNo" class="div-item">
+            <div :title="detail.supplierProductNo" class="div-item">
               <div class="item-label">货号：</div>
-              <div class="item-value">{{ detail.supplierItemNo }}</div>
+              <div class="item-value">{{ detail.supplierProductNo }}</div>
             </div>
             <div :title="detail.color" class="div-item">
               <div class="item-label">颜色：</div>
               <div class="item-value">
-                {{ detail.baseSku ? detail.baseSku.split("_")[1] : null }}
+                {{
+                  detail.thirdSkuCode ? detail.thirdSkuCode.split("_")[1] : null
+                }}
               </div>
             </div>
 
@@ -2293,12 +2294,12 @@ img {
       margin-bottom: 5px;
 
       .item-label {
-        flex: 1;
         text-align: right;
+        flex: 3%;
       }
 
       .item-value {
-        flex: 36%;
+        flex: 2;
       }
     }
   }