新增技术交底、技术方案打印；

新增项目负责人可以查看项目预算；
修改项目预算生成预算表时的表格样式；
修改项目变更表单。

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcPriceController.java

     {
         CmcPriceRemark cmcPriceRemark = new CmcPriceRemark();
         cmcPriceRemark.setWorkType(workType);
-        CmcPriceRemark priceRemark = cmcPriceRemarkService.selectCmcPriceRemarkList(cmcPriceRemark).get(0);
+        CmcPriceRemark priceRemark = new CmcPriceRemark();
+        if(cmcPriceRemarkService.selectCmcPriceRemarkList(cmcPriceRemark).size()>0)
+            priceRemark= cmcPriceRemarkService.selectCmcPriceRemarkList(cmcPriceRemark).get(0);
         return success(priceRemark.getRemark());
     }
 

oa-ui/src/utils/deleteResource.js

  * @Author: ysh
  * @Date: 2024-06-13 17:07:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-09 17:09:23
+ * @LastEditTime: 2024-08-02 17:02:24
  */
 import request from '@/utils/request'
 
       '/oa/borrow/:id',
       '/oa/borrowDetail/:id',
     ]
+  },
+  {
+    procDefName: '项目变更',
+    apiUrl: [
+      '/oa/projectChange/:id',
+    ]
   }
 ]
 

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

  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-01 10:11:59
+ * @LastEditTime: 2024-08-02 15:23:33
 -->
 <template>
   <div class="main">

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

 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:50:41
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-20 14:54:00
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-02 15:01:28
 -->
 <template>
   <div>
     <h2 style="text-align:center;">项目直接生产成本预算表</h2>
-    <table border="1" class="table">
-      <tr>
-        <td style="width: 100px;">项目名称</td>
-        <td colspan="6">{{ projectForm.projectName }}</td>
-        <td>项目编号</td>
-        <td colspan="1">{{ projectForm.projectNumber }}</td>
-      </tr>
-      <tr>
-        <td :rowspan="workLen+2">直接成本</td>
-        <td>工作简述</td>
-        <td>工作内容</td>
-        <td>数量</td>
-        <td>单价</td>
-        <td>单位</td>
-        <td>系数</td>
-        <td>金额</td>
-        <td style="width: 250px;">备注</td>
-      </tr>
-      <tr v-for="work in budgetForm.contentList">
-        <td>{{ work.content }}</td>
-        <td>{{ work.workItem }}</td>
-        <td>{{ work.workload }}</td>
-        <td>{{ work.price }}</td>
-        <td>{{ work.unit }}</td>
-        <td>{{ work.coefficient }}</td>
-        <td>{{ work.settle }}</td>
-        <td>{{ work.remark ? work.remark : '' }}</td>
-      </tr>
-      <tr>
-        <td :colspan="6" class="head">直接成本合计</td>
-        <td :colspan="1" class="head">{{ budgetForm.settleExpense }}</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td :rowspan="userLen + carLen + deviceLen + 2">间接成本</td>
-      </tr>
-      <tr v-if="userLen != 1">
-        <td :rowspan="userLen">人员</td>
-        <td>姓名</td>
-        <td>基本工资</td>
-        <td>岗位工资</td>
-        <td>人员成本（天）</td>
-        <!-- <td>进出场单价</td> -->
-        <td>预算天数</td>
-        <td>金额</td>
-        <td></td>
-      </tr>
-      <tr v-for="user in budgetForm.chooseUser" :key="'user' + user.userId">
-        <td>{{ user.nickName }}</td>
-        <td>1780</td>
-        <td>{{ user.salary.salary }}</td>
-        <td>{{ parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) }}</td>
-        <!-- <td>{{ user.inOutPrice }}</td> -->
-        <td>{{ user.days }}</td>
-        <td>{{ user.staffCost }}</td>
-        <td></td>
-      </tr>
-      <tr v-if="carLen != 1">
-        <td :rowspan="carLen">车辆</td>
-        <td>车牌号</td>
-        <td>油耗</td>
-        <td>总里程</td>
-        <td>折旧成本（天）</td>
-        <td>预算天数</td>
-        <td>金额</td>
-        <!-- <td></td> -->
-      </tr>
-      <tr v-for="car in budgetForm.chooseCar" :key="'car' + car.carId">
-        <td>{{ car.licensePlate }}</td>
-        <td>{{ car.mileage }}</td>
-        <td>{{ car.distance }}</td>
-        <td>{{ car.dayCost }}</td>
-        <td>{{ car.days }}</td>
-        <td>{{ car.expense }}</td>
-        <td></td>
-      </tr>
-      <tr v-if="deviceLen != 1">
-        <td :rowspan="deviceLen">设备</td>
-        <td>设备名称</td>
-        <td>规格型号</td>
-        <td>品牌</td>
-        <td>折旧成本（天）</td>
-        <td>预算天数</td>
-        <td>金额</td>
-        <!-- <td>备注</td> -->
-      </tr>
-      <tr v-for="device in budgetForm.chooseDevice" :key="'device' + device.deviceId">
-        <td>{{ device.name }}</td>
-        <td>{{ device.series }}</td>
-        <td>{{ device.brand }}</td>
-        <td>{{ device.dayCost }}</td>
-        <td>{{ device.days }}</td>
-        <td>{{ device.depreciation }}</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td :colspan="6" class="head">间接成本合计</td>
-        <td :colspan="1" class="head">{{ budgetForm.fixCost }}</td>
-        <td></td>
-      </tr>
-      <tr class="head">
-        <td :colspan="3">外协费用</td>
-        <td :colspan="5">{{ budgetForm.outExpense }}</td>
-        <td>{{ budgetForm.outRemark }}</td>
-      </tr>
-      <tr class="head">
-        <td colspan="3">车船租赁</td>
-        <td :colspan="5">{{ budgetForm.rentExpense }}</td>
-        <td>{{ budgetForm.rentRemark }}</td>
-      </tr>
-      <tr class="head">
-        <td colspan="3">其他费用</td>
-        <td :colspan="5">{{ budgetForm.otherExpense }}</td>
-        <td>{{ budgetForm.otherRemark }}</td>
-      </tr>
-      <tr class="head">
-        <td colspan="3">税费成本</td>
-        <td :colspan="5">{{ budgetForm.taxExpense }}</td>
-        <td>{{ budgetForm.taxRemark }}</td>
-      </tr>
-      <tr class="head">
-        <td colspan="3">经营管理费用</td>
-        <td :colspan="5">{{ budgetForm.businessExpense }}</td>
-        <td>{{ budgetForm.businessRemark }}</td>
-      </tr>
-      <tr>
-        <td colspan="3" class="head">成本合计</td>
-        <td colspan="5" class="head">{{ costSum }}</td>
-      </tr>
-      <tr v-if="budgetForm.contract">
-        <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>
-      </tr>
-    </table>
+    <el-descriptions :column="3" border class="descriptions">
+      <el-descriptions-item label="项目编号">
+        {{ projectForm.projectNumber }}
+      </el-descriptions-item>
+      <el-descriptions-item label="项目名称">
+        {{ projectForm.projectName }}
+      </el-descriptions-item>
+      <el-descriptions-item label="项目负责人">
+        {{ getUserName(projectForm.projectLeader) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="承担部门">
+        {{ getDeptNames(projectForm.undertakingDept) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="项目备注" :span="3">
+        {{ projectForm.remark }}
+      </el-descriptions-item>
+      <el-descriptions-item label="直接成本" :span="3">
+        <div>
+          <table border="1" style="width: 100%;">
+            <tr style="background-color:#f8f8f9">
+              <td style="width: 250px">工作简述</td>
+              <td style="width: 200px">工作内容</td>
+              <td style="width: 80px">数量</td>
+              <td style="width: 80px">单价</td>
+              <td style="width: 100px">单位</td>
+              <td style="width: 70px">系数</td>
+              <td style="width: 100px">金额</td>
+              <td style="width: 250px;">备注</td>
+            </tr>
+            <tr v-for="work in budgetForm.contentList">
+              <td>{{ work.content }}</td>
+              <td>{{ work.workItem }}</td>
+              <td>{{ work.workload }}</td>
+              <td>{{ work.price }}</td>
+              <td>{{ work.unit }}</td>
+              <td>{{ work.coefficient }}</td>
+              <td>{{ work.settle }}</td>
+              <td>{{ work.remark ? work.remark : '' }}</td>
+            </tr>
+            <tr>
+              <td :colspan="6" class="head">直接成本合计</td>
+              <td :colspan="1" class="head">{{ budgetForm.settleExpense }}</td>
+              <td></td>
+            </tr>
+          </table>
+        </div>
+      </el-descriptions-item>
+      <el-descriptions-item label="间接成本" :span="3">
+        <div>
+          <table border="1" style="width: 100%;">
+            <tr v-if="userLen != 1" style="background-color:#f8f8f9">
+              <td :rowspan="userLen" style="background-color:#f8f8f9">人员</td>
+              <td>姓名</td>
+              <td>基本工资</td>
+              <td>岗位工资</td>
+              <td>人员成本（天）</td>
+              <td>预算天数</td>
+              <td>金额</td>
+              <td>备注</td>
+            </tr>
+            <tr v-for="user in budgetForm.chooseUser" :key="'user' + user.userId">
+              <td>{{ user.nickName }}</td>
+              <td>1780</td>
+              <td>{{ user.salary.salary }}</td>
+              <td>{{ parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) }}</td>
+              <!-- <td>{{ user.inOutPrice }}</td> -->
+              <td>{{ user.days }}</td>
+              <td>{{ user.staffCost }}</td>
+              <td></td>
+            </tr>
+            <tr v-if="carLen != 1" style="background-color:#f8f8f9">
+              <td :rowspan="carLen" style="background-color:#f8f8f9">车辆</td>
+              <td>车牌号</td>
+              <td>油耗</td>
+              <td>总里程</td>
+              <td>折旧成本（天）</td>
+              <td>预算天数</td>
+              <td>金额</td>
+              <td>备注</td>
+            </tr>
+            <tr v-for="car in budgetForm.chooseCar" :key="'car' + car.carId">
+              <td>{{ car.licensePlate }}</td>
+              <td>{{ car.mileage }}</td>
+              <td>{{ car.distance }}</td>
+              <td>{{ car.dayCost }}</td>
+              <td>{{ car.days }}</td>
+              <td>{{ car.expense }}</td>
+              <td></td>
+            </tr>
+            <tr v-if="deviceLen != 1" style="background-color:#f8f8f9">
+              <td :rowspan="deviceLen" style="background-color:#f8f8f9">设备</td>
+              <td>设备名称</td>
+              <td>规格型号</td>
+              <td>品牌</td>
+              <td>折旧成本（天）</td>
+              <td>预算天数</td>
+              <td>金额</td>
+              <td>备注</td>
+            </tr>
+            <tr v-for="device in budgetForm.chooseDevice" :key="'device' + device.deviceId">
+              <td>{{ device.name }}</td>
+              <td>{{ device.series }}</td>
+              <td>{{ device.brand }}</td>
+              <td>{{ device.dayCost }}</td>
+              <td>{{ device.days }}</td>
+              <td>{{ device.depreciation }}</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td :colspan="6" class="head">间接成本合计</td>
+              <td :colspan="1" class="head">{{ budgetForm.fixCost }}</td>
+              <td></td>
+            </tr>
+          </table>
+        </div>
+      </el-descriptions-item>
+      <el-descriptions-item label="外协费用" :span="1">
+        <div class="text-center">
+          {{ budgetForm.outExpense }}
+        </div>
+      </el-descriptions-item>
+      <el-descriptions-item label="备注" :span="2">
+        {{ budgetForm.outRemark }}
+      </el-descriptions-item>
+      <el-descriptions-item label="车船租赁" :span="1">
+        <div class="text-center">
+          {{ budgetForm.rentExpense }}
+        </div>
+      </el-descriptions-item>
+      <el-descriptions-item label="备注" :span="2">
+        {{ budgetForm.rentRemark }}
+      </el-descriptions-item>
+      <el-descriptions-item label="其他费用" :span="1">
+        <div class="text-center">
+          {{ budgetForm.otherExpense }}
+        </div>
+      </el-descriptions-item>
+      <el-descriptions-item label="备注" :span="2">
+        {{ budgetForm.otherRemark }}
+      </el-descriptions-item>
+      <el-descriptions-item label="税费成本" :span="1">
+        <div class="text-center">
+          {{ budgetForm.taxExpense }}
+        </div>
+      </el-descriptions-item>
+      <el-descriptions-item label="备注" :span="2">
+        {{ budgetForm.taxRemark }}
+      </el-descriptions-item>
+      <el-descriptions-item label="经营管理费用" :span="1">
+        <div class="text-center">
+          {{ budgetForm.businessExpense }}
+        </div>
+      </el-descriptions-item>
+      <el-descriptions-item label="备注" :span="2">
+        {{ budgetForm.businessRemark }}
+      </el-descriptions-item>
+      <el-descriptions-item label="预算成本合计" :span="3">
+        <div class="text-center head">¥ {{ costSum }}</div>
+      </el-descriptions-item>
+      <el-descriptions-item label="合同总价约" :span="2" v-if="budgetForm.contract">
+        {{ budgetForm.contract ? budgetForm.contract.amount : '' }}
+      </el-descriptions-item>
+      <el-descriptions-item label="利润" :span="1" v-if="budgetForm.contract">
+        {{ profit }}
+      </el-descriptions-item>
+    </el-descriptions>
   </div>
 </template>
 
   },
   data() {
     return {
-      userLen: 1,
-      carLen: 1,
-      deviceLen: 1,
+      userLen: 0,
+      carLen: 0,
+      deviceLen: 0,
       workLen: 1,
       costSum: 0,
       inOutPrice: '',
-      profit:''
+      profit: ''
     }
   },
   created() {
     this.carLen = this.budgetForm.chooseCar.length + 1;
     this.deviceLen = this.budgetForm.chooseDevice.length + 1;
     this.workLen = this.budgetForm.contentList.length;
-    this.costSum = (Number(this.budgetForm.directExpense) + Number(this.budgetForm.fixCost) ).toFixed(2);
-    if(this.budgetForm.contract){
-      this.profit = (Number(this.budgetForm.contract.amount) - Number(this.costSum) ).toFixed(2)
+    this.costSum = (Number(this.budgetForm.directExpense) + Number(this.budgetForm.fixCost)).toFixed(2);
+    if (this.budgetForm.contract) {
+      this.profit = (Number(this.budgetForm.contract.amount) - Number(this.costSum)).toFixed(2)
     }
     this.$emit('getTotal', this.costSum);
   },
 </script>
 
 <style lang="scss" scoped>
-.table {
-  /*居中*/
-  // margin: 0 auto;
-  /*边框*/
-  /* border: 1px solid black; */
+table {
   text-align: center;
   border-collapse: collapse;
   margin: 0 auto;
   /* background-color: #bfa; */
   td {
     padding: 5px;
-    height: 40px;
   }
 }
 
   // color: #fff;
   font-weight: bold;
 }
+
+::v-deep .el-descriptions-item__label.is-bordered-label {
+  color: #5a5757;
+  background: rgba($color: #a9adb3, $alpha: 0.1);
+  width: 120px;
+  text-align: center;
+  min-width: 120px;
+}
+
+::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
+  border: 1px solid #cdd0d3;
+}
 </style>

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

             <el-button type="primary" size="mini" @click="openProject = true" v-if="taskName == '变更登记'">选择项目</el-button>
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="2" direction="vertical">
               <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.projectNumber
-              }}</el-descriptions-item>
-              <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA.partyName
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
+              <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA.partyAName
+                }}</el-descriptions-item>
               <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">{{
-                chooseProject.undertakingDeptName
-              }}</el-descriptions-item>
+      chooseProject.undertakingDeptName
+    }}</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>
           </el-form-item>
-          <el-form-item label="变更内容">
-            <el-input type="textarea" :rows="10" v-model="form.content" :disabled="taskName != '项目登记'" />
+          <el-form-item label="变更内容" prop="content">
+            <el-input type="textarea" :rows="10" v-model="form.content" :disabled="taskName != '变更登记'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
             </el-col>
           </el-row>
         </el-form>
-        <div style="text-align: center;">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+        <div style="text-align: center;" v-if="taskName && taskName == '变更登记'">
+          <el-button type="primary" @click="submitForm">提交申请</el-button>
+        </div>
+        <div style="text-align: center;" v-if="taskName && taskName == '变更确认'">
+          <el-button type="primary" @click="submitForm">确认变更</el-button>
         </div>
       </el-col>
       <el-col :span="6" :xs="24" v-if="isFlow">
       registrantName: '',
       // 表单校验
       rules: {
+        projectId: [
+          { required: true, message: '请选择项目编号', trigger: 'blur' }
+        ],
+        content: [
+          { required: true, message: '请输入变更内容', trigger: 'blur' }
+        ]
       }
     };
   },
     if (this.$route.query.projectId) {
       getProject(this.$route.query.projectId).then(res => {
         if (res.data) {
-          this.$set(this.form, 'projectId', res.data.projectId)
+          this.$set(this.form, 'projectId', res.data.projectId);
           this.handleSelectProject(res.data.projectId)
         }
       })
         else {
           this.formTotal = 1;
           this.form = res.data;
+          this.registrantName = res.data.registrantUser.nickName
           if (res.data.projectId) {
             getProject(res.data.projectId).then(response => {
               this.chooseProject = response.data;
         this.chooseProject = val[0]
         this.isSelect = true
         this.form.projectId = val[0].projectId
+        this.$refs.form.validateField('projectId');
+        if (this.chooseProject.projectLeader)
+          this.leaderList.push(this.chooseProject.projectLeader);
+        getUsersDeptLeaderByDept({ deptId: 109 }).then(res => {
+          this.leaderList.push(res.data.userId);
+        })
         if (this.chooseProject.undertakingDept) {
           let arr = this.chooseProject.undertakingDept.split(',')
           this.getLeader(arr);
         })
       }
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        changeId: null,
-        projectId: null,
-        content: null,
-        registrant: null,
-        registerTime: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.changeId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加cmc项目变更";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const changeId = row.changeId || this.ids
-      getProjectChange(changeId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改cmc项目变更";
-      });
-    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         }
       });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const changeIds = row.changeId || this.ids;
-      this.$modal.confirm('是否确认删除cmc项目变更编号为"' + changeIds + '"的数据项？').then(function () {
-        return delProjectChange(changeIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('oa/projectChange/export', {
-        ...this.queryParams
-      }, `projectChange_${new Date().getTime()}.xlsx`)
-    }
   }
 };
 </script>
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+</style>

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

 <!--
  * @Author: ysh
  * @Date: 2024-04-23 17:08:16
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-04 12:58:36
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-02 16:39:46
 -->
 <template>
   <div>
     <brand-form :key="'brand'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '品牌项目支付'"></brand-form>
     <deposit-form :key="'deposit'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '保证金审批'"></deposit-form>
     <device-form :key="'device'+taskForm.taskId" :taskForm="taskForm" :taskName="''" :formDisabled="true" v-else-if="taskForm.procDefName == '设备审批'"></device-form>
+    <change-form :key="'change'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '项目变更'"></change-form>
   </div>
 </template>
 
 import BrandForm from '../business/brandForm.vue';
 import DepositForm from '../finance/depositForm.vue';
 import DeviceForm from '../oa/deviceForm.vue';
+import changeForm from "../changeForm.vue";
 export default {
   props: {
     passingParam: {
     BudgetTab,
     BrandForm,
     DepositForm,
-    DeviceForm
+    DeviceForm,
+    changeForm
   },
   data() {
     return {

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

+<template>
+  <div>
+    <div id="printPlan">
+      <h2 class="text-center title">技术交底记录表</h2>
+      <table border="1">
+        <tr>
+          <td :colspan="1" class="fontbold">项目名称</td>
+          <td :colspan="4">{{ form.projectName }}</td>
+          <td :colspan="2" class="fontbold">项目编号</td>
+          <td :colspan="2">{{ form.projectNumber }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">承担部门</td>
+          <td :colspan="4">{{ getDeptNames(form.undertakingDept) }}</td>
+          <td :colspan="2" class="fontbold">项目负责人</td>
+          <td :colspan="2">{{ getUserName(form.projectLeader) }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">技术负责人</td>
+          <td :colspan="4">{{ getUserName(form.technicalDirector) }}</td>
+          <td :colspan="1" class="fontbold">技术设计人</td>
+          <td :colspan="4" style="white-space: pre-wrap;">{{ getUserName(form.technicalDesigner) }}</td>
+        </tr>
+        <tr>
+          
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">质量检查员</td>
+          <td :colspan="8" style="white-space: pre-wrap;">{{ formartVal(form.qualityInspector) }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">技术安排意见</td>
+          <td :colspan="4">{{ form.planComment }}</td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{
+            getUserName(form.technicalPlanner) }}</span></td>
+          <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.technicalTime }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">方案说明</td>
+          <td :colspan="4">{{ form.designDescription }}</td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">
+            签名：<span class="auditor">{{ getUserName(form.technicalDesigner) }}</span>
+          </td>
+          <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.technicalUploadTime }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">技术方案审核意见</td>
+          <td :colspan="4">{{ form.technicalComment }}</td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">
+            签名：<span class="auditor">{{ getUserName(form.technicalAuditor) }}</span>
+          </td>
+          <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.techApprovalTime }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">总工程师审核意见</td>
+          <td :colspan="4">{{ form.manageComment }}</td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">
+            签名：<span class="auditor">{{ getUserName(form.managerUserId) }}</span>
+          </td>
+          <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.manageApprovalTime }}</td>
+        </tr>
+      </table>
+    </div>
+    <div class="text-center mt20">
+      <el-button type="primary" v-print="print">确认打印</el-button>
+      <el-button @click="$emit('cancel')">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    form: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      settleSum: {},
+      deptSettleList: [],
+      deductionsList: [],
+      actualSumSettle: '',
+      undertakingDept: [],
+      print: {
+        id: 'printPlan',
+        popTitle: '技术方案表', // 打印配置页上方标题
+        extraHead: '', //最上方的头部文字，附加在head标签上的额外标签,使用逗号分隔
+        preview: false, // 是否启动预览模式，默认是false（开启预览模式，可以先预览后打印）
+        previewTitle: '', // 打印预览的标题（开启预览模式后出现）,
+        previewPrintBtnLabel: '', // 打印预览的标题的下方按钮文本，点击可进入打印（开启预览模式后出现）
+        zIndex: '', // 预览的窗口的z-index，默认是 20002（此值要高一些，这涉及到预览模式是否显示在最上面）
+        previewBeforeOpenCallback() { }, //预览窗口打开之前的callback（开启预览模式调用）
+        previewOpenCallback() { }, // 预览窗口打开之后的callback（开启预览模式调用）
+        beforeOpenCallback() { }, // 开启打印前的回调事件
+        openCallback() { }, // 调用打印之后的回调事件
+        closeCallback() { }, //关闭打印的回调事件（无法确定点击的是确认还是取消）
+        url: '',
+        standard: '',
+        extraCss: ''
+      }
+    }
+  },
+  methods:{
+    formartVal(val){
+      if (Array.isArray(val)) {
+        let newval = val.join(',');
+        let res = this.getUserNames(newval);
+        return res
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  width: 90%;
+  // text-align: center;
+  border-collapse: collapse;
+  margin: 0 auto;
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 5px;
+    // line-height: 30px;
+  }
+}
+
+.header {
+  font-family: '黑体';
+  font-size: 16px;
+  font-weight: bold;
+  line-height: 30px;
+}
+
+.bg {
+  background-color: #eee;
+  -webkit-print-color-adjust: exact;
+}
+
+.title {
+  font-family: '黑体';
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 30px;
+}
+
+.fontbold {
+  font-weight: bold;
+  min-width: 150px;
+  text-align: center;
+}
+
+.conment-width {
+  // max-width: 200px;
+}
+
+
+@page {
+  size: auto;
+  /* 去除页脚 */
+  margin-bottom: 0;
+  // 横向A4
+  // size:A4 landscape;
+}
+
+@media print {
+  #print table {
+    width: 100%;
+  }
+}
+</style>

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

  * @Author: ysh
  * @Date: 2024-07-30 16:56:08
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-31 17:39:52
+ * @LastEditTime: 2024-08-02 09:26:11
 -->
 <template>
   <div>
         </tr>
         <tr>
           <td :colspan="1" class="fontbold">承担部门</td>
-          <td :colspan="4">{{ getDeptName(form.undertakingDept) }}</td>
+          <td :colspan="4">{{ getDeptNames(form.undertakingDept) }}</td>
           <td :colspan="2" class="fontbold">项目负责人</td>
           <td :colspan="2">{{ getUserName(form.projectLeader) }}</td>
         </tr>

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

+<template>
+  <div>
+    <div id="printTechnical">
+      <h2 class="text-center title">技术交底记录表</h2>
+      <table border="1">
+        <tr>
+          <td :colspan="1" class="fontbold">项目名称</td>
+          <td :colspan="4">{{ form.projectName }}</td>
+          <td :colspan="2" class="fontbold">项目编号</td>
+          <td :colspan="2">{{ form.projectNumber }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">承担部门</td>
+          <td :colspan="4">{{ getDeptNames(form.undertakingDept) }}</td>
+          <td :colspan="2" class="fontbold">项目负责人</td>
+          <td :colspan="2">{{ getUserName(form.projectLeader) }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">接受交底人</td>
+          <td :colspan="8">{{ getUserName(form.disclosureAccepter) }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">技术交底内容</td>
+          <td :colspan="8" style="white-space: pre-wrap;">{{ form.content }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">技术交底意见</td>
+          <td :colspan="4">{{ form.disclosureComment }}</td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{
+            getUserName(form.disclosurer) }}</span></td>
+          <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.disclosureTime }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">接受交底意见</td>
+          <td :colspan="4">{{ form.acceptComment }}</td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">
+            签名：<span class="auditor">{{ getUserName(form.disclosureAccepter) }}</span>
+          </td>
+          <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.acceptTime }}</td>
+        </tr>
+      </table>
+    </div>
+    <div class="text-center mt20">
+      <el-button type="primary" v-print="print">确认打印</el-button>
+      <el-button @click="$emit('cancel')">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    form: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      settleSum: {},
+      deptSettleList: [],
+      deductionsList: [],
+      actualSumSettle: '',
+      undertakingDept: [],
+      print: {
+        id: 'printTechnical',
+        popTitle: '技术交底记录表', // 打印配置页上方标题
+        extraHead: '', //最上方的头部文字，附加在head标签上的额外标签,使用逗号分隔
+        preview: false, // 是否启动预览模式，默认是false（开启预览模式，可以先预览后打印）
+        previewTitle: '', // 打印预览的标题（开启预览模式后出现）,
+        previewPrintBtnLabel: '', // 打印预览的标题的下方按钮文本，点击可进入打印（开启预览模式后出现）
+        zIndex: '', // 预览的窗口的z-index，默认是 20002（此值要高一些，这涉及到预览模式是否显示在最上面）
+        previewBeforeOpenCallback() { }, //预览窗口打开之前的callback（开启预览模式调用）
+        previewOpenCallback() { }, // 预览窗口打开之后的callback（开启预览模式调用）
+        beforeOpenCallback() { }, // 开启打印前的回调事件
+        openCallback() { }, // 调用打印之后的回调事件
+        closeCallback() { }, //关闭打印的回调事件（无法确定点击的是确认还是取消）
+        url: '',
+        standard: '',
+        extraCss: ''
+      }
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  width: 90%;
+  // text-align: center;
+  border-collapse: collapse;
+  margin: 0 auto;
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 5px;
+    // line-height: 30px;
+  }
+}
+
+.header {
+  font-family: '黑体';
+  font-size: 16px;
+  font-weight: bold;
+  line-height: 30px;
+}
+
+.bg {
+  background-color: #eee;
+  -webkit-print-color-adjust: exact;
+}
+
+.title {
+  font-family: '黑体';
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 30px;
+}
+
+.fontbold {
+  font-weight: bold;
+  min-width: 150px;
+  text-align: center;
+}
+
+.conment-width {
+  // max-width: 200px;
+}
+
+
+@page {
+  size: auto;
+  /* 去除页脚 */
+  margin-bottom: 0;
+  // 横向A4
+  // size:A4 landscape;
+}
+
+@media print {
+  #print table {
+    width: 100%;
+  }
+}
+</style>

oa-ui/src/views/flowable/form/finance/borrowForm.vue

               <el-form-item label="核准金额" prop="managerAmount">
                 <el-input v-model="form.managerAmount" placeholder="请输入核准金额"
                   :disabled="taskName != '分管审核' && taskName != '党工团审核'" />
-                <span style="color:#E74C3C" v-if="form.managerAmount && form.borrowUsage == 0">超过预算金额：{{
+                <span style="color:#E74C3C" v-if="exceed && form.managerAmount && form.borrowUsage == 0">超过预算金额：{{
     getMoreAmount('1') }}</span>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
         </el-form>
-        <div style="text-align: center;" v-if="taskName !=''">
+        <div style="text-align: center;" v-if="taskName != ''">
           <el-button type="primary" @click="submitForm">提 交</el-button>
         </div>
       </el-col>
             { required: true, message: '请输入部门负责人意见', trigger: 'blur' },
           ],
         }
-        // } else if (this.taskName == '项目部审核') {
-        //   this.rules = {
-        //     xmComment: [
-        //       { required: true, message: '请输入项目部校核意见', trigger: 'blur' }
-        //     ]
-        //   }
       } else if (this.taskName == '分管审核') {
         this.rules = {
           managerComment: [
         else {
           this.formTotal = 1;
           this.form = res.data;
-          if (this.form.borrowUsage == '0') {
-            if ((this.totalBudget - this.form.applyAmount) < 0) {
-              this.exceed = true;
-            } else {
-              this.exceed = false;
-            }
-          } else {
-            this.exceed = false;
-          }
+
           this.hanldeChangeType();
           this.handleSelectProject(res.data.projectId)
           this.getBudgetSettle()
         let budget = budgetData.rows[0];
         this.totalBudget = budget.totalBudget
       }
+      if (budgetData.total == 0) {
+        this.totalBudget = 0
+      }
+      if (this.form.borrowUsage == '0') {
+        if ((this.totalBudget - this.form.applyAmount) < 0) {
+          this.exceed = true;
+        } else {
+          this.exceed = false;
+        }
+      } else {
+        this.exceed = false;
+      }
       let borrow = await listBorrow({ projectId: this.form.projectId })
       if (borrow.total != 0) {
         let borrowList = borrow.rows;

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

 <!--
  * @Author: ysh
  * @Date: 2024-04-19 15:32:00
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-08 18:00:55
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-02 10:43:19
 -->
 <template>
   <div class="app-container">
     <el-empty description="技术方案未编制" v-if="!haveTechnicalPlan"></el-empty>
     <div v-if="haveTechnicalPlan">
+      <el-button type="success" @click="openPrint = true">打印</el-button>
       <h3 class="text-center"><b>{{ form.projectNumber + '-' + form.projectName + ' 技术方案' }}</b></h3>
       <el-form ref="technicalPlan" :model="form" :rules="rules" label-width="125px" disabled>
         <el-form-item label="项目编号：" prop="projectNumber">
         </el-row>
       </el-form>
     </div>
+    <el-dialog title="技术方案表格预览" :visible.sync="openPrint" width="65%" append-to-body>
+      <plan-print :form="form" @cancel="openPrint = false"></plan-print>
+    </el-dialog>
   </div>
 </template>
 
   addTechnicalPlan,
   updateTechnicalPlan,
 } from "@/api/oa/technical/technicalPlan";
+import PlanPrint from '../components/planPrint.vue';
 export default {
-  components: { technicalPlan },
+  components: { technicalPlan, PlanPrint },
   props: {
     taskForm: {
       type: Object,
       form: {},
       rules: {},
       userList: [],
+      openPrint:false,
     };
   },
   mounted() {
             if (projectRes.data) {
               this.$set(this.form, "projectNumber", projectRes.data.projectNumber);
               this.$set(this.form, "projectName", projectRes.data.projectName);
+              this.$set(this.form, "projectLeader", projectRes.data.projectLeader);
+              this.$set(this.form, "undertakingDept", projectRes.data.undertakingDept);
             }
           }
         }
         // 如果是一个字符串，则按逗号分割并转换为整数数组
         const qualityInspectorArr = form.qualityInspector.split(',').map(inspector => parseInt(inspector, 10));
         return qualityInspectorArr
-       } else if (form.qualityInspector === null || form.qualityInspector === undefined || form.qualityInspector === '') {
-         // 如果为空、null或undefined，则设置为空数组
+      } else if (form.qualityInspector === null || form.qualityInspector === undefined || form.qualityInspector === '') {
+        // 如果为空、null或undefined，则设置为空数组
         return []
-       }
+      }
     },
     // 查询用户列表
     getUserList() {
 
 <style lang="scss" scoped>
 @import "@/assets/styles/element-reset.scss";
+
 ::v-deep .el-input.is-disabled .el-input__inner {
   color: #686a6e;
 }

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

           <el-input v-model="form.insideComment" placeholder="请输入信息安全管理要求" type="textarea" :autosize="{ minRows: 8 }" />
         </el-form-item>
         <el-form-item label="安全交底意见" prop="disclosureComment">
-          <el-input v-model="form.disclosureComment" placeholder="请输入安全交底意见" type="textarea" :autosize="{ minRows: 4 }" />
+          <el-input v-model="form.disclosureComment" placeholder="请输入安全交底意见" type="textarea"
+            :autosize="{ minRows: 4 }" />
         </el-form-item>
         <el-row>
           <el-col :span="6" :xs="24" :offset="12">
       </el-form>
     </div>
     <el-dialog title="安全交底表格预览" :visible.sync="openPrint" width="65%" append-to-body>
-      <safe-print :form="form"></safe-print>
+      <safe-print :form="form" @cancel="openPrint = false"></safe-print>
     </el-dialog>
   </div>
 </template>
     projectName(newval) {
       this.$set(this.form, "projectName", newval);
     },
-    'taskForm.formId'(){
+    'taskForm.formId'() {
       this.loading = true;
       this.initForm();
     }
       form: {},
       rules: {},
       userList: [],
-      loading:false,
-      openPrint:false,
+      loading: false,
+      openPrint: false,
     }
   },
   mounted() {

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

+<!--
+ * @Author: ysh
+ * @Date: 2024-07-04 17:37:29
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-02 09:46:48
+-->
 <template>
   <div class="app-container" v-loading="loading">
     <el-empty description="未进行技术交底" v-if="isEmpty"></el-empty>
     <div v-if="!isEmpty">
+      <el-button type="success" @click="openPrint = true">打印</el-button>
       <h3 class="text-center"><b>{{ form.projectNumber + '-' + form.projectName + ' 技术交底' }}</b></h3>
       <el-form ref="technicalForm" :model="form" :rules="rules" label-width="125px" disabled>
         <el-form-item label="项目编号：" prop="projectNumber">
         </el-row>
       </el-form>
     </div>
+    <el-dialog title="技术交底表格预览" :visible.sync="openPrint" width="65%" append-to-body>
+      <technical-print :form="form" @cancel="openPrint = false"></technical-print>
+    </el-dialog>
   </div>
 </template>
 
 import { listTechnical, getTechnical, delTechnical, addTechnical, updateTechnical } from "@/api/oa/technical/technical";
 import { listUser } from '@/api/system/user';
 import { getProject } from "@/api/oa/project/project";
+import technicalPrint from '../components/technicalPrint.vue';
 export default {
+  components: { technicalPrint },
   props: {
     taskForm: {
       type: Object,
       rules: {},
       userList: [],
       loading: false,
+      openPrint:false,
     }
   },
   mounted() {
               if (res.data) {
                 this.$set(this.form, "projectNumber", res.data.projectNumber);
                 this.$set(this.form, "projectName", res.data.projectName);
+                this.$set(this.form, "projectLeader", res.data.projectLeader);
+                this.$set(this.form, "undertakingDept", res.data.undertakingDept);
                 this.loading = false;
               }
             })

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

 <!--
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-04 13:07:30
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-02 16:18:05
 -->
 <template>
   <div class="app-container">
       if (this.taskName == '员工填报' || this.taskForm.procDefName == '用车审批' || this.taskForm.procDefName == '设备审批' || this.taskForm.procDefName == '项目流转'
         || (this.taskForm.procDefName == '项目预算' && this.taskName != '预算审核') || this.taskForm.procDefName == '借款审批' || this.taskForm.procDefName == '安全交底' ||
         this.taskForm.procDefName == '技术交底' || this.taskForm.procDefName == '技术方案' || this.taskForm.procDefName == '承接合同评审' || this.taskForm.procDefName == '分包合同评审'
-        || this.taskForm.procDefName == '品牌项目支付' || this.taskForm.procDefName == '保证金审批' || this.taskForm.procDefName == '成果归档' || this.taskForm.procDefName == '项目结算') {
+        || this.taskForm.procDefName == '品牌项目支付' || this.taskForm.procDefName == '保证金审批' || this.taskForm.procDefName == '成果归档' || this.taskForm.procDefName == '项目结算'
+        || this.taskForm.procDefName == '项目变更') {
         return false
       } else {
         return true

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

       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="耗材id" align="center" prop="materialId" />
       <el-table-column label="耗材名称" align="center" prop="name" />
-      <el-table-column label="耗材类别" align="center" prop="type" />
+      <!-- <el-table-column label="耗材类别" align="center" prop="type" /> -->
       <el-table-column label="规格型号" align="center" prop="series" />
       <el-table-column label="耗材品牌" align="center" prop="brand" />
       <el-table-column label="存放地点" align="center" prop="place" />

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

                 <svg-icon slot="prefix" icon-class="form" />
                 项目预算编制
               </template>
-              <!-- v-hasPermi="['oa:project:edit']" -->
-              <el-link type="primary" @click="openBudget = true"  v-hasPermi="['oa:allproject:query']">项目预算表</el-link>
+              <el-link type="primary" @click="openBudget = true" v-if="isProjectLeader">项目预算表</el-link>
+              <div v-else>
+                <el-link type="primary" @click="openBudget = true" v-hasPermi="['oa:allproject:query']">项目预算表</el-link>
+              </div>
             </el-descriptions-item>
           </el-descriptions>
         </div>
               <div>
                 <el-table :data="projectChangeList">
                   <el-table-column type="index" label="序号" width="55" align="center" />
-                  <el-table-column label="项目编号" align="center" width="80" prop="project.projectNumber" />
-                  <el-table-column label="项目名称" align="center" prop="project.projectName" />
-                  <el-table-column label="承担部门" align="center" prop="undertakingDeptName" />
-                  <el-table-column label="项目负责人" align="center" width="90" prop="leaderUser.nickName" />
-                  <el-table-column label="变更内容" align="center" width="600" prop="content" />
+                  <!-- <el-table-column label="项目编号" align="center" width="80" prop="project.projectNumber" />
+                  <el-table-column label="项目名称" align="center" prop="project.projectName" /> -->
+                  <!-- <el-table-column label="承担部门" align="center" prop="undertakingDeptName" />
+                  <el-table-column label="项目负责人" align="center" width="90" prop="leaderUser.nickName" /> -->
+                  <el-table-column label="变更内容" align="center" prop="content" />
                   <el-table-column label="登记人" align="center" width="80" prop="registrantUser.nickName" />
                   <el-table-column label="登记时间" align="center" prop="registerTime" width="100">
                     <template slot-scope="scope">
         </div>
       </div>
     </div>
-    <el-dialog title="项目预算" :visible.sync="openBudget" width="1000px" append-to-body>
+    <el-dialog title="项目预算" :visible.sync="openBudget" width="70%" append-to-body>
       <budget-tab :taskForm="taskForm"></budget-tab>
     </el-dialog>
     <el-dialog title="技术方案审批表" :visible.sync="openPlan" width="1000px" append-to-body>
       flowData: {},
       recordOpen: false,
       clickRow: {
-        procInsId:'',
-        deployId:''
-      }
+        procInsId: '',
+        deployId: ''
+      },
+      isProjectLeader: false
     }
   },
   methods: {
       getProject(projectId).then(res => {
         if (res.data) {
           this.project = res.data;
+          if (this.project.projectLeader == this.$store.state.user.id) {
+            this.isProjectLeader = true;
+          }
           let deptArr = this.project.undertakingDept.split(',');
           let undertakingDept = []
           for (let dept of deptArr) {