From 57442792c50db6948d30b561e866ca80316dc9f3 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 25 Apr 2023 13:39:45 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/pad/padPartAttribute.vue    |  9 +++-
 .../print/print_stock_label_preview.js        |  2 +-
 .../modules/production/generateReport.vue     |  6 +--
 src/views/modules/production/inspect.vue      | 46 +++++++++++--------
 4 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/pad/padPartAttribute.vue b/src/views/modules/pad/padPartAttribute.vue
index 3054434..a44f54f 100644
--- a/src/views/modules/pad/padPartAttribute.vue
+++ b/src/views/modules/pad/padPartAttribute.vue
@@ -96,7 +96,7 @@
             prop="componentPartNo"
             header-align="center"
             align="left"
-            min-width="60"
+            min-width="40"
             label="零部件编码">
           </el-table-column>
           <el-table-column
@@ -141,6 +141,13 @@
             min-width="30"
             label="计量单位">
           </el-table-column>
+          <el-table-column
+            prop="qtyAssemblyPerRecipe"
+            header-align="center"
+            align="right"
+            min-width="30"
+            label="配方单位用量">
+          </el-table-column>
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="工艺路线"  name="tab3" >
diff --git a/src/views/modules/print/print_stock_label_preview.js b/src/views/modules/print/print_stock_label_preview.js
index 6260ad7..df16c66 100644
--- a/src/views/modules/print/print_stock_label_preview.js
+++ b/src/views/modules/print/print_stock_label_preview.js
@@ -71,7 +71,7 @@ export function printMaterialLabelPreview(printList) {
       LODOP.ADD_PRINT_TEXT(176,216,100,20,"Valid Date:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(177,300,100,25,printData.expiredDate);
+      LODOP.ADD_PRINT_TEXT(176,296,100,25,printData.expiredDate);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.ADD_PRINT_TEXT(29,209,189,25,printData.status);
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index d7606ad..bcb7c3e 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -405,10 +405,10 @@
         <el-form-item label="合格数量">
           <el-input type="number" style="width: 178px;" :disabled="approveFlag"  class="input_reight"  v-model="saveHeaderData.qtyApprove" @blur="qtyApproveBlur()"></el-input>
         </el-form-item>
-        <el-form-item label="不合格数量" >
+        <el-form-item label="不合格/缺失数量" >
           <el-input type="number"  class="input_left" style="width: 178px;"  v-model="saveHeaderData.qtyUnApprove" @blur="qtyReportedBlur()"></el-input>
         </el-form-item>
-        <el-form-item label="模数" >
+        <el-form-item label="生产模数" >
           <el-input type="number" style="width: 178px;"  v-model="moQty"  @blur="moQtyBlur()"></el-input>
         </el-form-item>
 
@@ -417,7 +417,7 @@
         <el-form-item label="带框合格重量(KG)">
           <el-input type="number" style="width: 178px;"  class="input_reight" :disabled="factorFlag"  v-model="KGApprove" @blur="KGApproveBlur()"></el-input>
         </el-form-item>
-        <el-form-item label="不合格重量(KG)">
+        <el-form-item label="不合格/缺失重量(KG)">
           <el-input type="number"  class="input_left" style="width: 178px;" :disabled="factorFlag"  v-model="KGReported" @blur="KGReportedBlur()"></el-input>
         </el-form-item>
         <el-form-item label="模具孔数">
diff --git a/src/views/modules/production/inspect.vue b/src/views/modules/production/inspect.vue
index e158e2e..5928093 100644
--- a/src/views/modules/production/inspect.vue
+++ b/src/views/modules/production/inspect.vue
@@ -7,13 +7,16 @@
       <el-form-item :label="'生产订单号'">
         <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
       </el-form-item>
+      <el-form-item :label="'派工单号'">
+        <el-input v-model="searchData.seqNo" style="width: 120px" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')"></el-input>
+      </el-form-item>
       <el-form-item :label="'检验单类型'">
-        <el-select v-model="searchData.toTypeFlag" style="width: 120px">
+        <el-select v-model="searchData.toTypeFlagDb" style="width: 120px">
           <el-option label="全部" value=""></el-option>
-          <el-option label="混炼胶入库" value="混炼胶入库"></el-option>
-          <el-option label="硫化检验单" value="硫化检验单"></el-option>
-          <el-option label="进料检验" value="进料检验"></el-option>
-          <el-option label="物料过期送检" value="物料过期送检"></el-option>
+          <el-option label="混炼胶入库" value="W"></el-option>
+          <el-option label="硫化检验单" value="I"></el-option>
+          <el-option label="进料检验" value="Q"></el-option>
+          <el-option label="物料过期送检" value="S"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="'是否检验'">
@@ -379,12 +382,13 @@
           workCenterNo: '',
           partNo: '',
           site: '',
-          toTypeFlag:'',
+          toTypeFlagDb:'',
           inspectedFlag:'',
           needReceiveFlag:'N',
           endDate:'',
           startDate:'',
           operatorName:'',
+          seqNo:'',
         },
         height2:600,
         inspectData:{
@@ -497,7 +501,6 @@
         inspectSave(this.inspectData).then(({data}) => {
           if (data && data.code === 0) {
             this.search ();
-            debugger
             let printData=data.row
             printData.userId=this.$store.state.user.name
             if(this.inspectData.toTypeFlagDb=='S'){
@@ -505,7 +508,7 @@
               array.push(printData)
               printInspectStockLabel(array)
             }else {
-              if(printData.toTypeFlagDb!='I'){
+              if(this.inspectData.toTypeFlagDb!='I'){
                 printData.seqNo=printData.orderNo
               }
               let array=[];
@@ -553,14 +556,20 @@
         })
       },
       cancelInspect(row){
-        this.$confirm(`是否删除这条检验单?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
+        if(row.toTypeFlag==='硫化检验单'){
+          this.$alert('这个检验单不是重复的检验单无法删除', '错误', {
+            confirmButtonText: '确定'
+          })
+
+        }else {
+          this.$confirm(`是否删除这条检验单?`, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
             cancelInspect(row).then(({data}) => {
               if (data && data.code === 0) {
-                this.search ();
+                this.search();
                 this.$message({
                   message: '操作成功',
                   type: 'success',
@@ -568,14 +577,15 @@
                   onClose: () => {
                   }
                 })
-              }else {
+              } else {
                 this.$alert(data.msg, '错误', {
                   confirmButtonText: '确定'
                 })
               }
             })
-        }).catch(() => {
-        })
+          }).catch(() => {
+          })
+        }
       },
       toPrint(row){
         if(row.toTypeFlagDb=='S') {
@@ -597,7 +607,7 @@
             if (data && data.code === 0) {
               let printData=data.row
               printData.userId=this.$store.state.user.name
-              if(printData.toTypeFlagDb!='I'){
+              if(row.toTypeFlagDb!='I'){
                 printData.seqNo=printData.orderNo
               }
               if(row.toTypeFlag=='硫化检验单(重复)'){