From e6054f9b4fa501d0969b74237d2e34f313c99e52 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Fri, 24 Jun 2022 11:38:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=89=80=E6=9C=89=E6=B4=BE?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=93=8D=E4=BD=9C,fqc=E7=BB=93=E5=8D=95=20?=
 =?UTF-8?q?=202022-06-24=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otherReport/fqc_produce_report_normal.vue       |  8 ++++++++
 src/views/modules/yieldReport/produce_order.vue     | 13 ++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
index 4d1bbc3..383d885 100644
--- a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
@@ -301,6 +301,7 @@
                 开始生产
               </el-button>
             </el-form-item>
+
             <el-form-item style="margin-top: 20px ; margin-left: 10px">
               <el-button class="customer-bun-mid" type="primary" @click="bulkInspection"
                          :disabled="buttonTags.bulkInspectionFlag"
@@ -327,6 +328,13 @@
                 </el-button>
               </el-popover>
             </el-form-item>
+
+            <el-form-item style="margin-top: -106px;margin-left: 100px;">
+              <el-button class="customer-bun-mid" type="primary" :disabled="buttonTags.finishScheduleFlag"
+                         @click="showFinishScheduleModal" style="width: 80px;">
+                结单
+              </el-button>
+            </el-form-item>
           </el-form>
         </fieldset>
       </el-form>
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index 47683bc..83c975b 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -1176,7 +1176,7 @@ export default {
           if (currentRow == null) {
             return;
           }
-          this.menuButton.canceledAllPrdButton = false
+          //this.menuButton.canceledAllPrdButton = false
           this.menuButton.createRecheckButton = false
           this.menuButton.partStockFlag = false;
           // 判断是否具有该页面权限
@@ -1184,6 +1184,17 @@ export default {
           if (menList.length > 0) {
             this.menuButton.prdButton = false
           }
+          let canceledAllPrd = {
+            userSpecialSecurityNo: 232,
+            username: this.$store.state.user.name,
+          }
+          getUserSpecialSecurity(canceledAllPrd).then(({data}) => {
+            if (data.userSpecialSecurity == 'Y') {
+              this.menuButton.canceledAllPrdButton = false
+            } else {
+              this.menuButton.canceledAllPrdButton = true
+            }
+          })
           // 关闭按钮
           if (currentRow.closedFlag == 'N') {
             let data = {