修改预结算界面

oa-ui/src/views/oa/budget/addBudget.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-25 15:05:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-27 17:39:21
+ * @LastEditTime: 2024-03-28 17:49:30
 -->
 <!--
  * @Author: ysh
@@ -269,7 +269,7 @@
           <el-breadcrumb-item>固定成本小计</el-breadcrumb-item>
           <el-breadcrumb-item>¥ {{ budgetForm.fixCost }}</el-breadcrumb-item>
         </el-breadcrumb>
-        <choose-money :workList="workList"></choose-money>
+        <choose-money :workList="workList" @getSettle="getSettle"></choose-money>
       </div>
       <el-divider></el-divider>
       <div class="btn">
@@ -375,7 +375,7 @@ export default {
         {
           content: "实景三维制作（影像分辨率优于5cm）",
           scale: "1:500",
-          workload: "81",
+          workLoad: "10",
           unit: "km²",
           deadline: "2024-01-31",
           remark: "此为备注此为备注此为备注此为备注此为备注此为备注",
@@ -383,7 +383,7 @@ export default {
         {
           content: "XXXXXXXXXXXXXXXXXX",
           scale: "1:500",
-          workload: "81",
+          workLoad: "10",
           unit: "km²",
           deadline: "2024-01-31",
           remark: "此为备注此为备注此为备注此为备注此为备注此为备注",
@@ -432,7 +432,7 @@ export default {
         } else {
           this.activeStep += 1;
         }
-      } else if (this.activeStep == 1) {
+      } else {
         this.activeStep += 1;
       }
     },
@@ -453,9 +453,14 @@ export default {
         return res.data.salary;
       });
     },
+    getSettle(val){
+      console.log(val);
+      console.log(this.budgetForm);
+      this.budgetForm.settleExpense = val.settle;
+      this.budgetForm.workList = val.workList;
+    },
     // 计算单个人员的成本
     calculateUserTotal(user) {
-      debugger
       if (user.inOutPrice == undefined) {
         this.$message.error("请输入进出场单价");
         return;
@@ -478,7 +483,6 @@ export default {
     },
     // 合计
     calculateTotal(val) {
-      debugger
       const elements = document.querySelectorAll("." + val);
       let sum = 0;
       if (elements.length > 0) {

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

@@ -22,7 +22,7 @@
               {{ work.unit }}
             </td>
             <td>
-              {{ work.workload }}
+              {{ work.workLoad }}
             </td>
             <td>
               {{ work.deadline }}
@@ -39,12 +39,12 @@
             <td style="width: 100px">工作内容</td>
             <td>工作类别</td>
             <td>工作项目</td>
-            <td>项目细项</td>
+            <!-- <td>项目细项</td> -->
             <td>比例尺</td>
             <td>地类类型</td>
-            <td>单价</td>
-            <td>总工作量</td>
-            <td>系数</td>
+            <td style="width:90px;">单价</td>
+            <td style="width:90px;">总工作量</td>
+            <td style="width:70px;">系数</td>
             <td>总额</td>
           </tr>
           <tr v-for="(work, index) in workList" :key="index">
@@ -52,38 +52,64 @@
               {{ work.content }}
             </td>
             <td>
-              <el-select v-model="work.workType" :style="{ width: '100%' }" :loading="work.workTypeLoading"
-                @change="getWorkItemList(work.workType)">
-                <el-option v-for="item in work.workTypeList" :key="item.value" :label="item.label" :value="item.value">
+              <el-select v-model="work.workType" :style="{ width: '100%' }" :loading="work.workSelect.workTypeLoading"
+                @change="getWorkItemList(work, work.workType)">
+                <el-option v-for="item in work.workSelect.workTypeList" :key="item.value" :label="item.label"
+                  :value="item.value">
                 </el-option>
               </el-select>
             </td>
             <td>
-              {{ work.scale }}
-            </td>
-            <td>
-              {{ work.unit }}
+              <el-select v-model="work.workItem" :style="{ width: '100%' }" :remote="true"
+                @change="getScaleGradeList(work, work.workItem)">
+                <el-option v-for="item in work.workSelect.workItemList" :key="item.value" :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
             </td>
+            <!-- <td>
+              <el-select v-model="work.subItem" :style="{ width: '100%' }"
+                @change="getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType)">
+                <el-option v-for="item in work.workSelect.subItemList" :key="item.value" :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </td> -->
             <td>
-              {{ work.workload }}
+              <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 work.workSelect.scaleGradeList" :key="item.value" :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
             </td>
             <td>
-              {{ work.deadline }}
+              <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="一般地类">
+                </el-option>
+                <el-option key="复杂地类" label="复杂地类" value="复杂地类">
+                </el-option>
+              </el-select>
             </td>
             <td>
-              {{ work.remark }}
+              {{ work.price }} / {{ work.unit }}
             </td>
             <td>
-              {{ work.remark }}
+              {{ work.workLoad }}
             </td>
             <td>
-              {{ work.remark }}
+              <el-input v-model="work.coefficient" placeholder="请输入系数" @blur="getTotal(work)"></el-input>
             </td>
-            <td>
-              {{ work.remark }}
+            <td class="workTotal">
+              {{ work.total }}
             </td>
           </tr>
         </table>
+        <div style="color:red">tips:预结算表中的系数为：困难系统和调整系数相乘的值（1分制）。例如：困难系数1，调整系数0.8，最终系数为0.8</div>
+      </el-form-item>
+      <el-form-item label="预结算合计：">
+        {{ settle }}<el-button @click="getSettle()" type="success" style="margin-left:30px;">计算</el-button>
       </el-form-item>
     </el-form>
   </div>
@@ -91,6 +117,7 @@
 
 <script>
 import { getWorkTypeList, getWorkItemList, getSubItemList, getScaleGradeList, getUnitPrice } from '@/api/oa/price/price'
+import { deepClone } from '@/utils'
 export default {
   props: {
     workList: {
@@ -98,19 +125,132 @@ export default {
       require: true
     }
   },
+  data() {
+    return {
+      // 工作选项
+      workSelect: {
+        // 项目列表
+        projectList: [],
+        // 工作类别列表
+        workTypeList: [],
+        // 工作项目
+        workItemList: [],
+        // 项目细项
+        subItemList: [],
+        // 比例尺
+        scaleGradeList: [],
+        workTypeLoading: true,
+        workItemLoading: true,
+        subItemLoading: true,
+        scaleGradeLoading: true,
+      },
+      settle: 0
+    }
+  },
   created() {
-    this.getWorkTypeList();
+    for (let work of this.workList) {
+      this.setValue(work, 'workSelect', deepClone(this.workSelect));
+      this.getWorkTypeList(work);
+    }
   },
   methods: {
     /* 获取工作类别 */
     getWorkTypeList(work) {
       getWorkTypeList().then(res => {
         if (res) {
-          this.setValue(work, 'workTypeList', this.setArray(res));
-          this.setValue(work, 'workTypeLoading', false);
+          this.setValue(work.workSelect, 'workTypeList', this.setArray(res));
+          this.setValue(work.workSelect, 'workTypeLoading', false);
         }
       });
     },
+    /* 获取工作项目 */
+    getWorkItemList(work, workType) {
+      getWorkItemList({ workType: workType }).then(res => {
+        if (res) {
+          let workItemList = this.setArray(res);
+          work.workSelect.workItemLoading = false;
+          work.workSelect.workItemList = workItemList;
+          work.workItem = workItemList[0].label;
+          // this.getSubItemList(work, work.workItem);
+          work.subItem = '';
+          this.getScaleGradeList(work, work.workItem);
+        }
+      })
+    },
+    /* 获取项目细项 */
+    getSubItemList(work, workItem) {
+      getSubItemList({ workItem }).then(res => {
+        if (res) {
+          let subItemList = this.setArray(res);
+          work.workSelect.subItemLoading = false;
+          work.workSelect.subItemList = subItemList;
+          work.subItem = subItemList[0].label;
+          if (work.scaleGrade == undefined) {
+            this.setValue(work, 'scaleGrade', '无');
+          }
+          if (work.groundType == undefined) {
+            this.setValue(work, 'groundType', '一般地类');
+          }
+          this.getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType);
+        }
+      })
+    },
+    /* 获取比例尺 */
+    getScaleGradeList(work, workItem) {
+      getScaleGradeList({ workItem }).then(res => {
+        if (res) {
+          let scaleGradeList = this.setArray(res);
+          work.workSelect.scaleGradeLoading = false;
+          work.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', '一般地类');
+          }
+          this.getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType);
+        }
+      })
+    },
+    /* 获取单价 */
+    getUnitPrice(work, workItem, subItem, scaleGrade, groundType) {
+      getUnitPrice({ workItem, subItem, scaleGrade, priceType: groundType }).then(res => {
+        if (res.length != 0) {
+          work.priceId = res.data.id;
+          this.setValue(work, 'price', res.data.price)
+          this.setValue(work, 'coefficient', 1)
+          if (work.workLoad != undefined || work.workLoad != '') {
+            this.getTotal(work);
+          }
+        }
+      })
+    },
+    /* 获取总额 */
+    getTotal(work) {
+      let total = this.calculateTotal(work.price, work.coefficient, work.workLoad, 1);
+      this.setValue(work, 'total', total)
+    },
+    /* 计算总额 */
+    calculateTotal(price, coefficient, workLoad, percent) {
+      return ((parseFloat(price) * parseFloat(coefficient) * parseFloat(workLoad)) * percent).toFixed(2);
+    },
+    getSettle() {
+      const elements = document.querySelectorAll(".workTotal");
+      let sum = 0;
+      if (elements.length > 0) {
+        for (let e of elements) {
+          sum = sum + Number(e.innerHTML);
+        }
+        this.settle = sum.toFixed(2)
+      }
+      let obj = {}
+      obj.workList = this.workList;
+      obj.settle = this.settle;
+      console.log(this.workList);
+      this.$emit('getSettle',obj)
+    },
     //数组去重
     setArray(arr) {
       if (arr != [] && arr != undefined) {