From 3541fbf7a5f0756ad54c9d2f37b4956df96c97c9 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Mon, 29 May 2023 11:20:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qbzxdjhgk/component/merge.vue             |  3 ++
 .../enterpriseStandardPlan/index.vue          | 34 +++++++++----------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index 4cec8ec74..7999a597b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -696,6 +696,9 @@ export default {
         mergeReason: [
           {required: true, message: '请输入合并原因', trigger: 'blur'},
         ],
+        rqbName: [
+          { required: true, message: "请选择代替企标编号", trigger: "blur" }
+        ],
       },
       standinfoList: [],
       standardSearch: {
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 8598c5ead..e9c7d4a51 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -282,22 +282,7 @@
                                                 <el-option label="修订" value="2"></el-option>
                                             </el-select>
                                         </el-form-item>
-                                        <el-form-item v-if="addForm.reviseStatus === '1'" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-                                            <div style="display: flex;justify-content: space-between;align-items: center;">
-                                                <el-input
-                                                        style="display: none;"
-                                                        v-model="addForm.rqbJson">
-                                                </el-input>
-                                                <el-input
-                                                        clearable
-                                                        v-model="addForm.rqbName"
-                                                        placeholder="请选择代替企标编号"
-                                                        readonly
-                                                        @click.native="choiceQYBZ(addForm.rqbJson)">
-                                                </el-input>
-                                            </div>
-                                        </el-form-item>
-                                        <el-form-item v-else label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item" prop="rqbJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-form-item label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item" prop="rqbJson" :required="addForm.reviseStatus === '2'" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <div style="display: flex;justify-content: space-between;align-items: center;">
                                                 <el-input
                                                         style="display: none;"
@@ -882,8 +867,8 @@
                         {required: true, message: '请选择起草人', trigger: 'change'},
                     ],
                     rqbJson: [
-                        {required: false, message: '请选择代替企标编号', trigger: ['change', 'blur']},
-                    ]
+                        { validator: this.validationRqbJson, trigger: 'change'},
+                    ],
                 },
                 form: {
                     page: 1,
@@ -919,6 +904,17 @@
             },
         },
         methods: {
+            validationRqbJson(rule, value, callback){
+              if(this.addForm.reviseStatus === '2'){
+                if(!this.addForm.rqbJson || this.addForm.rqbJson === ''){
+                  return callback(new Error('请选择代替企标编号'))
+                }else{
+                  callback()
+                }
+              }else{
+                callback()
+              }
+            },
             workChange (data) {
                 this.workGroupList = data
             },
@@ -1079,6 +1075,7 @@
                 } else {
                     this.addForm.rqbJson = this.QYBZformSelect[0].id
                     this.addForm.rqbName = this.QYBZformSelect[0].standCode
+                    this.addForm.standNum = this.QYBZformSelect[0].standNumber
                     this.QYBZform = {
                         page: 1,
                         standCode: '',
@@ -1344,6 +1341,7 @@
                   drafterName: '',
                     LXD:'',
                     LXDName:'',
+                  standNum: ''
                 }
                 this.DrawerType = 'add'
                 this.addForm.planStatus = '6'