同步更新移动端

oa-ui-app/pages/form/borrow/borrow.vue

@@ -232,6 +232,7 @@ export default {
       formTotal: 0,
       siteExpenses: 0, //预结算额
       exceed: false, //是否超预算
+      need: true, //是否需要分管审批
       hasBorrow: 0, //已申请借款
       deptId: undefined,
       returnBack: false,
@@ -302,7 +303,9 @@ export default {
       getBorrow(this.taskForm.formId).then(async res => {
         if (res.data) {
           this.formTotal = 1;
-          this.form = res.data;
+          this.form = res.data;
+          if (this.form.applyDept == 104) //董事长分管的综合事务部，跳过分管审批
+            this.need = false;
           if (!this.applierUserName) {
             this.applierUserName = this.form.applierUser.nickName;
           }
@@ -468,16 +471,32 @@ export default {
               // 处理借款申请节点
               await this.borrowApprovalFun();
             } else if (this.taskName == '部门审核') {
-              // 得到分管领导根据部门
-              const res = await getUsersManageLeaderByDept({ deptId: this.form.applyDept });
-              let userIds = [];
-              if (res.data) {
-                res.data.forEach(item => {
-                  userIds.push(item.userId)
-                })
-              }
-              this.taskForm.variables.approvalList = userIds;
-              this.handleComplete(this.taskForm);
+              this.taskForm.variables.need = this.need;
+              if (this.need) {
+				  // 得到分管领导根据部门
+				  const res = await getUsersManageLeaderByDept({ deptId: this.form.applyDept });
+				  let userIds = [];
+				  if (res.data) {
+					res.data.forEach(item => {
+					  userIds.push(item.userId)
+					})
+				  }
+				  this.taskForm.variables.approvalList = userIds;
+				  this.handleComplete(this.taskForm);
+			  }
+			  else {
+				  const res = await getUsersManageLeaderByDept({ deptId: this.form.applyDept });
+				  let userIds = [];
+				  if (res.data) {
+					res.data.forEach(item => {
+					  userIds.push(item.userId)
+					})
+				  }
+				  this.taskForm.variables.approvalList = userIds;
+				  const response = await getUserByPost({ postName: '总经理' });
+				  this.taskForm.variables.approval = response.data[0].userId;
+				  this.handleComplete(this.taskForm);
+			  }
             } else if (this.taskName == '分管审核') {
               // 得到总经理
               const res = await getUserByPost({ postName: '总经理' });
@@ -533,7 +552,7 @@ export default {
           const res = await getUserByPost({ postName: '党总支书记' });
           userId = res.data[0].userId;
         } else {
-          const res = await getUserByPost({ postName: '团委书记' });
+          const res = await getUserByPost({ postName: '团支部书记' });
           userId = res.data[0].userId;
         }
         this.taskForm.variables.dept = this.deptId;

oa-ui-app/pages/form/car/car.vue

@@ -694,7 +694,7 @@ export default {
         return '工会主席'
       }
       else
-        return '团委书记'
+        return '团支部书记'
     },
     showFormItem(name) {
       let isShow = false;

oa-ui/src/assets/datas/publicData.js

@@ -6,7 +6,7 @@
  */
 const publicData = {
   partySecretary: 4, //党委书记
-  leagueSecretary: 15, //团委书记
+  leagueSecretary: 15, //团支部书记
   gm: 7, //总经理
   chairman: 2,//董事长
   zg: 9,

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -883,7 +883,7 @@ export default {
           const res = await getUserByPost({ postName: '党总支书记' });
           userId = res.data[0].userId;
         } else {
-          const res = await getUserByPost({ postName: '团委书记' });
+          const res = await getUserByPost({ postName: '团支部书记' });
           userId = res.data[0].userId;
         }
         this.$set(this.taskForm.variables, "dept", this.deptId);

oa-ui/src/views/flowable/form/oa/carForm.vue

@@ -663,7 +663,7 @@ export default {
         return '工会主席'
       }
       else
-        return '团委书记'
+        return '团支部书记'
     },
     // 查询项目列表
     getProjectList() {