修改借款审批

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

@@ -0,0 +1,6 @@
+const publicData = {
+  partySecretary: 4, //党委书记
+  leagueSecretary: 142, //团委书记
+  chairman: 2 //董事长
+}
+export default {publicData}

oa-ui/src/main.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-01-10 17:11:57
+ * @LastEditTime: 2024-04-24 15:36:45
  */
 import Vue from 'vue'
 
@@ -49,7 +49,7 @@ import DictData from '@/components/DictData'
 
 import Tinymce from '@/components/tinymce/index.vue'
 
-
+import publicData from '@/assets/datas/publicData'
 
 
 // 全局方法挂载
@@ -62,7 +62,7 @@ Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
-
+Vue.prototype.publicData = publicData
 // 全局组件挂载
 Vue.component('DictTag', DictTag)
 Vue.component('Pagination', Pagination)

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

@@ -1,8 +1,9 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading">
     <el-row :gutter="20">
       <el-col :span="18" :xs="24">
-        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <h2 class="text-center">借款申请</h2>
+        <el-form ref="form" :model="form" :rules="rules" label-width="125px">
           <el-row :gutter="20">
             <el-col :span="6" :xs="24">
               <el-form-item label="申请人" prop="user.nickName">
@@ -15,14 +16,26 @@
               </el-form-item>
             </el-col>
             <el-col :span="6" :xs="24">
-              <el-form-item label="申请时间：" prop="date">
+              <el-form-item label="申请时间" prop="date">
                 <el-date-picker style="width:140px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
                   placeholder="选择日期" :disabled="taskName != '借款申请'">
                 </el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-form-item label="项目编号：" prop="projectId" v-if="taskForm.procDefName == '借款审批'">
+          <el-form-item label="借款类型" prop="borrowUsage" v-if="taskForm.procDefName == '借款审批'">
+            <el-radio-group v-model="form.borrowUsage" @change="hanldeChangeType" :disabled="taskName != '借款申请'">
+              <el-radio label="0">项目借款</el-radio>
+              <el-radio label="1">非项目借款</el-radio>
+              <el-radio label="2">工会借款</el-radio>
+              <el-radio label="3">党委借款</el-radio>
+              <el-radio label="4">团委借款</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="借款事由" prop="applyReason" v-if="taskForm.procDefName == '借款审批' && !isProject">
+            <el-input v-model="form.applyReason" :disabled="taskName != '借款申请'"></el-input>
+          </el-form-item>
+          <el-form-item label="项目编号" prop="projectId" v-if="taskForm.procDefName == '借款审批' && isProject">
             <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
               :disabled="taskName != '借款申请'" clearable>
               <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber"
@@ -31,65 +44,65 @@
             </el-select>
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
-                chooseProject.projectLeaderUser.nickName : ''
-              }}</el-descriptions-item>
+      chooseProject.projectLeaderUser.nickName : ''
+                }}</el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">
                 <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
               </el-descriptions-item>
               <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
-          <el-form-item label="借款明细：">
-            <table border="1">
+          <el-form-item label="借款明细">
+            <table border="1" class="table">
               <tr>
-                <td>序号</td>
+                <td style="width:50px;">序号</td>
                 <td style="width:200px">开支项目</td>
                 <td>单位</td>
                 <td>单价</td>
                 <td>数量</td>
                 <td>申请金额</td>
-                <td>项目管理部校核金额</td>
-                <td>分管领导审核金额</td>
+                <td v-if="form.borrowUsage == 0 || form.borrowUsage == 1">项目管理部校核金额</td>
+                <td v-if="form.borrowUsage == 0 || form.borrowUsage == 1">分管领导审核金额</td>
               </tr>
               <tr v-for="(detail, index) in detailList" :key="index">
                 <td>
                   {{ index + 1 }}
                 </td>
                 <td>
-                  <el-input v-model="detail.borrowItem"></el-input>
+                  <el-input v-model="detail.borrowItem" type="textarea" :disabled="taskName != '借款申请'"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="detail.unit"></el-input>
+                  <el-input v-model="detail.unit" :disabled="taskName != '借款申请'"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="detail.price" @change="calculateAmount(detail)"></el-input>
+                  <el-input v-model="detail.price" @change="calculateAmount(detail)" :disabled="taskName != '借款申请'"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="detail.quantity" @change="calculateAmount(detail)"></el-input>
+                  <el-input v-model="detail.quantity" @change="calculateAmount(detail)" :disabled="taskName != '借款申请'"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="detail.applyAmount"></el-input>
+                  <el-input v-model="detail.applyAmount" :disabled="taskName != '借款申请'"></el-input>
                 </td>
-                <td>
+                <td v-if="form.borrowUsage == 0 || form.borrowUsage == 1">
                   <el-input v-model="detail.xmAmount" :disabled="taskName != '项目部审核'"
                     @change="calculateXmAmount(detail)"></el-input>
                 </td>
-                <td>
+                <td v-if="form.borrowUsage == 0 || form.borrowUsage == 1">
                   <el-input v-model="detail.managerAmount" :disabled="taskName != '分管审核'"
                     @change="calculateManagerAmount(detail)"></el-input>
                 </td>
                 <td>
-                  <el-button type="danger" icon="el-icon-minus" size="mini" circle
+                  <el-button type="danger" icon="el-icon-minus" size="mini" circle  :disabled="taskName != '借款申请'"
                     @click="deleDetailItem(index)"></el-button>
                 </td>
               </tr>
             </table>
-            <el-button icon="el-icon-plus" size="mini" @click="addDetailList()" type="primary" plain></el-button>
+            <el-button icon="el-icon-plus" size="mini" @click="addDetailList()" type="primary" plain :disabled="taskName != '借款申请'"></el-button>
           </el-form-item>
           <el-row :gutter="20">
             <el-col :span="6" :xs="24">
@@ -99,79 +112,105 @@
             </el-col>
             <el-col :span="6" :xs="24">
               <el-form-item label="核准金额" prop="managerAmount">
-                <el-input v-model="form.managerAmount" placeholder="请输入核准金额" :disabled="taskName != '分管审核'" />
+                <el-input v-model="form.managerAmount" placeholder="请输入核准金额" :disabled="taskName != '分管审核' && taskName != '党工团审核'" />
               </el-form-item>
             </el-col>
           </el-row>
-          <el-form-item label="申请人说明" prop="applyReason">
-            <el-input type="textarea" v-model="form.applyReason" placeholder="请输入申请人说明" :disabled="taskName != '借款申请'" />
+          <el-form-item label="申请人说明" prop="remark">
+            <el-input type="textarea" v-model="form.remark" placeholder="请输入申请人说明" :disabled="taskName != '借款申请'" />
           </el-form-item>
           <el-divider></el-divider>
-          <el-form-item label="部门负责人意见" prop="deptComment">
-            <el-input type="textarea" v-model="form.deptComment" placeholder="请输入部门负责人意见"
-              :disabled="taskName != '部门审核'" />
-          </el-form-item>
-          <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px" v-if="showFormItem('部门审核')">
-                <span class="auditor"> {{ form.deptUser ? form.deptUser.nickName : deptUser }} </span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px" v-if="showFormItem('部门审核')">
-                <span> {{ form.deptTime ? form.deptTime : deptTime }} </span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item label="项目部校核意见" prop="xmComment">
-            <el-input type="textarea" v-model="form.xmComment" placeholder="请输入项目部校核意见" :disabled="taskName != '项目部审核'" />
-          </el-form-item>
-          <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px" v-if="showFormItem('项目部审核')">
-                <span class="auditor"> {{ form.xmUser ? form.xmUser.nickName : xmUser }} </span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px" v-if="showFormItem('项目部审核')">
-                <span> {{ form.xmTime ? form.xmTime : xmTime }} </span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item label="分管领导审核意见" prop="managerComment">
-            <el-input type="textarea" v-model="form.managerComment" placeholder="请输入分管领导审核意见"
-              :disabled="taskName != '分管审核'" />
-          </el-form-item>
-          <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px" v-if="showFormItem('分管审核')">
-                <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px" v-if="showFormItem('分管审核')">
-                <span> {{ form.managerTime ? form.managerTime : managerTime }} </span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item label="总经理审批意见" prop="zjlComment">
-            <el-input type="textarea" v-model="form.zjlComment" placeholder="请输入总经理审批意见"
-              :disabled="taskName != '总经理审核'" />
-          </el-form-item>
-          <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px" v-if="showFormItem('总经理审核')">
-                <span class="auditor"> {{ form.zjlUser ? form.zjlUser.nickName : zjlUser }} </span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px" v-if="showFormItem('总经理审核')">
-                <span> {{ form.zjlTime ? form.zjlTime : zjlTime }} </span>
-              </el-form-item>
-            </el-col>
-          </el-row>
+          <!-- 非党工团审核 -->
+          <div v-if="form.borrowUsage == 0 || form.borrowUsage == 1">
+            <el-form-item label="部门负责人意见" prop="deptComment">
+              <el-input type="textarea" v-model="form.deptComment" placeholder="请输入部门负责人意见"
+                :disabled="taskName != '部门审核'" />
+            </el-form-item>
+            <el-row>
+              <el-col :span="6" :xs="24" :offset="12">
+                <el-form-item label="签名：" label-width="120px" v-if="showFormItem('部门审核')">
+                  <span class="auditor"> {{ form.deptUser ? form.deptUser.nickName : deptUser }} </span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="日期：" label-width="120px" v-if="showFormItem('部门审核')">
+                  <span> {{ form.deptTime ? form.deptTime : deptTime }} </span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item label="项目部校核意见" prop="xmComment">
+              <el-input type="textarea" v-model="form.xmComment" placeholder="请输入项目部校核意见"
+                :disabled="taskName != '项目部审核'" />
+            </el-form-item>
+            <el-row>
+              <el-col :span="6" :xs="24" :offset="12">
+                <el-form-item label="签名：" label-width="120px" v-if="showFormItem('项目部审核')">
+                  <span class="auditor"> {{ form.xmUser ? form.xmUser.nickName : xmUser }} </span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="日期：" label-width="120px" v-if="showFormItem('项目部审核')">
+                  <span> {{ form.xmTime ? form.xmTime : xmTime }} </span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item label="分管领导审核意见" prop="managerComment">
+              <el-input type="textarea" v-model="form.managerComment" placeholder="请输入分管领导审核意见"
+                :disabled="taskName != '分管审核'" />
+            </el-form-item>
+            <el-row>
+              <el-col :span="6" :xs="24" :offset="12">
+                <el-form-item label="签名：" label-width="120px" v-if="showFormItem('分管审核')">
+                  <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="日期：" label-width="120px" v-if="showFormItem('分管审核')">
+                  <span> {{ form.managerTime ? form.managerTime : managerTime }} </span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item label="总经理审批意见" prop="zjlComment">
+              <el-input type="textarea" v-model="form.zjlComment" placeholder="请输入总经理审批意见"
+                :disabled="taskName != '总经理审核'" />
+            </el-form-item>
+            <el-row>
+              <el-col :span="6" :xs="24" :offset="12">
+                <el-form-item label="签名：" label-width="120px" v-if="showFormItem('总经理审核')">
+                  <span class="auditor"> {{ form.zjlUser ? form.zjlUser.nickName : zjlUser }} </span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="日期：" label-width="120px" v-if="showFormItem('总经理审核')">
+                  <span> {{ form.zjlTime ? form.zjlTime : zjlTime }} </span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <!-- 党工团审核 -->
+          <div v-if="form.borrowUsage != 0 && form.borrowUsage != 1">
+            <el-form-item :label="dgtLabel" prop="unionComment">
+              <el-input type="textarea" v-model="form.unionComment" placeholder="请输入审核意见"
+                :disabled="taskName != '党工团审核'" />
+            </el-form-item>
+            <el-row>
+              <el-col :span="6" :xs="24" :offset="12">
+                <el-form-item label="签名：" label-width="120px" v-if="showFormItem('党工团审核')">
+                  <span class="auditor"> {{ form.unionUser ? form.unionUser.nickName : unionUser }} </span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="日期：" label-width="120px" v-if="showFormItem('党工团审核')">
+                  <span> {{ form.unionTime ? form.unionTime : unionTime }} </span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+
+
           <el-form-item label="财务部支付备注" prop="cwComment">
-            <el-input type="textarea" v-model="form.cwComment" placeholder="请输入财务部支付备注" :disabled="taskName != '财务处理'" />
+            <el-input type="textarea" v-model="form.cwComment" placeholder="请输入财务部支付备注"
+              :disabled="taskName != '财务处理'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -236,63 +275,34 @@ export default {
       xmUser: '',
       managerUser: '',
       zjlUser: '',
+      unionUser:'',
       cwUser: '',
       deptTime: '',
       xmTime: '',
       managerTime: '',
       zjlTime: '',
+      unionTime:'',
       lendTime: '',
       // 遮罩层
       loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // cmc借款申请表格数据
-      borrowList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        projectId: null,
-        applyReason: null,
-        applier: null,
-        applyDate: null,
-        applyAmount: null,
-        managerAmount: null,
-        deptComment: null,
-        deptUserId: null,
-        xmUserId: null,
-        xmComment: null,
-        managerComment: null,
-        managerUserId: null,
-        zjlUserId: null,
-        zjlComment: null,
-        cwUserId: null,
-        cwComment: null,
-        deptTime: null,
-        xmTime: null,
-        managerTime: null,
-        zjlTime: null,
-        lendTime: null
-      },
       detail: {},
-      detailList: [],
+      detailList: [
+        {
+          borrowItem: '',
+          unit: '',
+          price: '',
+          quantity: '',
+          applyAmount: '',
+          xmAmount: '',
+          managerAmount: '',
+        }
+      ],
       projectList: [],
       chooseProject: {},
       isSelect: false,
       // 表单参数
       form: {
+        borrowUsage: '0',
         user: {
           nickName: '',
         },
@@ -305,7 +315,10 @@ export default {
       rules: {
       },
       formTotal: 0,
-      flowData: {}
+      flowData: {},
+      isProject: true,
+      deptId: undefined,
+      dgtLabel: '工会审核意见'
     };
   },
   created() {
@@ -325,6 +338,10 @@ export default {
       this.zjlUser = this.$store.getters.name;
       this.zjlTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
+    if (this.taskName == '党工团审核') {
+      this.unionUser = this.$store.getters.name;
+      this.unionTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
     if (this.taskName == '财务处理') {
       this.cwUser = this.$store.getters.name;
       this.lendTime = parseTime(new Date(), '{y}-{m}-{d}')
@@ -332,8 +349,8 @@ export default {
     this.form.applyDate = new Date();
     this.form.user.nickName = this.$store.getters.name;
     this.form.dept.deptName = this.$store.getters.deptName;
+    this.deptId = this.$store.getters.deptId;
     this.getProjectList();
-    this.getList();
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
       this.flowData = res.data;
     })
@@ -344,9 +361,12 @@ export default {
   methods: {
     initForm() {
       getBorrowDetail(this.taskForm.formId).then(res => {
-        this.detailList = res.data;
+        if (res.data.length != 0) {
+          this.detailList = res.data
+        }
       });
       getBorrow(this.taskForm.formId).then(res => {
+        console.log(res);
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
           this.form.applier = this.$store.getters.userId;
@@ -354,21 +374,13 @@ export default {
         else {
           this.formTotal = 1;
           this.form = res.data;
+          this.hanldeChangeType()
         }
-      })
-    },
-    /** 查询cmc借款申请列表 */
-    getList() {
-      this.loading = true;
-      listBorrow(this.queryParams).then(response => {
-        this.borrowList = response.rows;
-        this.total = response.total;
         this.loading = false;
-      });
+      })
     },
     // 查询项目列表
     getProjectList() {
-      this.loading = true
       listProject({
         pageNum: 1,
         pageSize: 99999999
@@ -389,7 +401,6 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = false;
       this.reset();
     },
     isEmptyObject(obj) {
@@ -420,66 +431,6 @@ export default {
         managerAmount: '',
       });
     },
-    // 表单重置
-    reset() {
-      this.form = {
-        borrowId: null,
-        projectId: null,
-        applyReason: null,
-        applier: null,
-        applyDate: null,
-        applyAmount: null,
-        managerAmount: null,
-        deptComment: null,
-        deptUserId: null,
-        xmUserId: null,
-        xmComment: null,
-        managerComment: null,
-        managerUserId: null,
-        zjlUserId: null,
-        zjlComment: null,
-        cwUserId: null,
-        cwComment: null,
-        deptTime: null,
-        xmTime: null,
-        managerTime: null,
-        zjlTime: null,
-        lendTime: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.borrowId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加cmc借款申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const borrowId = row.borrowId || this.ids
-      getBorrow(borrowId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改cmc借款申请";
-      });
-    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -489,9 +440,6 @@ export default {
               updateBorrowDetail(detail);
             }
             updateBorrow(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
@@ -499,6 +447,7 @@ export default {
                 getUsersDeptLeaderByDept({ deptId: 107 }).then(res => {
                   let userId = res.data.userId;
                   this.$set(this.taskForm.variables, "approval", userId);
+                  this.$set(this.taskForm.variables, "isProject", this.isProject);
                   complete(this.taskForm).then(response => {
                     this.$modal.msgSuccess(response.msg);
                     this.$emit('goBack')
@@ -532,6 +481,12 @@ export default {
                   });
                 });
               }
+              else if (this.taskName == '党工团审核') {
+                complete(this.taskForm).then(response => {
+                  this.$modal.msgSuccess(response.msg);
+                  this.$emit('goBack')
+                });
+              }
               else if (this.taskName == '财务处理') {
                 complete(this.taskForm).then(response => {
                   this.$modal.msgSuccess(response.msg);
@@ -547,41 +502,41 @@ export default {
             this.form.borrowId = this.taskForm.formId;
             addBorrow(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
-              getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
-                let userId = res.data.userId;
+              let userId;
+              if (this.deptId == 0) {
+                if (this.form.borrowUsage == 2 || this.form.borrowUsage == 3) {
+                  userId = this.publicData.publicData.partySecretary
+                } else {
+                  userId = this.publicData.publicData.leagueSecretary
+                }
+                this.$set(this.taskForm.variables, "dept", this.deptId);
                 this.$set(this.taskForm.variables, "approval", userId);
                 complete(this.taskForm).then(response => {
                   this.$modal.msgSuccess(response.msg);
                   this.$emit('goBack')
                 });
-              })
+              } else {
+                getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+                  let userId = res.data.userId;
+                  this.$set(this.taskForm.variables, "approval", userId);
+                  this.$set(this.taskForm.variables, "dept", this.deptId);
+                  complete(this.taskForm).then(response => {
+                    this.$modal.msgSuccess(response.msg);
+                    this.$emit('goBack')
+                  });
+                })
+              }
+
             })
           }
         }
       });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const borrowIds = row.borrowId || this.ids;
-      this.$modal.confirm('是否确认删除cmc借款申请编号为"' + borrowIds + '"的数据项？').then(function () {
-        return delBorrow(borrowIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('oa/borrow/export', {
-        ...this.queryParams
-      }, `borrow_${new Date().getTime()}.xlsx`)
-    },
     showFormItem(name) {
+      debugger
       let isShow = false;
       if (name == '借款申请')
         isShow = true;
@@ -593,6 +548,8 @@ export default {
         isShow = (this.taskName != '借款申请' && this.taskName != '部门审核' && this.taskName != '项目部审核');
       else if (name == '总经理审核')
         isShow = (this.taskName == '总经理审核' || this.taskName == '财务处理');
+      else if(name == '党工团审核')
+        isShow = (this.taskName == '党工团审核' || this.taskName == '财务处理');
       else if (name == '财务处理')
         isShow = (this.taskName == '财务处理');
       return isShow;
@@ -615,13 +572,44 @@ export default {
       }
       this.form[name2] = sum.toFixed(2);
     },
+    // 修改借款类型
+    hanldeChangeType() {
+      debugger
+      if (this.form.borrowUsage == '0') {
+        this.dgtLabel = '工会审核意见'
+        this.isProject = true
+      } else {
+        this.isProject = false
+      }
+      if (this.form.borrowUsage == '2' || this.form.borrowUsage == '3' || this.form.borrowUsage == '4') {
+        this.deptId = 0
+        if (this.form.borrowUsage == '2') {
+          this.dgtLabel = '工会审核意见'
+        } else if (this.form.borrowUsage == '3') {
+          this.dgtLabel = '党委审核意见'
+        }else{
+          this.dgtLabel = '团委审核意见'
+        }
+      }
+    },
   }
 };
 </script>
 
-<style>
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
 .auditor {
   font-family: '华文行楷';
   font-size: 20px;
 }
+
+table {
+  text-align: center;
+  border-collapse: collapse;
+
+  td {
+    padding: 5px;
+  }
+}
 </style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-23 14:48:39
+ * @LastEditTime: 2024-04-24 14:12:39
 -->
 
 <template>
@@ -442,7 +442,6 @@ export default {
     getNextFlowNodeApproval() {
       if (this.taskName == '用车申请') {
         getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
-          debugger
           this.$set(this.taskForm.variables, "dept", this.dept);
           if (res.data && this.dept != 0) {
             this.$set(this.taskForm.variables, "approval", res.data.userId);

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-23 17:50:04
+ * @LastEditTime: 2024-04-24 09:50:29
 -->
 
 <template>
@@ -194,12 +194,12 @@ export default {
       });
     },
     getProjectInfo() {
-      getProject(this.$route.query.formId).then(res => {
+      getProject(this.taskForm.formId).then(res => {
         this.addForm = res.data;
       })
     },
     getProjectWorkList() {
-      getProjectWork(this.$route.query.formId).then(res => {
+      getProjectWork(this.taskForm.formId).then(res => {
         this.workList = res.data;
       })
     },

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-18 11:45:54
+ * @LastEditTime: 2024-04-24 10:09:13
 -->
 <template>
   <div class="app-container">
@@ -11,7 +11,7 @@
       <el-row>
         <el-col :span="12" :xs="24">
           <el-form-item label="承担部门：" prop="undertakingDept">
-            <el-select v-model="form.deptId" multiple clearable style="width:400px" @change="getDeptLeader">
+            <el-select v-model="form.deptId" multiple clearable style="width:100%" @change="getDeptLeader">
               <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId"
                 v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
               </el-option>
@@ -20,7 +20,7 @@
         </el-col>
         <el-col :span="12" :xs="24">
           <el-form-item label="部门负责人" prop="deptLeader">
-            <el-select v-model="form.deptLeader" multiple clearable style="width:400px">
+            <el-select v-model="form.deptLeader" multiple clearable style="width:100%">
               <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
               </el-option>
             </el-select>
@@ -122,7 +122,7 @@ export default {
   },
   methods: {
     initForm() {
-      getProject(this.$route.query.formId).then(res => {
+      getProject(this.taskForm.formId).then(res => {
         this.form = res.data;
         if (this.form.undertakingDept != null && this.form.undertakingDept != "" && this.form.undertakingDept != undefined) {
           this.form.deptId = this.form.undertakingDeptName.split(',')

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

@@ -95,7 +95,7 @@ export default {
       })
     },
     getDeptManageLeader() {
-      getProject(this.$route.query.formId).then(res => {
+      getProject(this.taskForm.formId).then(res => {
         let deptId = res.data.undertakingDept.split(',');
         this.$store.commit('SET_UNDERDEPTID', deptId);
         for (let d of deptId) {

oa-ui/src/views/oa/budget/components/chooseMoney.vue

@@ -2,14 +2,43 @@
   <div>
     <el-form>
       <el-form-item label="项目概况：">
+        <!-- <div style="display:flex;flex-wrap:wrap;">
+          <el-card v-for="(work, index) in workList" :key="index" class="card">
+            <div class="work-item">
+              <div class="work-label" style="min-width:70px">工作内容：</div>
+              <div>{{ work.content }}</div>
+            </div>
+            <div class="work-item">
+              <div class="work-label">等级或比例尺：</div>
+              <div>{{ work.scale }}</div>
+            </div>
+            <div class="work-item">
+              <div class="work-label">单位：</div>
+              <div>{{ work.unit }}</div>
+            </div>
+            <div class="work-item">
+              <div class="work-label">工作量：</div>
+              <div>{{ work.workload }}</div>
+            </div>
+            <div class="work-item">
+              <div class="work-label">要求完成时间：</div>
+              <div>{{ work.deadline }}</div>
+            </div>
+            <div class="work-item">
+              <div class="work-label">备注：</div>
+              <div>{{ work.remark }}</div>
+            </div>
+          </el-card>
+        </div> -->
+
         <table border="1">
           <tr>
-            <td style="width: 250px">工作内容</td>
+            <td style="width: 320px">工作内容</td>
             <td style="width:120px;">等级或比例尺</td>
             <td style="width:90px;">单位</td>
             <td style="width:90px;">工作量</td>
             <td style="width: 100px">要求完成时间</td>
-            <td style="width:90px;">备注</td>
+            <td style="width: 320px;">备注</td>
           </tr>
           <tr v-for="(work, index) in workList" :key="index">
             <td>
@@ -36,7 +65,7 @@
       <el-form-item label="预结算：">
         <table border="1">
           <tr>
-            <td style="width: 100px">工作内容</td>
+            <td style="width: 250px">工作内容</td>
             <td>工作类别</td>
             <td>工作项目</td>
             <!-- <td>项目细项</td> -->
@@ -284,11 +313,14 @@ export default {
       for (let user of this.chooseUser) {
         days = days + Number(user.days)
       }
+      debugger
       this.peopleNumber = days
-      if (this.budgetForm.inOutPriceSum && this.budgetForm.inOutPriceSum !=0 ) {
-        this.settle = Number(this.settle) + Number(this.budgetForm.inOutPriceSum)
-        this.inOutPrice = Number(this.budgetForm.inOutPriceSum) / this.peopleNumber
-        this.inOutPriceSum = this.budgetForm.inOutPriceSum
+      if (this.budgetForm.inOutPriceSum && this.budgetForm.inOutPriceSum != 0) {
+        if (this.inOutPriceSum ==0 ) {
+          this.settle = Number(this.settle) + Number(this.budgetForm.inOutPriceSum)
+          this.inOutPrice = Number(this.budgetForm.inOutPriceSum) / this.peopleNumber
+          this.inOutPriceSum = this.budgetForm.inOutPriceSum
+        }
       }
       let obj = {}
       obj.workList = this.workList;
@@ -299,6 +331,7 @@ export default {
       this.$emit('getSettle', obj);
     },
     getInoutpriceSum() {
+      debugger
       this.inOutPriceSum = Number(this.inOutPrice) * Number(this.peopleNumber);
       this.getSettleSum()
     },
@@ -340,4 +373,19 @@ table {
     padding: 3px;
   }
 }
+
+.card {
+  flex: 1;
+  margin: 0 5px;
+}
+
+.work-item {
+  display: flex;
+  border-bottom: 1px solid rgb(228, 228, 228);
+
+  .work-label {
+    text-align: right;
+    font-weight: bold;
+  }
+}
 </style>