修改项目生产界面里的项目结算

oa-ui/src/views/flowable/form/inProgress/settleData.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 14:45:03
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-10 17:45:25
+ * @LastEditTime: 2024-05-27 19:02:03
 -->
 <template>
   <div class="mt20">
@@ -18,11 +18,7 @@
 
     <el-table :data="dataList" style="width: 100%">
       <el-table-column type="index" label="序号" width="50" />
-      <el-table-column label="上报人">
-        <template slot-scope="scope">
-          {{ getReporter(scope.row) }}
-        </template>
-      </el-table-column>
+      <el-table-column label="上报人" prop="reporterName" />
       <el-table-column label="申请时间" prop="reportTime" />
       <el-table-column label="综合事务部意见" prop="zhComment" />
       <el-table-column label="技术质量部意见" prop="jsComment" />
@@ -37,6 +33,14 @@
         </template>
       </el-table-column>
     </el-table>
+    <el-dialog title="结算明细" :visible.sync="open" append-to-body>
+      <el-table :data="summaryList" style="width: 100%">
+        <el-table-column type="index" label="序号" width="50" />
+        <el-table-column prop="content" label="内容" />
+        <el-table-column prop="amount" label="结算金额" />
+        <el-table-column prop="remark" label="备注" />
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
@@ -49,6 +53,7 @@ import { todoList } from "@/api/flowable/todo";
 import { MessageBox } from 'element-ui'
 import { getUser } from "@/api/system/user";
 import { Snowflake } from '@/utils/snowFlake.js'
+import { listSettleSummary } from '@/api/oa/settle/settleSummary'
 export default {
   props: {
     taskForm: {
@@ -58,8 +63,10 @@ export default {
   },
   data() {
     return {
+      open: false,
       dataList: [],
       definitionList: [], //流程列表
+      summaryList:[]
     }
   },
   mounted() {
@@ -71,12 +78,23 @@ export default {
       listSettle({ projectId: this.taskForm.formId }).then(res => {
         if (res.code == 200) {
           this.dataList = res.rows
+          for (let row of res.rows) {
+            this.getReporter(row);
+          }
         }
       })
     },
     getReporter(row) {
+      console.log(row);
       getUser(row.reporter).then(res => {
-        return res.data.nickName
+        this.$set(row, 'reporterName', res.data.nickName)
+      })
+    },
+    getSummaryList(settleId) {
+      listSettleSummary({ settleId }).then(res => {
+        if (res.rows) {
+          this.summaryList = res.rows
+        }
       })
     },
     listDefinition() {
@@ -88,8 +106,10 @@ export default {
         this.definitionList = response.data.records;
       });
     },
-    handleLook(row){
-
+    handleLook(row) {
+      console.log(row);
+      this.getSummaryList(row.settleId)
+      this.open = true
     },
     addSettleFlow() {
       let row = this.definitionList[0];

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

@@ -1,15 +1,15 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: wrh
- * @LastEditTime: 2024-05-22 17:02:59
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-27 17:25:35
 -->
 <template>
   <div class="app-container" v-loading="loading">
     <el-button type="warning" icon="el-icon-printer" @click="printOpen = true">打印</el-button>
     <el-dialog title="结算表格预览" :visible.sync="printOpen" width="65%" append-to-body>
-      <settle-print :form="form" :chooseProject="chooseProject" :workList="settleWorkList" :settleList="oldSettleSumList"
-        @cancel="printOpen = false"></settle-print>
+      <settle-print :form="form" :chooseProject="chooseProject" :workList="settleWorkList"
+        :settleList="oldSettleSumList" @cancel="printOpen = false"></settle-print>
     </el-dialog>
     <el-row :gutter="20">
       <el-col :span="19" :xs="24">
@@ -84,13 +84,12 @@
             </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>
+            <FileUpload v-if="taskName == '结算发起'" ref="jssh" :limit="1" :filePathName="'项目结算'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getYuanShi"></FileUpload>
+            <el-link v-if="taskName != '结算发起'" :href="`${baseUrl}${'/profile/upload' + form.modifyDocument}`"
+              :underline="false" target="_blank">
+              <span class="el-icon-document"> {{ getFileName(form.modifyDocument) }} </span>
+            </el-link>
           </el-form-item>
           <el-form-item label="项目管理部审核结算单" prop="">
             <el-upload class="upload-demo" ref="upload" :file-list="fileList" action="" :auto-upload="false">
@@ -545,6 +544,7 @@ export default {
     }
   },
   methods: {
+    // 初始化表单
     initForm() {
       listSettle({ settleId: this.taskForm.formId }).then(res => {
         if (res.total == 1) {
@@ -574,6 +574,7 @@ export default {
 
       });
     },
+    // 获取当前处理人
     getCurrentUser() {
       if (this.taskName == '综合事务部处理') {
         this.form.zhUserName = this.$store.state.user.name;
@@ -606,6 +607,7 @@ export default {
       }
       this.getReviewerName();
     },
+    // 获取审核人
     getReviewerName() {
       if (this.form.zhUserId) {
         getUser(this.form.zhUserId).then(res => {
@@ -683,6 +685,7 @@ export default {
         }
       })
     },
+    // 获取下一个节点  (下一个用户id,部门id,是否为会签)
     getNextFlowNodeFn(userId, deptId, isList) {
       const params = { taskId: this.taskForm.taskId };
       getNextFlowNode(params).then(res => {
@@ -764,6 +767,7 @@ export default {
       }
       return true;
     },
+    // 获取合同
     getContractDataList() {
       listProjectContract({ projectId: this.taskForm.formId }).then(res => {
         if (res.rows) {
@@ -969,6 +973,24 @@ export default {
         this.addSettleSummaryFn(this.taskForm.formId)
       })
     },
+    getFileName(name) {
+      if (name) {
+        let arr = name.split('/')
+        return arr[arr.length - 1];
+      }
+    },
+    getYuanShi(val) {
+      this.getDoc()
+    },
+    getDoc(val, name) {
+      if (val) {
+        let arr = val.split('/upload')
+        this.form[name] = arr[1]
+        if (val == "") {
+          this.form[name] = ""
+        }
+      }
+    },
   },
 };
 </script>