From 227a2de5e37b3511b994b5c894b4ee6b1e0a6400 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Thu, 2 Dec 2021 08:32:51 +0800
Subject: [PATCH 1/2] tijiao

---
 hb_client/src/views/em/detection.vue     |  1 +
 hb_client/src/views/em/equipment.vue     |  1 +
 hb_client/src/views/em/record.vue        |  1 +
 hb_client/src/views/inm/fifo.vue         |  1 +
 hb_client/src/views/inm/fifodetail.vue   |  3 ++-
 hb_client/src/views/inm/warehouse.vue    |  1 +
 hb_client/src/views/mtm/material.vue     |  1 +
 hb_client/src/views/mtm/materialdo.vue   |  3 +++
 hb_client/src/views/mtm/process.vue      |  1 +
 hb_client/src/views/mtm/step.vue         |  5 ++++-
 hb_client/src/views/mtm/stepdo.vue       |  2 ++
 hb_client/src/views/pm/plan.vue          |  1 +
 hb_client/src/views/pm/work.vue          |  2 ++
 hb_client/src/views/sam/contract.vue     |  1 +
 hb_client/src/views/sam/customer.vue     |  1 +
 hb_client/src/views/sam/order.vue        |  1 +
 hb_client/src/views/sam/review.vue       |  1 +
 hb_client/src/views/wpm/need.vue         |  4 ++--
 hb_client/src/views/wpm/operation.vue    | 25 ++++++++++++++++++++----
 hb_client/src/views/wpm/operationdo.vue  |  5 +++--
 hb_client/src/views/wpm/worktask.vue     | 15 ++++++++++----
 hb_client/src/views/wpm/worktaskcopy.vue |  9 +++++----
 22 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/hb_client/src/views/em/detection.vue b/hb_client/src/views/em/detection.vue
index 36ce520..2f5461f 100644
--- a/hb_client/src/views/em/detection.vue
+++ b/hb_client/src/views/em/detection.vue
@@ -126,6 +126,7 @@
     </el-card>
     <el-dialog
       :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
       :title="dialogType === 'edit' ? '编辑设备' : '新增设备'"
     >
       <el-form
diff --git a/hb_client/src/views/em/equipment.vue b/hb_client/src/views/em/equipment.vue
index 30c8be7..6346164 100644
--- a/hb_client/src/views/em/equipment.vue
+++ b/hb_client/src/views/em/equipment.vue
@@ -135,6 +135,7 @@
     </el-card>
     <el-dialog
       :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
       :title="dialogType === 'edit' ? '编辑设备' : '新增设备'"
     >
       <el-form
diff --git a/hb_client/src/views/em/record.vue b/hb_client/src/views/em/record.vue
index 730d944..bf1999e 100644
--- a/hb_client/src/views/em/record.vue
+++ b/hb_client/src/views/em/record.vue
@@ -94,6 +94,7 @@
     </el-card>
     <el-dialog
       :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
       :title="dialogType === 'edit' ? '编辑校准检定' : '新增校准检定'"
     >
       <el-form
diff --git a/hb_client/src/views/inm/fifo.vue b/hb_client/src/views/inm/fifo.vue
index 352f30a..8147c52 100644
--- a/hb_client/src/views/inm/fifo.vue
+++ b/hb_client/src/views/inm/fifo.vue
@@ -97,6 +97,7 @@
     </el-card>
     <el-dialog
       :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
       :title="dialogType === 'edit' ? '编辑出/如库记录' : '新增出/如库记录'"
     >
       <el-form
diff --git a/hb_client/src/views/inm/fifodetail.vue b/hb_client/src/views/inm/fifodetail.vue
index 8c1e112..0f6db34 100644
--- a/hb_client/src/views/inm/fifodetail.vue
+++ b/hb_client/src/views/inm/fifodetail.vue
@@ -67,7 +67,7 @@
       />
     </el-card>
 
-    <el-dialog title="物料检查表" :visible.sync="outerVisible">
+    <el-dialog title="物料检查表" :close-on-click-modal="false" :visible.sync="outerVisible">
       <el-select style="width: 100%" v-model="recordform" placeholder="请选择">
         <el-option
           v-for="item in recordformList"
@@ -82,6 +82,7 @@
         width="30%"
         title="检查项目"
         :visible.sync="innerVisible"
+        :close-on-click-modal="false"
         append-to-body
       >
         <el-form label-width="80px" label-position="right">
diff --git a/hb_client/src/views/inm/warehouse.vue b/hb_client/src/views/inm/warehouse.vue
index ae2980e..a8ab21e 100644
--- a/hb_client/src/views/inm/warehouse.vue
+++ b/hb_client/src/views/inm/warehouse.vue
@@ -87,6 +87,7 @@
     </el-card>
     <el-dialog
       :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
       :title="dialogType === 'edit' ? '编辑仓库' : '新增仓库'"
     >
       <el-form
diff --git a/hb_client/src/views/mtm/material.vue b/hb_client/src/views/mtm/material.vue
index 5cbe25d..afaf129 100644
--- a/hb_client/src/views/mtm/material.vue
+++ b/hb_client/src/views/mtm/material.vue
@@ -116,6 +116,7 @@
     </el-card>
     <el-dialog
       :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
       :title="dialogType === 'edit' ? '编辑物料' : '新增物料'"
     >
       <el-form
diff --git a/hb_client/src/views/mtm/materialdo.vue b/hb_client/src/views/mtm/materialdo.vue
index 5050edf..6d3efcd 100644
--- a/hb_client/src/views/mtm/materialdo.vue
+++ b/hb_client/src/views/mtm/materialdo.vue
@@ -61,6 +61,7 @@
             <!--新增、编辑记录表格-->
             <el-dialog
               :visible.sync="dialogVisible"
+              :close-on-click-modal="false"
               :title="dialogType === 'edit' ? '编辑记录表格' : '新增记录表格'"
             >
               <el-form
@@ -85,6 +86,7 @@
             <!--表格展示-->
             <el-dialog
               :visible.sync="dialogVisibleForm"
+              :close-on-click-modal="false"
               :title="tableForm.name"
             >
               <el-form ref="Forms" label-width="80px" :model="checkForm">
@@ -316,6 +318,7 @@
             <!--表格字段新增编辑-->
             <el-dialog
               :visible.sync="dialogVisible1"
+              :close-on-click-modal="false"
               :title="dialogType1 === 'edit' ? '编辑表格字段' : '新增表格字段'"
             >
               <el-form
diff --git a/hb_client/src/views/mtm/process.vue b/hb_client/src/views/mtm/process.vue
index f5f2c07..3557080 100644
--- a/hb_client/src/views/mtm/process.vue
+++ b/hb_client/src/views/mtm/process.vue
@@ -76,6 +76,7 @@
       />
     </el-card>
     <el-dialog
+    :close-on-click-modal="false"
       :visible.sync="dialogVisible"
       :title="dialogType === 'edit' ? '编辑工序' : '新增工序'"
     >
diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue
index 6a51aca..5aa523f 100644
--- a/hb_client/src/views/mtm/step.vue
+++ b/hb_client/src/views/mtm/step.vue
@@ -61,6 +61,7 @@
       </el-table>
       <el-dialog
         :visible.sync="dialogVisibles"
+        :close-on-click-modal="false"
         :title="dialogTypes === 'edit' ? '编辑工序' : '新增工序'"
       >
         <el-form
@@ -175,6 +176,7 @@
             </el-table>
             <el-dialog
               :visible.sync="dialogVisible"
+              :close-on-click-modal="false"
               :title="dialogType === 'edit' ? '编辑记录表格' : '新增记录表格'"
             >
               <el-form
@@ -216,6 +218,7 @@
             </el-dialog>
             <el-dialog
               :model="tableForm"
+              :close-on-click-modal="false"
               :visible.sync="dialogVisibleForm"
               :title="tableForm.name">
               <el-form
@@ -349,7 +352,7 @@
         :limit.sync="listQueryfield.page_size"
         @pagination="fieldLists"
       />
-            <el-dialog :visible.sync="dialogVisible1" :title="dialogType1 === 'edit' ? '编辑表格字段' : '新增表格字段'">
+            <el-dialog :visible.sync="dialogVisible1" :close-on-click-modal="false" :title="dialogType1 === 'edit' ? '编辑表格字段' : '新增表格字段'">
               <el-form ref="Form" :model="field" label-width="80px" label-position="right">
                 <el-form-item label="字段类型" prop="field_type">
                   <el-select  style="width: 100%"  v-model="field.field_type" placeholder="请选择">
diff --git a/hb_client/src/views/mtm/stepdo.vue b/hb_client/src/views/mtm/stepdo.vue
index 8a5b5ff..b6c9cfd 100644
--- a/hb_client/src/views/mtm/stepdo.vue
+++ b/hb_client/src/views/mtm/stepdo.vue
@@ -66,6 +66,7 @@
                 </el-table>
                 <el-dialog
                   :visible.sync="dialogVisible"
+                  :close-on-click-modal="false"
                   :title="dialogType === 'edit' ? '编辑记录表格' : '新增记录表格'"
                 >
                   <el-form
@@ -160,6 +161,7 @@
                 </el-table>
                 <el-dialog
                   :visible.sync="dialogVisible1"
+                  :close-on-click-modal="false"
                   :title="dialogType1 === 'edit' ? '编辑表格字段' : '新增表格字段'"
                 >
                   <el-form
diff --git a/hb_client/src/views/pm/plan.vue b/hb_client/src/views/pm/plan.vue
index f3e80a6..dbc41bc 100644
--- a/hb_client/src/views/pm/plan.vue
+++ b/hb_client/src/views/pm/plan.vue
@@ -162,6 +162,7 @@
       />
     <el-dialog
       :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
       :title="'排产计划'"
     >
       <el-form
diff --git a/hb_client/src/views/pm/work.vue b/hb_client/src/views/pm/work.vue
index 6e2ef53..3b95142 100644
--- a/hb_client/src/views/pm/work.vue
+++ b/hb_client/src/views/pm/work.vue
@@ -102,6 +102,7 @@
     </el-card>
     <el-dialog
       :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
     >
       <el-form
         ref="Form"
@@ -140,6 +141,7 @@
     </el-dialog>
      <el-dialog
       :visible.sync="dialogVisibles"
+      :close-on-click-modal="false"
     >
      
           <el-table
diff --git a/hb_client/src/views/sam/contract.vue b/hb_client/src/views/sam/contract.vue
index 86a3547..571996b 100644
--- a/hb_client/src/views/sam/contract.vue
+++ b/hb_client/src/views/sam/contract.vue
@@ -98,6 +98,7 @@
     </el-card>
     <el-dialog
       :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
       :title="dialogType === 'edit' ? '编辑合同' : '新增合同'"
     >
       <el-form
diff --git a/hb_client/src/views/sam/customer.vue b/hb_client/src/views/sam/customer.vue
index d63b264..9a736d7 100644
--- a/hb_client/src/views/sam/customer.vue
+++ b/hb_client/src/views/sam/customer.vue
@@ -91,6 +91,7 @@
     </el-card>
     <el-dialog
       :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
       :title="dialogType === 'edit' ? '编辑客户' : '新增客户'"
     >
       <el-form
diff --git a/hb_client/src/views/sam/order.vue b/hb_client/src/views/sam/order.vue
index 33aa5d6..8ed9b82 100644
--- a/hb_client/src/views/sam/order.vue
+++ b/hb_client/src/views/sam/order.vue
@@ -98,6 +98,7 @@
     </el-card>
     <el-dialog
       :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
       :title="dialogType === 'edit' ? '编辑订单' : '新增订单'"
     >
       <el-form
diff --git a/hb_client/src/views/sam/review.vue b/hb_client/src/views/sam/review.vue
index eed7344..9a5d55f 100644
--- a/hb_client/src/views/sam/review.vue
+++ b/hb_client/src/views/sam/review.vue
@@ -97,6 +97,7 @@
     </el-card>
     <el-dialog
       :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
       :title="dialogType === 'edit' ? '编辑合同' : '新增合同'"
     >
       <el-form
diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue
index c1ac98b..37be5ee 100644
--- a/hb_client/src/views/wpm/need.vue
+++ b/hb_client/src/views/wpm/need.vue
@@ -147,7 +147,7 @@
   </el-tab-pane>
 </el-tabs>
    
-    <el-dialog title="物料检查表" :visible.sync="outerVisible">
+    <el-dialog title="物料检查表" :close-on-click-modal="false" :visible.sync="outerVisible">
       <el-select style="width: 100%" v-model="recordform" placeholder="请选择">
         <el-option
           v-for="item in recordformList"
@@ -302,7 +302,7 @@
         >
       </div>
     </el-dialog>
-    <el-dialog title="半成品入库" :visible.sync="dialogFormVisible">
+    <el-dialog title="半成品入库" :close-on-click-modal="false" :visible.sync="dialogFormVisible">
   <el-form :model="form">
       <el-form-item label="仓库" :label-width="formLabelWidth">
         <el-select
diff --git a/hb_client/src/views/wpm/operation.vue b/hb_client/src/views/wpm/operation.vue
index 881d642..89b9c65 100644
--- a/hb_client/src/views/wpm/operation.vue
+++ b/hb_client/src/views/wpm/operation.vue
@@ -37,13 +37,30 @@
         </el-table-column>
 
         <el-table-column label="过程记录表">
-          <template slot-scope="scope">{{ scope.row.record_count }}</template>
+          
+          <template slot-scope="scope" v-if="scope.row.record_">
+            <el-tag v-for="item in scope.row.record_"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">{{item.name}}</el-tag>
+          </template>
+      
+         
         </el-table-column>
         <el-table-column label="产品数量">
-          <template slot-scope="scope">{{ scope.row.wproduct_count }}</template>
+           <template slot-scope="scope" v-if="scope.row.wproduct_">
+             {{ scope.row.wproduct_.length }}
+           
+       </template>
         </el-table-column>
-        <el-table-column label="设备数量">
-          <template slot-scope="scope">{{ scope.row.equip_count }}</template>
+        <el-table-column label="生产设备">
+           <template slot-scope="scope" v-if="scope.row.equip_">
+             
+            <el-tag v-for="item in scope.row.equip_"
+                    :key="item.id"
+                    :label="item.number"
+                    :value="item.id">{{item.number}}</el-tag>
+        </template>
         </el-table-column>
 
         <el-table-column label="创建时间">
diff --git a/hb_client/src/views/wpm/operationdo.vue b/hb_client/src/views/wpm/operationdo.vue
index 41481c7..fd974e0 100644
--- a/hb_client/src/views/wpm/operationdo.vue
+++ b/hb_client/src/views/wpm/operationdo.vue
@@ -159,6 +159,7 @@
               <el-dialog
                 :model="tableForm"
                 :visible.sync="dialogVisibleForm"
+                :close-on-click-modal="false"
                 :title="tableForm.name"
               >
                 <el-form label-width="80px" label-position="right">
@@ -303,7 +304,7 @@
                 <el-table-column prop="count" label="消耗数量">
                 </el-table-column>
               </el-table>
-              <el-dialog title="车间物料" :visible.sync="dialogTablepick">
+              <el-dialog title="车间物料" :close-on-click-modal="false" :visible.sync="dialogTablepick">
                 <el-table
                   :data="wmaterialData"
                   border
@@ -394,7 +395,7 @@
               </el-table-column>
               <el-table-column prop="count" label="产出数量"> </el-table-column>
             </el-table>
-            <el-dialog title="产出物料" :visible.sync="dialogTableoutput">
+            <el-dialog title="产出物料" :close-on-click-modal="false" :visible.sync="dialogTableoutput">
               <el-table
                 :data="tprogressData"
                 border
diff --git a/hb_client/src/views/wpm/worktask.vue b/hb_client/src/views/wpm/worktask.vue
index 4cb2b8b..b638fbe 100644
--- a/hb_client/src/views/wpm/worktask.vue
+++ b/hb_client/src/views/wpm/worktask.vue
@@ -24,6 +24,12 @@
               scope.row.number
             }}</template>
           </el-table-column>
+           <el-table-column label="“产品名称”">
+          <template slot-scope="scope">{{ scope.row.product_.name }}</template>
+        </el-table-column>
+           <el-table-column label="“产品型号”">
+          <template slot-scope="scope">{{ scope.row.product_.specification }}</template>
+        </el-table-column>
             <el-table-column label="生产主产品" width="140">
             <template slot-scope="scope" >{{
               scope.row.main_product_.name
@@ -217,7 +223,7 @@
         </el-row>
       </el-tab-pane>
     </el-tabs>
-<el-dialog title="领半成品" :visible.sync="dialogTableVisiblepick">
+<el-dialog title="领半成品" :close-on-click-modal="false" :visible.sync="dialogTableVisiblepick">
   <el-table :data="bcplist" style="width: 100%">
    
             <el-table-column prop="material_.name" label="物料名称">
@@ -256,7 +262,7 @@
   </div>
 </el-dialog>
 
- <el-dialog title="半成品列表" :visible.sync="dialogTableVisiblepicks">
+ <el-dialog title="半成品列表" :close-on-click-modal="false" :visible.sync="dialogTableVisiblepicks">
    <el-table
        
         :data="wproductslist"
@@ -296,7 +302,7 @@
 </el-dialog>
 
 
-    <el-dialog :visible.sync="dialogVisiblenw" width="80%" title="领料">
+    <el-dialog :visible.sync="dialogVisiblenw" :close-on-click-modal="false" width="80%" title="领料">
       <el-card class="box-card">
         <div slot="header" class="clearfix">
           <span>生产所需领料表</span>
@@ -372,7 +378,7 @@
         </template>
       </el-card>
     </el-dialog>
-    <el-dialog title="半成品列表" :visible.sync="dialogTableVisible">
+    <el-dialog title="半成品列表" :close-on-click-modal="false" :visible.sync="dialogTableVisible">
    <el-table
        
         :data="iproductData"
@@ -409,6 +415,7 @@
 </el-dialog>
     <el-dialog
       :visible.sync="dialogVisiblework"
+      :close-on-click-modal="false"
       :fullscreen="true"
       title="填写记录"
     >
diff --git a/hb_client/src/views/wpm/worktaskcopy.vue b/hb_client/src/views/wpm/worktaskcopy.vue
index fcfd38c..afadbb2 100644
--- a/hb_client/src/views/wpm/worktaskcopy.vue
+++ b/hb_client/src/views/wpm/worktaskcopy.vue
@@ -199,7 +199,7 @@
         </el-row>
       </el-tab-pane>
     </el-tabs>
-<el-dialog title="领半成品" :visible.sync="dialogTableVisiblepick">
+<el-dialog title="领半成品" :close-on-click-modal="false" :visible.sync="dialogTableVisiblepick">
   <el-table :data="bcplist" style="width: 100%">
             <el-table-column prop="material_.name" label="物料名称">
             </el-table-column>
@@ -237,7 +237,7 @@
   </div>
 </el-dialog>
 
- <el-dialog title="半成品列表" :visible.sync="dialogTableVisiblepicks">
+ <el-dialog title="半成品列表" :close-on-click-modal="false" :visible.sync="dialogTableVisiblepicks">
    <el-table
        
         :data="wproductslist"
@@ -276,7 +276,7 @@
 </el-dialog>
 
 
-    <el-dialog :visible.sync="dialogVisiblenw" width="80%" title="领料">
+    <el-dialog :visible.sync="dialogVisiblenw" :close-on-click-modal="false" width="80%" title="领料">
       <el-card class="box-card">
         <div slot="header" class="clearfix">
           <span>生产所需领料表</span>
@@ -351,7 +351,7 @@
         </template>
       </el-card>
     </el-dialog>
-    <el-dialog title="半成品列表" :visible.sync="dialogTableVisible">
+    <el-dialog title="半成品列表" :close-on-click-modal="false" :visible.sync="dialogTableVisible">
    <el-table
        
         :data="iproductData"
@@ -388,6 +388,7 @@
 </el-dialog>
     <el-dialog
       :visible.sync="dialogVisiblework"
+      :close-on-click-modal="false"
       :fullscreen="true"
       title="填写记录"
     >

From f22078bb0a26898f9c7730310f270a4018ba4f97 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Thu, 2 Dec 2021 09:10:13 +0800
Subject: [PATCH 2/2] xiug

---
 hb_client/src/views/pm/work.vue      | 4 ++--
 hb_client/src/views/wpm/worktask.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hb_client/src/views/pm/work.vue b/hb_client/src/views/pm/work.vue
index 3b95142..0623fed 100644
--- a/hb_client/src/views/pm/work.vue
+++ b/hb_client/src/views/pm/work.vue
@@ -18,10 +18,10 @@
         <el-table-column type="index" width="50" />
         
           
-           <el-table-column label="“产品名称”">
+           <el-table-column label="产品名称">
           <template slot-scope="scope">{{ scope.row.product_.name }}</template>
         </el-table-column>
-           <el-table-column label="“产品型号”">
+           <el-table-column label="产品型号">
           <template slot-scope="scope">{{ scope.row.product_.specification }}</template>
         </el-table-column>
          <el-table-column label="名称">
diff --git a/hb_client/src/views/wpm/worktask.vue b/hb_client/src/views/wpm/worktask.vue
index b638fbe..598af64 100644
--- a/hb_client/src/views/wpm/worktask.vue
+++ b/hb_client/src/views/wpm/worktask.vue
@@ -24,10 +24,10 @@
               scope.row.number
             }}</template>
           </el-table-column>
-           <el-table-column label="“产品名称”">
+           <el-table-column label="产品名称">
           <template slot-scope="scope">{{ scope.row.product_.name }}</template>
         </el-table-column>
-           <el-table-column label="“产品型号”">
+           <el-table-column label="产品型号">
           <template slot-scope="scope">{{ scope.row.product_.specification }}</template>
         </el-table-column>
             <el-table-column label="生产主产品" width="140">