提了一哈

src/api/administration/administration.js

@@ -87,6 +87,17 @@ export function setDefaultCondition(data) {
   });
 }
 
+/**
+ *获取分段流程详情
+ */
+export function getConditionAndAuditInfo(data) {
+  return request({
+    url: '/WorkFlowManagement/GetConditionAndAuditInfo',
+    method: 'post',
+    data
+  });
+}
+
 
 
 

src/pages/administration/updateProcessDesign.vue

@@ -23,8 +23,8 @@
           <div class="approval_layer_info" v-if="approvalType==2">
             <div class="normalMember">
               <ul>
-                <li v-for="item in showMember">{{item.DepartmentName}}</li>
-                <!-- @click="mySetCheckedKeys(item.DepartmentId)"-->
+                <li v-for="item in showMember">{{item.DeptName}}</li>
+                <!-- @click="mySetCheckedKeys(item.DeptId)"-->
               </ul>
             </div>
             <input type="button" class="normalBtn" @click="getMember(),mySetCheckedKeys(-1)" value="添加成员" />
@@ -38,7 +38,7 @@
           <div class="approval_layer_info" v-if="approvalType==3">
             <div class="normalMember">
               <ul>
-                <li v-for="item in showRole">{{item.DepartmentName}}</li>
+                <li v-for="item in showRole">{{item.DeptName}}</li>
               </ul>
             </div>
             <input type="button" class="normalBtn" @click="getRole()" value="添加岗位" />
@@ -138,14 +138,14 @@
         </p>
         <el-tree class='ApprovalProcessBg'
                  :filter-node-method="filterNode"
-                 :data="memberList" show-checkbox ref="tree" :props="defaultProps" :render-after-expand="false" node-key="DepartmentId" @check-change="handleNodeChange">
+                 :data="memberList" show-checkbox ref="tree" :props="defaultProps" :render-after-expand="false" node-key="DeptId" @check-change="handleNodeChange">
         </el-tree>
       </div>
       <div class="fl">
         <p style="margin: 0 0 20px 0;">已选：</p>
         <div class="Approval_yxList">
-          <li v-for="item in showMember">{{item.DepartmentName}}
-            <i @click="mySetCheckedKeys(item.DepartmentId)" class="el-icon-circle-close showMemberIcon"></i>
+          <li v-for="item in showMember">{{item.DeptName}}
+            <i @click="mySetCheckedKeys(item.DeptId)" class="el-icon-circle-close showMemberIcon"></i>
           </li>
         </div>
       </div>
@@ -168,7 +168,7 @@
       <div class="fl">
         <p style="margin: 0 0 20px 0;">已选岗位：</p>
         <div class="Approval_yxList">
-          <li v-for="item in showRole">{{item.DepartmentName}}
+          <li v-for="item in showRole">{{item.DeptName}}
             <i @click="deleteRole()" class="el-icon-circle-close showMemberIcon"></i>
           </li>
         </div>
@@ -186,7 +186,7 @@
         </p>
         <el-tree class='ApprovalProcessBg'
                  :filter-node-method="filterNode2"
-                 :data="userList" show-checkbox ref="treeUser" :props="defaultProps2" :render-after-expand="false" node-key="DepartmentId" @check-change="handleNodeChange1">
+                 :data="userList" show-checkbox ref="treeUser" :props="defaultProps2" :render-after-expand="false" node-key="DeptId" @check-change="handleNodeChange1">
         </el-tree>
       </div>
       <div class="fl">
@@ -209,7 +209,9 @@
 <script>
   import {
     getAskForLeaveType,
-    setOtherCondition
+    setOtherCondition,
+    setDefaultCondition,
+    getConditionAndAuditInfo
   } from '../../api/administration/administration';
   import {
     getEmployeeAddrBook
@@ -222,16 +224,16 @@
         filterText2:"",
         defaultProps: {
           children: 'ChildList',
-          label: 'DepartmentName',
+          label: 'DeptName',
         },
         defaultProps1: {
           children: 'ChildList',
-          label: 'DepartmentName',
+          label: 'DeptName',
           disabled: "Disabled"
         },
         defaultProps2: {
           children: 'ChildList',
-          label: 'DepartmentName',
+          label: 'DeptName',
         },
         zgList: [{
           value: '1',
@@ -330,15 +332,15 @@
     methods: {
       filterNode(value, data) {
         if (!value) return true;
-        return data.DepartmentName.indexOf(value) !== -1;
+        return data.DeptName.indexOf(value) !== -1;
       },
       filterNode1(value, data) {
         if (!value) return true;
-        return data.DepartmentName.indexOf(value) !== -1;
+        return data.DeptName.indexOf(value) !== -1;
       },
       filterNode2(value, data) {
         if (!value) return true;
-        return data.DepartmentName.indexOf(value) !== -1;
+        return data.DeptName.indexOf(value) !== -1;
       },
       addAppPerson() {
         this.approvalType = 1;
@@ -362,12 +364,14 @@
         this.dialogTitle = '选择人员';
         this.outerVisible2 = true;
         let _this = this;
-        this.apipost('WorkFlow_get_GetDepartMentEmployee', {}, res => {
-          if(res.data.resultCode == 1) {
-            this.userList = res.data.data
+        getEmployeeAddrBook({}).then(res => {
+          if(res.Code == 1) {
+            this.userList = res.Data
             _this.$refs.treeUser.setCheckedKeys(_arr);
           }
-        }, err => {})
+        }).catch(() => {
+
+        })
         //
       },
       saveAuditUser() {
@@ -398,88 +402,101 @@
           ConditionId: this.TemplateId
         }, res => {
           if(res.data.resultCode == 1) {
+
+          } else {}
+        }, error => {})
+
+        getConditionAndAuditInfo({ConditionId: this.TemplateId}).then(res => {
+          if(res.Code == 1) {
             this.loading=false
-            this.TemplateTypeName = res.data.data.TemplateTypeName
-            this.addMsg.TemplateId=res.data.data.TemplateId
-            this.addMsg.Id = res.data.data.Id
-            this.askList = res.data.data.aftList;
-            this.askListType = res.data.data.TemplateType
-            this.addMsg.Sort = res.data.data.Sort
-            let _arr = res.data.data.AskforleaveType.substring(1, res.data.data.AskforleaveType.length - 1).split(",")
+            this.TemplateTypeName = res.Data.TemplateTypeName
+            this.addMsg.TemplateId=res.Data.TemplateId
+            this.addMsg.Id = res.Data.Id
+            this.askList = res.Data.aftList;
+            this.askListType = res.Data.TemplateType
+            this.addMsg.Sort = res.Data.Sort
+            let _arr = res.Data.AskforleaveType.substring(1, res.Data.AskforleaveType.length - 1).split(",")
             let _arr1 = []
             _arr.forEach(item => {
               _arr1.push(parseInt(item))
             })
-            this.addMsg.ConditionType = res.data.data.ConditionType.toString()
-            this.addMsg.StartValue = res.data.data.StartValue
-            if(res.data.data.StartType != null && res.data.data.StartType != '') {
-              this.addMsg.StartType = res.data.data.StartType.toString()
+            this.addMsg.ConditionType = res.Data.ConditionType.toString()
+            this.addMsg.StartValue = res.Data.StartValue
+            if(res.Data.StartType != null && res.Data.StartType != '') {
+              this.addMsg.StartType = res.Data.StartType.toString()
             }
-            if(res.data.data.EndValue != null && res.data.data.EndValue != '') {
-              this.addMsg.EndValue = res.data.data.EndValue
+            if(res.Data.EndValue != null && res.Data.EndValue != '') {
+              this.addMsg.EndValue = res.Data.EndValue
             }
-            if(res.data.data.EndType != null && res.data.data.EndType != '') {
-              this.addMsg.EndType = res.data.data.EndType.toString()
+            if(res.Data.EndType != null && res.Data.EndType != '') {
+              this.addMsg.EndType = res.Data.EndType.toString()
             }
 
             this.AskforleaveTypeArr = _arr1
-            this.myAuditList = res.data.data.AuditList
-            this.myAuditUserList = res.data.data.AuditUserList
+            this.myAuditList = res.Data.AuditList
+            this.myAuditUserList = res.Data.AuditUserList
             this.myAuditUserList1 = JSON.parse(JSON.stringify(this.myAuditUserList))
             this.myAuditUserList1.forEach(item => {
               this.sysUserKeys.push(item.EmployeeId)
             })
-          } else {}
-        }, error => {})
+          }
+        }).catch(() => {
+
+        })
       },
       getMember() {
         this.outerVisible = true;
         this.dialogTitle = '选择人员';
-        this.apipost('WorkFlow_get_GetDepartMentEmployee', {}, res => {
-          this.memberList = res.data.data
-        }, err => {})
+        getEmployeeAddrBook({}).then(res => {
+          if(res.Code == 1) {
+            this.memberList = res.Data
+          }
+        }).catch(() => {
+
+        })
+
       },
       getRole() {
         this.outerVisible1 = true;
         this.dialogTitle = '选择岗位';
         this.apipost('WorkFlow_get_GetDepartMentPost', {}, res => {
-          this.roleList = res.data.data
+          this.roleList = res.Data
         }, err => {})
       },
       handleNodeChange1(data, checked) {
         data.IsCheck = checked;
-        if(data.Type == 2 && data.IsCheck) { //是员工且选中
+        if(data.DataType  == 2 && data.IsCheck) { //是员工且选中
           let isExsit = false
           this.myAuditUserList1.forEach(x => {
-            if(x.EmployeeId == data.DepartmentId) {
+            if(x.EmployeeId == data.DeptId) {
               isExsit = true
               return false
             }
           })
           if(!isExsit) {
             this.myAuditUserList1.push({
-              EmName: data.DepartmentName,
-              EmployeeId: data.DepartmentId,
+              EmName: data.DeptName,
+              EmployeeId: data.DeptId,
               Sort: '1'
             })
-            this.memberSetCheckedUserKeys.push(data.DepartmentId)
+            this.memberSetCheckedUserKeys.push(data.DeptId)
           }
-        } else if(data.Type == 2 && !data.IsCheck) {
-          if(this.myAuditUserList1.findIndex(item => item.EmployeeId === data.DepartmentId) != -1) {
-            this.myAuditUserList1.splice(this.myAuditUserList1.findIndex(item => item.EmployeeId === data.DepartmentId), 1)
-            this.memberSetCheckedUserKeys.splice(this.memberSetCheckedUserKeys.findIndex(item => item === data.DepartmentId), 1)
+        } else if(data.DataType  == 2 && !data.IsCheck) {
+          if(this.myAuditUserList1.findIndex(item => item.EmployeeId === data.DeptId) != -1) {
+            this.myAuditUserList1.splice(this.myAuditUserList1.findIndex(item => item.EmployeeId === data.DeptId), 1)
+            this.memberSetCheckedUserKeys.splice(this.memberSetCheckedUserKeys.findIndex(item => item === data.DeptId), 1)
             if(this.myAuditUserList1.findIndex(item => item.EmployeeId === data.ParentId) != -1) {
               this.memberSetCheckedUserKeys.splice(this.memberSetCheckedUserKeys.findIndex(item => item === data.ParentId), 1)
             }
           }
         }
-        if(data.Type != 2 && data.IsCheck) {
-          if(this.memberSetCheckedUserKeys.findIndex(item => item === data.DepartmentId) == -1) {
-            this.memberSetCheckedUserKeys.push(data.DepartmentId)
+        if(data.DataType  != 2 && data.IsCheck) {
+          if(this.memberSetCheckedUserKeys.findIndex(item => item === data.DeptId) == -1) {
+            this.memberSetCheckedUserKeys.push(data.DeptId)
           }
-        } else if(data.Type == 2 && !data.IsCheck) {
-          if(this.memberSetCheckedUserKeys.findIndex(item => item === data.DepartmentId) != -1) {
-            this.memberSetCheckedUserKeys.splice(this.memberSetCheckedUserKeys.findIndex(item => item === data.DepartmentId), 1)
+        } else if(data.DataType  == 2 && !data.IsCheck) {
+          if(this.memberSetCheckedUserKeys.findIndex(item => item === data.DeptId) != -1) {
+            this.memberSetCheckedUserKeys.splice(this.memberSetCheckedUserKeys.findIndex(item => item === data.DeptId), 1)
             if(this.myAuditUserList1.findIndex(item => item.EmployeeId === data.ParentId) != -1) {
               this.memberSetCheckedUserKeys.splice(this.memberSetCheckedUserKeys.findIndex(item => item === data.ParentId), 1)
             }
@@ -488,38 +505,38 @@
       },
       handleNodeChange(data, checked) {
         data.IsCheck = checked;
-        if(data.Type == 2 && data.IsCheck) { //是员工且选中
+        if(data.DataType  == 2 && data.IsCheck) { //是员工且选中
           let isExsit = false
           this.showMember.forEach(x => {
-            if(x.DepartmentId == data.DepartmentId) {
+            if(x.DeptId == data.DeptId) {
               isExsit = true
               return false
             }
           })
           if(!isExsit) {
             this.showMember.push({
-              DepartmentName: data.DepartmentName,
-              DepartmentId: data.DepartmentId
+              DeptName: data.DeptName,
+              DeptId: data.DeptId
             })
-            this.memberSetCheckedKeys.push(data.DepartmentId)
+            this.memberSetCheckedKeys.push(data.DeptId)
           }
-        } else if(data.Type == 2 && !data.IsCheck) {
-          if(this.showMember.findIndex(item => item.DepartmentId === data.DepartmentId) != -1) {
-            this.showMember.splice(this.showMember.findIndex(item => item.DepartmentId === data.DepartmentId), 1)
-            this.memberSetCheckedKeys.splice(this.memberSetCheckedKeys.findIndex(item => item === data.DepartmentId), 1)
-            if(this.showMember.findIndex(item => item.DepartmentId === data.ParentId) != -1) {
+        } else if(data.DataType  == 2 && !data.IsCheck) {
+          if(this.showMember.findIndex(item => item.DeptId === data.DeptId) != -1) {
+            this.showMember.splice(this.showMember.findIndex(item => item.DeptId === data.DeptId), 1)
+            this.memberSetCheckedKeys.splice(this.memberSetCheckedKeys.findIndex(item => item === data.DeptId), 1)
+            if(this.showMember.findIndex(item => item.DeptId === data.ParentId) != -1) {
               this.memberSetCheckedKeys.splice(this.memberSetCheckedKeys.findIndex(item => item === data.ParentId), 1)
             }
           }
         }
-        if(data.Type != 2 && data.IsCheck) {
-          if(this.memberSetCheckedKeys.findIndex(item => item === data.DepartmentId) == -1) {
-            this.memberSetCheckedKeys.push(data.DepartmentId)
+        if(data.DataType  != 2 && data.IsCheck) {
+          if(this.memberSetCheckedKeys.findIndex(item => item === data.DeptId) == -1) {
+            this.memberSetCheckedKeys.push(data.DeptId)
           }
-        } else if(data.Type == 2 && !data.IsCheck) {
-          if(this.memberSetCheckedKeys.findIndex(item => item === data.DepartmentId) != -1) {
-            this.memberSetCheckedKeys.splice(this.memberSetCheckedKeys.findIndex(item => item === data.DepartmentId), 1)
-            if(this.showMember.findIndex(item => item.DepartmentId === data.ParentId) != -1) {
+        } else if(data.DataType  == 2 && !data.IsCheck) {
+          if(this.memberSetCheckedKeys.findIndex(item => item === data.DeptId) != -1) {
+            this.memberSetCheckedKeys.splice(this.memberSetCheckedKeys.findIndex(item => item === data.DeptId), 1)
+            if(this.showMember.findIndex(item => item.DeptId === data.ParentId) != -1) {
               this.memberSetCheckedKeys.splice(this.memberSetCheckedKeys.findIndex(item => item === data.ParentId), 1)
             }
           }
@@ -532,7 +549,7 @@
           this.$refs.tree.setCheckedKeys(this.memberSetCheckedKeys)
           return
         }
-        this.showMember.splice(this.showMember.findIndex(item => item.DepartmentId === id), 1)
+        this.showMember.splice(this.showMember.findIndex(item => item.DeptId === id), 1)
         this.memberSetCheckedKeys.splice(this.memberSetCheckedKeys.findIndex(item => item === id), 1)
         this.$refs.tree.setCheckedKeys(this.memberSetCheckedKeys);
       },
@@ -544,8 +561,8 @@
         if(data.Disabled == false && data.IsCheck) {
           this.showRole = [];
           this.showRole.push({
-            DepartmentName: data.DepartmentName,
-            Id: data.DepartmentId
+            DeptName: data.DeptName,
+            Id: data.DeptId
           })
         }
       },
@@ -567,8 +584,8 @@
           this.zgObj.AuditWay = obj.AuditWay;
           obj.AuditUserList.forEach((item, index) => {
             this.showMember.push({
-              DepartmentName: item.EmName,
-              DepartmentId: item.EmployeeId
+              DeptName: item.EmName,
+              DeptId: item.EmployeeId
             })
             this.memberSetCheckedKeys.push(item.EmployeeId)
           })
@@ -577,7 +594,7 @@
           this.zgObj.AuditWay = obj.AuditWay;
           this.showRole = [];
           this.showRole.push({
-            DepartmentName: obj.AuditDescription
+            DeptName: obj.AuditDescription
           })
         }
 
@@ -607,8 +624,8 @@
           let Auu = [];
           Au.forEach((item, index) => {
             Auu.push({
-              EmployeeId: item.DepartmentId,
-              EmName: item.DepartmentName,
+              EmployeeId: item.DeptId,
+              EmName: item.DeptName,
               Sort: index
             })
           })
@@ -642,7 +659,7 @@
             return
           } else {
             zg.RoleOrInitiator = this.showRole[0].Id;
-            zg.AuditDescription = this.showRole[0].DepartmentName;
+            zg.AuditDescription = this.showRole[0].DeptName;
           }
           this.myAuditList[this.updateItemIndex] = zg;
         }
@@ -682,8 +699,8 @@
           let Auu = [];
           Au.forEach((item, index) => {
             Auu.push({
-              EmployeeId: item.DepartmentId,
-              EmName: item.DepartmentName,
+              EmployeeId: item.DeptId,
+              EmName: item.DeptName,
               Sort: index
             })
           })
@@ -718,7 +735,7 @@
             return
           } else {
             zg.RoleOrInitiator = this.showRole[0].Id;
-            zg.AuditDescription = this.showRole[0].DepartmentName;
+            zg.AuditDescription = this.showRole[0].DeptName;
           }
           this.myAuditList.push(zg);
         }
@@ -757,15 +774,18 @@
         this.ConditionSortList = [],
           this.addMsg.AskforleaveType = '[' + this.AskforleaveTypeArr.toString() + ']'
         this.loading = true;
-        this.apipost('WorkFlow_post_SetOtherCondition', this.addMsg, res => {
-          if(res.data.resultCode == 1) {
+        setOtherCondition(this.addMsg).then(res => {
+          if(res.Code == 1) {
             this.loading = false;
             this.$message.success("操作成功！")
             this.goback()
-          }else{
-            this.$message.error(res.data.message)
+          }else {
+            this.$message.success(res.Message)
+
           }
-        }, err => {})
+        }).catch(() => {
+
+        })
       },
       goback() {
         history.back(-1)