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

---
 .../creatProcess/qbfs/common/formList.vue     | 21 ++++++++++---------
 .../pages/creatProcess/qbfs/step3.vue         |  3 ---
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
index 36e6c3ea4..07c420ea0 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
@@ -434,14 +434,14 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item v-if="verifySort() !== '' && !verifySort()" label="初稿完成日期" prop="draftTime" class="add-form-item form-item-disabled">
+                <el-form-item v-if="form.reviewResults === '1' && verifySort3()" label="初稿完成日期" prop="draftTime" class="add-form-item form-item-disabled">
                     <el-datePicker v-model="form.draftTime"
                                    :editable="false"
                                    placeholder="请选择初稿完成日期"
                                    value-format="yyyy-MM-dd"
                     ></el-datePicker>
                 </el-form-item>
-                <el-form-item v-if="verifySort() !== '' && verifySort() && opinionsShow2" label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
+                <el-form-item v-if="form.reviewResults === '1' && !verifySort3()" label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
                     <el-datePicker v-model="form.expirationDate"
                                    :editable="false"
                                    placeholder="请选择截止日期"
@@ -461,23 +461,23 @@
 <!--                </el-form-item>-->
             </el-col>
             <el-col :span="12">
-                <el-form-item v-if="form.reviewResults === '1' && opinionsShow2" label="主起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
-                    <el-input v-show="!opinionsShow2" v-model="form.QCRBUSS"  :title="form.QCRBUSS" :disabled="disabledState" clearable></el-input>
-                    <el-input v-show="opinionsShow2"
+                <el-form-item v-if="form.reviewResults === '1'" label="主起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
+                    <!--<el-input v-show="!opinionsShow2" v-model="form.QCRBUSS"  :title="form.QCRBUSS" :disabled="disabledState" clearable></el-input>-->
+                    <el-input
                               v-model="form.QCRBUSS"
                               placeholder="选择主起草人"
                               readonly="readonly"
                               @click.native="choiceZRRList('QCRBUSS', '选择主起草人', form.QCRBUSS)">
                     </el-input>
                 </el-form-item>
-                <el-form-item v-if="verifySort() !== '' && !verifySort()" label="计划标准发布日期" prop="releaseTime" class="add-form-item form-item-disabled">
+                <el-form-item v-if="form.reviewResults === '1' && verifySort3()" label="计划标准发布日期" prop="releaseTime" class="add-form-item form-item-disabled">
                     <el-datePicker v-model="form.releaseTime"
                                    :editable="false"
                                    placeholder="请选择计划标准发布日期"
                                    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') && !opinionsShow2 && 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 !== ''">-->
@@ -490,7 +490,7 @@
                 </el-form-item>
             </el-col>
         </el-row>
-        <el-form-item v-show="(form.reviewResults === '2' || form.reviewResults === '3') && opinionsShow2" label="理由" prop="reviewResultsContent" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled">
+        <el-form-item v-show="(form.reviewResults === '2' || form.reviewResults === '3')" label="理由" prop="reviewResultsContent" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled">
             <el-input
                     type="textarea"
                     :rows="3"
@@ -747,14 +747,15 @@ export default {
       },
       verifySort2(){
           if(this.showForm.reviewResults && this.showForm.reviewResults === '1'){
-              return !!(this.form.standSort && this.form.standSort.indexOf("Q/QCBFC") !== -1);
+              // 修订 && 产品标准true
+              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/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
index 5cfb5ec6e..769005a90 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
@@ -288,9 +288,6 @@ export default {
         reviewResults: [
           {required: true, message: "请选择复审结果", trigger: "change"}
         ],
-        QCRBUSS: [
-          {required: true, message: "请选择主起草人", trigger: "change"}
-        ],
         draftTime: [
           {required: true, message: "请选择初稿完成日期", trigger: "change"}
         ],