guoyujia 2 місяців тому
батько
коміт
517607fac5
1 змінених файлів з 31 додано та 25 видалено
  1. 31 25
      src/views/business/batchCertificate/index.vue

+ 31 - 25
src/views/business/batchCertificate/index.vue

@@ -8,14 +8,14 @@
           <el-input placeholder="请输入批次号" v-model.trim="queryParams.lotCode" @keydown.enter.prevent clearable
             style="width: 200px" />
         </el-form-item>
-        <el-form-item label="炉号:">
-          <el-input placeholder="请输入炉号" v-model.trim="queryParams.furnaceNumber" @keydown.enter.prevent clearable
-            style="width: 200px" />
-        </el-form-item>
         <el-form-item label="产品描述:">
           <el-input placeholder="请输入产品描述" v-model.trim="queryParams.productDescription" @keydown.enter.prevent clearable
             style="width: 200px" />
         </el-form-item>
+        <el-form-item label="炉号:">
+          <el-input placeholder="请输入炉号" v-model.trim="queryParams.furnaceNumber" @keydown.enter.prevent clearable
+            style="width: 200px" />
+        </el-form-item>
         <el-form-item label="包装线:">
           <el-select placeholder="请选择包装线" v-model.trim="queryParams.packageResourceGroupId" @keydown.enter.prevent
             clearable style="width: 200px">
@@ -37,10 +37,18 @@
             <el-table-column label="行号" type="index" width="80" align="center" />
             <el-table-column label="批次号" prop="lotCode" align="center" width="120"/>
             <el-table-column label="产品描述" prop="productDescription" align="center" width="250" />
-            <el-table-column label="生产工段" prop="certificate.deptName" align="center" width="230" >
+            <el-table-column label="炉号" prop="certificate.furnaceNumber" align="center" width="230" >
+              <template #default="scope">
+                <el-input disabled v-model="scope.row.certificate.furnaceNumber" placeholder="" style="width: 210px"> <template #append>
+                    <el-button :disabled="scope.row.certificate.generateTime != null" icon="Edit"
+                      @click="showFurnaceNumberDialog(scope.row)"></el-button>
+                  </template></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="生产工段" prop="certificate.deptName" align="center" width="170" >
               <template #default="scope">
                 <el-input readonly :disabled="scope.row.certificate.generateTime != null" v-model="scope.row.certificate.deptName" placeholder=""
-                  style="width: 210px">
+                  style="width: 150px">
                   <template #append>
                     <el-button :disabled="scope.row.certificategenerateTime != null" icon="Search"
                       @click="showDeptChoiceDialog(scope.row)"></el-button>
@@ -48,10 +56,10 @@
                 </el-input>
               </template>
             </el-table-column>
-            <el-table-column label="包装线号" prop="certificate.packageLineNo" align="center" width="230" >
+            <el-table-column label="包装线号" prop="certificate.packageLineNo" align="center" width="130" >
               <template #default="scope">
                 <el-input readonly :disabled="scope.row.certificate.generateTime != null" v-model="scope.row.certificate.packageLineNo" placeholder=""
-                  style="width: 210px">
+                  style="width: 120px">
                   <template #append>
                     <el-button :disabled="scope.row.certificate.generateTime != null" icon="Search"
                       @click="showLineChoiceDialog(scope.row)"></el-button>
@@ -59,10 +67,10 @@
                 </el-input>
               </template>
             </el-table-column>
-            <el-table-column label="包装箱号" prop="certificate.packageNo" align="center" width="230" >
+            <el-table-column label="包装箱号" prop="certificate.packageNo" align="center" width="110" >
               <template #default="scope">
                 <el-input readonly :disabled="scope.row.certificate.generateTime != null" v-model="scope.row.certificate.packageNo" placeholder=""
-                  style="width: 210px">
+                  style="width:100px">
                   <template #append>
                     <el-button :disabled="scope.row.certificate.generateTime != null" icon="Search"
                       @click="showPackageChoiceDialog(scope.row)"></el-button>
@@ -87,13 +95,13 @@
       </div>
     </template>
             </el-table-column>
-            <el-table-column label="标签数量" prop="certificate.labelNumber" align="center" width="130" >
+            <el-table-column label="标签数量" prop="certificate.labelNumber" align="center" width="110" >
               <template #default="scope">
                 <el-input-number :disabled="scope.row.certificate.generateTime != null" v-model="scope.row.certificate.labelNumber" :step="1"
                   step-strictly :controls="false" @change="handleLabelNumberChange(scope.row)" style="width: 100px" />
               </template>
             </el-table-column>
-            <el-table-column label="打印份数" prop="certificate.printPages" align="center" width="130" >
+            <el-table-column label="打印份数" prop="certificate.printPages" align="center" width="110" >
               <template #default="scope">
                 <el-input :disabled="scope.row.certificate.generateTime != null" v-model="scope.row.certificate.printPages" style="width: 100px" />
               </template>
@@ -112,22 +120,15 @@
                   </template></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="采购订单号" prop="certificate.purchaseOrderNo" align="center" width="230" >
+            <el-table-column label="采购订单号" prop="certificate.purchaseOrderNo" align="center" width="150" >
               <template #default="scope">
-                <el-input :disabled="scope.row.certificate.generateTime != null" v-model="scope.row.certificate.purchaseOrderNo" style="width: 210px" />
+                <el-input :disabled="scope.row.certificate.generateTime != null" v-model="scope.row.certificate.purchaseOrderNo" style="width: 130px" />
               </template>
             </el-table-column>
-            <el-table-column label="炉号" prop="certificate.furnaceNumber" align="center" width="230" >
-              <template #default="scope">
-                <el-input disabled v-model="scope.row.certificate.furnaceNumber" placeholder="" style="width: 210px"> <template #append>
-                    <el-button :disabled="scope.row.certificate.generateTime != null" icon="Edit"
-                      @click="showFurnaceNumberDialog(scope.row)"></el-button>
-                  </template></el-input>
-              </template>
-            </el-table-column>
-            <el-table-column label="包装尺寸" prop="certificate.packageStandard" align="center" width="200" >
+
+            <el-table-column label="包装尺寸" prop="certificate.packageStandard" align="center" width="150" >
             </el-table-column>
-            <el-table-column label="包装形式码" prop="certificate.packageTypeCode" align="center" width="200" >
+            <el-table-column label="包装形式码" prop="certificate.packageTypeCode" align="center" width="150" >
             </el-table-column>        
             <el-table-column label="创建时间" prop="submitTime" align="center" width="150" />
             <el-table-column label="打印次数" prop="printCount" align="center" />
@@ -253,7 +254,11 @@ function showCompanyNameDialog(row) {
   proxy.$refs.companyDialogRef.open(row.certificate.companyName);
 }
 function showFurnaceNumberDialog(row){
-  proxy.$refs.dialogFurnaceNoInfoRef.open({productionPlanNo:row.certificate.productionPlanNo,lineNumber:row.certificate.lineNumber})
+  proxy.$refs.dialogFurnaceNoInfoRef.open({productionPlanNo:row.productionPlanNo,lineNumber:row.lineNumber})
+}
+function handleFurnaceNoInfo(item){
+  let index = certificateList.value.findIndex(item=>item.id == sealItem.value.id)
+  certificateList.value[index].certificate.furnaceNumber = item.furnaceNumber;
 }
 function handleDeptChoice(item) {
   let index = certificateList.value.findIndex(item=>item.id == sealItem.value.id)
@@ -278,6 +283,7 @@ function handlePackageLineChoice(item) {
 function handlePackageTypeChoice(item) {
   let index = certificateList.value.findIndex(item=>item.id == sealItem.value.id)
   certificateList.value[index].certificate.packageCode = item.packageCode;
+  certificateList.value[index].certificate.packageNo = item.packageNo;
   certificateList.value[index].certificate.packageStandard = item.packageStandard;
   certificateList.value[index].certificate.packageId = item.accessoriesId;
   certificateList.value[index].certificate.packageTypeCode = item.packageTypeCode;