修改新增预算中的人员、车辆、设备、绩效选择

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

@@ -193,4 +193,9 @@ aside {
 @font-face {
   font-family: 'CMCTitle'; // 根据自己用的去重命名字体名 
   src: url('~@/assets/font/cmctitle/cmctitle.woff');
+}
+.vertical-text{
+  writing-mode: vertical-rl;
+  transform: rotate(360deg);
+  letter-spacing: 5px;
 }

oa-ui/src/views/flowable/form/budget/budgetInfo.vue

@@ -1,30 +1,30 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-08 18:07:49
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-09 15:48:22
 -->
 <template>
-  <div>
+  <div class="main">
     <h2 style="text-align: center">项目直接生产成本预算表</h2>
     <table border="1" class="table">
       <tr>
         <td class="head">项目名称</td>
-        <td colspan="3">{{ projectForm.projectName }}</td>
+        <td colspan="3">{{ budgetForm.project ? budgetForm.project.projectName : '' }}</td>
         <td class="head">项目编号</td>
-        <td colspan="2">{{ projectForm.projectNumber }}</td>
+        <td colspan="2">{{ budgetForm.project ? budgetForm.project.projectNumber : '' }}</td>
       </tr>
       <tr>
-        <td :rowspan="userLen" class="head">人员</td>
-        <td class="head">姓名</td>
+        <td :rowspan="userLen" class="head vertical-text">人员</td>
+        <td class="head" style="width:250px">姓名</td>
         <td class="head">岗位工资</td>
         <td class="head">人员成本（天）</td>
         <td class="head">进出场单价</td>
         <td class="head">预算天数</td>
         <td class="head">金额</td>
       </tr>
-      <tr v-for="user,index in chooseUser" :key="index">
-        <td>{{ user.nickName }}</td>
+      <tr v-for="user, index in chooseUser" :key="'user' + index">
+        <td>{{ user.user ? user.user.nickName : '' }}</td>
         <td>{{ user.salary.salary }}</td>
         <td>{{ parseFloat(user.salary.salary / 31).toFixed(2) }}</td>
         <td>{{ user.inOutPrice }}</td>
@@ -32,7 +32,7 @@
         <td>{{ user.staffCost }}</td>
       </tr>
       <tr>
-        <td :rowspan="carLen" class="head">车辆</td>
+        <td :rowspan="carLen" class="head vertical-text">车辆</td>
         <td class="head">车牌号</td>
         <td class="head">油耗</td>
         <td class="head">总里程</td>
@@ -40,16 +40,16 @@
         <td class="head">预算天数</td>
         <td class="head">金额</td>
       </tr>
-      <tr v-for="car,index in chooseCar" :key="index">
-        <td>{{ car.licensePlate }}</td>
+      <tr v-for="car, index in chooseCar" :key="'car' + index">
+        <td>{{ car.car ? car.car.licensePlate : '' }}</td>
         <td>{{ car.mileage }}</td>
         <td>{{ car.distance }}</td>
-        <td>{{ car.dayCost }}</td>
+        <td>{{ car.car ? car.car.dayCost : '' }}</td>
         <td>{{ car.days }}</td>
         <td>{{ car.expense }}</td>
       </tr>
       <tr>
-        <td :rowspan="deviceLen" class="head">设备</td>
+        <td :rowspan="deviceLen" class="head vertical-text">设备</td>
         <td class="head">设备名称</td>
         <td class="head">规格型号</td>
         <td class="head">品牌</td>
@@ -57,11 +57,11 @@
         <td class="head">预算天数</td>
         <td class="head">金额</td>
       </tr>
-      <tr v-for="device,index in chooseDevice" :key="index">
-        <td>{{ device.name }}</td>
-        <td>{{ device.series }}</td>
-        <td>{{ device.brand }}</td>
-        <td>{{ device.dayCost }}</td>
+      <tr v-for="device, index in chooseDevice" :key="'device' + index">
+        <td>{{ device.device ? device.device.name : '' }}</td>
+        <td>{{ device.device ? device.device.series : '' }}</td>
+        <td>{{ device.device ? device.device.brand : '' }}</td>
+        <td>{{ device.device ? device.device.dayCost : '' }}</td>
         <td>{{ device.days }}</td>
         <td>{{ device.depreciation }}</td>
       </tr>
@@ -70,7 +70,7 @@
         <td>{{ budgetForm.fixCost }}</td>
       </tr>
       <tr>
-        <td :rowspan="workLen" class="head">预计结算金额</td>
+        <td :rowspan="workLen" class="head vertical-text">预计结算金额</td>
         <td class="head">工作内容</td>
         <td class="head">比例尺</td>
         <td class="head">总工作量</td>
@@ -79,8 +79,8 @@
         <td class="head">金额</td>
       </tr>
       <tr v-for="(work, index) in workList" :key="'work' + index">
-        <td>{{ work.content }}</td>
-        <td>{{ work.scale }}</td>
+        <td>{{ workContentList.length != 0 ? workContentList[index].content : "" }}</td>
+        <td>{{ work.cmcprice ? work.cmcprice : '' }}</td>
         <td>{{ work.workload }}</td>
         <td>{{ work.price }}</td>
         <td>{{ work.coefficient }}</td>
@@ -110,12 +110,12 @@
         <td colspan="6" class="head">总成本=（固定成本+直接成本）*120%</td>
         <td>{{ budgetForm.totalBudget }}</td>
       </tr>
-      <!-- <tr>
+      <tr>
         <td class="head">编制人</td>
-        <td colspan="2">{{  }}</td>
+        <td colspan="2">{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName :'' }}</td>
         <td class="head">审核人</td>
-        <td colspan="3"></td>
-      </tr> -->
+        <td colspan="3">{{ name }}</td>
+      </tr>
     </table>
   </div>
 </template>
@@ -126,7 +126,12 @@ import { listBudgetCar, getBudgetCar } from "@/api/oa/budget/budgetCar";
 import { listBudgetDevice, getBudgetDevice } from "@/api/oa/budget/budgetDevice";
 import { listBudgetSettle, getBudgetSettle } from "@/api/oa/budget/budgetSettle";
 import { listBudgetStaff, getBudgetStaff } from "@/api/oa/budget/budgetStaff";
+import { getProjectWork } from "@/api/oa/project/projectWork";
+import { mapGetters } from 'vuex';
 export default {
+  computed: {
+    ...mapGetters(["name", "userId"]),
+  },
   props: {
     taskForm: {
       type: Object,
@@ -136,7 +141,8 @@ export default {
   data() {
     return {
       projectId: '',
-      budgetForm: {},
+      budgetForm: {
+      },
       projectForm: {},
       userLen: 1,
       carLen: 1,
@@ -146,15 +152,12 @@ export default {
       chooseCar: [],
       chooseDevice: [],
       chooseUser: [],
-      workList: []
+      workList: [],
+      workContentList: []
     };
   },
   created() {
     this.initBudgetForm();
-    this.userLen = this.chooseUser.length + 1;
-    this.carLen = this.chooseCar.length + 1;
-    this.deviceLen = this.chooseDevice.length + 1;
-    this.workLen = this.workList.length + 5;
     this.totalBudget = (
       (Number(this.budgetForm.directExpense) + Number(this.budgetForm.fixCost)) *
       1.2
@@ -167,25 +170,57 @@ export default {
         this.budgetForm = res.rows[0];
         getBudgetDevice(this.budgetForm.budgetId).then(res => {
           console.log(res);
-          this.chooseDevice = res.rows;
+          this.chooseDevice = res.data;
+          this.deviceLen = res.data.length + 1;
         })
-        getBudgetStaff(this.budgetForm.budgetId).then(result => {
-          console.log(result);
-          this.chooseUser = res.rows;
+        getBudgetStaff(this.budgetForm.budgetId).then(res => {
+          console.log(res);
+          this.chooseUser = res.data;
+          this.userLen = res.data.length + 1;
         })
-        getBudgetCar(this.budgetForm.budgetId).then(result => {
-          console.log(result);
-          this.chooseCar = res.rows;
+        getBudgetCar(this.budgetForm.budgetId).then(res => {
+          console.log(res);
+          this.chooseCar = res.data;
+          this.carLen = res.data.length + 1;
         })
-        getBudgetSettle(this.budgetForm.budgetId).then(result => {
-          console.log(result);
-          this.workList = res.rows;
+        getBudgetSettle(this.budgetForm.budgetId).then(res => {
+          console.log(res);
+          this.workList = res.data;
+          this.workLen = res.data.length + 5;
+          this.getProjectWorkList();
         })
       });
     },
-
+    getProjectWorkList() {
+      getProjectWork(this.$route.query.formId).then(res => {
+        this.workContentList = res.data;
+      })
+    },
   },
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.main {
+  width: 1200px;
+  margin: 0 auto;
+  text-align: center;
+}
+
+table {
+  text-align: center;
+  border-collapse: collapse;
+  margin: 0 auto;
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 5px;
+  }
+}
+
+.head {
+  line-height: 35px;
+  font-weight: bold;
+}
+</style>

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

@@ -253,7 +253,6 @@ export default {
     submit() {
       this.$refs['deviceForm'].validate((valid) => {
         if (valid) {
-          debugger
           this.form.formId = this.taskForm.formId;
           let formData = new FormData();
           let jsonForm = JSON.stringify(this.form);

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

@@ -102,7 +102,6 @@ export default {
     }
   },
   created() {
-    debugger
     if (this.$route.query.taskName != '项目登记') {
       this.initForm();
       // this.form.projectId = this.taskForm.formId;
@@ -112,7 +111,6 @@ export default {
   },
   methods: {
     initForm() {
-      debugger
       getProject(this.$route.query.formId).then(res => {
         this.form = res.data;
         if (this.form.undertakingDept != null && this.form.undertakingDept != "" && this.form.undertakingDept != undefined) {
@@ -148,7 +146,6 @@ export default {
       this.deptLeaderList = [];
       for (let v of val) {
         getUsersDeptLeaderByDept({ deptId: Number(v) }).then(res => {
-          debugger
           this.deptLeaderList.push(res.data.userId);
           this.form.deptLeader = this.deptLeaderList;
         })

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

@@ -2,18 +2,31 @@
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-08 14:08:27
+ * @LastEditTime: 2024-04-09 17:51:14
 -->
 <template>
   <div class="app-container">
     <el-form :model="form" :rules="rules" label-width="100px" :disabled="disabled">
-      
+      <el-form-item label="审核意见：">
+        <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="jyComment">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="审核人：">
+        {{ name }}
+      </el-form-item>
+      <el-form-item label="审核时间：">
+        {{  }}
+      </el-form-item>
     </el-form>
   </div>
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
 export default {
+  computed: {
+    ...mapGetters(['name']),
+  },
   props: {
     disabled: {
       type: Boolean,
@@ -26,15 +39,17 @@ export default {
   },
   data() {
     return {
-      form:{},
-      rules:{}
+      form: {},
+      rules: {},
+      jyComment: "",
+      jyApprovalTime: ""
     }
   },
   created() {
-
+    this.jyApprovalTime = 
   },
   methods: {
-    
+
   },
 }
 </script>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-08 14:01:51
+ * @LastEditTime: 2024-04-09 17:45:47
 -->
 
 <template>
@@ -19,7 +19,9 @@
           <el-tab-pane label="项目预算" name="项目预算">
             
           </el-tab-pane>
-          <el-tab-pane label="经营审核" name="经营审核"></el-tab-pane>
+          <el-tab-pane label="经营审核" name="经营审核">
+            <business-review :taskForm="taskForm" :disabled="taskName != '经营审核'" @goBack="goBack"></business-review>
+          </el-tab-pane>
           <el-tab-pane label="分管审核" name="分管审核"></el-tab-pane>
           <el-tab-pane label="生产确认" name="生产确认"></el-tab-pane>
           <el-tab-pane label="项目生产" name="项目生产"></el-tab-pane>
@@ -144,7 +146,6 @@ export default {
       this.addOpen = true
     },
     handleUpdate(row) {
-      debugger
       this.addForm = row;
       this.title = '修改项目信息';
       this.addOpen = true;

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

@@ -294,7 +294,6 @@ export default {
           const formData = {};
           formData.disabled = true;
           formData.formBtns = false;
-          debugger
           formData.formId = formId
           if (row.id) {
             variables.variables = formData;

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

@@ -183,7 +183,8 @@ import projectProcess from "@/views/flowable/form/projectProcess/index.vue"
 import AddBudget from '@/views/oa/budget/addBudget.vue';
 import borrowForm from '@/views/flowable/form/borrowForm.vue';
 import safeForm from '@/views/flowable/form/safeForm.vue';
-import budgetIndex from '../../../form/budget/budget.vue';
+import budgetIndex from '@/views/flowable/form/budget/budget.vue';
+import businessReview from '@/views/flowable/form/projectProcess/businessReview.vue';
 
 export default {
   name: "Record",
@@ -204,7 +205,8 @@ export default {
     AddBudget,
     borrowForm,
     safeForm,
-    budgetIndex
+    budgetIndex,
+    businessReview
   },
   props: {},
   data() {

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-04-08 09:28:41
+ * @LastEditTime: 2024-04-09 17:19:08
 -->
 <template>
   <div>
@@ -14,19 +14,19 @@
         <div class="title">
           <div class="title-text">新增预算</div>
           <div class="title-tips">
-            请精准填写预算标准，对应的人员、设备、车辆可直接选择生成固定成本
+            请精准填写预算标准，对应的人员、设备、车辆可直接选择生成间接成本
           </div>
         </div>
       </div>
       <div class="add-main">
         <el-steps :active="activeStep" align-center finish-status="success">
-          <el-step title="选择项目" description="选择想要生成预算的项目"></el-step>
+          <el-step title="项目信息" description="需要预算的项目"></el-step>
           <el-step
-            title="选择人员、车辆和设备"
-            description="选择参与的人员、车辆和设备，得到固定成本"
+            title="间接成本明细"
+            description="选择参与的人员、车辆和设备，得到间接成本"
           ></el-step>
           <!-- <el-step title="选择车辆和设备" description="选择，得到对应预算"></el-step> -->
-          <el-step title="绩效和其他预算" description="包含绩效预算和其他预算"></el-step>
+          <el-step title="直接成本明细" description="包含绩效预算和其他预算"></el-step>
           <el-step title="生成预算表" description="生成最终的项目预算表"></el-step>
         </el-steps>
         <!-- 选择项目 -->
@@ -64,11 +64,11 @@
               <table border="1">
                 <tr>
                   <td style="width: 250px">工作内容</td>
-                  <td>等级或比例尺</td>
-                  <td>单位</td>
-                  <td>工作量</td>
+                  <td style="width: 100px">等级或比例尺</td>
+                  <td style="width: 100px">单位</td>
+                  <td style="width: 100px">工作量</td>
                   <td style="width: 100px">要求完成时间</td>
-                  <td>备注</td>
+                  <td style="width: 100px">备注</td>
                 </tr>
                 <tr v-for="(work, index) in workList" :key="index">
                   <td>
@@ -150,7 +150,7 @@
                   <td style="width: 80px">姓名</td>
                   <td style="width: 100px">岗位工资</td>
                   <td style="width: 110px">人员成本(天)</td>
-                  <td style="width: 100px">进出场单价</td>
+                  <!-- <td style="width: 100px">进出场单价</td> -->
                   <td style="width: 100px">预算天数</td>
                   <td style="width: 100px">总额</td>
                 </tr>
@@ -158,13 +158,13 @@
                   <td>{{ user.nickName }}</td>
                   <td>{{ user.salary.salary }}</td>
                   <td>{{ parseFloat(user.salary.salary / 31).toFixed(2) }}</td>
-                  <td>
+                  <!-- <td>
                     <el-input
                       v-model="user.inOutPrice"
                       placeholder="请输入进出场单价"
                       @change="calculateUserTotal(user)"
                     ></el-input>
-                  </td>
+                  </td> -->
                   <td>
                     <el-input
                       v-model="user.days"
@@ -175,7 +175,7 @@
                   <td class="staffCost">{{ user.staffCost }}</td>
                 </tr>
                 <tr>
-                  <td colspan="5">合计</td>
+                  <td colspan="4">合计</td>
                   <td>{{ budgetForm.staffCost }}</td>
                 </tr>
               </table>
@@ -300,7 +300,7 @@
                 </tr>
               </table>
             </el-form-item>
-            <el-form-item label="固定成本小计：">
+            <el-form-item label="间接成本小计：">
               <el-tag type="danger" style="margin-right: 20px; font-size: 14px"
                 >¥ {{ budgetForm.fixCost }}</el-tag
               >
@@ -316,7 +316,7 @@
             <el-breadcrumb-item>{{ projectForm.projectLeaderUser.nickName }}</el-breadcrumb-item>
           </el-breadcrumb>
           <el-breadcrumb separator-class="el-icon-arrow-right" style="margin: 15px 0">
-            <el-breadcrumb-item>固定成本小计</el-breadcrumb-item>
+            <el-breadcrumb-item>间接成本小计</el-breadcrumb-item>
             <el-breadcrumb-item>¥ {{ budgetForm.fixCost }}</el-breadcrumb-item>
           </el-breadcrumb>
           <el-form>
@@ -366,7 +366,7 @@
             <el-breadcrumb-item>{{ projectForm.projectLeaderUser.nickName }}</el-breadcrumb-item>
           </el-breadcrumb>
           <el-breadcrumb separator-class="el-icon-arrow-right" style="margin: 15px 0">
-            <el-breadcrumb-item>固定成本小计</el-breadcrumb-item>
+            <el-breadcrumb-item>间接成本小计</el-breadcrumb-item>
             <el-breadcrumb-item>¥ {{ budgetForm.fixCost }}</el-breadcrumb-item>
           </el-breadcrumb>
           <el-breadcrumb separator-class="el-icon-arrow-right" style="margin: 15px 0">
@@ -481,7 +481,7 @@
         <chooseCar @chooseList="getChooseCar"></chooseCar>
       </el-dialog>
       <!-- 选择设备对话框 -->
-      <el-dialog title="选择设备" :visible.sync="openDevice" width="700px" append-to-body>
+      <el-dialog title="选择设备" :visible.sync="openDevice" width="750px" append-to-body>
         <chooseDevice @chooseList="getChooseDevice"></chooseDevice>
       </el-dialog>
     </div>
@@ -662,9 +662,7 @@ export default {
     },
     // 计算单个人员的成本
     calculateUserTotal(user) {
-      let total =
-        (parseFloat(user.salary.salary / 31).toFixed(2) + Number(user.inOutPrice)) *
-        Number(user.days);
+      let total =parseFloat(user.salary.salary / 31).toFixed(2) * Number(user.days);
       this.$set(user, "staffCost", total.toFixed(2));
       this.getCost("staffCost", "staffCost", this.chooseUser);
       this.getFixCost();

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

@@ -1,11 +1,21 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-03-27 11:10:26
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-09 16:37:57
+-->
 <template>
   <div>
     <el-form :inline="true">
       <el-form-item label="设备名称：">
-        <el-input v-model="queryParams.name" clearable></el-input>
+        <el-select v-model="queryParams.name">
+          <el-option v-for="item in nameList" :key="item.value" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+        <!-- <el-input v-model="queryParams.name" clearable></el-input> -->
       </el-form-item>
       <el-form-item label="品牌：">
-        <el-input v-model="queryParams.brand" clearable></el-input>
+        <el-input v-model="queryParams.brand" clearable @keyup.enter.native="getList"></el-input>
       </el-form-item>
       <el-form-item>
         <el-button @click="getList" type="primary">搜索</el-button>
@@ -30,9 +40,9 @@
         {{ item.name + '-' + item.series + '-' + item.brand }}
       </el-tag>
       <div style="text-align: center;margin-top: 20px;">
-      <el-button type="primary" @click="confirmChoose">确认选择</el-button>
-      <el-button @click="clearChoose">清空选择</el-button>
-    </div>
+        <el-button type="primary" @click="confirmChoose">确认选择</el-button>
+        <el-button @click="clearChoose">清空选择</el-button>
+      </div>
     </div>
   </div>
 </template>
@@ -51,6 +61,7 @@ export default {
       total: 0,
       loading: false,
       chooseList: [],
+      nameList: [],
     }
   },
   created() {

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

@@ -1,111 +1,114 @@
 <template>
   <div>
-    <el-form-item label="项目概况：">
-      <table border="1">
-        <tr>
-          <td style="width: 250px">工作内容</td>
-          <td>等级或比例尺</td>
-          <td>单位</td>
-          <td>工作量</td>
-          <td style="width: 100px">要求完成时间</td>
-          <td>备注</td>
-        </tr>
-        <tr v-for="(work, index) in workList" :key="index">
-          <td>
-            {{ work.content }}
-          </td>
-          <td>
-            {{ work.scale }}
-          </td>
-          <td>
-            {{ work.unit }}
-          </td>
-          <td>
-            {{ work.workload }}
-          </td>
-          <td>
-            {{ work.deadline }}
-          </td>
-          <td>
-            {{ work.remark }}
-          </td>
-        </tr>
-      </table>
-    </el-form-item>
-    <el-form-item label="预结算：">
-      <table border="1">
-        <tr>
-          <td style="width: 100px">工作内容</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 style="min-width:70px;">总额</td>
-        </tr>
-        <tr v-for="(work, index) in workList" :key="index">
-          <td>
-            {{ work.content }}
-          </td>
-          <td>
-            <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>
-            <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.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>
-            <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.price }} / {{ work.unit }}
-          </td>
-          <td>
-            {{ work.workload }}
-          </td>
-          <td>
-            <el-input v-model="work.coefficient" placeholder="请输入系数" @blur="getTotal(work)"></el-input>
-          </td>
-          <td class="workTotal">
-            {{ work.settle }}
-          </td>
-        </tr>
-        <tr>
-          <td colspan="8">合计</td>
-          <td>{{ settle }}</td>
-        </tr>
-      </table>
-      <div style="color:red">tips:预结算表中的系数为：困难系统和调整系数相乘的值（1分制）。例如：困难系数1，调整系数0.8，最终系数为0.8</div>
-    </el-form-item>
-    <el-form-item label="预结算合计：">
-      <el-tag type="danger" style="margin-right:20px;font-size:14px;">¥{{  settle }}</el-tag>
-    </el-form-item>
+    <el-form>
+      <el-form-item label="项目概况：">
+        <table border="1">
+          <tr>
+            <td style="width: 250px">工作内容</td>
+            <td style="width:120px;">等级或比例尺</td>
+            <td style="width:90px;">单位</td>
+            <td style="width:90px;">工作量</td>
+            <td style="width: 100px">要求完成时间</td>
+            <td style="width:90px;">备注</td>
+          </tr>
+          <tr v-for="(work, index) in workList" :key="index">
+            <td>
+              {{ work.content }}
+            </td>
+            <td>
+              {{ work.scale }}
+            </td>
+            <td>
+              {{ work.unit }}
+            </td>
+            <td>
+              {{ work.workload }}
+            </td>
+            <td>
+              {{ work.deadline }}
+            </td>
+            <td>
+              {{ work.remark }}
+            </td>
+          </tr>
+        </table>
+      </el-form-item>
+      <el-form-item label="预结算：">
+        <table border="1">
+          <tr>
+            <td style="width: 100px">工作内容</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 style="min-width:70px;">总额</td>
+          </tr>
+          <tr v-for="(work, index) in workList" :key="index">
+            <td>
+              {{ work.content }}
+            </td>
+            <td>
+              <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>
+              <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.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>
+              <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>
+            </td>
+            <td>
+              {{ work.price }} / {{ work.unit }}
+            </td>
+            <td>
+              {{ work.workload }}
+            </td>
+            <td>
+              <el-input v-model="work.coefficient" placeholder="请输入系数" @blur="getTotal(work)"></el-input>
+            </td>
+            <td class="workTotal">
+              {{ work.settle }}
+            </td>
+          </tr>
+          <tr>
+            <td colspan="8">合计</td>
+            <td>{{ settle }}</td>
+          </tr>
+        </table>
+        <div style="color:red">tips:预结算表中的系数为：困难系统和调整系数相乘的值（1分制）。例如：困难系数1，调整系数0.8，最终系数为0.8</div>
+      </el-form-item>
+      <el-form-item label="预结算合计：">
+        <el-tag type="danger" style="margin-right:20px;font-size:14px;">¥{{ settle }}</el-tag>
+      </el-form-item>
+    </el-form>
+
   </div>
 </template>
 
@@ -147,7 +150,7 @@ export default {
       this.getWorkTypeList(work);
     }
   },
-  mounted(){
+  mounted() {
     this.getSettleSum();
   },
   methods: {
@@ -186,7 +189,7 @@ export default {
             this.setValue(work, 'scaleGrade', '无');
           }
           if (work.groundType == undefined) {
-            this.setValue(work, 'groundType', '一般地类');
+            this.setValue(work, 'groundType', '0');
           }
           this.getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType);
         }
@@ -197,7 +200,7 @@ export default {
       if (work.scale) {
         this.setValue(work, 'scaleGrade', work.scale);
         if (work.groundType == undefined) {
-          this.setValue(work, 'groundType', '一般地类');
+          this.setValue(work, 'groundType', '0');
         }
         this.getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType);
       } else {
@@ -212,7 +215,7 @@ export default {
               this.setValue(work, 'scaleGrade', '无');
             }
             if (work.groundType == undefined) {
-              this.setValue(work, 'groundType', '一般地类');
+              this.setValue(work, 'groundType', '0');
             }
             this.getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType);
           }
@@ -222,7 +225,7 @@ export default {
     },
     /* 获取单价 */
     getUnitPrice(work, workItem, subItem, scaleGrade, groundType) {
-      getUnitPrice({ workItem, subItem, scaleGrade, priceType: groundType }).then(res => {
+      getUnitPrice({ workItem, subItem, scaleGrade, groundType: groundType }).then(res => {
         if (res.length != 0) {
           work.priceId = res.data.id;
           this.setValue(work, 'price', res.data.price)
@@ -245,7 +248,7 @@ export default {
     },
     getSettleSum() {
       let sum = 0;
-      for(let work of this.workList){
+      for (let work of this.workList) {
         sum = sum + Number(work.settle)
       }
       this.settle = sum.toFixed(2);

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

@@ -11,7 +11,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList">搜索</el-button>
+        <el-button @click="getList" type="primary">搜索</el-button>
       </el-form-item>
     </el-form>
     <el-table ref="chooseUser" :data="userList" @selection-change="handleSelectionChange" :row-key="getRowKeys">

oa-ui/src/views/oa/car/expense.vue

@@ -263,7 +263,6 @@ export default {
       });
     },
     handleDelete(row) {
-      debugger
       const carExpenseIds = row.carExpenseId || this.ids;
       this.$modal.confirm('是否确认删除车辆费用编号为"' + carExpenseIds + '"的数据项？').then(function () {
         return delCarExpense(carExpenseIds);

oa-ui/src/views/oa/device/approval.vue

@@ -325,7 +325,6 @@ export default {
       });
     },
     handleDelete(row) {
-      debugger
       const deviceApprovalIds = row.deviceApprovalId || this.ids;
       this.$modal.confirm('是否确认删除设备使用费用编号为"' + deviceApprovalIds + '"的数据项？').then(function () {
         return delDeviceApproval(deviceApprovalIds);

oa-ui/src/views/oa/project/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: wrh
- * @LastEditTime: 2024-03-28 10:50:22
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-09 17:39:50
 -->
 <template>
   <div class="project-wrapper">
@@ -294,7 +294,6 @@ export default {
       this.addOpen = true
     },
     handleUpdate(row) {
-      debugger
       this.addForm = row;
       this.title = '修改项目信息';
       this.addOpen = true;