新增项目结算中的合同信息

oa-ui/src/views/flowable/form/performance/performanceForm.vue

@@ -142,8 +142,6 @@ export default {
   created() {
     this.initFlow();
     this.initForm();
-    if (this.taskName == '绩效上报')
-      this.saves();
   },
   methods: {
     initFlow() {
@@ -166,6 +164,8 @@ export default {
           this.formTotal = 1
           this.form = res.data;
         }
+        if (this.taskName == '绩效上报')
+          this.saves();
       })
     },
     setAmount(val) {
@@ -185,7 +185,7 @@ export default {
       } else {
         this.form.performanceId = this.taskForm.formId;
         await addPerformance(this.form)
-        this.formTotal = 1
+        this.initForm();
       }
       this.savesWages()
       this.$message.success('保存成功')

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

@@ -0,0 +1,172 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-10-10 10:03:14
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-10-10 14:37:00
+-->
+<template>
+  <div>
+    <el-form-item label="主合同信息" label-width="120px">
+      <div v-if="hasContract">
+        <el-descriptions border style="margin-top: 10px" :column="2" v-for="item in contractObjList">
+          <el-descriptions-item label="合同名称">
+            {{ item.contractName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="合同编码">
+            {{ item.contractCode }}
+          </el-descriptions-item>
+          <el-descriptions-item label="合同编号">
+            {{ item.contractNumber }}
+          </el-descriptions-item>
+          <el-descriptions-item label="合同价款">
+            {{ item.amount }}
+          </el-descriptions-item>
+          <el-descriptions-item label="甲方单位">
+            {{ item.partyA ? item.partyA.partyAName : '' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="合同文件">
+            <div v-if="item.contractDocument" class="upload-list">
+              <el-link type="primary"
+                @click="reviewWord(`${baseUrl}${'/profile/upload' + item.contractDocument}`)">
+                {{ getFileName(item.contractDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning"
+                :href="`${baseUrl}${'/profile/upload' + item.contractDocument}`" :underline="false"
+                target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
+            </div>
+            <div v-else>
+              <el-tag type="info">暂无</el-tag>
+            </div>
+          </el-descriptions-item>
+          <el-descriptions-item label="合同备注">
+            {{ item.remark }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+      <div v-else>
+        <el-tag type="danger">暂无关联主合同信息</el-tag>
+      </div>
+    </el-form-item>
+    <el-form-item label="分包合同信息" label-width="120px">
+      <div v-if="hasSubContract">
+        <el-descriptions border style="margin-top: 10px" :column="2" v-for="item in subContractObjList">
+          <el-descriptions-item label="分包合同名称">
+            {{ item.subContractName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="分包合同价款">
+            {{ item.subAmount }}
+          </el-descriptions-item>
+          <el-descriptions-item label="合作单位">
+            {{ item.partner ? item.partner.partnerName : '' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="分包合同文件">
+            <div v-if="item.contractDocument" class="upload-list">
+              <el-link type="primary"
+                @click="reviewWord(`${baseUrl}${'/profile/upload' + item.contractDocument}`)">
+                {{ getFileName(item.contractDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning"
+                :href="`${baseUrl}${'/profile/upload' + item.contractDocument}`" :underline="false"
+                target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
+            </div>
+            <div v-else>
+              <el-tag type="info">暂无</el-tag>
+            </div>
+          </el-descriptions-item>
+          <el-descriptions-item label="分包合同备注">
+            {{ item.remark }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+      <div v-else>
+        <el-tag type="danger">暂无关联分包合同信息</el-tag>
+      </div>
+    </el-form-item>
+
+  </div>
+</template>
+
+<script>
+import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
+import { listProjectSubcontract, addProjectSubcontract, delProjectSubcontract } from '@/api/oa/contract/projectSubcontract'
+import { getContract } from "@/api/oa/contract/contract";
+import { getSubContract } from "@/api/oa/contract/subContract";
+export default {
+  props: {
+    projectId: {
+      type: String,
+      default: ''
+    }
+  },
+  watch: {
+    projectId(newval) {
+      this.init();
+    }
+  },
+  mounted() {
+  },
+  data() {
+    return {
+      baseUrl: process.env.VUE_APP_BASE_API,
+      contractObjList: [],
+      subContractObjList: [],
+      hasContract: true,
+      hasSubContract: true
+    }
+  },
+  methods: {
+    init() {
+      const projectId = this.projectId;
+      Promise.all([listProjectContract({ projectId }), listProjectSubcontract({ projectId })]).then(response => {
+        let [contractData = null, subContractData = null] = response
+        // 主合同
+        if (contractData.total >= 1) {
+          let list = contractData.rows;
+          this.contractObjList = []
+          for (let l of list) {
+            getContract(l.contractId).then(res => {
+              if (res.data) {
+                this.contractObjList.push(res.data)
+              }
+            })
+          }
+        } else if (contractData.total == 0) {
+          this.hasContract = false;
+        }
+
+        //分包合同
+        if (subContractData.total >= 1) {
+          let list = subContractData.rows;
+          this.subContractObjList = []
+          for (let l of list) {
+            getSubContract(l.subContractId).then(res => {
+              if (res.data) {
+                this.subContractObjList.push(res.data)
+              }
+            })
+          }
+        } else if (subContractData.total == 0) {
+          this.hasSubContract = false;
+        }
+      })
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-descriptions-item__label.is-bordered-label {
+  color: #5a5757;
+  background: rgba($color: #a9adb3, $alpha: 0.1);
+  width: 150px;
+  min-width: 150px;
+}
+
+::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
+  border: 1px solid #cdd0d3;
+}
+</style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-08 09:34:29
+ * @LastEditTime: 2024-10-10 16:15:50
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -25,12 +25,6 @@
               <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">
                 {{ getUserName(chooseProject.projectLeader) }}
               </el-descriptions-item>
@@ -119,6 +113,12 @@
               </el-link>
             </div>
           </el-form-item>
+
+          <div class="headers" v-hasRole="['leader', 'business']">
+            合同信息
+            <div class="line"></div>
+          </div>
+          <project-contract-info :projectId="projectId" v-hasRole="['leader', 'business']"></project-contract-info>
           <div class="headers">
             预算内项目结算明细
             <div class="line"></div>
@@ -379,7 +379,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-form-item label="经营发展部(校核)">
+            <el-form-item label="经营发展部(校核)" prop="jyComment">
               <el-input v-model="form.jyComment" type="textarea" :disabled="taskName != '经营发展部校核'" clearable
                 :autosize="{ minRows: 4, maxRows: 10 }">
               </el-input>
@@ -506,12 +506,14 @@ import SettlePrint from "./components/print/settlePrint.vue";
 import { getDept } from "@/api/system/dept";
 import { getContract } from "@/api/oa/contract/contract";
 import ChooseProject from "./components/chooseProject.vue";
+import projectContractInfo from "./projectContractInfo.vue";
 export default {
   components: {
     flow,
     ChoosePrice,
     SettlePrint,
     ChooseProject,
+    projectContractInfo
   },
   props: {
     taskName: {
@@ -554,7 +556,6 @@ export default {
           { required: true, trigger: "change", message: "请选择项目编号" },
         ],
       },
-      projectList: [],
       isSelect: false,
       chooseProject: {},
       fileList: [],
@@ -605,11 +606,11 @@ export default {
       exceed: false, //是否超预算
       exceedAmount: 0,
       isModify: false, //是否可以修改结算工作量
+      projectId: '',
     };
   },
   created() {
-    this.getProjectList(); //获取项目列表
-    this.getContractDataList(); //获取合同编码和编号
+    this.initRules();
     this.initForm();
     if (this.flowDisabled)
       flowXmlAndNode({
@@ -633,6 +634,17 @@ export default {
     this.isModify = this.taskName != '结算发起' && this.taskName != '经营发展部校核' && this.taskName != '分管审核'
   },
   methods: {
+    initRules() {
+      if (this.taskName == '经营发展部校核') {
+
+      } else if (this.taskName == '经营发展部校核') {
+        this.rules = {
+          jyComment: [
+            { required: true, message: '请输入意见', trigger: 'blur' }
+          ]
+        }
+      }
+    },
     // 初始化表单
     async initForm() {
       this.loading = true
@@ -655,6 +667,7 @@ export default {
 
         if (projectResponse) {
           this.chooseProject = projectResponse.data;
+          this.projectId = projectResponse.data.projectId
           this.isSelect = true;
         }
         if (budgetResponse && budgetResponse.total === 1) {
@@ -864,15 +877,6 @@ export default {
         this.$emit('goBack');
       })
     },
-    // 查询项目列表
-    getProjectList() {
-      listProject({
-        pageNum: 1,
-        pageSize: 99999999,
-      }).then((response) => {
-        this.projectList = response.rows;
-      });
-    },
     // 选择项目
     handleSelectProject(val) {
       if (val != "" && val != undefined && val != null) {
@@ -902,31 +906,6 @@ export default {
       }
       return true;
     },
-    // 获取合同
-    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;
-                }
-              }
-            });
-          }
-        }
-      });
-    },
     addWorkList() {
       this.settleWorkList.push({
         content: "",
@@ -975,9 +954,6 @@ export default {
         work.remark = '不足600，按600算'
         sum = 600
       }
-      else {
-        work.remark = ''
-      }
       work.settle = Number(sum).toFixed(2);
       this.calculateSumSettle();
       this.calculateActualSumSettle();
@@ -1182,4 +1158,15 @@ h3 {
   font-family: "黑体";
   font-weight: bold;
 }
+
+::v-deep .el-descriptions-item__label.is-bordered-label {
+  color: #5a5757;
+  background: rgba($color: #a9adb3, $alpha: 0.1);
+  width: 150px;
+  min-width: 150px;
+}
+
+::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
+  border: 1px solid #cdd0d3;
+}
 </style>