From 89c0ae87560239a04a8834ffba990f5ca3263efd 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: Wed, 20 Sep 2023 23:37:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=9B=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E7=AE=A1=E7=90=86=E9=BB=98=E8=AE=A4=E4=B8=89=E7=BA=A7?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/pro/feedback/index.vue | 9 ++++++++-
 src/views/mes/wm/location/index.vue  | 1 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue
index c5daedc..75be9eb 100644
--- a/src/views/mes/pro/feedback/index.vue
+++ b/src/views/mes/pro/feedback/index.vue
@@ -296,7 +296,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
         <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
-        <el-button type="primary" @click="handleSubmit" v-if="form.status =='PREPARE' && optType !='view' ">提交审批</el-button>
+        <el-button type="primary" @click="handleSubmit" v-if="form.status =='PREPARE' && optType !='view' && form.recordId !=null ">提交审批</el-button>
         <el-button type="success" @click="handleExecute" v-if="form.status =='APPROVING'  && form.recordId !=null">审批通过</el-button>
         <el-button type="danger" @click="handleReject" v-if="form.status =='APPROVING'  && form.recordId !=null">审批不通过</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -429,6 +429,7 @@ export default {
         itemName: null,
         specification: null,
         quantity: null,
+        quantityUncheck: null,
         quantityFeedback: null,
         quantityQualified: null,
         quantityUnquanlified: null,
@@ -596,6 +597,12 @@ export default {
         this.form.routeId = row.routeId;
         this.form.routeCode = row.routeCode;
         this.form.isCheck = row.isCheck;
+        if(row.isCheck == 'N'){
+          this.form.quantityUncheck = 0;
+        }else {
+          this.form.quantityQualified =0;
+          this.form.quantityUnquanlified = 0;
+        }
       }
     },
     //点击人员选择按钮
diff --git a/src/views/mes/wm/location/index.vue b/src/views/mes/wm/location/index.vue
index d1633bf..14e45d0 100644
--- a/src/views/mes/wm/location/index.vue
+++ b/src/views/mes/wm/location/index.vue
@@ -71,7 +71,6 @@
             size="mini"
             type="text"
             icon="el-icon-s-shop"
-            v-if="scope.row.areaFlag =='Y'"
             @click="handleArea(scope.row.locationId)"
             v-hasPermi="['mes:wm:area:edit','mes:wm:area:list']"
           >库位</el-button>