From 57a02d5333106a13644bd2d68ce92495f0624038 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 9 Jul 2021 10:06:14 +0800
Subject: [PATCH 1/2] commit

---
 src/pages/config/pages/mechanismManage/index.vue            | 1 +
 src/pages/config/pages/postManage/index.vue                 | 1 +
 src/pages/config/pages/roleManage/index.vue                 | 1 +
 src/pages/login/index.vue                                   | 1 +
 src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/xmpg/step1.vue   | 2 +-
 9 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index 5b17d5bd9..b6d7808e3 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -107,6 +107,7 @@
               ref="tree2"
               node-key="id"
               class="filter-tree"
+              style="height: 100%; overflow: auto;"
               v-if="modalPost"
               :props="props"
               :data="postList"
diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue
index 36915c846..0f19d2965 100644
--- a/src/pages/config/pages/postManage/index.vue
+++ b/src/pages/config/pages/postManage/index.vue
@@ -102,6 +102,7 @@
                     ref="tree"
                     node-key="id"
                     class="filter-tree"
+                    style="height: 100%; overflow: auto;"
                     v-if="modalRole"
                     :props="props"
                     :data="roleList"
diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index 19718aa73..fb7287909 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -206,6 +206,7 @@
                     class="filter-tree1"
                     :data="treeData"
                     :props="defaultProps"
+                    style="height: 100%; overflow: auto;"
                     default-expand-all
                     check-strictly
                     node-key="id"
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 0b4e6b7a6..214dd7983 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -90,6 +90,7 @@ export default {
             let userInfoStr = Base64.decode(res.data)
             let userInfo2 = decodeURIComponent(userInfoStr)
             let userInfoObj = JSON.parse(userInfo2)
+            userInfoObj.userId = userInfoObj.usid
             this.setToken(userInfoObj.usid) // vuex存储token
             this.getByUserInfoCode(userInfoObj.usid).then((userInfo) => {
               if (userInfo !== '' && userInfo !== null) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index aaf834d54..cd7a15d89 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -563,7 +563,7 @@
       size="800px">
       <el-tree
         v-if="modalshowflag"
-        style="height: 100%;"
+        style="height: 100%; overflow: auto;"
         node-key="id"
         class="filter-tree"
         :data="treeData"
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index 6007a1d32..d2787d24f 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -230,7 +230,7 @@
       size="800px">
       <el-tree
         v-if="modalshowflag"
-        style="height: 100%;"
+        style="height: 100%; overflow: auto;"
         node-key="id"
         class="filter-tree"
         :data="treeData"
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
index 2b5fcdb56..9c4edbd1c 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
@@ -149,7 +149,7 @@
       size="800px">
       <el-tree
         v-if="modalshowflag"
-        style="height: 100%;"
+        style="height: 100%; overflow: auto;"
         node-key="id"
         class="filter-tree"
         :data="treeData"
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
index 2f2b95286..5d3255c1e 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -142,7 +142,7 @@
       size="800px">
       <el-tree
         v-if="modalshowflag"
-        style="height: 100%;"
+        style="height: 100%; overflow: auto;"
         node-key="id"
         class="filter-tree"
         :data="treeData"
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index a69694b6d..29e5f81f3 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -290,7 +290,7 @@
       size="800px">
       <el-tree
         v-if="modalshowflag"
-        style="height: 100%;"
+        style="height: 100%; overflow: auto;"
         node-key="id"
         class="filter-tree"
         :data="treeData"

From 9317c2f2874fad41e7a7c825043ed85640e0f445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 9 Jul 2021 10:07:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1.vue       |  1 +
 .../pages/creatProcess/xmpg/step1.vue         | 54 ++++++++++++++++---
 src/sysConfig/index.js                        |  2 +-
 3 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index aaf834d54..ac4673fd0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -845,6 +845,7 @@ export default {
       let json = this.listForm;
       json.zrUserId = this.$store.getters.userInfo.userId;
       json.jlUserId = this.$store.getters.userInfo.userId;
+      // (如果是业务经理应该这样写 后续需要更改 例：json.jlUserId = this.roleForm.directorUser;)
       json.applyUpdUserId = this.$store.getters.userInfo.userId;
       json.approvalOpinion = "";
       json.prcCreateUser = this.$store.getters.userInfo.userId;
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index a69694b6d..6fe9f020e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -113,8 +113,8 @@
                   <h4>标准法法规业务经理</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" placeholder="选择审核责任人"
-                              @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择业务经理"
+                              @click.native="choiceZRR('dockUser', '选择业务经理', roleForm.dockUser)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -126,20 +126,56 @@
                   <h4>分发责任人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.ministerUserName" placeholder="选择标准/政策法规工程师"
-                              @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
+                    <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规工程师"
+                              @click.native="choiceZRR('ministerUser', '选择标准法规工程师', roleForm.ministerUser)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="审批" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="责任人填写评估反馈" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="directorUserName" style="margin-bottom: 0">
-                  <h4>业务经理</h4>
+                  <h4>责任人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.directorUserName" placeholder="选择业务经理"
-                              @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
+                    <el-input v-model="roleForm.directorUserName" placeholder="责任人"
+                              @click.native="choiceZRR('directorUser', '选择责任人', roleForm.directorUser)"></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="分发责任人进行任务分发" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
+                  <h4>分发责任人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规工程师"
+                              @click.native="choiceZRR('ministerUser', '选择标准法规工程师', roleForm.ministerUser)"></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="产品线责任人审批" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="directorUserName" style="margin-bottom: 0">
+                  <h4>产品线责任人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
+<!--                    <el-input v-model="roleForm.directorUserName" placeholder="责任人"-->
+<!--                              @click.native="choiceZRR('directorUser', '选择分发责任人', roleForm.directorUser)"></el-input>-->
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="标准法规部领导审批" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="directorUserName" style="margin-bottom: 0">
+                  <h4>标准法规部领导</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.directorUserName" placeholder="请选择标准法规部领导"
+                              @click.native="choiceZRR('directorUser', '选择标准法规部领导', roleForm.directorUser)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -573,6 +609,8 @@ export default {
         _this: this
       }, res => {
         this.productData = res.data
+        //分发责任人
+        // this.roleForm.directorUser = res.data.
         // this.totalNo = res.data
       }, e => {
 
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 0b7476a89..6bd16fca3 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -6,8 +6,8 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
+// const devIp = '192.168.10.248'
 const devIp = '192.168.10.248'
-const devIp = '192.168.10.30'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'