修改借款，若超预算走董事长批准流程；

修改项目安排显示错误的问题

oa-ui/src/components/FileUpload/index.vue

@@ -15,7 +15,7 @@
         <template v-if="fileType">
           格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
         </template>
-        的文件
+        的文件，文件名请勿包含特殊字符（如：/、\、*、?、"、<、>、|、#）
       </div>
     </el-upload>
 

oa-ui/src/views/flowable/form/components/print/borrowPrint.vue

@@ -140,7 +140,7 @@
             </el-row>
           </td>
         </tr>
-        <tr v-if="form.borrowUsage == '0' && exceed">
+        <tr v-if="form.borrowUsage == '0' && exceed && !form.cwUser">
           <td :colspan="2" class="fontbold">董事长批准</td>
           <td :colspan="8">
             <div class="minHeight">{{ form.dszComment }}</div>

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

@@ -122,7 +122,8 @@
               <span class="low-money">{{ siteExpenses.toFixed(2) }}</span>
               <span class="up-money">（大写：{{ formatNumberWithWan(siteExpenses) }}）</span>
             </el-tag>
-            <el-button type="primary" size="mini" @click="openBudget = true" v-hasPermi="['cmc:budget:list']">查看预算</el-button>
+            <el-button type="primary" size="mini" @click="openBudget = true"
+              v-hasPermi="['oa:budget:list']">查看预算</el-button>
           </el-form-item>
           <el-form-item label="已申请借款" v-if="isSelect">
             <el-tag type="danger">
@@ -227,11 +228,11 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-form-item label="董事长批准意见" prop="dszComment" label-width="150px">
+            <el-form-item label="董事长批准意见" prop="dszComment" label-width="150px" v-if="exceed && !form.cwUser">
               <el-input type="textarea" v-model="form.dszComment" placeholder="请输入董事长批准意见"
                 :disabled="taskName != '董事长批准'" :autosize="{ minRows: 4 }" />
             </el-form-item>
-            <el-row>
+            <el-row v-if="exceed && !form.cwUser">
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px" v-if="showFormItem('董事长批准')">
                   <span class="auditor"> {{ form.dszUser ? form.dszUser.nickName : dszUser }} </span>
@@ -728,115 +729,123 @@ export default {
       if (this.taskName == '借款申请') {
         await this.VerificationAmount();
       }
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.borrowUsage == '0' && !this.form.projectId) {
-            this.$message.error('请选择项目！')
-            return
-          }
-          if (this.formTotal != 0) {
-            // 更新借款明细项
-            delBorrowDetail(this.taskForm.formId).then(res => {
-              this.detailList.forEach(detail => {
-                detail.borrowId = this.taskForm.formId;
-                addBorrowDetail(detail)
-              })
-            })
-            if (this.taskName == '部门审核') {
-              this.form.deptUserId = this.$store.getters.userId;
-              this.form.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
-            }
-            if (this.taskName == '分管审核') {
-              this.form.managerUserId = this.$store.getters.userId;
-              this.form.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
-            }
-            if (this.taskName == '总经理审核') {
-              this.form.zjlUserId = this.$store.getters.userId;
-              this.form.zjlTime = parseTime(new Date(), '{y}-{m}-{d}')
-            }
-            if (this.taskName == '董事长批准') {
-              this.form.dszUserId = this.$store.getters.userId;
-              this.form.dszTime = parseTime(new Date(), '{y}-{m}-{d}')
-            }
-            if (this.taskName == '党工团审核') {
-              this.form.unionUserId = this.$store.getters.userId;
-              this.form.unionTime = parseTime(new Date(), '{y}-{m}-{d}')
-            }
-            if (this.taskName == '财务处理') {
-              this.form.cwUserId = this.$store.getters.userId;
-              this.form.lendTime = parseTime(new Date(), '{y}-{m}-{d}')
+      let msg;
+      if(this.taskName == '财务处理'){
+        msg = '最后一个节点，提交将结束流程，是否提交？'
+      }else{
+        msg = '是否提交到下一个流程？'
+      }
+      this.$confirm(msg, '提示', {
+        confirmButtonText: '确定',
+        type: 'warning'
+      }).then(() => {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.borrowUsage == '0' && !this.form.projectId) {
+              this.$message.error('请选择项目！')
+              return
             }
-            // 更新借款审批表
-            updateBorrow(this.form);
-            const params = { taskId: this.taskForm.taskId };
-            getNextFlowNode(params).then(res => {
-              if (this.taskName == '借款申请') {
-                this.borrowAprrovalFun();
-              } else if (this.taskName == '部门审核') {
-                getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
-                  let userIds = [];
-                  if (res.data) {
-                    res.data.forEach(item => {
-                      userIds.push(item.userId)
-                    })
-                  }
-                  this.$set(this.taskForm.variables, "approvalList", userIds);
-                  this.handleComplete(this.taskForm);
+            if (this.formTotal != 0) {
+              // 更新借款明细项
+              delBorrowDetail(this.taskForm.formId).then(res => {
+                this.detailList.forEach(detail => {
+                  detail.borrowId = this.taskForm.formId;
+                  addBorrowDetail(detail)
                 })
+              })
+              if (this.taskName == '部门审核') {
+                this.form.deptUserId = this.$store.getters.userId;
+                this.form.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
               }
-              else if (this.taskName == '分管审核') {
-                getUserByPost({ postName: '总经理' }).then(res => {
-                  this.$set(this.taskForm.variables, "approval", res.data[0].userId);
-                  this.handleComplete(this.taskForm);
-                })
+              if (this.taskName == '分管审核') {
+                this.form.managerUserId = this.$store.getters.userId;
+                this.form.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
               }
-              else if (this.taskName == '总经理审核') {
-                this.exceed = false; //待删
-                this.$set(this.taskForm.variables, "exceed", this.exceed);
-                if (!this.exceed) { //没有超预算
-                  this.submitFD(); //提交到财务部审核
+              if (this.taskName == '总经理审核') {
+                this.form.zjlUserId = this.$store.getters.userId;
+                this.form.zjlTime = parseTime(new Date(), '{y}-{m}-{d}')
+              }
+              if (this.taskName == '董事长批准') {
+                this.form.dszUserId = this.$store.getters.userId;
+                this.form.dszTime = parseTime(new Date(), '{y}-{m}-{d}')
+              }
+              if (this.taskName == '党工团审核') {
+                this.form.unionUserId = this.$store.getters.userId;
+                this.form.unionTime = parseTime(new Date(), '{y}-{m}-{d}')
+              }
+              if (this.taskName == '财务处理') {
+                this.form.cwUserId = this.$store.getters.userId;
+                this.form.lendTime = parseTime(new Date(), '{y}-{m}-{d}')
+              }
+              // 更新借款审批表
+              updateBorrow(this.form);
+              const params = { taskId: this.taskForm.taskId };
+              getNextFlowNode(params).then(res => {
+                if (this.taskName == '借款申请') {
+                  this.borrowAprrovalFun();
+                } else if (this.taskName == '部门审核') {
+                  getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
+                    let userIds = [];
+                    if (res.data) {
+                      res.data.forEach(item => {
+                        userIds.push(item.userId)
+                      })
+                    }
+                    this.$set(this.taskForm.variables, "approvalList", userIds);
+                    this.handleComplete(this.taskForm);
+                  })
                 }
-                else {
-                  getUserByPost({ postName: '董事长' }).then(res => {
+                else if (this.taskName == '分管审核') {
+                  getUserByPost({ postName: '总经理' }).then(res => {
                     this.$set(this.taskForm.variables, "approval", res.data[0].userId);
                     this.handleComplete(this.taskForm);
                   })
                 }
-              }
-              else if (this.taskName == '董事长批准') {
-                this.submitFD(); //提交到财务部审核
-              }
-              else if (this.taskName == '党工团审核') {
-                this.submitFD(); //提交到财务部审核
-              }
-              else if (this.taskName == '财务处理') {
-                this.$modal.confirm('最后一个节点，提交将结束流程，是否提交？').then(res => {
+                else if (this.taskName == '总经理审核') {
+                  // this.exceed = false; //待删
+                  this.$set(this.taskForm.variables, "exceed", this.exceed);
+                  if (!this.exceed) { //没有超预算
+                    this.submitFD(); //提交到财务部审核
+                  }
+                  else {
+                    getUserByPost({ postName: '董事长' }).then(res => {
+                      this.$set(this.taskForm.variables, "approval", res.data[0].userId);
+                      this.handleComplete(this.taskForm);
+                    })
+                  }
+                }
+                else if (this.taskName == '董事长批准') {
+                  this.submitFD(); //提交到财务部审核
+                }
+                else if (this.taskName == '党工团审核') {
+                  this.submitFD(); //提交到财务部审核
+                }
+                else if (this.taskName == '财务处理') {
                   this.handleComplete(this.taskForm);
-                })
-              }
-            })
+                }
+              })
+            } else {
+              delBorrowDetail(this.taskForm.formId).then(() => {
+                for (let detail of this.detailList) {
+                  detail.borrowId = this.taskForm.formId;
+                  addBorrowDetail(detail);
+                }
+              })
+              this.form.borrowId = this.taskForm.formId;
+              addBorrow(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+              });
+              const params = { taskId: this.taskForm.taskId };
+              // 提交到下一个流程
+              getNextFlowNode(params).then(res => {
+                this.borrowAprrovalFun();
+              })
+            }
           } else {
-            delBorrowDetail(this.taskForm.formId).then(() => {
-              for (let detail of this.detailList) {
-                detail.borrowId = this.taskForm.formId;
-                addBorrowDetail(detail);
-              }
-            })
-            this.form.borrowId = this.taskForm.formId;
-            addBorrow(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-            });
-            const params = { taskId: this.taskForm.taskId };
-            // 提交到下一个流程
-            getNextFlowNode(params).then(res => {
-              this.borrowAprrovalFun();
-            })
+            this.$message.error('请完善必填项')
           }
-        } else {
-          this.$message.error('请完善必填项')
-        }
-      });
-
+        });
+      })
     },
     handleComplete(taskForm) {
       complete(taskForm).then(response => {
@@ -985,7 +994,7 @@ export default {
     VerificationAmount() {
       if (this.isSelect) {
         if (this.form.applyAmount > (this.siteExpenses - this.hasBorrow)) {
-          return this.$confirm('借款总额已经超过项目预算，将走《超预算或预算外支付（报销）》流程', '提示', {
+          return this.$confirm('借款总额已经超过项目预算，将走《超预算或预算外支付（报销）》流程，即需要董事长批准，才可到财务。', '提示', {
             confirmButtonText: '确定',
             type: 'warning'
           }).then(() => {

oa-ui/src/views/flowable/form/projectProcess/arrangeProject.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:54
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-10 17:30:59
+ * @LastEditTime: 2025-07-21 12:28:43
 -->
 <template>
   <div class="app-container">
@@ -11,7 +11,7 @@
       <el-row :gutter="20">
         <el-col :span="12" :xs="24">
           <el-form-item label="项目负责人：" prop="projectLeader">
-            <el-select v-model="peopleForm.deptId" @change="handleChangeDept" clearable style="width:60%">
+            <el-select v-model="peopleForm.deptId" filterable @change="handleChangeDept" clearable style="width:60%">
               <el-option v-for="item, index in peopleForm.deptList" :key="'d' + index" :label="item.deptName"
                 :value="item.deptId" v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
               </el-option>
@@ -114,6 +114,7 @@ export default {
             let arr = (this.form.undertakingDept.split(',')).map(Number)
             this.$set(this.form, 'deptId', arr)
             this.getDeptLeader(arr);
+            this.getProjectLeaderDeptId();
           } else {
             this.$set(this.form, 'deptId', [])
           }
@@ -122,7 +123,7 @@ export default {
           this.$store.commit('SET_PROJECT', this.form)
         })
       } else {
-        let kcDatas = await listProject({ projectId: this.taskForm.formId, undertakingDept: 113 });
+        let kcDatas = await listProject({ projectId: this.taskForm.formId, undertakingDept: 113 }); //勘察设计事业部的项目
         if (kcDatas.rows.length > 0) {
           getProject(this.taskForm.formId).then(res => {
             this.form = res.data;
@@ -135,7 +136,7 @@ export default {
             this.$set(this.form, 'deptLeader', [])
             if (this.form.undertakingDept) {
               let arr = (this.form.undertakingDept.split(',')).map(Number)
-              this.$set(this.form, 'deptId', arr)
+              this.$set(this.form, 'deptId', arr);
               this.getDeptLeader(arr);
             } else {
               this.$set(this.form, 'deptId', [])
@@ -155,6 +156,7 @@ export default {
       }).then(res => {
         this.deptList = res.data
         this.peopleForm.deptList = res.data
+        console.log(this.peopleForm.deptList)
       })
     },
     async getDeptLeader(val) {
@@ -171,7 +173,6 @@ export default {
           })
         })
       })
-      this.handleChangeDept(val[0])
     },
     // 人员选择
     choosePeople() {
@@ -180,7 +181,6 @@ export default {
     // 改变部门选择
     handleChangeDept(deptId) {
       this.peopleForm.userId = '';
-      this.$set(this.peopleForm, 'deptId', deptId)
       listUser({ pageSize: 999999, deptId: deptId }).then(res => {
         this.peopleForm.userList = res.rows
         for (let a of res.rows) {
@@ -198,6 +198,12 @@ export default {
         this.peopleForm.allDeptUserList = uniqueArray
       })
     },
+    getProjectLeaderDeptId() {
+      let userList = this.$store.state.user.userList;
+      let leaderUser = userList.find(item => item.userId == this.form.projectLeader);
+      this.peopleForm.deptId = leaderUser.deptId;
+      this.handleChangeDept(leaderUser.deptId);
+    },
     // 确定项目负责人
     confirmPeople() {
       this.form.projectLeader = this.peopleForm.userId;
@@ -215,11 +221,6 @@ export default {
         }
       }
     },
-    cancelChoosePeople() {
-      this.peopleForm.deptId = '';
-      this.peopleForm.userId = '';
-      this.peopleVisible = false;
-    },
     save() {
       this.$refs['arrangeForm'].validate((vaild) => {
         if (vaild) {