From 2dccf771b5776b6bbb178e26142ae665a0630b58 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 28 Nov 2021 10:15:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=BA=93=20-=20=E7=BC=96=E8=BE=91=20-=20=E9=80=89=E4=BA=BA?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue | 67 +++++++++++++++----
 1 file changed, 53 insertions(+), 14 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index ceacb4530..0517854dd 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -735,14 +735,16 @@
                         class="add-form-item"
                     >
                       <template slot="label">责任工程师</template>
-                      <el-input
-                          :key="field.attrField"
-                          :config="field"
-                          clearable
-                          v-model="sarStandardsInfoEO['ZRGCS']"
-                          :disabled="formdisableflag" placeholder="选择责任工程师"
-                          @click.native="choiceRole('ZRGCSUserId', '责任工程师', sarStandardsInfoEO.ZRGCSUserId)">
+                      <el-input v-model="sarStandardsInfoEO['ZRGCS']" placeholder="选择责任工程师" @click.native="choiceZRRS('zrgcs', '选择责任工程师', sarStandardsInfoEO['ZRGCS'])">
                       </el-input>
+<!--                      <el-input-->
+<!--                          :key="field.attrField"-->
+<!--                          :config="field"-->
+<!--                          clearable-->
+<!--                          v-model="sarStandardsInfoEO['ZRGCS']"-->
+<!--                          :disabled="formdisableflag" placeholder="选择责任工程师"-->
+<!--                          @click.native="choiceRole('ZRGCSUserId', '责任工程师', sarStandardsInfoEO.ZRGCSUserId)">-->
+<!--                      </el-input>-->
                     </el-form-item>
                   </template>
                   <template v-else-if="field.attrField === 'WSSMR'">
@@ -752,14 +754,16 @@
                         class="add-form-item"
                     >
                       <template slot="label">我司署名人</template>
-                      <el-input
-                          :key="field.attrField"
-                          :config="field"
-                          clearable
-                          v-model="sarStandardsInfoEO['WSSMR']"
-                          :disabled="formdisableflag" placeholder="选择我司署名人"
-                          @click.native="choiceRole('WSSMRUserId', '我司署名人', sarStandardsInfoEO.WSSMRUserId)">
+                      <el-input v-model="sarStandardsInfoEO['WSSMR']" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择我司署名人', sarStandardsInfoEO['WSSMR'])">
                       </el-input>
+<!--                      <el-input-->
+<!--                          :key="field.attrField"-->
+<!--                          :config="field"-->
+<!--                          clearable-->
+<!--                          v-model="sarStandardsInfoEO['WSSMR']"-->
+<!--                          :disabled="formdisableflag" placeholder="选择我司署名人"-->
+<!--                          @click.native="choiceRole('WSSMRUserId', '我司署名人', sarStandardsInfoEO.WSSMRUserId)">-->
+<!--                      </el-input>-->
                     </el-form-item>
                   </template>
                   <template v-else>
@@ -1819,6 +1823,12 @@
         @confirm="isTreeOk"
     ></org-table>
     <loading style="z-index: 2099;" :loading="importLoading">导入中...</loading>
+    <Role-tree
+        :is-title="drawerTitle"
+        :is-visible.sync="modalShowRoleFlag"
+        @checkedRole="checkedRole2"
+        :nodeList="nodeList2"
+    ></Role-tree>
     <Role-tree
         is-title="选择人员信息"
         :is-visible.sync="modalshowflagRole"
@@ -1944,7 +1954,9 @@ export default {
       OCRModel: false,
       ocrList: [],
       nodeList: [],
+      nodeList2: [],
       nodeListZRBM: [],
+      modalShowRoleFlag: false,
       modalshowflagRole: false,
       modalshowflagZRBM: false,
       filterText: '', // 国内法规过滤
@@ -5315,6 +5327,33 @@ export default {
         this.$set(this.textStatusMap, item.value, item.label)
       })
     },
+    choiceZRRS (type, title, id) {
+      console.log('2077',title)
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.userType = type
+      this.drawerTitle = title
+      this.modalShowRoleFlag = true
+    },
+    checkedRole2 (data) {
+      console.log('1712',this.drawerTitle)
+      let idList = ''
+      let nameList = ''
+      data.forEach( item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      if (this.drawerTitle === '选择我司署名人'){
+        this.sarStandardsInfoEO['WSSMR'] = nameList
+      }else if (this.drawerTitle === '选择责任工程师'){
+        this.sarStandardsInfoEO['ZRGCS'] = nameList
+      }
+
+    },
     choiceRole(type, title, id) {
       this.nodeList = []
       this.nodeList.push(id)