update:修改包装工序

src/api/mes/pro/packageLablePrint.js

@@ -19,6 +19,15 @@ export function workorderPackageList(query) {
   });
 }
 
+// 工单关联属性查询
+export function workorderLinkInfo(query) {
+  return request({
+    url: "/mes/pro/workorder/linkInfo",
+    method: "get",
+    params: query,
+  });
+}
+
 
 // 装箱标签生成
 export function buildPackagePrint(data) {

src/views/mes/pro/packageLablePrint/index.vue

@@ -64,7 +64,7 @@
         </el-card>
       </el-col>
       <el-col :span="16">
-        <el-card style="height: 300px;margin-bottom:10px;">
+        <el-card style="height: 240px;margin-bottom:10px;">
           <el-button
           type="primary"
           plain
@@ -85,40 +85,25 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="12">
-                <el-form-item label="包装方式：" prop="packNum">
+              <el-col :span="8">
+                <el-form-item label="包装数量：" prop="packNum">
                   <el-input
                     v-model="produceForm.packNum"
-                    placeholder="请输入包装方式"
+                    placeholder="请输入包装数量"
                     clearable
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="细分/小包：" prop="minPackageNum">
+              <el-col :span="8">
+                <el-form-item label="装箱数量：" prop="encasementNum">
                   <el-input
-                    v-model="produceForm.minPackageNum"
-                    placeholder="请输入细分/小包"
+                    v-model="produceForm.encasementNum"
+                    placeholder="请输入装箱数量"
                     clearable
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="">
-                  <div style="display:flex;">
-                    <el-checkbox-group v-model="produceForm.packType" style="margin-right:10px;">
-                      <!-- 包装类型，0:无，1：size 2：指令 -->
-                      <el-checkbox label="1" disabled>分SIZE</el-checkbox>
-                      <el-checkbox label="2" disabled>分指令</el-checkbox>
-                    </el-checkbox-group>
-                    <el-checkbox disabled v-model="produceForm.lossIndividuallyWrap">LOSS单独包装</el-checkbox>
-                    <!-- LOSS数是否单独包装，Y：是，N：否 -->
-                  </div>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="检验员：" prop="checkBy">
                   <el-input
                     v-model="produceForm.checkBy"
@@ -127,11 +112,6 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="备注：">
-                  <span>{{ produceForm.remark }}</span>
-                </el-form-item>
-              </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
@@ -156,10 +136,18 @@
                   </el-date-picker>
                 </el-form-item>
               </el-col>
+
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="备注：">
+                  <span>{{ produceForm.remark }}</span>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </el-card>
-        <el-card style="min-height: 390px;">
+        <el-card style="min-height: 450px;">
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
               <el-button
@@ -188,7 +176,7 @@
             @selection-change="handleSelectionChange"
           >
             <el-table-column type="selection" width="55" align="center" />
-            <el-table-column label="备注" width="200" align="center" prop="remark" >
+            <el-table-column label="备注" width="150" align="center" prop="remark" >
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.remark"
@@ -197,21 +185,22 @@
                 />
               </template>
             </el-table-column>
-            <el-table-column label="净重" width="200" align="center" prop="netWeight" >
+            <el-table-column label="净重" width="150" align="center" prop="netWeight" >
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.netWeight"
                   placeholder="请输入净重"
                   clearable
+                  style="width: 100%;"
                 />
                 </template>
               </el-table-column>
             <el-table-column label="指令" width="80" align="center" prop="directive" />
             <el-table-column label="SIZE" width="80" align="center" prop="standardSize" />
-            <el-table-column label="条码" align="center" prop="barcode" />
+            <el-table-column label="二维码" width="150" align="center" prop="qrcode" />
             <el-table-column label="序号" width="80" align="center" prop="sheetCount" />
-            <el-table-column label="小包序号" width="100" align="center" prop="minSheetCount" />
             <el-table-column label="数量" width="80" align="center" prop="packageNum" />
+            <el-table-column label="LOSS数量" width="100" align="center" prop="lossNum" />
             <el-table-column label="打印次数" width="100" align="center" prop="printTime" />
           </el-table>
 
@@ -238,7 +227,7 @@
 </template>
 
 <script>
-import { workorderList, buildPackagePrint, workorderPackageList, updatePackagePrintRecord, packagePrintRecordInfo } from "@/api/mes/pro/packageLablePrint";
+import { workorderList, workorderLinkInfo, buildPackagePrint, workorderPackageList, updatePackagePrintRecord, packagePrintRecordInfo } from "@/api/mes/pro/packageLablePrint";
 import templatePrint from '@/views/mes/report/index'
 import { postBatchPrintPdf }  from '@/utils/ruoyi'
 export default {
@@ -255,7 +244,13 @@ export default {
       showSearch: true,
       loading: false,
       tableList: [],
-      produceForm: {},
+      produceForm: {
+        packNum: '',
+        checkBy: '',
+        inputBy: '',
+        inputTime: '',
+        encasementNum: ''
+      },
       loadingPackage: false,
       queryPackageParams: {
         pageNum: 1,
@@ -326,10 +321,10 @@ export default {
          return
       }
       const params = {
+        "encasementNum": this.produceForm.encasementNum,
         "checkBy": this.produceForm.checkBy,
         "inputBy": this.produceForm.inputBy,
         "inputTime": this.produceForm.inputTime,
-        "minPackageNum": Number(this.produceForm.minPackageNum),
         "packNum": Number(this.produceForm.packNum),
         "workorderId": this.produceForm.workorderId
       }
@@ -388,15 +383,22 @@ export default {
     },
     handleCurrentChange(row) {
       console.log(row, 'row88')
-      this.produceForm = Object.assign({},row)
-      this.produceForm.packType = [row.packType]
-      this.produceForm.lossIndividuallyWrap = row.lossIndividuallyWrap == 'Y'? true: false
-      this.selectedItemId = row.workorderCode
-      this.queryPackageParams = {
-        pageNum: 1,
-        pageSize: 10
-      }
-      this.getPackageList()
+      workorderLinkInfo({workorderId: row.workorderId}).then((response) => {
+        console.log(response, 'response')
+        if (response.code === 200) {
+          this.produceForm = Object.assign({},row)
+          // this.produceForm.packNum = response.data.packNum
+          // this.produceForm.encasementNum = response.data.encasementNum || ''
+          this.$set(this.produceForm, 'packNum', response.data.packNum || '')
+          this.$set(this.produceForm, 'encasementNum', response.data.encasementNum || '')
+          this.selectedItemId = row.workorderCode
+          this.queryPackageParams = {
+            pageNum: 1,
+            pageSize: 10
+          }
+          this.getPackageList()
+        }
+      });
     },
     handleSelectionChange(selection) {
       this.selectPackageTable = selection