Merge branch 'master' of http://oa.sccehui.com:6101/cmc-coding/cmc-oa

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

     /* 获取单价 */
     getUnitPrice(work, workItem, subItem, scaleGrade, groundType) {
       getUnitPrice({ workItem, subItem, scaleGrade, groundType: groundType }).then(res => {
+        let content = work.workType + '/' + workItem
         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
+          this.work.content = content
         }
       })
     },

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

  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-07 16:13:01
+ * @LastEditTime: 2024-05-08 17:54:13
 -->
 <template>
   <div class="app-container" v-loading="loading">
                   {{ work.price }}
                 </td>
                 <td>
-                  <el-input-number style="width: 100px" v-model="work.workload" clearable @blur="calculateSettle(work)"
-                    :controls="false"></el-input-number>
+                  <el-input-number :precision="2" 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
+                  <el-input-number :precision="2" style="width: 100px" v-model="work.coefficient" clearable
                     @blur="calculateSettle(work)" :controls="false"></el-input-number>
                 </td>
                 <td>
             <div class="line"></div>
           </div>
           <el-form-item label-width="60px">
+            <h3>表1：扣除明细</h3>
             <table border="1">
               <tr>
                 <td style="width: 50px">序号</td>
                   </el-input>
                 </td>
                 <td>
-                  <el-input-number style="width: 200px" v-model="work.amount" clearable :controls="false"
-                    @blur="calculateActualSumSettle()"></el-input-number>
+                  <el-input-number :min="0" :precision="2" style="width: 200px" v-model="work.amount" clearable
+                    :controls="false" @blur="calculateActualSumSettle()"></el-input-number>
                   <!-- {{ work.amount }} -->
                 </td>
                 <td>
                     @click="deletWorkItem(index, settleSumList)">删除行</el-button>
                 </td>
               </tr>
+            </table>
+            <el-button icon="el-icon-plus" type="primary" plain size="mini" @click="addSumWorkList"></el-button>
+            <h3>表2：部门结算金额</h3>
+            <table border="1">
+              <tr>
+                <td style="width: 50px">序号</td>
+                <td style="width: 280px">部门名称</td>
+                <td style="width: 200px">结算金额（元）</td>
+                <td style="width: 280px">备注</td>
+                <td style="width: 100px">操作</td>
+              </tr>
+              <tr v-for="(dept, index) in deptSettleList" :key="index">
+                <td>
+                  {{ index + 1 }}
+                </td>
+                <td>
+                  <el-input v-model="dept.content" type="textarea" clearable :autosize="{ minRows: 2, maxRows: 10 }">
+                  </el-input>
+                </td>
+                <td>
+                  <el-input-number :precision="2" style="width: 200px" v-model="dept.amount" clearable
+                    :controls="false" @blur="calculateDeptAmount(index)"></el-input-number>
+                </td>
+                <td>
+                  <el-input v-model="dept.remark" type="textarea" clearable :autosize="{ minRows: 2, maxRows: 10 }">
+                  </el-input>
+                </td>
+                <td>
+                  <el-button type="text" size="mini" style="color: #f56c6c"
+                    @click="deletWorkItem(index, deptSettleList)">删除行</el-button>
+                </td>
+              </tr>
               <tr>
                 <td :colspan="2">实际结算总金额</td>
                 <td :colspan="3">
-                  <el-input-number style="width: 100%" v-model="actualSumSettle" clearable
+                  <el-input-number :precision="2" style="width: 100%" v-model="actualSumSettle" clearable
                     :controls="false"></el-input-number>
                 </td>
               </tr>
                 </td>
               </tr>
             </table>
-            <el-button icon="el-icon-plus" type="primary" plain size="mini" @click="addSumWorkList"></el-button>
+            <el-button icon="el-icon-plus" type="primary" plain size="mini" @click="addDeptSettleList"></el-button>
           </el-form-item>
 
           <!-- 结算审核情况 -->
       type: Boolean,
       default: false
     }
+  },
+  watch: {
+    
   },
   data() {
     return {
         content: "结算费用合计",
         amount: 0,
         remark: "",
+        tableNumber: '2'
       },
       settleSumList: [
         {
           content: "",
           amount: 0,
           remark: "",
+          tableNumber: '0'
         },
       ],
+      deptSettleList: [
+        {
+          content: "",
+          amount: 0,
+          remark: "",
+          tableNumber: '1'
+        }
+      ],
       oldSettleSumList: [],
       actualSumSettle: "",
       clickWork: {},
           this.listSettleSummaryFn();
           getUser(this.form.reporter).then(res => {
             if (res.data) {
-              console.log(res.data);
               this.form.reporterName = res.data.nickName;
               this.deptId = res.data.deptId
             }
       this.$refs["settleForm"].validate(vaild => {
         if (vaild) {
           this.preserve();
-          debugger
           if (this.taskName == '结算发起') {
             this.getNextFlowNodeFn(17);
           } else if (this.taskName == '综合事务部处理') {
         content: "",
         amount: 0,
         remark: "",
+        tableNumber: '0'
+      });
+    },
+    addDeptSettleList() {
+      this.deptSettleList.push({
+        content: "",
+        amount: 0,
+        remark: "",
+        tableNumber: '1'
       });
     },
     deletWorkItem(index, arr) {
       let sum = work.workload * work.coefficient * work.price;
       work.settle = Number(sum).toFixed(2);
       this.calculateSumSettle();
+      this.calculateActualSumSettle();
     },
     calculateSumSettle() {
       let sum = 0;
       for (let a of arr) {
         sum = sum + Number(a.settle);
       }
-      this.settleSumTr.amount = sum;
+      this.settleSumTr.amount = sum.toFixed(2);
     },
     calculateActualSumSettle() {
       let sum = 0;
       for (let a of arr) {
         sum = sum + Number(a.amount);
       }
-      this.actualSumSettle = sum;
+      this.actualSumSettle = Number(this.settleSumTr.amount) - sum;
+    },
+    calculateDeptAmount(index){
+      debugger
+      let num = 0
+      let len = this.deptSettleList.length
+      if (len > 1){
+        if(index == len - 1){
+          for(let i = 0; i< index ;i ++){
+            num = num + this.deptSettleList[i].amount
+          }
+          this.deptSettleList[index].amount = this.actualSumSettle - num
+        }
+      }
     },
     handleChoosePrice(work, index) {
       this.clickWork = work;
       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.setValue(this.settleWorkList[index], "content", val.content);
       this.calculateSettle(this.settleWorkList[index]);
       this.drawer = false;
     },
     addSettleFn() {
       let settleId = this.taskForm.formId;
       this.form.settleId = settleId;
-      addSettle(this.form).then(res => {
-        this.addSettleWorkFn(settleId);
-        this.addSettleSummaryFn(settleId);
-      });
+      getSettle(this.taskForm.formId).then(res=>{
+        if(res.data){
+          updateSettle(this.form);
+          this.addSettleWorkFn(settleId);
+          this.addSettleSummaryFn(settleId);
+        }else{
+          addSettle(this.form).then(res => {
+          this.addSettleWorkFn(settleId);
+          this.addSettleSummaryFn(settleId);
+        });
+        }
+        
+      })
+      
     },
     addSettleWorkFn(settleId) {
       for (let work of this.settleWorkList) {
       for (let item of this.settleSumList) {
         item.settleId = settleId;
         setTimeout(() => {
-          addSettleSummary(item);
-        }, 500)
+          addSettleSummary(item).then(res=>{
+            console.log(item);
+          });
+        }, 1000)
+      }
+      for (let item of this.deptSettleList) {
+        item.settleId = settleId;
+        setTimeout(() => {
+          addSettleSummary(item).then(res=>{
+            console.log(item);
+          });
+        }, 1000)
       }
     },
     // 获取数据
     },
     listSettleSummaryFn() {
       listSettleSummary({ settleId: this.taskForm.formId }).then(res => {
-        this.settleSumList = res.rows;
         this.oldSettleSumList = res.rows;
-        for (let s of this.settleSumList) {
+        for (let s of res.rows) {
           if (s.content == "结算费用合计") {
             this.settleSumTr = s;
             break;
           }
         }
-        this.settleSumList = this.settleSumList.filter(
-          item => item.content !== "结算费用合计"
+        this.settleSumList = res.rows.filter(
+          item => item.tableNumber == "0"
+        );
+        this.deptSettleList = res.rows.filter(
+          item => item.tableNumber == "1"
         );
         this.calculateActualSumSettle();
       });
   /*设置背景颜色*/
   /* background-color: #bfa; */
 }
+
+h3 {
+  font-family: '黑体';
+  font-weight: bold;
+}
 </style>