From dd8da6f0c9043df01bbfc367d7cac39f798be86f Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Fri, 23 Jul 2021 17:30:22 +0800
Subject: [PATCH] =?UTF-8?q?bug=20=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B--=E4=B8=8B=E6=8B=89=E6=A1=86=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 32 ++++++++++---------
 .../domesticStandardsAndRegulations/index.vue | 10 ++++++
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index e5e830a6e..3f8d70f52 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -58,7 +58,7 @@
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.textStatus" placeholder="请选择文本状态">
+                                    <el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
                                         <el-option
                                                 v-for="item in standStateOptions"
                                                 placeholder="请选择"
@@ -79,7 +79,7 @@
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.standSort" placeholder="请选择标准类别">
+                                    <el-select :popper-append-to-body="false" v-model="form.standSort" placeholder="请选择标准类别">
                                         <el-option
                                                 v-for="item in standSortOptions"
                                                 placeholder="请选择"
@@ -90,7 +90,7 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.standNature" placeholder="请选择标准性质">
+                                    <el-select :popper-append-to-body="false" v-model="form.standNature" placeholder="请选择标准性质">
                                         <el-option
                                                 v-for="item in standNatureOptions"
                                                 placeholder="请选择"
@@ -473,7 +473,7 @@
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.zrbm" placeholder="请选择责任部门" multiple>
                                         <el-option
                                                 v-for="item in zrbmOptions"
                                                 placeholder="请选择"
@@ -484,7 +484,7 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.cllx" placeholder="请选择适用车型" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.cllx" placeholder="请选择适用车型" multiple>
                                         <el-option
                                                 v-for="item in applyArcticOptions"
                                                 placeholder="请选择"
@@ -495,7 +495,7 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.nylx" placeholder="请选择能源类型" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.nylx" placeholder="请选择能源类型" multiple>
                                         <el-option
                                                 v-for="item in categoryOptions"
                                                 placeholder="请选择"
@@ -555,7 +555,7 @@
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
                                         <el-option
                                                 v-for="item in qcdwOption"
                                                 placeholder="请选择"
@@ -566,7 +566,7 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.txlb" placeholder="请选择体系类别" multiple>
                                         <el-option
                                                 v-for="item in txlbOptions"
                                                 placeholder="请选择"
@@ -579,7 +579,7 @@
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.sycpx" placeholder="请选择适用产品线" multiple>
                                         <el-option
                                                 v-for="item in sycpxOptions"
                                                 placeholder="请选择"
@@ -590,7 +590,7 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.syrz" placeholder="请选择适用认证" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.syrz" placeholder="请选择适用认证" multiple>
                                         <el-option
                                                 v-for="item in applyAuthOptions"
                                                 placeholder="请选择"
@@ -601,7 +601,7 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>
                                         <el-option
                                                 v-for="item in zrgcsOptions"
                                                 placeholder="请选择"
@@ -633,13 +633,13 @@
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
                                         <el-option label="署名人1" value="1"></el-option>
                                         <el-option label="署名人2" value="2"></el-option>
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.cysd" placeholder="请选择我司参与深度">
+                                    <el-select :popper-append-to-body="false" v-model="form.cysd" placeholder="请选择我司参与深度">
                                         <el-option
                                                 v-for="item in cysdOptions"
                                                 placeholder="请选择"
@@ -673,7 +673,7 @@
                                     >{{'手动查找'}}</el-button>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.cbcd" placeholder="请选择采标程度">
+                                    <el-select :popper-append-to-body="false" v-model="form.cbcd" placeholder="请选择采标程度">
                                         <el-option label="采标程度1" value="1"></el-option>
                                         <el-option label="采标程度2" value="2"></el-option>
                                     </el-select>
@@ -859,6 +859,7 @@
                     <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
                         <el-form-item label="标准来源" class="search-item" v-if="dataSource">
                             <el-select
+                                :popper-append-to-body="false"
                                     v-model="replaceLawsNumForm.standType"
                                     placeholder="请选择标准来源"
                                     @change="dataSourceChange">
@@ -984,6 +985,7 @@
                         <el-form :model="standardSearchForm" inline class="label-input-form search-area">
                             <el-formItem label="标准来源" style="margin-right:-20px" prop="standType" class="search-item" >
                                 <el-select
+                                    :popper-append-to-body="false"
                                         v-model="standardSearchForm.standType"
                                         placeholder="请选择标准来源">
                                     <el-option value="INLAND" label="国内标准库"></el-option>
@@ -991,7 +993,7 @@
                                 </el-select>
                             </el-formItem>
                             <el-form-item label="标准类别" style="margin-right:-20px" prop="standSort" class="search-item" >
-                                <el-select v-model="standardSearchForm.standSort" placeholder="请选择标准类别" filterable clearable>
+                                <el-select :popper-append-to-body="false" v-model="standardSearchForm.standSort" placeholder="请选择标准类别" filterable clearable>
                                     <el-option
                                             v-for="item in standSortOptions"
                                             :key="item.value"
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index a1e1fc1fd..7dc2712f0 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1295,6 +1295,7 @@ export default {
         children: 'children',
         label: 'menuName'
       },
+      id: '',
       modalShowFlag1: false, // drawer开关
       modalShowFlag2: false, // drawer开关
       modalShowFlag3: false, // drawer开关
@@ -2262,6 +2263,7 @@ export default {
     },
     // 编辑标准属性
     selectStandardPro (item, state) {
+      this.id = item.id
       this.addOrUPdateFlag = 2
       this.modalshowtitle = '编辑国内标准'
       this.modalshowflag = true
@@ -3116,6 +3118,14 @@ export default {
               }, res => {
                 this.isSubmit = false
                 if (res.ok) {
+                  this.personCollect.collectType = 'INLAND_STAND'
+                  this.personCollect.id = this.id
+                  this.personCollect.userId = this.$store.getters.userInfo.userId
+                  this.$http.get('person/personCollect/updatePersonCollect', this.personCollect, {
+                    _this: this,
+                    loading: 'loading'
+                  }, res => {
+                  }, e => {})
                   this.getDomesticStandardTable(this.tableFlag)
                   this.resetForm()
                   if (this.addOrUPdateFlag === 1) {