Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0

* 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui:
  youhua

# Conflicts:
#	src/components/PopupRight/index.vue
#	src/views/kpi/workbench/assessmentGroup/edit/components/process.vue

config/index.js

@@ -12,9 +12,10 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/lz_management': {
-        target: `https://tlzmanagement.ldxinyong.com`,
+        // target: `https://tlzmanagement.ldxinyong.com`,
+        target: `http://192.168.4.12:8080`,
         changeOrigin: true,
-        secure: false ,
+        // secure: false ,
         // pathRewrite: {
         //   '^/lz_management': '/'
         // }

src/api/workbench.js

@@ -18,6 +18,15 @@ export function saveBaseSet (query) {
   })
 }
 
+// 获取基础设置
+export function getByIdForBasis (query) {
+  return request({
+    url: '/lz_management/evaluationGroup/getById',
+    method: 'get',
+    params: query
+  })
+}
+
 //  删除考核组基础设置
 export function groundDelete (query) {
   return request({
@@ -36,6 +45,15 @@ export function saveTemSet (query) {
   })
 }
 
+//  获取模板详情
+export function getByGroupId (query) {
+  return request({
+    url: '/lz_management/resultModel/getByGroupId',
+    method: 'get',
+    params: query
+  })
+}
+
 //  获取流程设计的流程节点
 export function getByFlowManagerId (query) {
   return request({

src/components/PopupRight/index.vue

@@ -1,30 +1,22 @@
 <template>
   <transition name="popupfade">
-    <div
+    <div class="taskDetailRight" @click="getRight">
-      class="taskDetailRight"
+      <div class="taskDetailRight-contant" @click.stop="aa">
-      @click="getRight"
-    >
-      <div
-        class="taskDetailRight-contant"
-        @click.stop="aa"
-      >
           <div class="taskDetailRight-contant-title commonFont" >{{title}}</div>
           <div  class="taskDetailRight-contant-content" >
              <slot name="content"></slot>
           </div>
           <div  class="taskDetailRight-contant-footer" >
-          <el-button
+           <div>
-            size="small"
+              <slot name="footer-left"></slot>
-            @click="$emit('cancel')"
+           </div>
-          >取 消</el-button>
+            <div>
-          <el-button
+              <el-button size="small"  @click="$emit('cancel')">取 消</el-button>
-            size="small"
+            <el-button size="small" type="primary" @click="$emit('submit')">确 定</el-button>
-            type="primary"
-            @click="$emit('submit')"
-          >确 定</el-button>
             <slot name="footer"></slot>
             </div>
           </div>
+      </div>
       <div>
       </div>
     </div>
@@ -78,8 +70,7 @@ export default {
 .fade-enter-to{
     transform: translateX(-100%);
   }
-.popupfade-leave-active,
+.popupfade-leave-active,.fade-enter-active {
-.fade-enter-active {
   transition:all 40s;
 }
 
@@ -97,8 +88,7 @@ export default {
     height: 100%;
     float: right;
     background:#fff;
-        box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.12),
+    box-shadow: 0 1px 6px 0 rgba(0,0,0,.12), 0 1px 6px 0 rgba(0,0,0,.12);
-            0 1px 6px 0 rgba(0, 0, 0, 0.12);
     display: flex;
     flex-direction: column;
     &-title{
@@ -111,7 +101,8 @@ export default {
       overflow: auto;
     }
     &-footer{
-            text-align: right;
+      display: flex;
+      justify-content: space-between;
       padding: 10px 20px;
       border-top: 1px solid @borderColor;
     }

src/components/getDepart/a.js

@@ -18,12 +18,12 @@ const a = {
           'list': null,
           'staffDtos': [
             {
-              'staffId': 371,
+              'staffId': 350,
               'staffNo': null,
-              'name': '郑一肇',
+              'name': '许婉君',
-              'position': '金融运营总监',
+              'position': '结算专员',
               'staffStatus': '在职',
-              'departmentLeader': 1
+              'departmentLeader': 0
             },
             {
               'staffId': 360,
@@ -34,12 +34,12 @@ const a = {
               'departmentLeader': 0
             },
             {
-              'staffId': 350,
+              'staffId': 371,
               'staffNo': null,
-              'name': '许婉君',
+              'name': '郑一肇',
-              'position': '结算专员',
+              'position': '金融运营总监',
               'staffStatus': '在职',
-              'departmentLeader': 0
+              'departmentLeader': 1
             },
             {
               'staffId': 407,
@@ -95,22 +95,6 @@ const a = {
               'staffStatus': '在职',
               'departmentLeader': 1
             },
-            {
-              'staffId': 336,
-              'staffNo': null,
-              'name': '肖兴',
-              'position': '商务主管',
-              'staffStatus': '在职',
-              'departmentLeader': 0
-            },
-            {
-              'staffId': 339,
-              'staffNo': null,
-              'name': '罗锦鸾',
-              'position': '商务经理',
-              'staffStatus': '在职',
-              'departmentLeader': 0
-            },
             {
               'staffId': 335,
               'staffNo': null,
@@ -120,10 +104,10 @@ const a = {
               'departmentLeader': 0
             },
             {
-              'staffId': 340,
+              'staffId': 336,
               'staffNo': null,
-              'name': '陈瑛瑛',
+              'name': '肖兴',
-              'position': '商务BD',
+              'position': '商务主管',
               'staffStatus': '在职',
               'departmentLeader': 0
             },
@@ -143,6 +127,22 @@ const a = {
               'staffStatus': '在职',
               'departmentLeader': 0
             },
+            {
+              'staffId': 339,
+              'staffNo': null,
+              'name': '罗锦鸾',
+              'position': '商务经理',
+              'staffStatus': '在职',
+              'departmentLeader': 0
+            },
+            {
+              'staffId': 340,
+              'staffNo': null,
+              'name': '陈瑛瑛',
+              'position': '商务BD',
+              'staffStatus': '在职',
+              'departmentLeader': 0
+            },
             {
               'staffId': 405,
               'staffNo': null,
@@ -276,10 +276,10 @@ const a = {
               'list': null,
               'staffDtos': [
                 {
-                  'staffId': 376,
+                  'staffId': 343,
                   'staffNo': null,
-                  'name': '刘巧',
+                  'name': '余鑫峰',
-                  'position': '电销总监',
+                  'position': '',
                   'staffStatus': '在职',
                   'departmentLeader': 0
                 },
@@ -292,18 +292,18 @@ const a = {
                   'departmentLeader': 0
                 },
                 {
-                  'staffId': 343,
+                  'staffId': 374,
                   'staffNo': null,
-                  'name': '余鑫峰',
+                  'name': '刘妮',
                   'position': '',
                   'staffStatus': '在职',
                   'departmentLeader': 0
                 },
                 {
-                  'staffId': 374,
+                  'staffId': 376,
                   'staffNo': null,
-                  'name': '刘妮',
+                  'name': '刘巧',
-                  'position': '',
+                  'position': '电销总监',
                   'staffStatus': '在职',
                   'departmentLeader': 0
                 },
@@ -394,14 +394,6 @@ const a = {
               'open': null,
               'list': null,
               'staffDtos': [
-                {
-                  'staffId': 300,
-                  'staffNo': null,
-                  'name': '吴涛',
-                  'position': '联通开发主管',
-                  'staffStatus': '在职',
-                  'departmentLeader': 1
-                },
                 {
                   'staffId': 293,
                   'staffNo': null,
@@ -410,6 +402,14 @@ const a = {
                   'staffStatus': '在职',
                   'departmentLeader': 0
                 },
+                {
+                  'staffId': 295,
+                  'staffNo': null,
+                  'name': '谷乾尧',
+                  'position': 'Java开发工程师',
+                  'staffStatus': '在职',
+                  'departmentLeader': 0
+                },
                 {
                   'staffId': 297,
                   'staffNo': null,
@@ -419,20 +419,12 @@ const a = {
                   'departmentLeader': 0
                 },
                 {
-                  'staffId': 321,
+                  'staffId': 300,
                   'staffNo': null,
-                  'name': '朱华坤',
+                  'name': '吴涛',
-                  'position': 'Java开发工程师',
+                  'position': '联通开发主管',
                   'staffStatus': '在职',
-                  'departmentLeader': 0
+                  'departmentLeader': 1
-                },
-                {
-                  'staffId': 295,
-                  'staffNo': null,
-                  'name': '谷乾尧',
-                  'position': 'Java开发工程师',
-                  'staffStatus': '在职',
-                  'departmentLeader': 0
                 },
                 {
                   'staffId': 304,
@@ -449,6 +441,14 @@ const a = {
                   'position': 'Java开发工程师',
                   'staffStatus': '在职',
                   'departmentLeader': 0
+                },
+                {
+                  'staffId': 321,
+                  'staffNo': null,
+                  'name': '朱华坤',
+                  'position': 'Java开发工程师',
+                  'staffStatus': '在职',
+                  'departmentLeader': 0
                 }
               ]
             },
@@ -460,14 +460,6 @@ const a = {
               'open': null,
               'list': null,
               'staffDtos': [
-                {
-                  'staffId': 276,
-                  'staffNo': null,
-                  'name': '苏伟丽',
-                  'position': '开发经理',
-                  'staffStatus': '在职',
-                  'departmentLeader': 1
-                },
                 {
                   'staffId': 275,
                   'staffNo': null,
@@ -476,6 +468,14 @@ const a = {
                   'staffStatus': '在职',
                   'departmentLeader': 0
                 },
+                {
+                  'staffId': 276,
+                  'staffNo': null,
+                  'name': '苏伟丽',
+                  'position': '开发经理',
+                  'staffStatus': '在职',
+                  'departmentLeader': 1
+                },
                 {
                   'staffId': 277,
                   'staffNo': null,
@@ -502,22 +502,6 @@ const a = {
               'open': null,
               'list': null,
               'staffDtos': [
-                {
-                  'staffId': 307,
-                  'staffNo': null,
-                  'name': '赵聪',
-                  'position': '数据开发主管',
-                  'staffStatus': '在职',
-                  'departmentLeader': 1
-                },
-                {
-                  'staffId': 324,
-                  'staffNo': null,
-                  'name': '宋发元',
-                  'position': 'Java开发工程师',
-                  'staffStatus': '在职',
-                  'departmentLeader': 0
-                },
                 {
                   'staffId': 289,
                   'staffNo': null,
@@ -526,6 +510,14 @@ const a = {
                   'staffStatus': '在职',
                   'departmentLeader': 0
                 },
+                {
+                  'staffId': 307,
+                  'staffNo': null,
+                  'name': '赵聪',
+                  'position': '数据开发主管',
+                  'staffStatus': '在职',
+                  'departmentLeader': 1
+                },
                 {
                   'staffId': 317,
                   'staffNo': null,
@@ -534,6 +526,14 @@ const a = {
                   'staffStatus': '在职',
                   'departmentLeader': 0
                 },
+                {
+                  'staffId': 324,
+                  'staffNo': null,
+                  'name': '宋发元',
+                  'position': 'Java开发工程师',
+                  'staffStatus': '在职',
+                  'departmentLeader': 0
+                },
                 {
                   'staffId': 327,
                   'staffNo': null,
@@ -553,12 +553,12 @@ const a = {
               'list': null,
               'staffDtos': [
                 {
-                  'staffId': 312,
+                  'staffId': 269,
                   'staffNo': null,
-                  'name': '杨阳',
+                  'name': '朱吉达1',
-                  'position': '前端开发经理',
+                  'position': 'IOS开发工程师',
                   'staffStatus': '在职',
-                  'departmentLeader': 1
+                  'departmentLeader': 0
                 },
                 {
                   'staffId': 298,
@@ -568,22 +568,6 @@ const a = {
                   'staffStatus': '在职',
                   'departmentLeader': 0
                 },
-                {
-                  'staffId': 269,
-                  'staffNo': null,
-                  'name': '朱吉达',
-                  'position': 'IOS开发工程师',
-                  'staffStatus': '在职',
-                  'departmentLeader': 0
-                },
-                {
-                  'staffId': 319,
-                  'staffNo': null,
-                  'name': '俞毓民',
-                  'position': 'Android开发工程师',
-                  'staffStatus': '在职',
-                  'departmentLeader': 0
-                },
                 {
                   'staffId': 308,
                   'staffNo': null,
@@ -599,6 +583,22 @@ const a = {
                   'position': 'Web前端开发工程师',
                   'staffStatus': '在职',
                   'departmentLeader': 0
+                },
+                {
+                  'staffId': 312,
+                  'staffNo': null,
+                  'name': '杨阳',
+                  'position': '前端开发经理',
+                  'staffStatus': '在职',
+                  'departmentLeader': 1
+                },
+                {
+                  'staffId': 319,
+                  'staffNo': null,
+                  'name': '俞毓民',
+                  'position': 'Android开发工程师',
+                  'staffStatus': '在职',
+                  'departmentLeader': 0
                 }
               ]
             },
@@ -610,30 +610,6 @@ const a = {
               'open': null,
               'list': null,
               'staffDtos': [
-                {
-                  'staffId': 310,
-                  'staffNo': null,
-                  'name': '黎甜',
-                  'position': '测试主管',
-                  'staffStatus': '在职',
-                  'departmentLeader': 1
-                },
-                {
-                  'staffId': 326,
-                  'staffNo': null,
-                  'name': '王燕林',
-                  'position': '软件测试工程师',
-                  'staffStatus': '在职',
-                  'departmentLeader': 0
-                },
-                {
-                  'staffId': 306,
-                  'staffNo': null,
-                  'name': '雷闪闪',
-                  'position': '软件测试工程师',
-                  'staffStatus': '在职',
-                  'departmentLeader': 0
-                },
                 {
                   'staffId': 292,
                   'staffNo': null,
@@ -650,6 +626,22 @@ const a = {
                   'staffStatus': '在职',
                   'departmentLeader': 0
                 },
+                {
+                  'staffId': 306,
+                  'staffNo': null,
+                  'name': '雷闪闪',
+                  'position': '软件测试工程师',
+                  'staffStatus': '在职',
+                  'departmentLeader': 0
+                },
+                {
+                  'staffId': 310,
+                  'staffNo': null,
+                  'name': '黎甜',
+                  'position': '测试主管',
+                  'staffStatus': '在职',
+                  'departmentLeader': 1
+                },
                 {
                   'staffId': 325,
                   'staffNo': null,
@@ -657,6 +649,14 @@ const a = {
                   'position': '软件测试工程师',
                   'staffStatus': '在职',
                   'departmentLeader': 0
+                },
+                {
+                  'staffId': 326,
+                  'staffNo': null,
+                  'name': '王燕林',
+                  'position': '软件测试工程师',
+                  'staffStatus': '在职',
+                  'departmentLeader': 0
                 }
               ]
             },
@@ -695,12 +695,12 @@ const a = {
               'list': null,
               'staffDtos': [
                 {
-                  'staffId': 314,
+                  'staffId': 294,
                   'staffNo': null,
-                  'name': '吴林',
+                  'name': '瞿贻晓',
-                  'position': '攻关开发主管',
+                  'position': 'Java开发工程师',
                   'staffStatus': '在职',
-                  'departmentLeader': 1
+                  'departmentLeader': 0
                 },
                 {
                   'staffId': 313,
@@ -711,12 +711,12 @@ const a = {
                   'departmentLeader': 0
                 },
                 {
-                  'staffId': 294,
+                  'staffId': 314,
                   'staffNo': null,
-                  'name': '瞿贻晓',
+                  'name': '吴林',
-                  'position': 'Java开发工程师',
+                  'position': '攻关开发主管',
                   'staffStatus': '在职',
-                  'departmentLeader': 0
+                  'departmentLeader': 1
                 }
               ]
             }
@@ -743,7 +743,7 @@ const a = {
             {
               'staffId': 270,
               'staffNo': null,
-              'name': '吴玲丽',
+              'name': '吴玲丽2',
               'position': '品牌专员',
               'staffStatus': '在职',
               'departmentLeader': 0
@@ -775,9 +775,25 @@ const a = {
               'departmentLeader': 1
             },
             {
-              'staffId': 320,
+              'staffId': 296,
               'staffNo': null,
-              'name': '张思思',
+              'name': '谢宇航',
+              'position': '客服专员',
+              'staffStatus': '在职',
+              'departmentLeader': 0
+            },
+            {
+              'staffId': 299,
+              'staffNo': null,
+              'name': '程晶雅',
+              'position': '客服专员',
+              'staffStatus': '在职',
+              'departmentLeader': 0
+            },
+            {
+              'staffId': 311,
+              'staffNo': null,
+              'name': '金森瀚',
               'position': '客服专员',
               'staffStatus': '在职',
               'departmentLeader': 0
@@ -799,25 +815,9 @@ const a = {
               'departmentLeader': 0
             },
             {
-              'staffId': 311,
+              'staffId': 320,
               'staffNo': null,
-              'name': '金森瀚',
+              'name': '张思思',
-              'position': '客服专员',
-              'staffStatus': '在职',
-              'departmentLeader': 0
-            },
-            {
-              'staffId': 299,
-              'staffNo': null,
-              'name': '程晶雅',
-              'position': '客服专员',
-              'staffStatus': '在职',
-              'departmentLeader': 0
-            },
-            {
-              'staffId': 296,
-              'staffNo': null,
-              'name': '谢宇航',
               'position': '客服专员',
               'staffStatus': '在职',
               'departmentLeader': 0
@@ -856,22 +856,6 @@ const a = {
           'open': null,
           'list': null,
           'staffDtos': [
-            {
-              'staffId': 283,
-              'staffNo': null,
-              'name': '黄晓琪',
-              'position': '金融产品主管',
-              'staffStatus': '在职',
-              'departmentLeader': 1
-            },
-            {
-              'staffId': 284,
-              'staffNo': null,
-              'name': '卞悦',
-              'position': '产品经理',
-              'staffStatus': '在职',
-              'departmentLeader': 0
-            },
             {
               'staffId': 279,
               'staffNo': null,
@@ -888,6 +872,22 @@ const a = {
               'staffStatus': '在职',
               'departmentLeader': 0
             },
+            {
+              'staffId': 283,
+              'staffNo': null,
+              'name': '黄晓琪',
+              'position': '金融产品主管',
+              'staffStatus': '在职',
+              'departmentLeader': 1
+            },
+            {
+              'staffId': 284,
+              'staffNo': null,
+              'name': '卞悦',
+              'position': '产品经理',
+              'staffStatus': '在职',
+              'departmentLeader': 0
+            },
             {
               'staffId': 408,
               'staffNo': null,
@@ -906,14 +906,6 @@ const a = {
           'open': null,
           'list': null,
           'staffDtos': [
-            {
-              'staffId': 285,
-              'staffNo': null,
-              'name': '何永生',
-              'position': '设计经理',
-              'staffStatus': '在职',
-              'departmentLeader': 1
-            },
             {
               'staffId': 281,
               'staffNo': null,
@@ -921,6 +913,14 @@ const a = {
               'position': 'UI设计师',
               'staffStatus': '在职',
               'departmentLeader': 0
+            },
+            {
+              'staffId': 285,
+              'staffNo': null,
+              'name': '何永生',
+              'position': '设计经理',
+              'staffStatus': '在职',
+              'departmentLeader': 1
             }
           ]
         }
@@ -992,6 +992,14 @@ const a = {
               'open': null,
               'list': null,
               'staffDtos': [
+                {
+                  'staffId': 387,
+                  'staffNo': null,
+                  'name': '叶形君',
+                  'position': '网络管理员',
+                  'staffStatus': '在职',
+                  'departmentLeader': 0
+                },
                 {
                   'staffId': 388,
                   'staffNo': null,
@@ -1015,14 +1023,6 @@ const a = {
                   'position': '行政专员',
                   'staffStatus': '在职',
                   'departmentLeader': 0
-                },
-                {
-                  'staffId': 387,
-                  'staffNo': null,
-                  'name': '叶形君',
-                  'position': '网络管理员',
-                  'staffStatus': '在职',
-                  'departmentLeader': 0
                 }
               ]
             }
@@ -1065,22 +1065,6 @@ const a = {
           'open': null,
           'list': null,
           'staffDtos': [
-            {
-              'staffId': 397,
-              'staffNo': null,
-              'name': '傅卿卿',
-              'position': '财务总监',
-              'staffStatus': '在职',
-              'departmentLeader': 1
-            },
-            {
-              'staffId': 398,
-              'staffNo': null,
-              'name': '丁迪峰',
-              'position': '费用会计',
-              'staffStatus': '在职',
-              'departmentLeader': 0
-            },
             {
               'staffId': 392,
               'staffNo': null,
@@ -1097,6 +1081,14 @@ const a = {
               'staffStatus': '在职',
               'departmentLeader': 0
             },
+            {
+              'staffId': 394,
+              'staffNo': null,
+              'name': '潘慧婷',
+              'position': '总账会计',
+              'staffStatus': '在职',
+              'departmentLeader': 0
+            },
             {
               'staffId': 396,
               'staffNo': null,
@@ -1106,18 +1098,26 @@ const a = {
               'departmentLeader': 0
             },
             {
-              'staffId': 399,
+              'staffId': 397,
               'staffNo': null,
-              'name': '朱琴玲',
+              'name': '傅卿卿',
-              'position': '会计',
+              'position': '财务总监',
+              'staffStatus': '在职',
+              'departmentLeader': 1
+            },
+            {
+              'staffId': 398,
+              'staffNo': null,
+              'name': '丁迪峰',
+              'position': '费用会计',
               'staffStatus': '在职',
               'departmentLeader': 0
             },
             {
-              'staffId': 394,
+              'staffId': 399,
               'staffNo': null,
-              'name': '潘慧婷',
+              'name': '朱琴玲',
-              'position': '总账会计',
+              'position': '会计',
               'staffStatus': '在职',
               'departmentLeader': 0
             }
@@ -1132,18 +1132,10 @@ const a = {
           'list': null,
           'staffDtos': [
             {
-              'staffId': 365,
+              'staffId': 329,
               'staffNo': null,
-              'name': '刘更顺',
+              'name': '蒋勰思',
-              'position': 'CRO',
+              'position': '清算经理',
-              'staffStatus': '在职',
-              'departmentLeader': 1
-            },
-            {
-              'staffId': 331,
-              'staffNo': null,
-              'name': '蔡航东',
-              'position': '清算主管',
               'staffStatus': '在职',
               'departmentLeader': 0
             },
@@ -1156,10 +1148,10 @@ const a = {
               'departmentLeader': 0
             },
             {
-              'staffId': 329,
+              'staffId': 331,
               'staffNo': null,
-              'name': '蒋勰思',
+              'name': '蔡航东',
-              'position': '清算经理',
+              'position': '清算主管',
               'staffStatus': '在职',
               'departmentLeader': 0
             },
@@ -1178,6 +1170,14 @@ const a = {
               'position': '清算专员',
               'staffStatus': '在职',
               'departmentLeader': 0
+            },
+            {
+              'staffId': 365,
+              'staffNo': null,
+              'name': '刘更顺',
+              'position': 'CRO',
+              'staffStatus': '在职',
+              'departmentLeader': 1
             }
           ]
         },
@@ -1190,10 +1190,10 @@ const a = {
           'list': null,
           'staffDtos': [
             {
-              'staffId': 400,
+              'staffId': 322,
               'staffNo': null,
-              'name': '杨春',
+              'name': '徐虹杰',
-              'position': '总裁助理',
+              'position': 'CTO',
               'staffStatus': '在职',
               'departmentLeader': 0
             },
@@ -1206,10 +1206,10 @@ const a = {
               'departmentLeader': 1
             },
             {
-              'staffId': 322,
+              'staffId': 400,
               'staffNo': null,
-              'name': '徐虹杰',
+              'name': '杨春',
-              'position': 'CTO',
+              'position': '总裁助理',
               'staffStatus': '在职',
               'departmentLeader': 0
             }

src/components/getDepart/index.vue

@@ -42,6 +42,7 @@
                     closable>
                     {{tag.departmentName}}
                   </el-tag>
+
                   <div class="commonFont noChoose" v-if="tags.length===0">
                     暂无选择
                   </div>
@@ -163,17 +164,7 @@ export default {
     },
     // 关闭弹窗
     centerDialogVisible () {
-      const params = {
+      const params = this.$departGetForm(this.tags)
-        list: this.tags,
-        title: '',
-        value: ''
-      }
-      for (let i in this.tags) {
-        if (i < 1) {
-          params.title = params.title + (i === '0' ? '' : ',') + this.tags[i].departmentName
-        }
-        params.value += this.tags[i].departmentId + (i < this.tags.length - 1 ? ',' : '')
-      }
       this.$emit('update:value', params.value)
       this.$emit('update:showDataList', params)
       this.$emit('update:isShow', false)

src/components/getPersonnel/index.vue

@@ -210,11 +210,6 @@ export default {
     },
     // 关闭弹窗
     centerDialogVisible () {
-      const params = {
-        list: [],
-        title: '',
-        value: ''
-      }
       let arr = this.handleGetPerson(this.tags)
       let obj = {}
       arr = arr.reduce((item, next) => {
@@ -224,11 +219,7 @@ export default {
         }
         return item
       }, [])
-      params.list = arr
+      const params = this.$personlGetForm(arr)
-      for (let i in arr) {
-        if (i < 1) { params.title = params.title + (i === '0' ? '' : ',') + arr[i].name }
-        params.value += arr[i].staffId + (i < arr.length - 1 ? ',' : '')
-      }
       this.$emit('update:value', params.value)
       this.$emit('update:showDataList', params)
       this.$emit('update:isShow', false)

src/main.js

@@ -7,9 +7,7 @@ import store from './store'
 import './utils/elementConfig'
 import './utils/permission'
 import './style/index.less'
-import {
+import {debounce, departGetForm, personlGetForm} from '@/utils/common'
-  debounce
-} from '@/utils/common'
 import '@/icons'
 import {
   format
@@ -19,6 +17,8 @@ console.log('store: ', store)
 Vue.config.productionTip = false
 Vue.prototype.$format = format
 Vue.prototype.debounce = debounce
+Vue.prototype.$personlGetForm = personlGetForm
+Vue.prototype.$departGetForm = departGetForm
 
 /* eslint-disable no-new */
 new Vue({

src/utils/common.js

@@ -25,3 +25,53 @@ export function debounce (func, wait, immediate) {
     }
   }
 }
+
+export function personlGetForm (arr = []) {
+  const params = {
+    list: [],
+    title: '',
+    value: ''
+  }
+  if (!arr || arr.length === 0) return params
+  if (!arr[0].staffId) {
+    arr = arr.map(i => {
+      i.staffId = i.id
+      return i
+    })
+  }
+  const key = 'staffId'
+  params.list = arr
+  for (let i in arr) {
+    if (i < 1) { params.title = params.title + (i === '0' ? '' : ',') + arr[i].name }
+    params.value += arr[i][key] + (i < arr.length - 1 ? ',' : '')
+  }
+  console.log('params: ', params)
+  return params
+}
+
+export function departGetForm (arr = []) {
+  const params = {
+    list: [],
+    title: '',
+    value: ''
+  }
+  if (!arr || arr.length === 0) return params
+  if (!arr[0].departmentId) {
+    arr = arr.map(i => {
+      i.departmentId = i.id
+      if (!i.departmentName) i.departmentName = i.name
+      return i
+    })
+  }
+  const key = 'departmentId'
+  const key1 = 'departmentName'
+  params.list = arr
+  for (let i in arr) {
+    if (i < 1) {
+      params.title = params.title + (i === '0' ? '' : ',') + arr[i][key1]
+    }
+    params.value += arr[i][key] + (i < arr.length - 1 ? ',' : '')
+  }
+  console.log('params: ', params)
+  return params
+}

src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue

@@ -108,10 +108,11 @@
 </template>
 
 <script>
-import getDepart from './getDepart'
+import getDepart from '@/components/getDepart'
-import getPersonnel from './getPersonnel'
+import getPersonnel from '@/components/getPersonnel'
 import PopupRight from '@/components/PopupRight'
 import { getGround } from '@/api/data'
+import { getByIdForBasis } from '@/api/workbench'
 export default {
   props: {
     basisForm: {
@@ -130,6 +131,7 @@ export default {
   },
   data () {
     return {
+      id: '',
       GroundList: [],
       GroundList1: [],
       isSshowOutIds: false,
@@ -145,22 +147,6 @@ export default {
       showData: {
         list: []
       }, // 部门信息
-      zhouqi: [{
-        id: 1,
-        name: '月度'
-      }, {
-        id: 2,
-        name: '季度'
-      }, {
-        id: 3,
-        name: '半年度'
-      }, {
-        id: 4,
-        name: '年度'
-      }, {
-        id: 5,
-        name: '试用期'
-      }],
       form: {},
       rules: {
         name: [
@@ -195,14 +181,46 @@ export default {
   },
   beforeMount () {},
   async mounted () {
-    this.form = this.basisForm
     this.handleGetGround()
+    const id = this.$route.query.id || ''
+    this.id = id
+    if (id) {
+      this.handleGetByIdForBasis(id)
+    }
+    this.form = this.basisForm
   },
   methods: {
+    // 获取基础设置
+    async handleGetByIdForBasis (id) {
+      try {
+        let res = await getByIdForBasis({id})
+        console.log('res: ', res)
+        this.GroundList1 = res.managers.map(i => {
+          i.staffId = i.id
+          i.staffName = i.name
+          i.isSelect = 1
+          return i
+        })
+        if (res.deps.length !== 0) {
+          const b = this.$personlGetForm(res.outs)
+          this.outIdsLsit = b
+          this.form.outIds = b.value
+        }
+        const a = this.$personlGetForm(res.staffs)
+        const c = this.$departGetForm(res.deps)
+        this.form.staffIds = a.value
+        this.form.depIds = c.value
+        this.personnelList = a
+        this.showData = c
+        this.form.id = res.id
+        this.form.name = res.name
+      } catch (error) {
+        this.$message.error(error.msg)
+      }
+    },
     async handleGetGround () {
       try {
         let res = await getGround({groupId: 1})
-        console.log('res: ', res)
         res = res.map(i => {
           i.isDisable = i.isSelect
           return i

src/views/kpi/workbench/assessmentGroup/edit/components/process.vue

@@ -2,33 +2,16 @@
 <template>
     <div class="process">
         <div class="process-type commonFont">
-      流程方式： <el-radio
+          流程方式： <el-radio v-model="radio" label="1">按评分人设置流程</el-radio>
-        v-model="radio"
-        label="1"
-      >按评分人设置流程</el-radio>
         </div>
         <div class="process-title">
-      <div
+          <div class="process-title-item" v-for="(i,index) in processLsit" :key="i.id">
-        class="process-title-item"
+              <div @click="handleChangleTitle(i)" class="process-title-item-contant commonFont" :class="{active:componentId===i.componment}">
-        v-for="(i,index) in processLsit"
-        :key="i.id"
-      >
-        <div
-          @click="handleChangleTitle(i)"
-          class="process-title-item-contant commonFont"
-          :class="{active:componentId===i.componment}"
-        >
                 <span>{{i.name}}</span>
                  <span>{{i.label}}</span>
               </div>
-        <div
+              <div v-if="index+1  !==processLsit.length" class="process-title-item-img">
-          v-if="index+1  !==processLsit.length"
+                <img src="./imgs/right.png" alt="">
-          class="process-title-item-img"
-        >
-          <img
-            src="./imgs/right.png"
-            alt=""
-          >
               </div>
           </div>
         </div>
@@ -47,6 +30,7 @@ import Entry from './Entry'
 import Score from './Score'
 import Approval from './Approval'
 import {getByFlowManagerId, saveDetailProcs} from '@/api/workbench'
+console.log('saveDetailProcs: ', saveDetailProcs)
 export default {
   data () {
     return {
@@ -90,8 +74,16 @@ export default {
   },
   computed: {},
   beforeMount () {},
-  mounted () { },
+  mounted () {
+    // this.handleGetByFlowManagerId()
+  },
   methods: {
+    // 获取流程大节点
+    async handleGetByFlowManagerId (id = 1) {
+      const res = await getByFlowManagerId({id})
+      this.processLsit = res
+      console.log('res: ', res)
+    },
     handleChangleTitle (i) {
       this.isActive = i.id
       this.componentId = i.componment

src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue

@@ -21,10 +21,10 @@
                 </el-form-item>
                 <el-form-item  label="3.75评分等级制">
                   <el-switch
-                    v-model="info.gradeStatus"
+                    v-model="info.gradeGroupId"
                     active-color="#3ba1ff"
                     :active-value='1'
-                    :inactive-value='0'
+                    :inactive-value='2'
                     inactive-color="#dcdfe6">
                 </el-switch>
                 <el-popover
@@ -203,10 +203,9 @@
 import PopupRight from '@/components/PopupRight'
 import draggable from 'vuedraggable'
 import {getDimensions} from '@/api/data'
+import { getByGroupId } from '@/api/workbench'
 // console.log('Sortable: ', Sortable)
 const info = {
-  id: 8,
-  gradeStatus: 1,
   gradeGroupId: 1,
   modelItems: [
   ]
@@ -215,6 +214,7 @@ export default {
   props: ['templateForm'],
   data () {
     return {
+      id: '',
       isEditForm: {},
       zhibiaoTitle: '添加指标',
       weiduTitle: '添加维度',
@@ -283,11 +283,30 @@ export default {
   computed: {},
   beforeMount () {},
   mounted () {
+    const id = this.$route.query.id || ''
+    this.id = id
+    if (id) {
+      this.handleGetByGroupId(id)
+    }
     this.handleGetDimensions()
   },
   methods: {
+    async handleGetByGroupId (id) {
+      try {
+        let res = await getByGroupId({id})
+        res = Object.assign({}, res, {
+          evaluationGroupId: res.id,
+          calculateId: 1 }
+        )
+        this.info = res
+        this.$forceUpdate()
+        console.log('res: ', res)
+      } catch (error) {
+        this.$message.error(error.msg)
+      }
+    },
     handleFilter (item) {
-      return item ? item.filter(i => i.isDelete === 0) : []
+      return item ? item.filter(i => !i.isDelete) : []
     },
     // 更具维度id获取维度名称
     handleWeiDu (item) {

src/views/kpi/workbench/assessmentGroup/edit/index.vue

@@ -22,12 +22,11 @@ import basis from './components/basis'
 import process from './components/process'
 import templateSet from './components/templateSet'
 import {saveBaseSet, saveTemSet} from '@/api/workbench'
-console.log('saveBaseSet: ', saveBaseSet)
 
 export default {
   data () {
     return {
-      active: 3,
+      active: 1,
       // 基础
       basisForm: {
         // id: 8,
@@ -39,12 +38,10 @@ export default {
         name: ''
       },
       templateForm: {
-        evaluationGroupId: 8,
         calculateId: 1,
-        gradeGroupId: 1,
-        gradeStatus: 1,
         modelItems: []
-      }
+      },
+      id: ''
     }
   },
   components: {
@@ -61,6 +58,7 @@ export default {
     handleChangle (item) {
       this.active = item
     },
+
     async handSaveBasisc () {
       console.log('this.templateForm: ', this.templateForm)
       console.log('this.basisForm: ', this.basisForm)