From ae83082ed9c5b78c10c0bdac57a6941ccb61bb78 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Wed, 11 Dec 2024 13:13:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=AD=BE=E5=90=8D=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E5=B7=B2=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality/Materialinspection/index.vue      | 36 +++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index 702543e..cdb7873 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -342,18 +342,24 @@
           <u-form-item label="备注描述:">
             <u-input v-model="formdata.attr3" placeholder="" type="textarea" :maxlength="700" :border="border" :height="height" :auto-height="autoHeight" />
           </u-form-item>
-          <u-form-item label-width="60" v-show="selectList.value == 'checkTypeSC'" label="签名:">
-            <u-row class="button-bar">
+          <u-form-item label-width="55" v-show="selectList.value == 'checkTypeSC'" label="签名:">
+            <u-row class="button-barsing">
               <!-- 确定 -->
               <u-col :span="4">
-                <u-button @click="singname('1')" type="primary">产线组长签名</u-button>
+                <u-button style="font-size: 24rpx" @click="singname('1')" type="primary"
+                  >产线组长签名<span>({{ formdata.cxzz && formdata.cxzz != '' ? 'Y' : 'N' }})</span></u-button
+                >
               </u-col>
               <!-- 返回 -->
               <u-col :span="4">
-                <u-button @click="singname('2')" type="primary">机管员签名</u-button>
+                <u-button style="font-size: 24rpx" @click="singname('2')" type="primary"
+                  >机管员签名 <span>({{ formdata.jgy && formdata.jgy != '' ? 'Y' : 'N' }})</span></u-button
+                >
               </u-col>
               <u-col :span="4">
-                <u-button @click="singname('3')" type="primary">品管员签名</u-button>
+                <u-button style="font-size: 24rpx" @click="singname('3')" type="primary"
+                  >品管员签名 <span>({{ formdata.pgy && formdata.pgy != '' ? 'Y' : 'N' }})</span></u-button
+                >
               </u-col>
             </u-row>
           </u-form-item>
@@ -801,6 +807,9 @@ export default class PurchaseWHSRM extends BasePage {
       factoryCode: session.PoolName,
       workorderCode: this.clickitem.orderNo,
     };
+    this.formdata.cxzz = null;
+    this.formdata.jgy = null;
+    this.formdata.pgy = null;
     //debugger;
     if (this.selectList.value == 'checkTypeSC' || this.selectList.value == 'checkTypeSCXJ' || this.selectList.value == 'checkTypeCP' || this.selectList.value == 'checkTypeCC') {
       await model.getdeptFromListPDA();
@@ -931,6 +940,10 @@ export default class PurchaseWHSRM extends BasePage {
       this.selectZLType.value = dataobj.pgzr; //质量主管
       this.detaillistceshi = dataobj.qcCheckTaskDetails;
       this.detaillistdefects = dataobj.defects;
+      this.formdata.cxzz = dataobj.cxzz;
+      this.formdata.jgy = dataobj.jgy;
+      this.formdata.pgy = dataobj.pgy;
+
       ///this.selectdisqualificationType.value = dataobj.remarkCode; //是否不合格
       this.detaillistdefects.forEach((item) => {
         if (item.noOkQuality == null) {
@@ -1910,6 +1923,7 @@ export default class PurchaseWHSRM extends BasePage {
     });
   }
   closepopup() {
+    //this.show = false;
     //是否关闭弹窗
     this.SaveDraft();
     this.$nextTick(() => {
@@ -1984,8 +1998,8 @@ export default class PurchaseWHSRM extends BasePage {
       //   item.sampleQuality = this.sampleQuality;
       // }
     });
-
-    let params = {
+    let params;
+    params = {
       sampleQuality: this.formdata.sampleQuality,
       updateBy: session.userName,
       factoryCode: session.PoolName,
@@ -2053,6 +2067,11 @@ export default class PurchaseWHSRM extends BasePage {
       //qc主管
       qczg: this.formdata.qcFrom,
     };
+    if (this.selectList.value == 'checkTypeSC') {
+      params.cxzz = this.formdata.cxzz;
+      params.jgy = this.formdata.jgy;
+      params.pgy = this.formdata.pgy;
+    }
     try {
       await model.commitDraft(params); //99999
       if (model.commitDraftCode == 200) {
@@ -2409,6 +2428,9 @@ export default class PurchaseWHSRM extends BasePage {
 
   .button-bar {
   }
+  .button-barsing {
+    font-size: 20px;
+  }
 
   .photoList {
     display: flex;