From 4c3006340482c22896c654ec72f888211e45da50 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 5 Jan 2022 15:48:25 +0800
Subject: [PATCH] commit

---
 .../InputForAllStandards2.vue                 |   5 +-
 .../enterpriseStandardPlan/index.vue          | 107 +++++++++++-------
 2 files changed, 67 insertions(+), 45 deletions(-)

diff --git a/src/components/CustomFormComponents/InputForAllStandards2.vue b/src/components/CustomFormComponents/InputForAllStandards2.vue
index a9f6f123d..b50ead6cd 100644
--- a/src/components/CustomFormComponents/InputForAllStandards2.vue
+++ b/src/components/CustomFormComponents/InputForAllStandards2.vue
@@ -164,6 +164,9 @@
             labelWidth: {
                 type: String,
                 default: '150px'
+            },
+            placeholderText: {
+                type: String
             }
         },
         data () {
@@ -193,7 +196,7 @@
         },
         computed: {
             placeholder () {
-                return `请输入${this.config.attrName}`
+                return `${this.placeholderText}`
             },
             showMessage () {
                 return `${this.config.attrName}不能为空`
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 15a654958..657981764 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -222,6 +222,18 @@
                                                     placeholder="请输入企标名称"
                                                     :maxlength="500"/>
                                         </el-form-item>
+                                        <el-form-item label="适用车型" style="width: 100%; margin-right:10px" class="add-form-item" prop="area" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                            <div style="display: flex;justify-content: space-between;align-items: center;">
+                                                <el-select :disabled="DrawerType === 'see'" v-model="addForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
+                                                    <el-option
+                                                            v-for="item in BZList"
+                                                            :key="item.value"
+                                                            :label="item.label"
+                                                            :value="item.value">
+                                                    </el-option>
+                                                </el-select>
+                                            </div>
+                                        </el-form-item>
                                         <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <el-select :disabled="DrawerType === 'see'" v-model="addForm.planStatus" placeholder="请选择计划状态">
                                                 <el-option label="未开始" value="0"></el-option>
@@ -237,6 +249,51 @@
                                                 <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' : ''">
+                                            <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 label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" :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.unit">
+                                                </el-input>
+                                                <el-input
+                                                        clearable
+                                                        v-model="addForm.unitName"
+                                                        placeholder="请选择起草责任单位"
+                                                        readonly
+                                                        @click.native="choiceZRBM(addForm.unit)">
+                                                </el-input>
+                                            </div>
+                                        </el-form-item>
                                         <el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <el-input
                                                     style="display: none;"
@@ -276,36 +333,6 @@
                                                     placeholder="请选择计划标准发布时间">
                                             </el-date-picker>
                                         </el-form-item>
-                                        <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" :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.unit">
-                                                </el-input>
-                                                <el-input
-                                                        clearable
-                                                        v-model="addForm.unitName"
-                                                        placeholder="请选择起草责任单位"
-                                                        readonly
-                                                        @click.native="choiceZRBM(addForm.unit)">
-                                                </el-input>
-                                            </div>
-                                        </el-form-item>
-                                        <el-form-item label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="rqbJson" :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 label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item" prop="tsJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <div style="display: flex;justify-content: space-between;align-items: center;">
                                                 <el-input
@@ -321,19 +348,7 @@
                                                 </el-input>
                                             </div>
                                         </el-form-item>
-                                        <el-form-item label="标准范围" style="width: 100%; margin-right:10px" class="add-form-item" prop="area" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-                                            <div style="display: flex;justify-content: space-between;align-items: center;">
-                                                <el-select :disabled="DrawerType === 'see'" v-model="addForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
-                                                    <el-option
-                                                            v-for="item in BZList"
-                                                            :key="item.value"
-                                                            :label="item.label"
-                                                            :value="item.value">
-                                                    </el-option>
-                                                </el-select>
-                                            </div>
-                                        </el-form-item>
-                                        <el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-form-item label="是否采用标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
                                                 <el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.isRelate">
                                                     <el-radio label="是" value="是"></el-radio>
@@ -371,8 +386,9 @@
                                         <template>
                                             <custom-input-for-all-standards2
                                                     class="classDisplay"
+                                                    :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
                                                     :disabled="DrawerType === 'see'"
-                                                    :config="{attrName: '配套标准'}"
+                                                    :config="{attrName: '引用标准'}"
                                                     :labelWidth="'180px'"
                                                     v-model="addForm.esMatingRelations"
                                             ></custom-input-for-all-standards2>
@@ -672,6 +688,9 @@
                     drafter: [
                         {required: true, message: '请选择起草人', trigger: 'change'},
                     ],
+                    rqbJson: [
+                        {required: true, message: '请选择代替企标编号', trigger: 'change'},
+                    ]
                 },
                 form: {
                     page: 1,