From 588eba955400dc109311b876596dceeb628f3f66 Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Fri, 23 Jul 2021 17:19:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?bug=EF=BC=9A=20=E6=A0=87=E5=87=86=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B--=E6=A0=87=E5=87=86=E4=BD=93?=
 =?UTF-8?q?=E7=B3=BB=EF=BC=8C=E9=80=89=E4=B8=AD=EF=BC=8C=E7=82=B9=E7=A1=AE?=
 =?UTF-8?q?=E5=AE=9A=EF=BC=8C=E4=B8=8D=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 27deb03e8..e5e830a6e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -122,7 +122,7 @@
                                     </el-radio-group>
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard" v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
-                                    <el-input v-model="form.standSystemName" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
+                                    <el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
                                     <tree-select-new
                                             :key="key"
                                             :multiple=false

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 2/3] =?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) {

From 1cff3561c104e335d2ef37c9125f2adaa51ec802 Mon Sep 17 00:00:00 2001
From: liuhuaizhi <liuhuaizhi@91isoft.com>
Date: Fri, 23 Jul 2021 17:48:39 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(445721=20=E6=9C=AA=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E9=A1=B9=E6=95=B4=E6=94=B9--=E5=8E=86=E5=8F=B2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=82=B9=E5=87=BB=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E7=BC=96=E5=8F=B7=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=BA=94=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=B8=94=E5=8E=86=E5=8F=B2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=9F=A5=E8=AF=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=97=A0=E4=BD=9C=E7=94=A8=20):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nonConfomity/pages/historicalData.vue     | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
index da111f143..d79752675 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
@@ -25,7 +25,7 @@
                       :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-            <el-input v-model="historySearch.responseUnit" v-show="false" />
+            <el-input v-model="historySearch.responseUnitShow" v-show="false" />
             <el-popover
               placement="bottom"
               popper-class="user-dept-popper"
@@ -495,8 +495,19 @@ export default {
       })
     },
     detailsStandard (item) {
-      this.$http.post('lawss/sarTestItem/validateStandNumber', {
-        standnumber: item.standNum
+      console.log(item);
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.id,
+          pageType: 'INLAND_STAND'
+          // pageType: item.standType + '_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+      // 接口调用无返回值与后台商量后先行封存 使用未符合整改数据库中方法直接跳转
+      /*this.$http.post('lawss/sarTestItem/validateStandNumber', {
+        standNumber: item.standId
       }, {
         _this: this
       }, res => {
@@ -510,7 +521,7 @@ export default {
         })
         window.open(routeUrl.href, '_blank')
       }, e => {
-      })
+      })*/
     },
     getOrgTreeSource () {
       this.$http.get('sys/org/getTree', {}, {_this: this},
@@ -612,8 +623,9 @@ export default {
     //   })
     // },
     treeClickSearch (treeId, treeNode) {
-      this.historySearch.responseUnit = treeNode.id
+      this.historySearch.responsibleUnit = treeNode.id
       this.historySearch.responseUnitShow = treeNode.name
+      this.$forceUpdate()
     },
     // 点击清空按钮事件
     clearAllSearch () {
@@ -621,7 +633,8 @@ export default {
         standNumOrName: '',
         quesType: '',
         productName: '',
-        responseUnit: ''
+        responsibleUnit: '',
+        responseUnitShow:''
       }
       this.getTableBtn()
     },