修改项目结算流程表单

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

@@ -1,6 +1,24 @@
 const publicData = {
   partySecretary: 4, //党委书记
   leagueSecretary: 142, //团委书记
-  chairman: 2 //董事长
+  chairman: 2,//董事长
+  pathRoute: [
+    {
+      name: '借款审批',
+      path: '/applyForm/borrow'
+    },
+    {
+      name: '用车审批',
+      path: '/applyForm/carApply'
+    },
+    {
+      name: '设备审批',
+      path: '/applyForm/deviceApply'
+    },
+    {
+      name: '项目结算',
+      path: '/applyForm/settleApply'
+    }
+  ]
 }
-export default {publicData}
+export default publicData 

oa-ui/src/assets/styles/element-ui.scss

@@ -98,7 +98,7 @@
 }
 
 .el-form-item__label {
-  font-family: '微软雅黑';
-  color: #34363b;
+  font-family:'微软雅黑', Arial, Helvetica, sans-serif;
+  // color: #4b4d52;
 }
 

oa-ui/src/router/index.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-28 16:17:01
+ * @LastEditTime: 2024-04-30 09:53:32
  */
 /*
  * @Author: ysh
@@ -273,6 +273,20 @@ export const constantRoutes = [
         name: 'deviceApply',
         meta: { title: '设备审批', icon: '' }
 
+      }
+    ]
+  },
+  {
+    path: '/applyForm/settleApply',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/flowable/task/todo/applyForm/settleIndex'),
+        name: 'settleApply',
+        meta: { title: '项目结算', icon: '' }
+
       }
     ]
   }

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

@@ -535,9 +535,9 @@ export default {
               let userId;
               if (this.deptId == 0) {
                 if (this.form.borrowUsage == 2 || this.form.borrowUsage == 3) {
-                  userId = this.publicData.publicData.partySecretary
+                  userId = this.publicData.partySecretary
                 } else {
-                  userId = this.publicData.publicData.leagueSecretary
+                  userId = this.publicData.leagueSecretary
                 }
                 this.$set(this.taskForm.variables, "dept", this.deptId);
                 this.$set(this.taskForm.variables, "approval", userId);

oa-ui/src/views/flowable/form/components/choosePrice.vue

@@ -0,0 +1,186 @@
+<template>
+  <div class="app-container">
+    <el-form :model="work">
+      <el-form-item label="工作内容">
+        {{ row.content }}
+      </el-form-item>
+      <el-form-item label="工作类别">
+        <el-select v-model="work.workType" :style="{ width: '100%' }" @change="getWorkItemList(work, work.workType)">
+          <el-option v-for="item in workSelect.workTypeList" :key="item.value" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="工作项目">
+        <el-select v-model="work.workItem" :style="{ width: '100%' }" :remote="true"
+          @change="getScaleGradeList(work, work.workItem)">
+          <el-option v-for="item in workSelect.workItemList" :key="item.value" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="等级或比例尺">
+        <el-select v-model="work.scaleGrade" :style="{ width: '100%' }"
+          @change="getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType)">
+          <el-option v-for="item in workSelect.scaleGradeList" :key="item.value" :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="地类">
+        <el-select v-model="work.groundType" :style="{ width: '100%' }"
+          @change="getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType)">
+          <el-option key="一般地类" label="一般地类" value="0">
+          </el-option>
+          <el-option key="复杂地类" label="复杂地类" value="1">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单价">
+        {{ work.price }} / {{ work.unit }}
+      </el-form-item>
+    </el-form>
+    <el-row>
+      <el-button type="primary" @click="$emit('getPrice', work)">确定</el-button>
+      <el-button @click="$emit('cancel')">取消</el-button>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getWorkTypeList, getWorkItemList, getSubItemList, getScaleGradeList, getUnitPrice, getPrice } from '@/api/oa/price/price'
+export default {
+  props: {
+    row: {
+      type: Object,
+      require: true
+    }
+  },
+  watch: {
+    row(val) {
+      this.getPriceById()
+    }
+  },
+  data() {
+    return {
+      work: {},
+      workSelect: {
+        workTypeList: [],
+        workItemList: [],
+        scaleGradeList: []
+      }
+    }
+  },
+  mounted() {
+    this.getPriceById();
+    this.getWorkTypeList()
+  },
+  methods: {
+    // 根据id获取单价
+    getPriceById() {
+      if (this.row.priceId) {
+        getPrice(this.row.priceId).then(res => {
+          if (res.data) {
+            this.setValue(this.work, 'workType', res.data.workType)
+            this.setValue(this.work, 'workItem', res.data.workItem)
+            this.setValue(this.work, 'scaleGrade', res.data.scaleGrade)
+            this.setValue(this.work, 'unit', res.data.unit)
+            this.setValue(this.work, 'groundType', this.row.groundType)
+            this.setValue(this.work, 'price', this.row.price)
+            getWorkItemList({ workType: res.data.workType }).then(res => {
+              if (res) {
+                let workItemList = this.setArray(res);
+                this.workSelect.workItemList = workItemList;
+              }
+            })
+            getScaleGradeList({ workItem: res.data.workItem }).then(res => {
+              let scaleGradeList = this.setArray(res);
+              this.workSelect.scaleGradeList = scaleGradeList;
+            })
+          }
+        })
+      } else {
+        this.work = {}
+      }
+    },
+    /* 获取工作类别 */
+    getWorkTypeList() {
+      getWorkTypeList().then(res => {
+        if (res) {
+          this.setValue(this.workSelect, 'workTypeList', this.setArray(res));
+        }
+      });
+    },
+    /* 获取工作项目 */
+    getWorkItemList(work, workType) {
+      getWorkItemList({ workType: workType }).then(res => {
+        if (res) {
+          let workItemList = this.setArray(res);
+          this.workSelect.workItemList = workItemList;
+          work.workItem = workItemList[0].label;
+          work.subItem = '';
+          this.getScaleGradeList(work, work.workItem);
+        }
+      })
+    },
+    /* 获取比例尺 */
+    getScaleGradeList(work, workItem) {
+      if (work.scale) {
+        this.setValue(work, 'scaleGrade', work.scale);
+        if (work.groundType == undefined) {
+          this.setValue(work, 'groundType', '0');
+        }
+        this.getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType);
+      } else {
+        getScaleGradeList({ workItem }).then(res => {
+          if (res) {
+            let scaleGradeList = this.setArray(res);
+            this.workSelect.scaleGradeList = scaleGradeList;
+            this.setValue(work, 'scaleGrade', scaleGradeList[0].label)
+            // work.scaleGrade = scaleGradeList[0].label;
+            if (work.scaleGrade == undefined) {
+              this.setValue(work, 'scaleGrade', '');
+            }
+            if (work.groundType == undefined) {
+              this.setValue(work, 'groundType', '0');
+            }
+            this.getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType);
+          }
+        })
+      }
+
+    },
+    /* 获取单价 */
+    getUnitPrice(work, workItem, subItem, scaleGrade, groundType) {
+      getUnitPrice({ workItem, subItem, scaleGrade, groundType: groundType }).then(res => {
+        if (res.length != 0) {
+          work.priceId = res.data.id;
+          this.setValue(work, 'price', res.data.price)
+          this.setValue(work, 'unit', res.data.unit)
+          this.work.content = this.row.content
+        }
+      })
+    },
+
+    setValue(key, name, val) {
+      this.$set(key, name, val)
+    },
+    //数组去重
+    setArray(arr) {
+      if (arr != [] && arr != undefined) {
+        let datalist = [...new Set(arr)];
+        let list = [];
+        for (let i of datalist) {
+          let obj = new Object();
+          obj.label = i;
+          obj.value = i;
+          list.push(obj);
+        }
+        return list;
+      } else {
+        return [];
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-29 14:08:59
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-30 11:36:20
 -->
 
 <template>
@@ -245,7 +245,6 @@ export default {
                 } else {
                   this.contractNumber = res.data.contractNumber;
                 }
-                console.log(res);
               }
             })
           }

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-29 14:10:25
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-30 11:27:44
 -->
 <template>
   <div class="app-container">
@@ -29,7 +29,7 @@
 import { mapGetters } from 'vuex';
 import { parseTime } from "@/utils/ruoyi";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
-import { listProjectComment, addProjectComment } from "@/api/oa/project/projectComment"
+import { getProjectComment, addProjectComment } from "@/api/oa/project/projectComment"
 import { listProject, getProject, addProject, updateProject, delProject, submitProject, modifyProject } from "@/api/oa/project/project";
 import { getUsersManageLeaderByDept } from '@/api/system/post'
 export default {
@@ -76,9 +76,9 @@ export default {
   },
   methods: {
     initForm() {
-      listProjectComment({projectId: this.taskForm.formId}).then(res => {
-        if (res.rows) {
-          this.form = res.rows
+      getProjectComment(this.taskForm.formId).then(res => {
+        if (res.data) {
+          this.form = res.data
           if (this.form.jyUser) {
             this.form.jyApproverName = this.form.jyUser.nickName
           }

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-29 14:14:29
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-30 11:30:01
 -->
 <template>
   <div class="app-container">
@@ -29,7 +29,7 @@
 import { mapGetters } from 'vuex';
 import { parseTime } from "@/utils/ruoyi";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
-import { listProjectComment, addProjectComment, updateProjectComment } from "@/api/oa/project/projectComment"
+import { getProjectComment, addProjectComment, updateProjectComment } from "@/api/oa/project/projectComment"
 import { getUsersDeptLeaderByDept } from '@/api/system/post'
 export default {
   computed: {
@@ -79,16 +79,16 @@ export default {
   },
   methods: {
     initForm() {
-      listProjectComment({projectId: this.taskForm.formId}).then(res => {
-        if (res.rows) {
-          this.form = res.rows
+      getProjectComment(this.taskForm.formId).then(res => {
+        if (res.data) {
+          this.form = res.data
           if (this.taskName == '分管审核') {
             this.form.manageApprover = this.$store.state.user.userId;
             this.form.manageApproverName = this.$store.state.user.name;
             this.form.manageApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
           } else {
-            if (res.rows.managerUser)
-              this.form.manageApproverName = res.rows.managerUser.nickName
+            if (res.data.managerUser)
+              this.form.manageApproverName = res.data.managerUser.nickName
           }
         } else {
           if (this.taskName == '分管审核') {

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-29 14:15:16
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-30 11:30:34
 -->
 <template>
   <div class="app-container">
@@ -30,7 +30,7 @@
 import { mapGetters } from 'vuex';
 import { parseTime } from "@/utils/ruoyi";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
-import { listProjectComment, addProjectComment, updateProjectComment } from "@/api/oa/project/projectComment"
+import { getProjectComment, addProjectComment, updateProjectComment } from "@/api/oa/project/projectComment"
 import { getUsersDeptLeaderByDept } from '@/api/system/post'
 import { getProject } from '@/api/oa/project/project'
 export default {
@@ -81,12 +81,12 @@ export default {
   },
   methods: {
     initForm() {
-    listProjectComment({projectId: this.taskForm.formId}).then(res => {
-        if (res.rows) {
-          this.form = res.rows
+    getProjectComment(this.taskForm.formId).then(res => {
+        if (res.data) {
+          this.form = res.data
           this.form.scApprover = '';
-          if (res.rows.scApproverName) {
-            this.form.scApproverName = res.rows.scApproverName
+          if (res.data.scApproverName) {
+            this.form.scApproverName = res.data.scApproverName
           }
         } else {
           this.form.scApprover = '';

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

@@ -1,124 +1,176 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-04-30 09:03:14
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-30 17:23:24
+-->
+<!--
+ * @Author: ysh
+ * @Date: 2024-04-30 09:03:14
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-30 14:15:59
+-->
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="18" :xs="24">
+      <el-col :span="19" :xs="24">
         <h2 class="text-center">项目结算表</h2>
-        <el-divider></el-divider>
-        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-          <el-form-item label="项目id" prop="projectId">
+        <div class="headers">
+          项目信息
+          <div class="line"></div>
+        </div>
+        <el-form ref="form" :model="form" :rules="rules" label-width="160px">
+          <el-form-item label="项目编号" prop="projectId">
             <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.projectName" :value="item.projectId">
+              :disabled="taskName != '结算发起'" clearable style="width: 100%;">
+              <el-option v-for="item in projectList" :key="item.value"
+                :label="item.projectNumber + '-' + item.projectName" :value="item.projectId">
               </el-option>
             </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 label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-              }}</el-descriptions-item>
-              <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
-                chooseProject.projectLeaderUser.nickName : ''
-              }}</el-descriptions-item>
+            <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="2">
+              <el-descriptions-item label="项目编号" label-class-name="my-label">
+                {{ chooseProject.projectNumber }}
+              </el-descriptions-item>
+              <el-descriptions-item label="项目名称" label-class-name="my-label">
+                {{ chooseProject.projectName }}
+              </el-descriptions-item>
+              <el-descriptions-item label="合同编码" label-class-name="my-label">
+                {{ chooseProject.contractCode }}
+              </el-descriptions-item>
+              <el-descriptions-item label="合同编号" label-class-name="my-label">
+                {{ chooseProject.contractNumber }}
+              </el-descriptions-item>
+              <el-descriptions-item label="项目负责人" label-class-name="my-label">
+                {{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : '' }}
+              </el-descriptions-item>
+              <el-descriptions-item label="甲方单位" label-class-name="my-label">
+                {{ chooseProject.partyA }}
+              </el-descriptions-item>
+              <el-descriptions-item label="联系人" label-class-name="my-label">
+                {{ chooseProject.contactPerson }}
+              </el-descriptions-item>
+              <el-descriptions-item label="联系电话" label-class-name="my-label">
+                {{ chooseProject.telephone }}
+              </el-descriptions-item>
+              <el-descriptions-item label="项目类型" label-class-name="my-label">
+                {{ chooseProject.projectType }}
+              </el-descriptions-item>
+              <el-descriptions-item label="项目级别" label-class-name="my-label">
+                {{ chooseProject.projectLevel }}
+              </el-descriptions-item>
+              <el-descriptions-item label="承担部门" label-class-name="my-label">
+                {{ chooseProject.undertakingDept }}
+              </el-descriptions-item>
+              <el-descriptions-item label="项目登记人" label-class-name="my-label">
+                {{ chooseProject.projectRegistrant }}
+              </el-descriptions-item>
             </el-descriptions>
           </el-form-item>
           <el-form-item label="工作量上报说明" prop="workloadReport">
-            <el-input v-model="form.workloadReport" placeholder="请输入工作量上报说明" />
-          </el-form-item>
-          <el-form-item label="上报人" prop="reporter">
-            <el-input v-model="form.reporter" placeholder="请输入上报人" />
-          </el-form-item>
-          <el-form-item label="上报日期" prop="reportTime">
-            <el-date-picker clearable v-model="form.reportTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择上报日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="结算说明" prop="settleComment">
-            <el-input v-model="form.settleComment" placeholder="请输入结算说明" />
-          </el-form-item>
-          <el-form-item label="综合事务部审核人" prop="zhUserId">
-            <el-input v-model="form.zhUserId" placeholder="请输入综合事务部审核人" />
-          </el-form-item>
-          <el-form-item label="综合事务部审核日期" prop="zhTime">
-            <el-date-picker clearable v-model="form.zhTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择综合事务部审核日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="综合事务部审核意见" prop="zhComment">
-            <el-input v-model="form.zhComment" placeholder="请输入综合事务部审核意见" />
-          </el-form-item>
-          <el-form-item label="技术质量部审核人" prop="jsUserId">
-            <el-input v-model="form.jsUserId" placeholder="请输入技术质量部审核人" />
-          </el-form-item>
-          <el-form-item label="技术质量部审核日期" prop="jsTime">
-            <el-date-picker clearable v-model="form.jsTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择技术质量部审核日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="技术质量部审核意见" prop="jsComment">
-            <el-input v-model="form.jsComment" placeholder="请输入技术质量部审核意见" />
-          </el-form-item>
-          <el-form-item label="项目管理部审核人" prop="xmUserId">
-            <el-input v-model="form.xmUserId" placeholder="请输入项目管理部审核人" />
-          </el-form-item>
-          <el-form-item label="项目管理部审核日期" prop="xmTime">
-            <el-date-picker clearable v-model="form.xmTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择项目管理部审核日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="项目管理部审核意见" prop="xmComment">
-            <el-input v-model="form.xmComment" placeholder="请输入项目管理部审核意见" />
-          </el-form-item>
-          <el-form-item label="承担部门审核人" prop="deptUserId">
-            <el-input v-model="form.deptUserId" placeholder="请输入承担部门审核人" />
-          </el-form-item>
-          <el-form-item label="承担部门审核日期" prop="deptTime">
-            <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择承担部门审核日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="承担部门审核意见" prop="deptComment">
-            <el-input v-model="form.deptComment" placeholder="请输入承担部门审核意见" />
-          </el-form-item>
-          <el-form-item label="经营发展部审核人" prop="jyUserId">
-            <el-input v-model="form.jyUserId" placeholder="请输入经营发展部审核人" />
+            <el-input v-model="form.workloadReport" type="textarea" placeholder="请输入工作量上报说明" />
           </el-form-item>
-          <el-form-item label="经营发展部审核日期" prop="jyTime">
-            <el-date-picker clearable v-model="form.jyTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择经营发展部审核日期">
-            </el-date-picker>
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="工作上报人：" prop="reporter">
+                <span class="auditor">
+                  {{ form.reporter }}
+                </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="上报日期：" prop="reportTime">
+                <span> {{ form.reportTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="原始上报数据" prop="">
+            <el-upload class="upload-demo" ref="upload" :file-list="fileList" :auto-upload="false" action="">
+              <el-button slot="trigger" size="mini" type="primary" icon="el-icon-upload"
+                :disabled="taskName != '结算发起'">选取文件</el-button>
+              <div slot="tip" class="el-upload__tip">只能上传docx/doc文件，且不超过500kb</div>
+            </el-upload>
           </el-form-item>
-          <el-form-item label="经营发展部审核意见" prop="jyComment">
-            <el-input v-model="form.jyComment" placeholder="请输入经营发展部审核意见" />
+          <el-form-item label="项目管理部审核结算单" prop="">
+            <el-upload class="upload-demo" ref="upload" :file-list="fileList" action="" :auto-upload="false">
+              <el-button slot="trigger" size="mini" type="primary" icon="el-icon-upload"
+                :disabled="taskName != '项目管理部结算'">选取文件</el-button>
+              <div slot="tip" class="el-upload__tip">只能上传docx/doc文件，且不超过500kb</div>
+            </el-upload>
           </el-form-item>
-          <el-form-item label="分管审核人" prop="managerUserId">
-            <el-input v-model="form.managerUserId" placeholder="请输入分管审核人" />
+          <el-form-item label="分管领导审核结算单" prop="">
+            <el-upload class="upload-demo" ref="upload" :file-list="fileList" action="" :auto-upload="false">
+              <el-button slot="trigger" size="mini" type="primary" icon="el-icon-upload"
+                :disabled="taskName != '分管审核'">选取文件</el-button>
+              <div slot="tip" class="el-upload__tip">只能上传docx/doc文件，且不超过500kb</div>
+            </el-upload>
           </el-form-item>
-          <el-form-item label="分管审核日期" prop="managerTime">
-            <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择分管审核日期">
-            </el-date-picker>
+          <el-form-item label="项目完成工作量及经费计算">
+            <table border="1">
+              <tr>
+                <td style="width: 50px">序号</td>
+                <td style="width: 180px">工作内容</td>
+                <td style="width: 100px">等级或比例尺</td>
+                <td style="width: 100px">单位</td>
+                <td style="width: 100px">地类</td>
+                <td style="width: 100px">单价</td>
+                <td>工作量</td>
+                <td>其他系数</td>
+                <td style="width: 100px">项目经费</td>
+                <td>备注</td>
+                <td>操作</td>
+              </tr>
+              <tr v-for="(work, index) in settleWorkList" :key="index">
+                <td>
+                  {{ index + 1 }}
+                </td>
+                <td>
+                  <el-input v-model="work.content" type="textarea" clearable
+                    :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+                </td>
+                <td>
+                  {{ work.scale == '' ? '无' : work.scale }}
+                </td>
+                <td>
+                  {{ work.unit }}
+                </td>
+                <td>
+                  {{ work.groundType == '0' ? '一般地类' : '复杂地类' }}
+                </td>
+                <td>
+                  {{ work.price }}
+                </td>
+                <td>
+                  <el-input-number style="width:100px" v-model="work.workload" clearable @blur="calculateSettle(work)"
+                    :controls="false"></el-input-number>
+                </td>
+                <td>
+                  <el-input-number style="width:100px" v-model="work.coefficient" clearable
+                    @blur="calculateSettle(work)" :controls="false"></el-input-number>
+                </td>
+                <td>
+                  <!-- <el-input-number style="width:100px" v-model="work.settle" clearable :controls="false"></el-input-number> -->
+                  {{ work.settle }}
+                </td>
+                <td>
+                  <el-input v-model="work.remark" type="textarea" clearable
+                    :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+                </td>
+                <td>
+                  <el-button size="mini" type="text" @click="handleChoosePrice(work, index)">选择单价</el-button>
+                  <el-button type="text" size="mini" style="color: #F56C6C;"
+                    @click="deletWorkItem(index)">删除行</el-button>
+                </td>
+              </tr>
+            </table>
+            <el-button icon="el-icon-plus" size="mini" @click="addWorkList"></el-button>
           </el-form-item>
-          <el-form-item label="分管审核意见" prop="managerComment">
-            <el-input v-model="form.managerComment" placeholder="请输入分管审核意见" />
-          </el-form-item>
-          <el-form-item label="总经理审核人" prop="gmUserId">
-            <el-input v-model="form.gmUserId" placeholder="请输入总经理审核人" />
-          </el-form-item>
-          <el-form-item label="总经理审核日期" prop="gmTime">
-            <el-date-picker clearable v-model="form.gmTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择总经理审核日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="总经理审核意见" prop="gmComment">
-            <el-input v-model="form.gmComment" placeholder="请输入总经理审核意见" />
+          <el-form-item label="结算汇总">
+
           </el-form-item>
+
         </el-form>
-        <div style="text-align: center;">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
       </el-col>
-      <el-col :span="6" :xs="24">
+      <el-col :span="5" :xs="24">
         <el-card>
           <h2 style="text-align: center;">流程进度</h2>
           <div>
@@ -127,20 +179,25 @@
         </el-card>
       </el-col>
     </el-row>
+
+    <el-drawer title="选择单价" :visible.sync="drawer" direction="rtl">
+      <choose-price :row="clickWork" @getPrice="getPrice" @cancel="drawer = false"></choose-price>
+    </el-drawer>
   </div>
 </template>
 
 <script>
+import flow from '@/views/flowable/task/todo/detail/flow'
+import { flowXmlAndNode } from "@/api/flowable/definition";
 import { parseTime } from "@/utils/ruoyi";
 import { listProject, getProject } from "@/api/oa/project/project";
 import { listSettle, getSettle, delSettle, addSettle, updateSettle } from "@/api/oa/settle/settle";
-import { complete, getNextFlowNode } from "@/api/flowable/todo";
-import flow from '@/views/flowable/task/todo/detail/flow'
-import { flowXmlAndNode } from "@/api/flowable/definition";
-
+import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
+import ChoosePrice from './components/choosePrice.vue';
 export default {
   components: {
-    flow
+    flow,
+    ChoosePrice
   },
   props: {
     taskName: {
@@ -152,116 +209,63 @@ export default {
       required: true
     }
   },
-  name: "Settle",
   data() {
     return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // cmc结算审批表格数据
-      settleList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        projectId: null,
-        workloadReport: null,
-        reporter: null,
-        reportTime: null,
-        settleComment: null,
-        zhUserId: null,
-        zhTime: null,
-        zhComment: null,
-        jsUserId: null,
-        jsTime: null,
-        jsComment: null,
-        xmUserId: null,
-        xmTime: null,
-        xmComment: null,
-        deptUserId: null,
-        deptTime: null,
-        deptComment: null,
-        jyUserId: null,
-        jyTime: null,
-        jyComment: null,
-        managerUserId: null,
-        managerTime: null,
-        managerComment: null,
-        gmUserId: null,
-        gmTime: null,
-        gmComment: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      },
-      chooseProject: {},
-      isSelect: false,
-      formTotal: 0,
+      drawer: false,
       flowData: {},
+      form: {},
+      rules: {},
       projectList: [],
-    };
+      isSelect: false,
+      chooseProject: {},
+      fileList: [],
+      settleWorkList: [
+        {
+          content: '',
+          priceId: '',
+          scale: '无',
+          unit: '',
+          groundType: '0',
+          price: '',
+          workload: 0,
+          coefficient: 1,
+          settle: 0,
+          remark: ''
+        }
+      ],
+      clickWork: {}
+    }
   },
   created() {
-    this.getProjectList();
-    this.getList();
+    this.getProjectList(); //获取项目列表
+    this.getContractDataList(); //获取合同编码和编号
+    this.initForm();
+    if (this.$route.query.projectId) {
+
+    }
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
       this.flowData = res.data;
     })
+  },
+  mounted() {
+
   },
   methods: {
-    // 初始化表单
     initForm() {
-      getSettle(this.taskForm.formId).then(res => {
-        if (this.isEmptyObject(res.data)) {
-          this.formTotal = 0;
-          this.form.applier = this.$store.getters.userId;
-          this.form.applyTime = parseTime(new Date(), '{y}-{m}-{d}')
-        }
-        else {
-          this.formTotal = 1;
-          this.form = res.data;
-          if (res.data.projectId) {
-            getProject(data.projectId).then(response => {
-              this.chooseProject = response.data;
-              this.isSelect = true
-            })
+      listSettle({ projectId: this.taskForm.formId }).then(res => {
+        console.log(res);
+        if (res.total == 1) {
+          this.form = res.rows[0]
+        } else {
+          if (this.taskName == '结算发起') {
+            this.form.reporter = this.$store.state.user.name
+            this.form.reportTime = parseTime(new Date(), '{y}-{m}-{d}')
           }
-          this.loading = false
         }
       })
     },
-    /** 查询cmc结算审批列表 */
-    getList() {
-      this.loading = true;
-      listSettle(this.queryParams).then(response => {
-        this.settleList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
     // 查询项目列表
     getProjectList() {
-      this.loading = true
       listProject({
         pageNum: 1,
         pageSize: 99999999
@@ -269,7 +273,7 @@ export default {
         this.projectList = response.rows;
       })
     },
-    // 选择项目
+    // 选择项目.data
     handleSelectProject(val) {
       if (val != "" && val != undefined && val != null) {
         getProject(val).then(res => {
@@ -288,107 +292,105 @@ export default {
       }
       return true;
     },
-    // 表单重置
-    reset() {
-      this.form = {
-        settleId: null,
-        projectId: null,
-        workloadReport: null,
-        reporter: null,
-        reportTime: null,
-        settleComment: null,
-        zhUserId: null,
-        zhTime: null,
-        zhComment: null,
-        jsUserId: null,
-        jsTime: null,
-        jsComment: null,
-        xmUserId: null,
-        xmTime: null,
-        xmComment: null,
-        deptUserId: null,
-        deptTime: null,
-        deptComment: null,
-        jyUserId: null,
-        jyTime: null,
-        jyComment: null,
-        managerUserId: null,
-        managerTime: null,
-        managerComment: null,
-        gmUserId: null,
-        gmTime: null,
-        gmComment: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+    getContractDataList() {
+      listProjectContract({ projectId: this.taskForm.formId }).then(res => {
+        if (res.rows) {
+          for (let row of res.rows) {
+            getContract(row.contractId).then(res => {
+              if (res.data) {
+                if (this.form.contractCode != '') {
+                  this.form.contractCode = this.form.contractCode + '、' + res.data.contractCode;
+                } else {
+                  this.form.contractCode = res.data.contractCode;
+                }
+                if (this.form.contractNumber != '') {
+                  this.form.contractNumber = this.form.contractNumber + '、' + res.data.contractNumber;
+                } else {
+                  this.form.contractNumber = res.data.contractNumber;
+                }
+              }
+            })
+          }
+        }
+      })
     },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+    addWorkList() {
+      this.settleWorkList.push({
+        content: '',
+        priceId: '',
+        scale: '',
+        unit: '',
+        groundType: '0',
+        price: '',
+        workload: 0,
+        coefficient: 1,
+        settle: 0,
+        remark: ''
+      });
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.settleId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
+    deletWorkItem(index) {
+      let arr = this.settleWorkList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加cmc结算审批";
+    calculateSettle(work) {
+      let sum = (work.workload * work.coefficient).toFixed(2)
+      work.settle = sum * Number(work.price)
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const settleId = row.settleId || this.ids
-      getSettle(settleId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改cmc结算审批";
-      });
+    handleChoosePrice(work, index) {
+      this.clickWork = work
+      this.clickWork.index = index
+      this.drawer = true
+
     },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.formTotal != 0) {
-            updateSettle(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addSettle(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
+    getPrice(val) {
+      let index = this.clickWork.index
+      this.setValue(this.settleWorkList[index], 'scale', val.scaleGrade)
+      this.setValue(this.settleWorkList[index], 'unit', val.unit)
+      this.setValue(this.settleWorkList[index], 'groundType', val.groundType)
+      this.setValue(this.settleWorkList[index], 'price', val.price)
+      this.setValue(this.settleWorkList[index], 'priceId', val.priceId)
+      this.calculateSettle(this.settleWorkList[index])
+      this.drawer = false
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const settleIds = row.settleId || this.ids;
-      this.$modal.confirm('是否确认删除cmc结算审批编号为"' + settleIds + '"的数据项？').then(function () {
-        return delSettle(settleIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
+    setValue(key, name, val) {
+      this.$set(key, name, val)
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('oa/settle/export', {
-        ...this.queryParams
-      }, `settle_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
+  },
+}
 </script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
+.headers {
+  position: relative;
+  font-weight: bold;
+  font-size: 18px;
+  padding-left: 40px;
+  padding-bottom: 40px;
+
+  .line {
+    position: absolute;
+    left: 22px;
+    top: 5px;
+    width: 5px;
+    height: 14px;
+    border-radius: 10px;
+    background-color: #2893e5;
+  }
+}
+
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+}
+</style>

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-29 16:39:09
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-30 10:05:21
 -->
 <template>
   <div class="app-container">
@@ -204,7 +204,25 @@ export default {
       },
       // 当前点击的行数据
       clickRow: {},
-      passingParam: {}
+      passingParam: {},
+      pathRoute: [
+        {
+          name: '借款审批',
+          path: '/applyForm/borrow'
+        },
+        {
+          name: '用车审批',
+          path: '/applyForm/carApply'
+        },
+        {
+          name: '设备审批',
+          path: '/applyForm/deviceApply'
+        },
+        {
+          name: '项目结算',
+          path: '/applyForm/settleApply'
+        }
+      ]
     };
   },
   created() {
@@ -358,14 +376,13 @@ export default {
     },
     getRoutePath(row) {
       let path;
-      if (row.name == '借款审批') {
-        path = '/applyForm/borrow'
-      }else if (row.name == '用车审批'){
-        path = '/applyForm/carApply'
-      }else if (row.name == '设备审批'){
-        path = '/applyForm/deviceApply'
-      } else {
-        path = '/flowable/task/todo/detail/index'
+      for (let p of this.publicData.pathRoute) {
+        if (p.name == row.name) {
+          path = p.path
+          break
+        } else {
+          path = '/flowable/task/todo/detail/index'
+        }
       }
       return path
     },
@@ -448,11 +465,11 @@ export default {
     },
     // 子流程不可以删除
     beDeleted(row) {
-      if (row.procDefName == '项目预算' || row.procDefName == '技术交底' || row.procDefName == '安全交底'  || row.finishTime != null) {
+      if (row.procDefName == '项目预算' || row.procDefName == '技术交底' || row.procDefName == '安全交底' || row.finishTime != null) {
         return true
-      }else if (row.procDefName == '项目流转' && row.taskName != '项目登记') {
+      } else if (row.procDefName == '项目流转' && row.taskName != '项目登记') {
         return true
-      }else {
+      } else {
         return false
       }
     },

oa-ui/src/views/flowable/task/todo/applyForm/settleIndex.vue

@@ -0,0 +1,106 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-04-26 17:01:15
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-28 14:30:48
+-->
+<template>
+  <div class="app-container">
+    <nav-header :taskForm="taskForm" :taskName="taskName" :startUser="startUser"
+      :flowRecordList="flowRecordList"></nav-header>
+    <settle-form :taskForm="taskForm" :taskName="taskName" @goBack="goBack"></settle-form>
+  </div>
+</template>
+
+<script>
+import { flowRecord } from "@/api/flowable/finished";
+import { getProcessVariables, flowXmlAndNode, definitionStart } from "@/api/flowable/definition";
+import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
+import navHeader from './components/navHeader.vue'
+import SettleForm from '../../../form/settleForm.vue';
+export default {
+  components: {
+    navHeader,
+    SettleForm,
+  },
+  data() {
+    return {
+      taskForm: {
+        returnTaskShow: false, // 是否展示回退表单
+        delegateTaskShow: false, // 是否展示回退表单
+        defaultTaskShow: true, // 默认处理
+        comment: "", // 意见内容
+        procInsId: "", // 流程实例编号
+        instanceId: "", // 流程实例编号
+        deployId: "",  // 流程定义编号
+        taskId: "",// 流程任务编号
+        procDefId: "",  // 流程编号
+        targetKey: "",
+        variables: {
+          variables: {}
+        },
+      },
+      startUser: null, // 发起人信息,
+      taskName: null, // 任务节点
+      flowRecordList: []
+    }
+  },
+  created() {
+    if (this.$route.query) {
+      this.taskName = this.$route.query.taskName;
+      this.startUser = this.$route.query.startUser;
+      this.taskForm.deployId = this.$route.query.deployId;
+      this.taskForm.taskId = this.$route.query.taskId;
+      this.taskForm.procInsId = this.$route.query.procInsId;
+      this.taskForm.executionId = this.$route.query.executionId;
+      this.taskForm.instanceId = this.$route.query.procInsId;
+      this.taskForm.formId = this.$route.query.formId;
+      this.taskForm.procDefName = this.$route.query.procDefName;
+      // 流程任务获取变量信息
+      if (this.taskForm.taskId) {
+        this.processVariables(this.taskForm.taskId)
+        this.getFlowTaskForm(this.taskForm.taskId)
+      }
+      this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
+    }
+  },
+  methods: {
+    /** 获取流程变量内容 */
+    processVariables(taskId) {
+      if (taskId) {
+        // 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
+        getProcessVariables(taskId).then(res => {
+        });
+      }
+    },
+    /** 流程节点表单 */
+    getFlowTaskForm(taskId) {
+      if (taskId) {
+        // 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
+        flowTaskForm({ taskId: taskId }).then(res => {
+          this.taskForm.variables = res.data.formData;
+        });
+      }
+    },
+    /** 流程流转记录 */
+    getFlowRecordList(procInsId, deployId) {
+      const that = this
+      const params = { procInsId: procInsId, deployId: deployId }
+      flowRecord(params).then(res => {
+        that.flowRecordList = res.data.flowList;
+      }).catch(res => {
+        this.goBack();
+      })
+    },
+    goBack() {
+      // 关闭当前标签页并返回上个页面
+      const obj = this.$route;
+      this.$tab.closeOpenPage(obj);
+      this.$router.go(-1);
+    }
+  }
+
+}
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/views/flowable/task/todo/index.vue

@@ -66,7 +66,7 @@ import {
   delDeployment,
   exportDeployment
 } from "@/api/flowable/todo";
-import { getProcessVariables } from "@/api/flowable/definition";
+import { getProcessVariables } from "@/api/flowable/definition"
 export default {
   name: "Deploy",
   components: {},
@@ -138,14 +138,13 @@ export default {
     },
     getRoutePath(row) {
       let path;
-      if (row.procDefName == '借款审批') {
-        path = '/applyForm/borrow'
-      } else if (row.procDefName == '用车审批') {
-        path = '/applyForm/carApply'
-      } else if (row.procDefName == '设备审批') {
-        path = '/applyForm/deviceApply'
-      } else {
-        path = '/flowable/task/todo/detail/index'
+      for (let p of this.publicData.pathRoute) {
+        if (p.name == row.procDefName) {
+          path = p.path
+          break
+        } else {
+          path = '/flowable/task/todo/detail/index'
+        }
       }
       return path
     },