From 1feb6620b3667c878e1e2554884587468104bf44 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Thu, 27 Apr 2023 10:58:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../creatProcess/qbfs/common/formList.vue     | 20 ++++++++++++++++---
 .../qbfs/common/formListStep5.vue             |  7 +++++++
 .../pages/creatProcess/qbfs/step3.vue         |  5 ++++-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
index 4de6ebf4e..bbaae19e5 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
@@ -369,6 +369,13 @@
                     </div>
                 </template>
             </el-table-column>
+            <el-table-column
+                prop="reviewResultsContent"
+                label="复审理由"
+                min-width="8%"
+                align="center"
+            >
+            </el-table-column>
 <!--            <el-table-column-->
 <!--                    prop="releaseTime"-->
 <!--                    label="初稿完成日期"-->
@@ -477,7 +484,7 @@
                                    value-format="yyyy-MM-dd"
                     ></el-datePicker>
                 </el-form-item>
-                <el-form-item v-if="(form.reviewResults === '1' || form.reviewResults === '2' || form.reviewResults === '3') && !opinionsShow2" label="复审单" prop="FSDName" class="add-form-item form-item-disabled">
+                <el-form-item v-if="(form.reviewResults === '1' || form.reviewResults === '2' || form.reviewResults === '3') && !opinionsShow && verifySort3()" label="复审单" prop="FSDName" class="add-form-item form-item-disabled">
                     <div v-if="FSDList.length > 0" v-for="(item,index) in FSDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
                         <span style="width: 80%;" @click="handleFilePreviewNew(item,'preview','fs')" :title="item.name">{{ item.name | ellipsis2 }}</span>
 <!--                        <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
@@ -738,16 +745,23 @@ export default {
       showDrawerClose () {
           this.showDrawer = false
       },
+      verifySort3(){
+          // 技术标准返回true 产品标准返回false
+          if(this.form.standSort){
+            return this.form.standSort.indexOf("Q/QCBFC") === -1 && this.form.standSort.indexOf("Q/FT X") === -1
+          }
+          return false
+      },
       verifySort2(){
           if(this.showForm.reviewResults && this.showForm.reviewResults === '1'){
-              return !!(this.form.standSort && this.form.standSort.indexOf("Q/QCBFC") !== -1);
+              return !!(this.form.standSort && (this.form.standSort.indexOf("Q/QCBFC") !== -1 || this.form.standSort.indexOf("Q/FT X") !== -1 ));
           }else {
               return ""
           }
       },
       verifySort(){
         if(this.form.reviewResults && this.form.reviewResults === '1'){
-            return !!(this.form.standSort && this.form.standSort.indexOf("Q/QCBFC") !== -1);
+            return !!(this.form.standSort && (this.form.standSort.indexOf("Q/QCBFC") !== -1 || this.form.standSort.indexOf("Q/FT X") !== -1 ));
         }else {
             return ""
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue
index cf2689342..136429059 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue
@@ -366,6 +366,13 @@
                     </div>
                 </template>
             </el-table-column>
+            <el-table-column
+                prop="reviewResultsContent"
+                label="复审理由"
+                min-width="8%"
+                align="center"
+            >
+            </el-table-column>
 <!--            <el-table-column-->
 <!--                    prop="releaseTime"-->
 <!--                    label="初稿完成日期"-->
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
index 769005a90..4d7ee4053 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
@@ -29,7 +29,7 @@
               :LXDListSub = "LXDList === undefined ? [] : LXDList"
               :FSDListSub = "FSDList === undefined ? [] : FSDList"
               :disabledState = "disabledState"
-              :opinionsShow2 = "false"
+              :opinionsShow2 = "true"
               :verifySarStandard = "verifySarStandard"
               @emitDataLoading="emitDataLoading"
               @formCancel="formCancel"
@@ -288,6 +288,9 @@ export default {
         reviewResults: [
           {required: true, message: "请选择复审结果", trigger: "change"}
         ],
+        QCRBUSS: [
+          {required: true, message: "请选择主起草人", trigger: "change"}
+        ],
         draftTime: [
           {required: true, message: "请选择初稿完成日期", trigger: "change"}
         ],