From 63b479acbffec776b8dfbb590d2ec44ee581e2e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Thu, 28 Aug 2025 13:12:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yieldReport/com_produce_report_normal.vue | 19 ++++++++-------
 .../modules/yieldReport/produce_order.vue     | 24 +++++++++----------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 411b348..ff79066 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -450,7 +450,8 @@
           <el-form>
             <el-form-item style="margin-top: -5px;">
               <el-button class="customer-bun-mid controller-bun" type="primary" @click="produceToolModal"
-                         :disabled="buttonTags.toolFlag" style="margin-left: 15px; margin-top: 20px;">
+                         disabled="disabled" style="margin-left: 15px; margin-top: 20px;">
+<!--                :disabled="buttonTags.toolFlag"-->
                 {{ buttons.toolButton }}
               </el-button>
             </el-form-item>
@@ -509,10 +510,10 @@
 <!--                    {{ buttons.scannerRoll || '扫描卷' }}-->
 <!--                  </el-button>-->
                 </div>
-                <el-button type="primary" class="controller-bun" :disabled="buttonTags.finishScheduleFlag"
-                           style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true"
-                           slot="reference">{{ labels.otherButtons }}
-                </el-button>
+<!--                <el-button type="primary" class="controller-bun" :disabled="buttonTags.finishScheduleFlag"-->
+<!--                           style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true"-->
+<!--                           slot="reference">{{ labels.otherButtons }}-->
+<!--                </el-button>-->
               </el-popover>
             </el-form-item>
             <el-form-item style="margin-top: 10px ; margin-left: 5px">
@@ -533,10 +534,10 @@
                     {{ labels.scannerMaterial }}
                   </el-button>
                 </div>
-                <el-button type="primary" class="controller-bun" :disabled="buttonTags.materialMalformedFlag  "
-                           style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag2=true"
-                           slot="reference">{{ labels.materialMalformed }}
-                </el-button>
+<!--                <el-button type="primary" class="controller-bun" :disabled="buttonTags.materialMalformedFlag  "-->
+<!--                           style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag2=true"-->
+<!--                           slot="reference">{{ labels.materialMalformed }}-->
+<!--                </el-button>-->
               </el-popover>
             </el-form-item>
           </el-form>
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index 838aaf6..bce831c 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="customer-css">
     <!--  菜单按钮区域  -->
-    <fieldset class="customer-field" style="width: 300px; padding: 0.35em 0.75em 0.425em;">
+    <fieldset class="customer-field" style="width: 200px; padding: 0.35em 0.75em 0.425em;">
       <legend>菜单</legend>
       <el-form :inline="true" label-position="top" label-width="100px" style="">
         <el-form-item :label="''">
@@ -15,12 +15,12 @@
                      style="margin-left: 10px;  margin-bottom: 5px;">{{ buttons.reportButton }}
           </el-button>
         </el-form-item>
-        <el-form-item :label="''">
-          <el-button type="primary" @click="switchOperatorModal(1)" class="customer-bun-mid"
-                     :disabled="reportButton.fqcReportButton"
-                     style="margin-left: 10px;  margin-bottom: 5px;">{{ buttons.fqcReportButton }}
-          </el-button>
-        </el-form-item>
+<!--        <el-form-item :label="''">-->
+<!--          <el-button type="primary" @click="switchOperatorModal(1)" class="customer-bun-mid"-->
+<!--                     :disabled="reportButton.fqcReportButton"-->
+<!--                     style="margin-left: 10px;  margin-bottom: 5px;">{{ buttons.fqcReportButton }}-->
+<!--          </el-button>-->
+<!--        </el-form-item>-->
 <!--        <el-form-item :label="''">-->
 <!--          <el-button type="primary" @click="switchOperatorModal(2)" class="customer-bun-mid"-->
 <!--                     :disabled="reportButton.reworkReportButton"-->
@@ -1971,11 +1971,11 @@ export default {
       if (val == 0) {
         let orderType = this.currentRow.orderType
         let workCenterNo = this.currentRow.workCenterNo
-        if (orderType != 'S' || workCenterNo === 'FQC' || nextItemNo == 0) {
-          // 验证通过
-          this.$message.error(this.labels.thisScheduleCantReport)
-          return false
-        }
+        // if (orderType != 'S' || workCenterNo === 'FQC' || nextItemNo == 0) {
+        //   // 验证通过
+        //   this.$message.error(this.labels.thisScheduleCantReport)
+        //   return false
+        // }
         let data = {
           site: this.currentRow.site,
           resourceId: this.currentRow.resourceId,