From 99087c671bdace7e5186a84c0e92239b4f121478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
 <411641505@qq.com>
Date: Tue, 10 Oct 2023 18:16:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=92=8C=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E7=9A=84=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E5=8D=95=E7=A7=BB=E5=8A=A8=E5=88=B0=E8=A1=8C=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/wm/itemrecpt/index.vue    | 12 ++----
 src/views/mes/wm/itemrecpt/line.vue     | 53 ++++++++++++++++++++++++-
 src/views/mes/wm/productsalse/index.vue | 14 ++-----
 src/views/mes/wm/productsalse/line.vue  | 53 ++++++++++++++++++++++++-
 4 files changed, 109 insertions(+), 23 deletions(-)

diff --git a/src/views/mes/wm/itemrecpt/index.vue b/src/views/mes/wm/itemrecpt/index.vue
index 638d168..4bcdc27 100644
--- a/src/views/mes/wm/itemrecpt/index.vue
+++ b/src/views/mes/wm/itemrecpt/index.vue
@@ -105,7 +105,6 @@
         </template>
       </el-table-column>
       <el-table-column label="入库单名称" align="center" prop="recptName" :show-overflow-tooltip="true"/>
-      <el-table-column label="检验单编号" align="center" width="180px" prop="iqcCode" />
       <el-table-column label="供应商名称" align="center" prop="vendorName" :show-overflow-tooltip="true"/>      
       <el-table-column label="入库日期" align="center" prop="recptDate" width="180">
         <template slot-scope="scope">
@@ -210,14 +209,6 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="来料检验单" prop="iqcCode">
-              <el-input v-model="form.iqcCode" readonly="readonly" placeholder="请选择来料检验单" >
-                <el-button slot="append" @click="handleSelectIqc" icon="el-icon-search"></el-button>
-              </el-input>
-              <IqcSelect ref="iqcSelect" @onSelected="onIqcSelected"></IqcSelect>
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="供应商" prop="vendorName">
               <el-input v-model="form.vendorName" readonly="readonly" placeholder="请选择供应商" >
@@ -236,6 +227,9 @@
               </el-cascader>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+
+          </el-col>
         </el-row>               
         <el-row>
           <el-col :span="24">
diff --git a/src/views/mes/wm/itemrecpt/line.vue b/src/views/mes/wm/itemrecpt/line.vue
index e870ad8..de6f6f5 100644
--- a/src/views/mes/wm/itemrecpt/line.vue
+++ b/src/views/mes/wm/itemrecpt/line.vue
@@ -41,6 +41,12 @@
           <span>{{ parseTime(scope.row.expireDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="是否检验" align="center" prop="iqcCheck">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.iqcCheck"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="检验单编号" width="120" align="center" prop="iqcCode" />
       <el-table-column label="操作" align="center" width="100px" v-if="optType != 'view'" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -115,7 +121,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="入库仓库" prop="warehouseId">
               <el-cascader v-model="warehouseInfo"
                 :options="warehouseOptions"
@@ -125,6 +131,33 @@
               </el-cascader>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否检验">
+              <el-radio-group v-model="form.iqcCheck" disabled v-if="optType=='view'">
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+
+              <el-radio-group v-model="form.iqcCheck" v-else>
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span ="8">
+            <el-form-item v-if="form.iqcCheck == 'Y'" label="来料检验单" prop="iqcCode">
+              <el-input v-model="form.iqcCode" readonly="readonly" placeholder="请选择来料检验单" >
+                <el-button slot="append" @click="handleSelectIqc" icon="el-icon-search"></el-button>
+              </el-input>
+              <IqcSelect ref="iqcSelect" @onSelected="onIqcSelected"></IqcSelect>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -145,10 +178,12 @@
 <script>
 import { listItemrecptline, getItemrecptline, delItemrecptline, addItemrecptline, updateItemrecptline } from "@/api/mes/wm/itemrecptline";
 import ItemSelect  from "@/components/itemSelect/single.vue";
+import IqcSelect from "@/components/iqcSelect/single.vue";
 import {getTreeList} from "@/api/mes/wm/warehouse"
 export default {
   name: "Itemrecptline",
-  components :{ItemSelect},
+  dicts: ['sys_yes_no'],
+  components :{ItemSelect,IqcSelect},
   props:{
     recptId: null,
     optType: null,
@@ -294,6 +329,9 @@ export default {
         areaId: this.areaId,
         areaCode: null,
         areaName: null,
+        iqcCheck: 'N',
+        iqcId: null,
+        iqcCode: null,
         expireDate: null,
         remark: null,
         attr1: null,
@@ -362,6 +400,17 @@ export default {
           this.form.unitOfMeasure = obj.unitOfMeasure;  
         }
     },
+    //IQC检验单选择
+    handleSelectIqc(){
+      this.$refs.iqcSelect.showFlag = true;
+    },
+    //IQC检验单选择弹出框
+    onIqcSelected(obj){
+        if(obj != undefined && obj != null){
+          this.form.iqcId = obj.iqcId;
+          this.form.iqcCode = obj.iqcCode;
+        }
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
diff --git a/src/views/mes/wm/productsalse/index.vue b/src/views/mes/wm/productsalse/index.vue
index ca6cee3..51cfde4 100644
--- a/src/views/mes/wm/productsalse/index.vue
+++ b/src/views/mes/wm/productsalse/index.vue
@@ -97,7 +97,6 @@
         </template>
       </el-table-column>
       <el-table-column label="出库单名称" width="150px" align="center" prop="salseName" />
-      <el-table-column label="出货检验单" width="150px" align="center" prop="oqcCode" />
       <el-table-column label="销售订单编号" width="120px" align="center" prop="soCode" />
       <el-table-column label="客户编码" align="center" prop="clientCode" />
       <el-table-column label="客户名称" align="center" prop="clientName" />   
@@ -175,14 +174,6 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="出货检验单" prop="oqcCode">
-              <el-input v-model="form.oqcCode" placeholder="请输入出货检验单" >
-                <el-button slot="append" @click="handleSelectOqc" icon="el-icon-search"></el-button>
-              </el-input>
-            </el-form-item>
-            <OqcSelectSingle ref="oqcSelect" @onSelected="onOqcSelected"></OqcSelectSingle>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="销售订单编号" prop="soCode">
               <el-input v-model="form.soCode" placeholder="请输入销售订单编号" />
@@ -196,13 +187,14 @@
               <ClientSelect ref="clientSelect" @onSelected="onClientSelected" > </ClientSelect>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item label="客户名称" prop="clientName">
               <el-input v-model="form.clientName" readonly="readonly"/>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+
           <el-col :span="8">
             <el-form-item label="出库日期" prop="salseDate">
               <el-date-picker clearable
diff --git a/src/views/mes/wm/productsalse/line.vue b/src/views/mes/wm/productsalse/line.vue
index 169f91e..adeb0ff 100644
--- a/src/views/mes/wm/productsalse/line.vue
+++ b/src/views/mes/wm/productsalse/line.vue
@@ -47,6 +47,12 @@
       <el-table-column label="仓库名称" align="center" prop="warehouseName" />
       <el-table-column label="库区名称" align="center" prop="locationName" />
       <el-table-column label="库位名称" align="center" prop="areaName" />
+      <el-table-column label="是否检验" align="center" prop="iqcCheck">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.oqcCheck"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="检验单编号" width="120" align="center" prop="oqcCode" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -134,6 +140,35 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="是否检验">
+              <el-radio-group v-model="form.oqcCheck" disabled v-if="optType=='view'">
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+
+              <el-radio-group v-model="form.oqcCheck" v-else>
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item v-if="form.oqcCheck == 'Y'" label="出货检验单" prop="oqcCode">
+              <el-input v-model="form.oqcCode" placeholder="请输入出货检验单" >
+                <el-button slot="append" @click="handleSelectOqc" icon="el-icon-search"></el-button>
+              </el-input>
+            </el-form-item>
+            <OqcSelectSingle ref="oqcSelect" @onSelected="onOqcSelected"></OqcSelectSingle>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
@@ -153,9 +188,11 @@
 <script>
 import { listProductsalseline, getProductsalseline, delProductsalseline, addProductsalseline, updateProductsalseline } from "@/api/mes/wm/productsalseline";
 import StockSelect from "@/components/stockSelect/single.vue"
+import OqcSelectSingle from "@/components/oqcSelect/single.vue"
 export default {
   name: "Productsalseline",
-  components: {StockSelect},
+  dicts: ['sys_yes_no'],
+  components: {StockSelect,OqcSelectSingle},
   props: {
     salseId: null,
     optType: null,
@@ -271,6 +308,9 @@ export default {
         areaId: this.areaId,
         areaCode: null,
         areaName: null,
+        oqcCheck: 'N',
+        oqcId: null,
+        oqcCode: null,
         remark: null,
         attr1: null,
         attr2: null,
@@ -381,6 +421,17 @@ export default {
           this.form.quantityMax = obj.quantityOnhand;
         }
     },
+    //OQC检验单选择
+    handleSelectOqc(){
+      this.$refs.oqcSelect.showFlag = true;
+    },
+    //OQC检验单选择弹出框
+    onOqcSelected(obj){
+        if(obj != undefined && obj != null){
+          this.form.oqcId = obj.oqcId;
+          this.form.oqcCode = obj.oqcCode;
+        }
+    },
   }
 };
 </script>

From cd1a8b30a8d0d2bec50c5e7cb7e6969610ab746d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
 <411641505@qq.com>
Date: Mon, 16 Oct 2023 11:17:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/cal/plan/index.vue  |  2 +-
 src/views/mes/cal/plan/shift.vue  |  4 ++--
 src/views/mes/cal/plan/team.vue   |  2 +-
 src/views/mes/cal/team/index.vue  | 12 ++++++------
 src/views/mes/cal/team/member.vue |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/mes/cal/plan/index.vue b/src/views/mes/cal/plan/index.vue
index a1c2e22..2fc18f3 100644
--- a/src/views/mes/cal/plan/index.vue
+++ b/src/views/mes/cal/plan/index.vue
@@ -91,7 +91,7 @@
                 <el-button              
                   type="text"
                   @click="handleView(scope.row)"
-                  v-hasPermi="['mes:cal:plan:query']"
+                  v-hasPermi="['mes:cal:calplan:query']"
                 >{{scope.row.planCode}}</el-button>
           </template>
       </el-table-column>
diff --git a/src/views/mes/cal/plan/shift.vue b/src/views/mes/cal/plan/shift.vue
index 0587c15..c81211d 100644
--- a/src/views/mes/cal/plan/shift.vue
+++ b/src/views/mes/cal/plan/shift.vue
@@ -52,14 +52,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['cal:shift:edit']"
+            v-hasPermi="['mes:cal:shift:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['cal:shift:remove']"
+            v-hasPermi="['mes:cal:shift:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/cal/plan/team.vue b/src/views/mes/cal/plan/team.vue
index 65dd7d5..1469cfa 100644
--- a/src/views/mes/cal/plan/team.vue
+++ b/src/views/mes/cal/plan/team.vue
@@ -18,7 +18,7 @@
                             type="text"
                             icon="el-icon-delete"
                             @click="handleDelete(scope.row)"
-                            v-hasPermi="['mes:cal:plan:edit']"
+                            v-hasPermi="['mes:cal:calplan:edit']"
                         >删除</el-button>
                         </template>
                     </el-table-column>                    
diff --git a/src/views/mes/cal/team/index.vue b/src/views/mes/cal/team/index.vue
index 5130b52..53de664 100644
--- a/src/views/mes/cal/team/index.vue
+++ b/src/views/mes/cal/team/index.vue
@@ -41,7 +41,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['cal:team:add']"
+          v-hasPermi="['mes:cal:team:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -52,7 +52,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['cal:team:edit']"
+          v-hasPermi="['mes:cal:team:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -63,7 +63,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['cal:team:remove']"
+          v-hasPermi="['mes:cal:team:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -73,7 +73,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['cal:team:export']"
+          v-hasPermi="['mes:cal:team:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -104,14 +104,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['cal:team:edit']"
+            v-hasPermi="['mes:cal:team:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['cal:team:remove']"
+            v-hasPermi="['mes:cal:team:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/cal/team/member.vue b/src/views/mes/cal/team/member.vue
index bffd73a..8a0b2c3 100644
--- a/src/views/mes/cal/team/member.vue
+++ b/src/views/mes/cal/team/member.vue
@@ -48,7 +48,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['cal:teammember:remove']"
+            v-hasPermi="['mes:cal:team:remove']"
           >删除</el-button>
         </template>
       </el-table-column>