修改项目生产、用车审批

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-25 15:05:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-22 18:48:24
+ * @LastEditTime: 2024-05-23 17:40:09
 -->
 <template>
   <div>
@@ -162,7 +162,7 @@
             <!-- 选择车辆 -->
             <el-form-item label="选择车辆：">
               <span v-if="chooseCar.length != 0">
-                <el-tag effect="plain" type="" v-for="item in chooseCar" style="margin: 5px; font-size: 14px"
+                <el-tag effect="plain" v-for="item in chooseCar" style="margin: 5px; font-size: 14px"
                   :key="item.licensePlate">
                   {{ item.licensePlate + item.brand }}
                 </el-tag>
@@ -372,7 +372,7 @@
         </div>
         <el-divider></el-divider>
         <div class="btn">
-          <el-button @click="activeStep -= 1" :disabled="activeStep == 0">上一步</el-button>
+          <el-button @click="activeStep -= 1" :disabled="activeStep == 0 || activeStep == 4">上一步</el-button>
           <el-button @click="confirmStep" type="primary" v-if="activeStep < 4">下一步</el-button>
           <el-button @click="submitComplete" type="primary" v-if="activeStep == 4">完成</el-button>
         </div>
@@ -701,7 +701,9 @@ export default {
       }
       for (let work of form.contentList) {
         work.budgetId = form.budgetId;
-        addBudgetSettle(work)
+        addBudgetSettle(work).then(res=>{
+          this.$message.success('预算添加成功')
+        })
       }
     },
     calculateThatCost() {

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

@@ -2,16 +2,17 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-22 19:10:22
+ * @LastEditTime: 2024-05-23 11:21:44
 -->
 <template>
   <div class="main">
     <h2 style="text-align: center">项目直接生产成本预算表</h2>
+    <p style="text-align: right;padding-right:80px;">编制人：{{ budgetForm.compilerUser? budgetForm.compilerUser.nickName: '' }}</p>
     <table border="1" class="table">
       <tr>
         <td style="width: 100px;">项目名称</td>
         <td colspan="6">{{ budgetForm.project ? budgetForm.project.projectName : '' }}</td>
-        <td>项目编号</td>
+        <td style="min-width: 100px;">项目编号</td>
         <td colspan="1">{{ budgetForm.project ? budgetForm.project.projectNumber : '' }}</td>
       </tr>
       <tr>
@@ -23,11 +24,11 @@
         <td>单位</td>
         <td>系数</td>
         <td>金额</td>
-        <td style="width: 250px;">备注</td>
+        <td style="min-width: 150px;">备注</td>
       </tr>
       <tr v-for="work in workList">
         <td>{{ work.content }}</td>
-        <td>{{ work.cmcPrice ? work.cmcPrice.workItem:''}}</td>
+        <td>{{ work.cmcPrice ? work.cmcPrice.workItem : '' }}</td>
         <td>{{ work.workload }}</td>
         <td>{{ work.price }}</td>
         <td>{{ work.unit }}</td>
@@ -132,11 +133,11 @@
         <td colspan="3" class="head">成本合计</td>
         <td colspan="5" class="head">{{ budgetForm.totalBudget }}</td>
       </tr>
-      <tr v-if="budgetForm.contract">
+      <tr v-if="contract.contractId">
         <td colspan="3" class="head">利润</td>
         <td colspan="2" class="head">{{ profit }}</td>
         <td colspan="3" class="head">合同总价约</td>
-        <td colspan="1" class="head">{{ budgetForm.contract ? budgetForm.contract.amount : '' }}</td>
+        <td colspan="1" class="head">{{ contract.contractId ? contract.amount : '' }}</td>
       </tr>
     </table>
   </div>
@@ -150,6 +151,8 @@ import { listBudgetSettle } from "@/api/oa/budget/budgetSettle";
 import { listBudgetStaff } from "@/api/oa/budget/budgetStaff";
 import { listProjectWork } from "@/api/oa/project/projectWork";
 import { mapGetters } from 'vuex';
+import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
+import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 export default {
   computed: {
     ...mapGetters(["name", "userId"]),
@@ -170,20 +173,17 @@ export default {
       carLen: 1,
       deviceLen: 1,
       workLen: 1,
-      totalBudget: 0,
       chooseCar: [],
       chooseDevice: [],
       chooseUser: [],
       workList: [],
-      workContentList: []
+      workContentList: [],
+      contract: {},
+      profit: 0
     };
   },
   created() {
     this.initBudgetForm();
-    this.totalBudget = (
-      (Number(this.budgetForm.directExpense) + Number(this.budgetForm.fixCost)) *
-      1.2
-    ).toFixed(2);
   },
   methods: {
     initBudgetForm() {
@@ -204,7 +204,6 @@ export default {
           this.budgetForm.inOutPriceSum = Number(days) * Number(this.chooseUser[0].inOutPrice)
         })
         listBudgetCar({ budgetId: this.budgetForm.budgetId }).then(res => {
-          console.log(res.rows);
           this.chooseCar = res.rows;
           this.carLen = res.rows.length + 1;
         })
@@ -225,10 +224,19 @@ export default {
           }
           this.getProjectWorkList();
         })
+        listProjectContract({ projectId: this.taskForm.formId }).then(res => {
+          console.log(res);
+          if (res.total == 1) {
+            getContract(res.rows[0].contractId).then(response => {
+              this.contract = response.data;
+              this.profit = Number(this.contract.amount) - Number(this.budgetForm.totalBudget)
+            })
+          }
+        })
       });
     },
     getProjectWorkList() {
-      listProjectWork({ projectId: this.$route.query.formId }).then(res => {
+      listProjectWork({ projectId: this.taskForm.formId }).then(res => {
         this.workContentList = res.rows;
       })
     },

oa-ui/src/views/flowable/form/budget/components/chooseCar.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-27 11:10:16
- * @LastEditors: wrh
- * @LastEditTime: 2024-05-22 17:55:15
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-23 15:37:34
 -->
 <template>
   <div>
@@ -20,7 +20,7 @@
     <el-table ref="chooseCar" :data="list" @selection-change="handleSelectionChange" :row-key="getRowKeys">
       <el-table-column type="selection" width="50" align="center" :reserve-selection="true" />
       <el-table-column label="车牌号" align="center" prop="licensePlate" />
-      <el-table-column label="驾驶员" align="center" prop="driver" />
+      <el-table-column label="驾驶员" align="center" prop="driverUser.nickName" />
       <el-table-column label="品牌" align="center" prop="brand" />
       <el-table-column label="单日成本" align="center" prop="dayCost" />
     </el-table>

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

@@ -6,7 +6,7 @@
       </el-form-item>
       <el-form-item label="部门：">
         <el-select v-model="queryParams.deptId" clearable @change="getList">
-          <el-option v-for="item in deptList" :key="item.id" :label="item.label" :value="item.id">
+          <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
           </el-option>
         </el-select>
       </el-form-item>
@@ -53,8 +53,14 @@
 
 <script>
 import { listUser, deptTreeSelect } from "@/api/system/user";
+import { listDept } from "@/api/system/dept";
 export default {
   dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_user_titles', 'sys_user_certificates', 'sys_user_pmlevel', 'sys_user_postlevel', 'sys_user_salarylevel'],
+  props: {
+    deptId: {
+      type: Number
+    }
+  },
   data() {
     return {
       queryParams: {
@@ -70,6 +76,7 @@ export default {
     }
   },
   created() {
+    this.queryParams.deptId = this.deptId
     this.getList();
     this.getDeptTree();
   },
@@ -84,10 +91,13 @@ export default {
     },
     /** 查询部门 */
     getDeptTree() {
-      deptTreeSelect().then(response => {
-        this.deptOptions = response.data;
-        this.deptList = response.data[0].children
-      });
+      // deptTreeSelect().then(response => {
+      //   this.deptOptions = response.data;
+      //   this.deptList = response.data[0].children
+      // });
+      listDept().then(res => {
+        this.deptList = res.data.filter(item => item.deptName != '四川中水成勘院测绘工程有限责任公司')
+      })
     },
     // 格式化表格里的薪资岗级
     formatLevel(postLevel, salaryLevel, postLevelList, salaryLevelList) {

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
- * @LastEditors: wrh
- * @LastEditTime: 2024-05-22 18:54:31
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-23 19:22:26
 -->
 
 <template>
@@ -46,25 +46,27 @@
                 </el-radio-group>
               </el-form-item>
               <el-form-item label="项目编号：" prop="projectId" v-if="form.carUsage == '0'">
-                <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
+                <el-button type="primary" size="mini" @click="openProject = true"
+                  v-if="taskName == '用车申请'">选择项目</el-button>
+                <!-- <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
                   :disabled="taskName != '用车申请'" clearable>
                   <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber"
                     :value="item.projectId">
                   </el-option>
-                </el-select>
+                </el-select> -->
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
                   <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
-                    chooseProject.projectLeaderUser.nickName : ''
-                  }}</el-descriptions-item>
+    chooseProject.projectLeaderUser.nickName : ''
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
                     <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
                   </el-descriptions-item>
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
               <el-form-item label="用车事由：" prop="applyReason">
@@ -75,7 +77,8 @@
               <el-row>
                 <el-col :span="7" :xs="24">
                   <el-form-item label="乘车人数：" prop="passengers">
-                    <el-input-number v-model="form.passengers" :min="1" :disabled="taskName != '用车申请'"></el-input-number>
+                    <el-input-number v-model="form.passengers" :min="1"
+                      :disabled="taskName != '用车申请'"></el-input-number>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6" :xs="24">
@@ -195,19 +198,15 @@
                 <el-checkbox-group v-model="form.cars" :disabled="taskName != '安排用车'">
                   <el-checkbox :label="item.carId" v-for="item in carList" :key="item.carId" :value="item.carId"
                     v-if="item.remark == null">
-                    {{ item.licensePlate }}
+                    {{ item.licensePlate + item.brand }}
                   </el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
               <el-form-item label="驾驶员：">
-                <!-- <el-checkbox-group v-model="form.drivers" :disabled="taskName != '安排用车'"
-                  v-if="chooseOtherDrivers == false">
-                  <el-checkbox :label="item.userId" v-for="item in driverList" :key="item.userId" :value="item.userId">
-                    {{ item.nickName }}
-                  </el-checkbox>
-                </el-checkbox-group> -->
-                <el-select v-model="form.drivers" filterable multiple clearable style="width:220px"
-                  :disabled="taskName != '安排用车'">
+                <el-tag :key="'d' + index" class="mr10" v-for="item, index in chooseDriver">{{ item.nickName }}</el-tag>
+                <el-button v-if="taskName == '安排用车'" icon="el-icon-plus" @click="openCar = true"></el-button>
+                <el-select v-if="taskName != '安排用车'" v-model="form.drivers" filterable multiple clearable
+                  style="width:420px" :disabled="taskName != '安排用车'">
                   <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
                     v-if="item.nickName != 'admin'">
                   </el-option>
@@ -219,7 +218,7 @@
             </el-row>
             <el-row style="text-align: center;" v-else>
               <el-button type="primary" :disabled="taskName == ''" @click="completeApply">{{ taskName == '申请确认' ? "确认" :
-                "完成审批" }}</el-button>
+    "完成审批" }}</el-button>
             </el-row>
           </div>
         </el-card>
@@ -234,7 +233,12 @@
         </el-card>
       </el-col>
     </el-row>
-
+    <el-dialog title="选择驾驶员" :visible.sync="openCar" width="700px" append-to-body>
+      <choose-user :deptId="200" @chooseUser="getChooseDriver"></choose-user>
+    </el-dialog>
+    <el-dialog title="选择项目" :visible.sync="openProject" width="70%" append-to-body>
+      <project-choose @chooseProject="confirmProject"></project-choose>
+    </el-dialog>
   </div>
 </template>
 
@@ -250,9 +254,13 @@ import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { listUser } from '@/api/system/user';
 import { getUserByRole } from "@/api/system/role";
+import chooseUser from "@/views/flowable/form/budget/components/choosePeople.vue";
+import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
 export default {
   components: {
-    flow
+    flow,
+    chooseUser,
+    projectChoose
   },
   props: {
     taskName: {
@@ -348,7 +356,10 @@ export default {
       flowData: {},
       dept: 0,
       dgtAdvice: '审核意见',//党工团审核意见的label
-      userList: []
+      userList: [],
+      chooseDriver: [],
+      openCar: false,
+      openProject: false,
     }
   },
   mounted() {
@@ -372,10 +383,13 @@ export default {
           let data = res.data;
           // 初始化党工团审核意见的label
           if (data.carUsage == '2') {
+            this.dept = 0;
             this.dgtAdvice = '工会审核意见'
           } else if (data.carUsage == '3') {
+            this.dept = 0;
             this.dgtAdvice = '党委审核意见'
-          } else {
+          } else if (data.carUsage == '4') {
+            this.dept = 0;
             this.dgtAdvice = '团委审核意见'
           }
           if (res.data.drivers == null || res.data.drivers == undefined || res.data.drivers == "") {
@@ -399,6 +413,7 @@ export default {
             data.cars = arr;
           }
           this.form = data;
+          console.log(this.form);
           if (data.projectId) {
             getProject(data.projectId).then(response => {
               this.chooseProject = response.data;
@@ -413,6 +428,7 @@ export default {
       this.$refs['carForm'].validate((valid) => {
         if (valid) {
           this.form.carApplyId = this.taskForm.formId;
+          this.form.drivers = this.chooseDriver;
           let formData = new FormData();
           let jsonForm = JSON.stringify(this.form);
           formData.append("form", jsonForm);
@@ -424,7 +440,7 @@ export default {
             this.form.drivers = '';
             addCarApproval(this.form);
           }
-          // 获取下一个流程节点
+          // // 获取下一个流程节点
           getNextFlowNode(params).then(res => {
             const data = res.data;
             this.taskForm.formData = formData;
@@ -451,33 +467,38 @@ export default {
     // 获取下一个审批人
     getNextFlowNodeApproval() {
       if (this.taskName == '用车申请') {
-        getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
-          this.$set(this.taskForm.variables, "dept", this.dept);
-          if (res.data && this.dept != 0) {
-            this.$set(this.taskForm.variables, "approval", res.data.userId);
+        this.$set(this.taskForm.variables, "dept", this.dept);
+        if (this.dept == 102) {
+          getUserByPost({ postName: '总经理' }).then(result => {
+            this.$set(this.taskForm.variables, "approval", result.data[0].userId);
             complete(this.taskForm).then(response => {
               this.$modal.msgSuccess(response.msg);
               this.$emit('goBack')
             })
-          } else if (this.dept == 102) {
-            getUserByPost({ postName: '总经理' }).then(result => {
-              this.$set(this.taskForm.variables, "approval", result.data[0].userId);
-              complete(this.taskForm).then(response => {
-                this.$modal.msgSuccess(response.msg);
-                this.$emit('goBack')
-              })
+          })
+        }
+        else if (this.dept == 0) {
+          let postName = this.getChooseType()
+          getUserByPost({ postName: postName }).then(result => {
+            this.$set(this.taskForm.variables, "approval", result.data[0].userId);
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit('goBack')
             })
-          } else {
-            let postName = this.getChooseType()
-            getUserByPost({ postName: postName }).then(result => {
-              this.$set(this.taskForm.variables, "approval", result.data[0].userId);
+          })
+        }
+        else {
+          getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+            debugger
+            if (res.data) {
+              this.$set(this.taskForm.variables, "approval", res.data.userId);
               complete(this.taskForm).then(response => {
                 this.$modal.msgSuccess(response.msg);
                 this.$emit('goBack')
               })
-            })
-          }
-        })
+            }
+          })
+        }
       } else if (this.taskName == '部门审核') {
         getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
           let userId = res.data.userId;
@@ -556,6 +577,29 @@ export default {
         this.userList = res.rows
       })
     },
+
+    getChooseDriver(val) {
+      this.chooseDriver = val;
+      if (val.length != 0) {
+        let drivers = []
+        for (let d of this.chooseDriver) {
+          drivers.push(d.userId)
+        }
+        this.form.drivers = drivers;
+      }
+      this.openCar = false;
+    },
+    confirmProject(val) {
+      if (val.length > 1) {
+        this.$message.error('请选择一个项目');
+        return
+      } else if (val.length == 1) {
+        this.chooseProject = val[0]
+        this.isSelect = true
+        this.form.projectId = val[0].projectId
+      }
+      this.openProject = false
+    },
     calculateDay() {
       if (this.form.beginDate && this.form.endDate) {
         let y1 = new Date(this.form.beginDate);
@@ -591,21 +635,29 @@ export default {
     showFormItem(name) {
       let isShow = false;
       if (name == '部门审核')
-        isShow = (this.dept > 102 && this.taskName == '用车申请') || (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.deptUserId != null);
+        isShow = (this.dept > 102 && this.taskName == '用车申请') || (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.deptUserId != null)
+          || (this.dept > 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
       else if (name == '分管审核')
-        isShow = (this.dept > 102 && this.taskName == '用车申请') || (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.managerUserId != null);
+        isShow = (this.dept > 102 && this.taskName == '用车申请') || (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.managerUserId != null)
+          || (this.dept > 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
       else if (name == '党工团审核')
-        isShow = (this.dept == 0 && this.taskName == '用车申请') || this.taskName == '党工团审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.unionUserId != null);
+        isShow = (this.dept == 0 && this.taskName == '用车申请') || this.taskName == '党工团审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.unionUserId != null)
+          || (this.dept == 0 && this.taskName == '' && (this.form.carUsage == 2 || this.form.carUsage == 3 || this.form.carUsage == 4));
       else if (name == '总经理审核')
-        isShow = (this.dept == 102 && this.taskName == '用车申请') || this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null);
+        isShow = (this.dept == 102 && this.taskName == '用车申请') || this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null)
+          || (this.dept == 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
       else if (name == '部门审核签名')
-        isShow = (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.deptUserId != null);
+        isShow = (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.deptUserId != null)
+          || (this.dept > 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
       else if (name == '分管审核签名')
-        isShow = this.taskName == '分管审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.managerUserId != null);
+        isShow = this.taskName == '分管审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.managerUserId != null)
+          || (this.dept > 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
       else if (name == '党工团审核签名')
-        isShow = this.taskName == '党工团审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.unionUserId != null);
+        isShow = this.taskName == '党工团审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.unionUserId != null)
+          || (this.dept == 0 && this.taskName == '' && (this.form.carUsage == 2 || this.form.carUsage == 3 || this.form.carUsage == 4));
       else if (name == '总经理审核签名')
-        isShow = this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null);
+        isShow = this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null)
+          || (this.dept == 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
       return isShow;
     },
   },

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

@@ -2,15 +2,8 @@
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-22 13:51:57
+ * @LastEditTime: 2024-05-23 10:23:07
 -->
-<!--
- * @Author: ysh
- * @Date: 2024-02-27 14:49:15
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-22 11:00:26
--->
-
 <template>
   <div class="project-wrapper">
     <!-- 项目登记 -->
@@ -175,7 +168,7 @@ export default {
   },
   data() {
     return {
-      openContract:false,
+      openContract: false,
       registerTime: undefined,
       // 查询参数
       queryParams: {
@@ -195,7 +188,7 @@ export default {
         projectRegistrant: "",
         projectSource: "0"
       },
-      chooseContractInfo:{},
+      chooseContractInfo: {},
       contractCode: "",
       contractNumber: "",
       rules: {
@@ -249,7 +242,7 @@ export default {
         this.loading = false;
       });
     },
-    
+
     getProjectInfo() {
       getProject(this.taskForm.formId).then(res => {
         this.addForm = res.data;
@@ -282,7 +275,7 @@ export default {
         }
       })
     },
-    setContract(val){
+    setContract(val) {
       this.chooseContractInfo = val;
       this.openContract = false;
     },
@@ -296,10 +289,13 @@ export default {
         this.$modal.msgSuccess("新增成功");
         this.getList();
       });
-      let pcobj = {projectId:this.taskForm.formId,contractId:this.chooseContractInfo.contractId}
-      addProjectContract(pcobj).then(response =>{
-        this.$modal.msgSuccess("合同关联成功");
-      })
+      let contractId = this.chooseContractInfo.contractId ? this.chooseContractInfo.contractId : ''
+      let pcobj = { projectId: this.taskForm.formId, contractId }
+      if (contractId != '') {
+        addProjectContract(pcobj).then(response => {
+          this.$modal.msgSuccess("合同关联成功");
+        })
+      }
       const params = { taskId: this.taskForm.taskId };
       // 获取下一个流程节点
       getNextFlowNode(params).then(res => {

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

@@ -2,11 +2,10 @@
  * @Author: ysh
  * @Date: 2024-04-15 09:35:41
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-20 17:58:13
+ * @LastEditTime: 2024-05-23 17:41:35
 -->
 <template>
   <div>
-    <!-- <el-skeleton animated :rows="20" v-if="loading" class="app-container" /> -->
     <div class="app-container">
       <h2 style="text-align: center">项目运作情况</h2>
       <div class="headers">
@@ -14,30 +13,18 @@
         <div class="line"></div>
       </div>
       <el-form ref="progress" :model="form" :disabled="disabled" label-width="100px">
-        <el-row :gutter="20" v-if="!noBudget">
-          <el-col :span="11">
-            <el-form-item label="使用车辆（车牌号）：" label-width="153px">
-              {{ form.licensePlate }}
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item label="驾驶员：">
-              <el-select v-model="form.driver" filterable multiple clearable style="width:220px">
-                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
-                  v-if="item.nickName != 'admin'">
-                </el-option>
-              </el-select>
-            </el-form-item>
-
-          </el-col>
-        </el-row>
-        <el-form-item label="参与人员：" v-if="!noBudget">
-          {{ form.staff }}
+        <el-form-item label="参与人员：">
+          <el-tag class="mr10" :key="item" v-for="item in participates">{{ item.nickName }}</el-tag>
+          <el-button class="ml10" @click="openPeople = true" type="primary" size="mini" icon="el-icon-plus"></el-button>
+        </el-form-item>
+        <el-form-item label="驾驶员：">
+          <el-tag class="mr10" :key="item" v-for="item in chooseDriver">{{ item.nickName }}</el-tag>
+          <el-button class="ml10" @click="openDriver = true" type="primary" size="mini" icon="el-icon-plus"></el-button>
+        </el-form-item>
+        <el-form-item label="使用车辆：">
+          <el-tag class="mr10" :key="item.licensePlate" v-for="item in chooseCar">{{ item.licensePlate + item.brand }}</el-tag>
+          <el-button class="ml10" @click="openCar = true" type="primary" size="mini" icon="el-icon-plus"></el-button>
         </el-form-item>
-        <div v-if="noBudget" class="mb20">
-          <el-alert title="项目未做预算表，请先编制预算表" type="warning" :closable="false">
-          </el-alert>
-        </div>
         <el-row :gutter="20">
           <el-col :span="11">
             <el-form-item label="进场时间：">
@@ -56,7 +43,7 @@
           <table border="1">
             <tr>
               <td style="width: 80px">序号</td>
-              <td>截止日期</td>
+              <td>截至日期</td>
               <td>累计总进度（%）</td>
               <td style="width: 300px">情况说明</td>
             </tr>
@@ -104,6 +91,18 @@
         <el-button type="primary" @click="submitNextFlow()" :disabled="disabled">项目结束</el-button>
       </div>
     </div>
+    <!-- 选择人员对话框 -->
+    <el-dialog title="选择人员" :visible.sync="openPeople" width="700px" append-to-body>
+      <choosePeople @chooseUser="getChooseUser"></choosePeople>
+    </el-dialog>
+    <!-- 选择车辆对话框 -->
+    <el-dialog title="选择车辆" :visible.sync="openCar" width="700px" append-to-body>
+      <choose-car @chooseList="getChooseCar"></choose-car>
+    </el-dialog>
+    <!-- 选择司机对话框 -->
+    <el-dialog title="选择驾驶员" :visible.sync="openDriver" width="700px" append-to-body>
+      <choosePeople @chooseUser="getChooseDriver"></choosePeople>
+    </el-dialog>
   </div>
 </template>
 
@@ -140,10 +139,15 @@ import { getCar } from "@/api/oa/car/car";
 import { listUser } from '@/api/system/user';
 import borrowData from '../inProgress/borrowData.vue';
 import SettleData from '../inProgress/settleData.vue';
+import ChoosePeople from '../budget/components/choosePeople.vue';
+import ChooseCar from '../budget/components/chooseCar.vue';
+import ChooseDevice from "../budget/components/chooseDevice.vue";
 export default {
   components: {
     borrowData,
-    SettleData
+    SettleData,
+    ChoosePeople,
+    ChooseCar
   },
   computed: {
     ...mapGetters(["name", "userId"]),
@@ -165,6 +169,9 @@ export default {
   data() {
     return {
       loading: true,
+      openPeople: false,
+      openDriver: false,
+      openCar: false,
       form: {
         licensePlate: "",
         driver: [],
@@ -183,21 +190,23 @@ export default {
         },
       ],
       oldProgressList: [],
-      noBudget: true,
       budgetId: "",
-      userList: []
+      userList: [],
+      participates: [],
+      chooseCar: [],
+      chooseDriver: []
     };
   },
   watch: {
     taskName(newval, oldval) {
       if (newval == "项目生产") {
-        this.doesItExistBudget(this.taskForm.formId);
+        // this.doesItExistBudget(this.taskForm.formId);
       }
     },
   },
   created() {
     if (this.taskName == "项目生产") {
-      this.doesItExistBudget(this.taskForm.formId);
+      // this.doesItExistBudget(this.taskForm.formId);
       this.initProgress();
       this.getUserList();
     }
@@ -217,6 +226,18 @@ export default {
         }
       });
     },
+    getChooseUser(val) {
+      this.participates = val;
+      this.openPeople = false;
+    },
+    getChooseCar(val) {
+      this.chooseCar = val;
+      this.openCar = false;
+    },
+    getChooseDriver(val) {
+      this.chooseDriver = val;
+      this.openDriver = false;
+    },
     // 查询是否有预算表
     doesItExistBudget(projectId) {
       listBudget({ projectId }).then(res => {

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-19 15:32:00
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-19 17:33:30
+ * @LastEditTime: 2024-05-23 14:35:16
 -->
 <template>
   <div class="app-container">
@@ -53,7 +53,9 @@
           </el-col>
         </el-row>
         <el-form-item label="技术方案" prop="technicalDocument">
-          <el-input v-model="form.technicalDocument" placeholder="请输入技术方案" />
+          <el-link :href="`${baseUrl}${'/profile/upload' + form.technicalDocument}`" :underline="false" target="_blank">
+            <span class="el-icon-document" style="color:#00f"> {{ getFileName(form.technicalDocument) }} </span>
+          </el-link>
         </el-form-item>
         <el-form-item label="方案说明" prop="designDescription">
           <el-input type="textarea" v-model="form.designDescription" placeholder="请输入方案说明" />
@@ -70,6 +72,11 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-form-item label="修改技术方案" prop="modifyDocument">
+          <el-link :href="`${baseUrl}${'/profile/upload' + form.modifyDocument}`" :underline="false" target="_blank">
+            <span class="el-icon-document" style="color:#00f"> {{ getFileName(form.modifyDocument) }} </span>
+          </el-link>
+        </el-form-item>
         <el-form-item label="技术部审核意见" prop="technicalComment">
           <el-input type="textarea" v-model="form.technicalComment" placeholder="请输入技术审核意见" />
         </el-form-item>
@@ -85,6 +92,11 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-form-item label="最终技术方案" prop="finalDocument">
+          <el-link :href="`${baseUrl}${'/profile/upload' + form.finalDocument}`" :underline="false" target="_blank">
+            <span class="el-icon-document" style="color:#00f"> {{ getFileName(form.finalDocument) }} </span>
+          </el-link>
+        </el-form-item>
         <el-form-item label="总工程师审核意见" prop="manageComment">
           <el-input type="textarea" v-model="form.manageComment" placeholder="请输入总工审核意见" />
         </el-form-item>
@@ -96,7 +108,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="日期：" label-width="120px">
-              <span> {{ form.manageApprovalTime  }} </span>
+              <span> {{ form.manageApprovalTime }} </span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -131,16 +143,17 @@ export default {
       return this.$store.state.projectProcess.projectName;
     },
   },
-  watch:{
-    projectNumber(newval){
+  watch: {
+    projectNumber(newval) {
       this.$set(this.form, "projectNumber", newval);
     },
-    projectName(newval){
+    projectName(newval) {
       this.$set(this.form, "projectName", newval);
     }
   },
   data() {
     return {
+      baseUrl:process.env.VUE_APP_BASE_API,
       haveTechnical: false,
       form: {},
       rules: {},
@@ -160,6 +173,18 @@ export default {
           this.form = res.data;
           this.$set(this.form, "projectNumber", this.projectNumber);
           this.$set(this.form, "projectName", this.projectName);
+          let data = res.data;
+          if (res.data.qualityInspector == null || res.data.qualityInspector == undefined || res.data.qualityInspector == "") {
+            data.qualityInspector = []
+          } else {
+            let arr = []
+            data.qualityInspector = data.qualityInspector.split(',');
+            for (let inspector of data.qualityInspector) {
+              arr.push(parseInt(inspector))
+            }
+            data.qualityInspector = arr
+          }
+          this.$set(this.form, "qualityInspector", data.qualityInspector);
         }
       });
     },
@@ -169,6 +194,12 @@ export default {
         this.userList = res.rows;
       });
     },
+    getFileName(name) {
+      if (name) {
+        let arr = name.split('/')
+        return arr[arr.length - 1];
+      }
+    },
   },
 };
 </script>

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

@@ -7,17 +7,17 @@
             <el-input v-model="chooseProject.projectNumber" placeholder="请输入项目编号" disabled style="width: 300px" />
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
-                chooseProject.projectLeaderUser.nickName : ''
-              }}</el-descriptions-item>
+      chooseProject.projectLeaderUser.nickName : ''
+                }}</el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">
                 <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
               </el-descriptions-item>
               <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
           <el-row>
@@ -53,7 +53,8 @@
             </el-col>
           </el-row>
           <el-form-item label="技术安排意见" prop="planComment">
-            <el-input type="textarea" v-model="form.planComment" placeholder="请输入技术安排意见" :disabled="taskName != '技术安排'" />
+            <el-input type="textarea" v-model="form.planComment" placeholder="请输入技术安排意见"
+              :disabled="taskName != '技术安排'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -69,7 +70,12 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="技术方案" prop="technicalDocument">
-            <el-input v-model="form.technicalDocument" placeholder="请输入技术方案" :disabled="taskName != '方案上传'" />
+            <FileUpload v-if="taskName == '方案上传'" ref="bsFile" :limit="1" :filePathName="'技术方案/初始'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getTechnicalDoc"></FileUpload>
+            <el-link v-if="taskName != '方案上传'" :href="`${baseUrl}${'/profile/upload' + form.technicalDocument}`"
+              :underline="false" target="_blank">
+              <span class="el-icon-document"> {{ getFileName(form.technicalDocument) }} </span>
+            </el-link>
           </el-form-item>
           <el-form-item label="方案说明" prop="designDescription">
             <el-input type="textarea" v-model="form.designDescription" placeholder="请输入方案说明"
@@ -89,7 +95,12 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="修改技术方案" prop="modifyDocument">
-            <el-input v-model="form.modifyDocument" placeholder="请输入修改技术方案" :disabled="taskName != '技术审核'" />
+            <FileUpload v-if="taskName == '技术审核'" ref="jssh" :limit="1" :filePathName="'技术方案/修改'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getModifyDoc"></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="technicalComment">
             <el-input type="textarea" v-model="form.technicalComment" placeholder="请输入技术审核意见"
@@ -108,7 +119,12 @@
             </el-col>
           </el-row>
           <el-form-item label="最终技术方案" prop="finalDocument">
-            <el-input v-model="form.finalDocument" placeholder="请输入最终技术方案" :disabled="taskName != '总工审核'" />
+            <FileUpload v-if="taskName == '总工审核'" ref="final" :limit="1" :filePathName="'技术方案/最终'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getFinalDoc"></FileUpload>
+            <el-link v-if="taskName != '总工审核'" :href="`${baseUrl}${'/profile/upload' + form.finalDocument}`"
+              :underline="false" target="_blank">
+              <span class="el-icon-document"> {{ getFileName(form.finalDocument) }} </span>
+            </el-link>
           </el-form-item>
           <el-form-item label="总工程师审核意见" prop="manageComment">
             <el-input type="textarea" v-model="form.manageComment" placeholder="请输入总工审核意见"
@@ -117,7 +133,7 @@
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
               <el-form-item label="签名" prop="manager" v-if="showFormItem('总工审核')">
-                <span class="auditor"> {{ managerUser }} </span>
+                <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -170,6 +186,7 @@ export default {
   },
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       planUser: '',
       managerUser: '',
       designUser: '',
@@ -303,6 +320,30 @@ export default {
         this.loading = false;
       });
     },
+    getTechnicalDoc(val) {
+      this.getDoc(val, 'technicalDocument')
+    },
+    getModifyDoc(val) {
+      this.getDoc(val, 'modifyDocument')
+    },
+    getFinalDoc(val) {
+      this.getDoc(val, 'finalDocument')
+    },
+    getDoc(val, name) {
+      if (val) {
+        let arr = val.split('/upload')
+        this.form[name] = arr[1]
+        if (val == "") {
+          this.form[name] = ""
+        }
+      }
+    },
+    getFileName(name) {
+      if (name) {
+        let arr = name.split('/')
+        return arr[arr.length - 1];
+      }
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -407,7 +448,7 @@ export default {
               }
             })
           } else {
-            this.form.qualityInspector = '';
+            this.form.qualityInspector = this.form.qualityInspector.join(',');
             this.form.technicalId = this.taskForm.formId;
             this.form.projectId = this.taskForm.formId;
             addTechnical(this.form).then(response => {
@@ -465,6 +506,7 @@ export default {
   font-family: '华文行楷';
   font-size: 20px;
 }
+
 ::v-deep .el-input.is-disabled .el-input__inner {
   color: #686a6e;
 }