修改借款、预算、工作量填报

oa-ui/src/views/flowable/form/budget/budgetInfo.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-02 15:23:33
+ * @LastEditTime: 2024-08-21 15:49:18
 -->
 <template>
   <div class="main">
@@ -30,7 +30,7 @@
             <table border="1" style="width: 100%;">
               <tr style="background-color:#f8f8f9">
                 <td style="width: 250px">工作内容</td>
-                <td style="width: 100px">等级或比例尺</td>
+                <td style="width: 100px">比例尺/等级</td>
                 <td style="width: 100px">单位</td>
                 <td style="width: 100px">工作量</td>
                 <td style="width: 100px">要求完成时间</td>
@@ -64,6 +64,7 @@
             <tr style="background-color:#f8f8f9" v-if="workList.length != 0">
               <td>工作简述</td>
               <td>工作内容</td>
+              <td>比例尺/等级</td>
               <td>数量</td>
               <td>单价</td>
               <td>单位</td>
@@ -74,6 +75,9 @@
             <tr v-for="work in workList">
               <td>{{ work.content }}</td>
               <td>{{ work.cmcPrice ? work.cmcPrice.workItem : '' }}</td>
+              <td>
+                {{ work.scaleGrade  }}
+              </td>
               <td v-if="taskName == '分管审核' || taskName == '总经理审核'">
                 <el-input-number :controls="false" style="width:100px;" v-model="work.workload"
                   @change="computeWorkSettle(work)"></el-input-number>

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

@@ -40,7 +40,7 @@
             <td>工作类别</td>
             <td>工作项目</td>
             <!-- <td>项目细项</td> -->
-            <td>比例尺</td>
+            <td>比例尺/等级</td>
             <td>地类类型</td>
             <td style="width:90px;">单价</td>
             <td>单位</td>
@@ -104,7 +104,8 @@
               <el-button type="text" @click="getCoefficientRemark(work.workType)">系数备注</el-button>
             </td>
             <td>
-              <el-input v-model="work.settle"></el-input>
+              <!-- <el-input v-model="work.settle"></el-input> -->
+              {{ work.settle }}
             </td>
             <td>
               <el-input type="textarea" v-model="work.remark"></el-input>

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

@@ -490,7 +490,7 @@ export default {
       }
     },
     initForm() {
-      listBorrowDetail({ borrowId: this.taskForm.formId }).then(res => {
+      listBorrowDetail({ pageSize:999, borrowId: this.taskForm.formId }).then(res => {
         if (res.rows.length != 0) {
           this.detailList = res.rows
         }

oa-ui/src/views/flowable/form/work/declareForm.vue

@@ -2,10 +2,10 @@
  * @Author: ysh
  * @Date: 2024-08-16 09:16:36
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-19 11:05:07
+ * @LastEditTime: 2024-08-21 14:11:13
 -->
 <template>
-  <div class="app-container">
+  <div>
     <el-row :gutter="20">
       <el-col :span="isFlow ? 18 : 24" :xs="24">
         <h2 class="text-center">项目工作填报表</h2>
@@ -14,49 +14,28 @@
           <el-form-item label="项目名称：" prop="projectId">
             <el-button icon="el-icon-plus" type="primary" @click="prOpen = true" size="mini"
               v-if="taskName == '工作填报'">选择项目</el-button>
-            <el-descriptions border v-if="form.projectId" style="margin-top: 10px" :column="2">
-              <el-descriptions-item label="项目编号">
-                {{ chooseProject.projectNumber }}
-              </el-descriptions-item>
-              <el-descriptions-item label="项目名称">
-                {{ chooseProject.projectName }}
-              </el-descriptions-item>
-              <el-descriptions-item label="项目负责人">
-                {{ getUserName(chooseProject.projectLeader) }}
-              </el-descriptions-item>
-              <el-descriptions-item label="甲方单位">
-                {{ chooseProject.partyA ? chooseProject.partyA.partyAName : '' }}
-              </el-descriptions-item>
-              <el-descriptions-item label="联系人">
-                {{ chooseProject.contactPerson }}
-              </el-descriptions-item>
-              <el-descriptions-item label="联系电话">
-                {{ chooseProject.telephone }}
-              </el-descriptions-item>
-              <el-descriptions-item label="项目类型">
-                {{ chooseProject.projectType }}
-              </el-descriptions-item>
-              <el-descriptions-item label="项目级别">
-                {{ chooseProject.projectLevel == "0" ? " 一般项目" : "重大项目" }}
-              </el-descriptions-item>
-              <el-descriptions-item label="承担部门">
-                {{ chooseProject.undertakingDeptName }}
-              </el-descriptions-item>
-              <el-descriptions-item label="项目登记人">
-                {{ chooseProject.projectRegistrantUser ? chooseProject.projectRegistrantUser.nickName : "" }}
-              </el-descriptions-item>
-            </el-descriptions>
           </el-form-item>
+          <el-descriptions class="mb20" border v-if="form.projectId" style="margin-top: 10px" :column="1">
+            <el-descriptions-item label="项目编号">
+              {{ chooseProject.projectNumber }}
+            </el-descriptions-item>
+            <el-descriptions-item label="项目名称">
+              {{ chooseProject.projectName }}
+            </el-descriptions-item>
+            <el-descriptions-item label="项目负责人">
+              {{ getUserName(chooseProject.projectLeader) }}
+            </el-descriptions-item>
+          </el-descriptions>
           <el-form-item label="工作类别：" prop="workType">
-            <el-select v-model="form.workType" @change="getWorkItemList(form.workType)" :style="{ width: '100%' }"
+            <el-select v-model="form.workType" @change="getWorkTypeList(form.workType)" :style="{ width: '100%' }"
               :disabled="taskName != '工作填报'">
-              <el-option v-for="item in workTypeList" :key="item.value" :label="item.label" :value="item.value">
-              </el-option>
+              <el-option label="外业" value="外业"></el-option>
+              <el-option label="内业" value="内业"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="工作细项：" prop="workItem">
             <el-select v-model="form.workItem" :style="{ width: '100%' }" :disabled="taskName != '工作填报'">
-              <el-option v-for="item in workItemList" :key="item.value" :label="item.label" :value="item.value">
+              <el-option v-for="item in workTypeList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
@@ -104,7 +83,7 @@
         </el-card>
       </el-col>
     </el-row>
-    <el-dialog title="选择项目" :visible.sync="prOpen" width="70%" append-to-body>
+    <el-dialog title="选择项目" :visible.sync="prOpen" :width="deviceWidth" append-to-body>
       <choose-project @chooseProject="confirmProject"></choose-project>
     </el-dialog>
   </div>
@@ -113,7 +92,7 @@
 <script>
 import flow from '@/views/flowable/task/todo/detail/flow';
 import { flowXmlAndNode } from "@/api/flowable/definition";
-import { getWorkTypeList, getWorkItemList } from '@/api/oa/price/price'
+import { listPrice, getWorkTypeList, getWorkItemList } from '@/api/oa/price/price'
 import { listDeclare, getDeclare, addDeclare, updateDeclare } from '@/api/oa/declare/declare';
 import { listProject, getProject } from "@/api/oa/project/project";
 import { mapState } from 'vuex';
@@ -150,10 +129,12 @@ export default {
     }
   },
   created() {
-    this.getWorkTypeList();
     this.initForm();
     if (this.device == 'mobile') {
-      this.isFlow = false
+      this.isFlow = false;
+      this.deviceWidth = '450px'
+    }else{
+      this.deviceWidth = '70%'
     }
     if (this.isFlow) {
       flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
@@ -163,6 +144,7 @@ export default {
   },
   data() {
     return {
+      deviceWidth: '400px',
       flowData: {},
       form: {
         workLoad: 1,
@@ -189,6 +171,7 @@ export default {
       chooseProject: {},
       workTypeList: [],
       workItemList: [],
+      projectList: [],
       hasForm: false,
       money: 0
     }
@@ -199,6 +182,9 @@ export default {
         this.$set(this.form, 'userId', this.$store.state.user.id)
         this.form.submitTime = parseTime(new Date(), "{y}-{m}-{d}")
       }
+      listProject({ pageSize: 20 }).then(res => {
+        this.projectList = res.rows
+      })
       getDeclare(this.taskForm.formId).then(res => {
         if (res.data) {
           this.form = res.data;
@@ -304,12 +290,20 @@ export default {
       this.$refs.form.validateField('projectId');
     },
     /* 获取工作类别 */
-    getWorkTypeList() {
-      getWorkTypeList().then(res => {
-        if (res) {
-          this.workTypeList = this.setArray(res);
+    getWorkTypeList(workType) {
+      listPrice({ workType: workType, pageNum: 1, pageSize: 9999 }).then(res => {
+        if (res.code == 200) {
+          let data = res.rows;
+          let list = [];
+          for (let d of data) {
+            list.push(d.workItem)
+          }
+          if (workType == '内业') {
+            list.push('其他')
+          }
+          this.workTypeList = this.setArray(list);
         }
-      });
+      })
     },
     /* 获取工作项目 */
     getWorkItemList(workType) {
@@ -336,6 +330,15 @@ export default {
         return [];
       }
     },
+    remoteMethod(val) {
+      listProject({
+        pageNum: 1,
+        pageSize: 20,
+        projectNumber: val
+      }).then(res => {
+        this.projectList = res.rows;
+      })
+    },
   },
 }
 </script>

oa-ui/src/views/oa/borrow/borrowTable.vue

@@ -0,0 +1,143 @@
+<template>
+  <div>
+    <el-table v-loading="loading" :data="borrowList">
+      <el-table-column label="序号" align="center" type="index" />
+      <el-table-column label="借款类型" align="center" prop="borrowUsage">
+        <template slot-scope="scope">
+          <el-tag :type="setTagType(scope.row.borrowUsage)">
+            {{ setBorrowUsage(scope.row.borrowUsage) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="借款事由" align="center" prop="applyReason" :formatter="setReasonByUsage" />
+      <el-table-column label="申请金额" align="center" prop="applyAmount" />
+      <el-table-column label="核准金额" align="center" prop="managerAmount" />
+      <el-table-column label="借款人" align="center" prop="applier">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.applier) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="借款人说明" align="center" prop="remark" show-overflow-tooltip />
+      <el-table-column label="借款日期" align="center" prop="applyDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="借款支付时间" align="center" prop="lendTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.lendTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
+import { listProject } from '@/api/oa/project/project';
+import BorrowForm from '../../flowable/form/finance/borrowForm.vue';
+import { mapGetters } from 'vuex'
+export default {
+  props: {
+    borrowUsage: {
+      type: String
+    },
+  },
+  computed: {
+    ...mapGetters(['roles', 'deptId']),
+  },
+  data() {
+    return {
+      borrowList: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        borrowType: 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,
+        applyDept: null
+      },
+    }
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      this.queryParams.borrowUsage = this.borrowUsage;
+      if (this.roles.some(element => element === "dept")) {
+        this.queryParams.applyDept = this.deptId;
+        // this.queryParams.undertakingDept = this.deptId;
+      }
+      listBorrow(this.queryParams).then(response => {
+        this.borrowList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleView(row) {
+      this.$emit('clickView', row)
+    },
+    setBorrowUsage(row) {
+      if (row == '0') {
+        return '项目借款'
+      } else if (row == '1') {
+        return '非项目借款'
+      } else if (row == '2') {
+        return '工会借款'
+      } else if (row == '3') {
+        return '党委借款'
+      } else if (row == '4') {
+        return '团委借款'
+      }
+    },
+    setTagType(row) {
+      if (row == '0') {
+        return 'success'
+      } else if (row == '1') {
+        return 'warning'
+      } else if (row == '2') {
+        return ''
+      } else if (row == '3') {
+        return ''
+      } else if (row == '14') {
+        return ''
+      }
+    },
+    setReasonByUsage(row) {
+      if (row.projectId) {
+        return row.project.projectNumber + '-' + row.project.projectName
+      } else {
+        return row.applyReason
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/views/oa/borrow/index.vue

@@ -1,3 +1,9 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-06-21 18:51:59
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-21 10:22:33
+-->
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
@@ -38,7 +44,15 @@
     <el-row :gutter="10" class="mb8">
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
+    <!-- <el-tabs v-model="activeName" type="card" @tab-click="handleClick" v-if="roles.some(element => element === 'dept')">
+      <el-tab-pane label="项目借款" name="0">
+        <borrow-table :borrowUsage="activeName" @clickView="handleView"></borrow-table>
+      </el-tab-pane>
+      <el-tab-pane label="非项目借款" name="1"></el-tab-pane>
+      <el-tab-pane label="工会借款" name="2"></el-tab-pane>
+      <el-tab-pane label="党委借款" name="3"></el-tab-pane>
+      <el-tab-pane label="团委借款" name="4"></el-tab-pane>
+    </el-tabs> -->
     <el-table v-loading="loading" :data="borrowList" @selection-change="handleSelectionChange">
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="借款类型" align="center" prop="borrowUsage">
@@ -93,13 +107,15 @@ import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api
 import { listProject } from '@/api/oa/project/project';
 import BorrowForm from '../../flowable/form/finance/borrowForm.vue';
 import { mapGetters } from 'vuex'
+import BorrowTable from './borrowTable.vue';
 export default {
   name: "Borrow",
   components: {
-    BorrowForm
+    BorrowForm,
+    BorrowTable
   },
   computed: {
-    ...mapGetters(['roles','deptId']),
+    ...mapGetters(['roles', 'deptId']),
   },
   data() {
     return {
@@ -157,20 +173,26 @@ export default {
       taskForm: {
         formId: '',
         procDefName: '借款审批'
-      }
+      },
+      activeName: '0'
     };
   },
   created() {
+    this.queryParams.borrowUsage = '0'
     this.getList();
   },
   methods: {
     /** 查询cmc借款申请列表 */
     getList() {
       this.loading = true;
-      if(this.roles.some(element => element === "dept")){
+      if (this.roles.some(element => element === "dept")) {
         this.queryParams.applyDept = this.deptId;
         // this.queryParams.undertakingDept = this.deptId;
       }
+      if (this.roles.some(e => e === 'leader')) {
+        this.queryParams.applyDept = null;
+        this.queryParams.undertakingDept = null;
+      }
       listBorrow(this.queryParams).then(response => {
         this.borrowList = response.rows;
         this.total = response.total;
@@ -324,6 +346,9 @@ export default {
       } else {
         return row.applyReason
       }
+    },
+    handleClick() {
+
     }
   }
 };