修改文件上传的在线预览，修改人员信息详情等

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

                     .desc().list();
             List<FlowTaskDto> hisFlowList = new ArrayList<>();
             for (HistoricActivityInstance histIns : list) {
+                if (histIns.getDeleteReason() != null && histIns.getDeleteReason().startsWith("Change"))
+                    continue;
                 // 展示开始节点
 //                if ("startEvent".equals(histIns.getActivityType())) {
 //                    FlowTaskDto flowTask = new FlowTaskDto();

oa-ui/src/store/modules/user.js

           listUser({ pageNum: 1, pageSize: 9999 }).then(result => {
             commit('SET_USERLIST', result.rows)
             listDept({ pageNum: 1, pageSize: 9999 }).then(response => {
-              commit('SET_DEPTLIST', response.data)
+              let deptList = response.data.filter(item => item.deptName != '四川中水成勘院测绘工程有限责任公司')
+              commit('SET_DEPTLIST', deptList)
             })
           })
           resolve(res)

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

                   <td>
                     <el-input v-model="car.days" placeholder="请输入天数" @change="calculateCarTotal(car)"></el-input>
                   </td>
-                  <td class="carCost">{{ car.expense }}</td>
+                  <td class="carCost">{{ (car.expense).toFixed(2) }}</td>
                 </tr>
                 <tr>
                   <td colspan="5">合计</td>
                     <el-input v-model="device.days" placeholder="请输入天数"
                       @change="calculateDeviceTotal(device)"></el-input>
                   </td>
-                  <td class="deviceCost">{{ device.depreciation }}</td>
+                  <td class="deviceCost">{{ (device.depreciation).toFixed(2) }}</td>
                 </tr>
                 <tr>
                   <td colspan="5">合计</td>

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

               {{ work.price }}
             </td>
             <td>
-              <el-select v-model="work.unit" placeholder="请选择" clearable>
-                <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label"
-                  :value="dict.label" />
-              </el-select>
+              {{ work.unit }}
             </td>
             <td>
               <el-input v-model="work.workload" @change="getTotal(work)"></el-input>

oa-ui/src/views/flowable/form/business/brandForm.vue

               :disabled="taskName != '支付申请'" />
           </el-form-item>
           <el-form-item label="审核文件" prop="approvalDocument">
-            <FileUpload v-if="form.approvalDocument == '' || form.approvalDocument == null" :disabled="taskName != '支付申请'"
+            <FileUpload v-if="formTotal == 0" :disabled="taskName != '支付申请'"
               :limit="1" :filePathName="'品牌项目支付/审核文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
               @input="getBrandPath"></FileUpload>
-            <div v-if="form.approvalDocument != '' && form.approvalDocument != null">
-              <file-item :document="form.approvalDocument"></file-item>
+            <div v-if="formTotal == 1">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.approvalDocument}`)">
+                {{ getFileName(form.approvalDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.approvalDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
             </div>
           </el-form-item>
           <el-row>
       };
       this.resetForm("form");
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.brandId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加cmc品牌项目支付审批";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const brandId = row.brandId || this.ids
-      getBrand(brandId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改cmc品牌项目支付审批";
-      });
-    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         }
       });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const brandIds = row.brandId || this.ids;
-      this.$modal.confirm('是否确认删除cmc品牌项目支付审批编号为"' + brandIds + '"的数据项？').then(function () {
-        return delBrand(brandIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('oa/brand/export', {
-        ...this.queryParams
-      }, `brand_${new Date().getTime()}.xlsx`)
-    },
     getBrandPath(val) {
       let arr = val.split('/upload')
       this.form.approvalDocument = arr[1]
 };
 </script>
 <style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
 table {
-  /*居中*/
-  margin: 0 auto;
   /*边框*/
   /* border: 1px solid black; */
   text-align: center;

oa-ui/src/views/flowable/form/business/contractForm.vue

  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-04 16:33:59
+ * @LastEditTime: 2024-06-07 10:43:03
 -->
 <template>
   <div class="app-container">
               <el-form-item label="投标项目名称：" prop="tenderId">
                 <el-button type="primary" size="mini" @click="tbOpen = true"
                   v-if="taskName == '合同拟稿'">选择投标项目</el-button>
-                <!-- <el-select v-model="form.tenderId" filterable placeholder="请选择" @change="handleSelectTender"
-                  :disabled="taskName != '合同拟稿'" clearable>
-                  <el-option v-for="item in tenderList" :key="item.value" :label="item.projectName"
-                    :value="item.tenderId">
-                  </el-option>
-                </el-select> -->
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="2" direction="vertical">
                   <el-descriptions-item label="投标项目名称" label-class-name="my-label" :span="2">{{ chooseTender.projectName
                     }}</el-descriptions-item>
                     }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
-
-              <el-row :gutter="20">
-                <el-col :span="10" :xs="24">
-                  <el-form-item label="合同编码" prop="contractCode">
-                    <el-input style="width: 150px;" v-model="form.contractCode" placeholder="请输入合同编码"
-                      :disabled="taskName != '合同拟稿'"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="14" :xs="24">
-                  <el-form-item label="合同编号" prop="contractNumber">
-                    <el-input style="width: 180px;" v-model="form.contractNumber" placeholder="请输入合同编号"
-                      :disabled="taskName != '合同拟稿'"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="20">
-                <el-col :span="12" :xs="24">
-                  <el-form-item label="合同金额" prop="amount">
-                    <el-input style="width:100px;" v-model="form.amount" placeholder="请输入合同金额"
-                      :disabled="taskName != '合同拟稿'" />
-                    <span>元</span>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" :xs="24">
-                  <el-form-item style="text-align: left;" label="履约保证金" prop="deposit">
-                    <el-input style="width:100px;" v-model="form.deposit" placeholder="请输入履约保证金"
-                      :disabled="taskName != '合同拟稿'" />
-                    <span>元</span>
-                  </el-form-item>
-                </el-col>
-              </el-row>
+              <el-form-item label="合同编码" prop="contractCode">
+                <el-input style="width: 100%;" v-model="form.contractCode" placeholder="请输入合同编码"
+                  :disabled="taskName != '合同拟稿'"></el-input>
+              </el-form-item>
+              <el-form-item label="合同编号" prop="contractNumber">
+                <el-input style="width:  100%;" v-model="form.contractNumber" placeholder="请输入合同编号"
+                  :disabled="taskName != '合同拟稿'"></el-input>
+              </el-form-item>
+              <el-form-item label="合同金额" prop="amount">
+                <el-input style="width:100%;" v-model="form.amount" placeholder="请输入合同金额"
+                  :disabled="taskName != '合同拟稿'">
+                  <template slot="append">元</template>
+                </el-input>
+              </el-form-item>
+              <el-form-item style="text-align: left;" label="履约保证金" prop="deposit">
+                <el-input style="width:100%;" v-model="form.deposit" placeholder="请输入履约保证金"
+                  :disabled="taskName != '合同拟稿'">
+                  <template slot="append">元</template>
+                </el-input>
+              </el-form-item>
             </el-col>
 
             <el-col :span="12" :xs="24">
+              <el-alert title="院外项目，不选关联项目；院内项目，必选关联项目" type="warning">
+              </el-alert>
               <el-form-item label="关联项目：" prop="projectIds">
-                <!-- <el-select v-model="projectContractForm.projectIds" multiple filterable placeholder="请选择"
-                  @change="handleSelectProject" :disabled="taskName != '合同拟稿'" clearable>
-                  <el-option v-for="item in projectList" :key="item.value"
-                    :label="item.projectNumber + item.projectName" :value="item.projectId">
-                  </el-option>
-                </el-select> -->
                 <el-button type="primary" size="mini" @click="open = true" v-if="taskName == '合同拟稿'">选择项目</el-button>
               </el-form-item>
-              <el-table v-loading="loading" :data="chooseProjectList">
+              <el-table v-loading="projectloading" :data="chooseProjectList">
                 <el-table-column label="项目编号" align="center" prop="projectNumber"></el-table-column>
                 <el-table-column label="项目名称" align="center" prop="projectName"></el-table-column>
                 <el-table-column label="项目负责人" align="center" prop="projectLeaderUser.nickName"></el-table-column>
               v-if="form.contractDocument == '' || form.contractDocument == null" ref="contractFile" :limit="1"
               :filePathName="'承接合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getContractPath">
             </FileUpload>
-            <div v-if="form.contractDocument != '' && form.contractDocument != null">
-              <file-item :document="form.contractDocument"></file-item>
-              <button class="preview-btn" type="primary" size="mini" plain
-                @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">在线预览</button>
+            <div v-if="form.contractDocument && taskName != '合同拟稿'">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">
+                {{ getFileName(form.contractDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.contractDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
             </div>
           </el-form-item>
-          <el-divider></el-divider>
           <el-form-item label="合同计划工作量：">
             <table border="1">
               <tr>
                     :autosize="{ minRows: 4, maxRows: 10 }" :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="payment.paymentPercentage" clearable :disabled="taskName != '合同拟稿'"></el-input>
+                  <el-input-number :controls="false" v-model="payment.paymentPercentage" clearable
+                    :disabled="taskName != '合同拟稿'" @change="calculatePaymentAmount(payment)"></el-input-number>
                 </td>
                 <td>
-                  <el-input v-model="payment.paymentAmount" clearable :disabled="taskName != '合同拟稿'"></el-input>
+                  <el-input-number :controls="false" :precision="2" v-model="payment.paymentAmount" clearable
+                    :disabled="taskName != '合同拟稿'"></el-input-number>
                 </td>
                 <td>
                   <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd"
               </el-form-item>
             </el-col>
           </el-row>
-          <el-divider></el-divider>
           <el-form-item label="评审方式" prop="commentType">
             <el-radio-group v-model="form.commentType" @change="changeCommentType" :disabled="taskName != '合同拟稿'">
               <el-radio :label="'0'">无须评审</el-radio>
               </tr>
             </table>
           </el-form-item>
+          <el-divider></el-divider>
           <el-form-item label="分管审批意见" prop="remark">
             <el-input v-model="form.managerComment" type="textarea" placeholder="请输入审批意见"
               :disabled="taskName != '分管审核'" />
               ref="contractFile" :limit="1" :filePathName="'承接合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
               @input="getSignScanPath">
             </FileUpload>
-            <div v-if="form.signScan != null && form.signScan != ''">
-              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
+            <div v-if="form.signScan && taskName != '合同签订'">
+              <!-- <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
                 tag="ul">
                 <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
                   <el-link :href="`${baseUrl}${'/profile/upload' + form.signScan}`" :underline="false" target="_blank">
                   <button class="preview-btn" type="primary" size="mini" plain
                     @click="reviewWord(`${baseUrl}${'/profile/upload' + form.signScan}`)">在线预览</button>
                 </li>
-              </transition-group>
+              </transition-group> -->
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.signScan}`)">
+                {{ getFileName(form.signScan) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.signScan}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
             </div>
           </el-form-item>
         </el-form>
         <div style="text-align: center;">
           <el-button type="primary" @click="submitForm" :disabled="formDisabled">提 交</el-button>
-          <!-- <el-button @click="cancel">取 消</el-button> -->
         </div>
       </el-col>` `
       <el-col :span="6" :xs="24">
   data() {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
+      isTenderIdValid: true, // 用于跟踪tenderId是否有效 
+      isDocumentValid: true,
       draftUser: '',
       draftTime: undefined,
       managerUser: '',
       commentTime: undefined,
       // 遮罩层
       loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // cmc合同评审表格数据
-      contractList: [],
+      projectloading: true,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
       tbOpen: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        contractNumber: null,
-        amount: null,
-        deposit: null,
-        contractDocument: null,
-        drafter: null,
-        draftTime: null,
-        signDate: null,
-        signRemark: null,
-        signScan: null,
-        commentType: ''
-      },
       // 表单参数
-      form: {},
+      form: {
+        amount: 0,
+        deposit: 0
+      },
       meetingForm: {
         users: [],
       },
     this.getDeptList();
     this.getTenderList();
     this.getUserList();
-    this.getList();
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
       this.flowData = res.data;
     })
     initRules() {
       if (this.taskName == '合同拟稿') {
         this.rules = {
-          tenderId: [
-            { required: true, message: '请选择投标项目', trigger: 'blur' },
-          ],
           contractCode: [
             { required: true, message: '请输入合同编码', trigger: 'blur' },
           ],
-          contractDocument: [
-            { required: true, message: '请上传合同文件', trigger: 'blur' },
-          ],
           commentType: [
-            { required: true, message: '请选择评审方式', trigger: 'blur' },
-          ],
+            { required: true, message: '请选择评审方式', trigger: 'change' },
+          ]
         }
       } else if (this.taskName == '分管审核') {
         this.rules = {
           this.formTotal = 0;
           this.form.drafter = this.$store.getters.userId;
           this.form.draftTime = parseTime(new Date(), '{y}-{m}-{d}');
+          this.projectloading = false;
         }
         else {
           this.formTotal = 1;
                   this.chooseProjectList.push(response.data)
                 })
               }
+              this.projectloading = false;
             }
           })
         }
       })
     },
-    /** 查询cmc合同评审列表 */
-    getList() {
-      this.loading = true;
-      listContract(this.queryParams).then(response => {
-        this.contractList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
     // 查询项目列表
     getProjectList() {
       this.loading = true
         this.isSelect = false
       }
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
     isEmptyObject(obj) {
       for (var key in obj) {
         if (obj.hasOwnProperty(key)) {
       };
       this.resetForm("form");
     },
+    // 手动验证tenderId的方法  
+    validateTenderId(tenderId) {
+      // 这里添加你的验证逻辑  
+      // 例如，检查tenderId是否为空或者是否符合其他规则  
+      if (!tenderId || tenderId.trim() === '') {
+        this.$message.error('请选择一个有效的投标项目');
+        return false;
+      }
+      return true;
+    },
+    validateDocument(doc) {
+      // 这里添加你的验证逻辑  
+      // 例如，检查tenderId是否为空或者是否符合其他规则  
+      if (!doc || doc.trim() === '') {
+        this.$message.error('请上传合同文件');
+        return false;
+      }
+      return true;
+    },
     /** 提交按钮 */
     submitForm() {
+      this.isTenderIdValid = this.validateTenderId(this.form.tenderId);
+      this.isDocumentValid = this.validateDocument(this.form.contractDocument)
+      if (!this.isTenderIdValid) {
+        // tenderId无效，阻止提交  
+        return;
+      }
+      if (!this.isDocumentValid) {
+        return;
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.formTotal != 0) {
             updateContract(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
-              this.getList();
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
               if (response.code == 200) {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
-                this.getList();
                 for (let work of this.workList) {
                   work.contractId = this.form.contractId
                   addContractWork(work);
     },
     confirmTender(val) {
       this.tbOpen = false
+      this.form.amount = val.quote
+      this.form.deposit = val.deposit
       this.form.tenderId = val.tenderId
       this.chooseTender = val
       this.isSelect = true
     },
+    calculatePaymentAmount(payment) {
+      let amount = (payment.paymentPercentage / 100) * this.form.amount
+      this.$set(payment, 'paymentAmount', Number(amount))
+    },
     reviewWord(url) {
       this.$router.push({
         path: '/preview',

oa-ui/src/views/flowable/form/business/subContract.vue

 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-04 09:18:40
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-07 10:40:11
 -->
 <template>
   <div class="app-container">
               <el-descriptions-item label="项目编号" label-class-name="my-label">
                 {{ chooseProject.projectNumber }}</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.partyA
-              }}</el-descriptions-item>
+                }}</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 :gutter="20">
           <el-row :gutter="20">
             <el-col :span="16" :xs="24">
               <el-form-item label="承接单位" prop="partnerId">
-                <el-select allow-create v-model="form.partnerId" filterable placeholder="请选择"
+                <el-select allow-create v-model="form.partnerId" filterable placeholder="请选择" style="width: 100%;"
                   :disabled="taskName != '合同拟稿'" clearable @change="handleSelectPartner">
                   <el-option v-for="item in partnerList" :key="item.value" :label="item.partnerName"
                     :value="item.partnerId">
           </el-row>
 
           <el-form-item label="合同文件" prop="contractDocument">
-            <FileUpload v-if="form.contractDocument == '' || form.contractDocument == null" :disabled="taskName != '合同拟稿'"
-              ref="contractFile" :limit="1" :filePathName="'分包合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
-              @input="getContractPath">
+            <FileUpload v-if="formTotal == 0"
+              :disabled="taskName != '合同拟稿'" ref="contractFile" :limit="1" :filePathName="'分包合同/合同文件'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getContractPath">
             </FileUpload>
-            <div v-if="form.contractDocument != '' && form.contractDocument != null">
-              <file-item :document="form.contractDocument"></file-item>
+            <div v-if="formTotal == 1">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">
+                {{ getFileName(form.contractDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.contractDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
             </div>
           </el-form-item>
           <el-form-item label="合同计划工作量：">
                     :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletWorkItem(index)"
-                    :disabled="taskName != '合同拟稿'"></el-button>
+                  <el-button type="text" style="color:#F56C6C" size="mini" circle @click="deletWorkItem(index)"
+                    :disabled="taskName != '合同拟稿'">删除行</el-button>
                 </td>
               </tr>
             </table>
           <el-form-item label="合同付款计划：">
             <table border="1">
               <tr>
-                <td style="width:50px;">序号</td>
-                <td>付款条件</td>
-                <td>付款比例（%）</td>
-                <td>付款金额（元）</td>
+                <td style="min-width:50px;">序号</td>
+                <td style="min-width:200px;">付款条件</td>
+                <td style="max-width:100px;">付款比例（%）</td>
+                <td style="max-width:100px;">付款金额（元）</td>
                 <td>预计时间</td>
                 <td>备注</td>
               </tr>
                     :autosize="{ minRows: 4, maxRows: 10 }" :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="payment.paymentPercentage" clearable :disabled="taskName != '合同拟稿'"></el-input>
+                  <el-input-number :controls="false" style="width:100%" v-model="payment.paymentPercentage" clearable
+                    @change="calculatePaymentAmount(payment)" :disabled="taskName != '合同拟稿'"></el-input-number>
                 </td>
                 <td>
-                  <el-input v-model="payment.paymentAmount" clearable :disabled="taskName != '合同拟稿'"></el-input>
+                  <el-input-number :controls="false" style="width:100%" v-model="payment.paymentAmount" clearable
+                    :disabled="taskName != '合同拟稿'"></el-input-number>
                 </td>
                 <td>
-                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd" type="date"
-                    placeholder="选择日期" :disabled="taskName != '合同拟稿'">
+                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd"
+                    type="date" placeholder="选择日期" :disabled="taskName != '合同拟稿'">
                   </el-date-picker>
                 </td>
                 <td>
                     :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletPaymentItem(index)"
-                    :disabled="taskName != '合同拟稿'"></el-button>
+                  <el-button type="text" style="color:#F56C6C" size="mini" @click="deletPaymentItem(index)"
+                    :disabled="taskName != '合同拟稿'">删除行</el-button>
                 </td>
               </tr>
             </table>
                   <span> {{ comment.commentTime }} </span>
                 </td>
                 <td>
-                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletCommentItem(index)"
-                    :disabled="taskName != '合同拟稿'"></el-button>
+                  <el-button type="text" style="color:#F56C6C" size="mini" circle @click="deletCommentItem(index)"
+                    :disabled="taskName != '合同拟稿'">删除行</el-button>
                 </td>
               </tr>
             </table>
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="签订日期" prop="signDate">
-            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期"
-              :disabled="taskName != '合同签订'">
+            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择签订日期" :disabled="taskName != '合同签订'">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="签订备注" prop="signRemark">
             <FileUpload :disabled="taskName != '合同签订'" v-if="form.signScan == null || form.signScan == ''" :limit="1"
               :filePathName="'分包合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getSignScanPath">
             </FileUpload>
-            <div v-if="form.signScan != null && form.signScan != ''">
-              <file-item :document="form.signScan"></file-item>
+            <div v-if="form.signScan && taskName != '合同签订'">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.signScan}`)">
+                {{ getFileName(form.signScan) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.signScan}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
             </div>
           </el-form-item>
         </el-form>
     initRules() {
       if (this.taskName == '合同拟稿') {
         this.rules = {
-          projectId: [
-            { required: true, message: '请选择登记项目', trigger: 'blur' },
-          ],
           partnerId: [
-            { required: true, message: '请选择承接单位', trigger: 'blur' },
+            { required: true, message: '请选择承接单位', trigger: 'change' },
           ],
           subContractName: [
             { required: true, message: '请输入分包合同名称', trigger: 'blur' },
           ],
-          contractDocument: [
-            { required: true, message: '请上传合同文件', trigger: 'blur' },
-          ],
           subAmount: [
             { required: true, message: '请输入分包合同额', trigger: 'blur' },
           ],
           commentType: [
-            { required: true, message: '请选择评审方式', trigger: 'blur' },
+            { required: true, message: '请选择评审方式', trigger: 'change' },
           ],
         }
       } else if (this.taskName == '分管审核') {
       };
       this.resetForm("form");
     },
+    validateDocument(doc) {
+      // 这里添加你的验证逻辑  
+      // 例如，检查tenderId是否为空或者是否符合其他规则  
+      if (!doc || doc.trim() === '') {
+        this.$message.error('请上传合同文件');
+        return false;
+      }
+      return true;
+    },
     /** 提交按钮 */
     submitForm() {
+      let isProjectValid = this.validateManual(this.form.projectId);
+      let isDocValid = this.validateDocument(this.form.contractDocument)
+      if (!(isProjectValid || isDocValid)) {
+        // 无效，阻止提交  
+        return;
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.formTotal != 0) {
         this.chooseProject = val[0]
         this.isSelect = true
         this.form.projectId = val[0].projectId
+        let undertakingDeptName = []
+        if (val[0].undertakingDept) {
+          let deptArr = val[0].undertakingDept.split(',');
+          for (let dept of deptArr) {
+            undertakingDeptName.push(this.getDeptName(dept))
+          }
+        }
+        this.chooseProject.undertakingDeptName = undertakingDeptName.join(',');
         listProjectContract({ projectId: this.form.projectId }).then(response => {
           if (response.rows) {
             for (let row of response.rows) {
     clickFile(val) {
       this.clickTd = val
     },
+    // 手动验证tenderId的方法  
+    validateManual(name) {
+      // 这里添加你的验证逻辑  
+      // 例如，检查tenderId是否为空或者是否符合其他规则  
+      if (!name || name.trim() === '') {
+        this.$message.error('请选择一个有效项目');
+        return false;
+      }
+      return true;
+    },
+    calculatePaymentAmount(payment) {
+      let amount = (payment.paymentPercentage / 100) * this.form.subAmount
+      this.$set(payment, 'paymentAmount', Number(amount))
+    },
   }
 };
 </script>

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

  * @Author: ysh
  * @Date: 2024-04-23 17:08:16
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-03 09:40:19
+ * @LastEditTime: 2024-06-07 16:13:25
 -->
 <template>
   <div>
     <project-process :key="'pro'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '项目流转'"></project-process>
     <car-form :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '用车审批'"></car-form>
     <technical-form :key="'tec'+taskForm.taskId" :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'"></technical-form>
-    <safe-form :key="'safe'+taskForm.taskId" :taskForm="taskForm" v-else-if="taskForm.procDefName == '安全交底'"></safe-form>
+    <safe-form :key="'safe'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '安全交底'"></safe-form>
     <settle-form :key="'fb'+taskForm.taskId" :taskForm="taskForm" :taskName="''" :disabled="true"
       v-else-if="taskForm.procDefName == '项目结算'"></settle-form>
     <!-- <budget-in :key="'budget'+taskForm.taskId" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目预算'"></budget-in> -->
       v-else-if="taskForm.procDefName == '分包合同评审'"></sub-contract>
     <archive-form :key="'arc'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '成果归档'"></archive-form>
     <borrow-form :key="'bor'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '借款审批'"></borrow-form>
+    <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="''" v-else-if="taskForm.procDefName == '设备审批'"></device-form>
   </div>
 </template>
 
 import ArchiveForm from '../archiveForm.vue';
 import BorrowForm from '../finance/borrowForm.vue';
 import BudgetTab from '../projectProcess/budgetTab.vue';
+import BrandForm from '../business/brandForm.vue';
+import DepositForm from '../finance/depositForm.vue';
+import DeviceForm from '../oa/deviceForm.vue';
 export default {
   props: {
     passingParam: {
     SubContract,
     ArchiveForm,
     BorrowForm,
-    BudgetTab
+    BudgetTab,
+    BrandForm,
+    DepositForm,
+    DeviceForm
   },
   data() {
     return {

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

             <FileUpload v-if="form.borrowDocument == null || form.borrowDocument == ''" :disabled="taskName != '借款申请'"
               :limit="1" :filePathName="'借款/申请附件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
               @input="getBorrowPath"></FileUpload>
-            <div v-if="form.borrowDocument != null && form.borrowDocument != ''">
-              <file-item :document="form.borrowDocument"></file-item>
+            <div v-if="form.borrowDocument && taskName != '借款申请'">
+              <!-- <file-item :document="form.borrowDocument"></file-item> -->
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.borrowDocument}`)">
+                {{ getFileName(form.borrowDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.borrowDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
             </div>
           </el-form-item>
           <el-divider></el-divider>
             <FileUpload v-if="form.lendDocument == null || form.lendDocument == ''" :disabled="taskName != '财务处理'"
               :limit="1" :filePathName="'借款/支付凭证'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getLendPath">
             </FileUpload>
-            <div v-if="form.lendDocument != null && form.lendDocument != ''">
-              <file-item :document="form.lendDocument"></file-item>
+            <div v-if="form.lendDocument && taskName != '财务处理'">
+              <!-- <file-item :document="form.lendDocument"></file-item> -->
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.lendDocument}`)">
+                {{ getFileName(form.lendDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.lendDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
             </div>
           </el-form-item>
           <el-form-item label="财务部支付备注" prop="cwComment">
         this.chooseProject = val[0]
         this.isSelect = true
         this.form.projectId = val[0].projectId
+        let undertakingDeptName = []
+        if (val[0].undertakingDept) {
+          let deptArr = val[0].undertakingDept.split(',');
+          for (let dept of deptArr) {
+            undertakingDeptName.push(this.getDeptName(dept))
+          }
+        }
+        this.chooseProject.undertakingDeptName = undertakingDeptName.join(',');
       }
       this.openProject = false
     },

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

             <FileUpload v-if="form.applyDocument == null || form.applyDocument == ''" :disabled="taskName != '保证金申请'"
               :limit="1" :filePathName="'保证金/申请附件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
               @input="getApplyPath"></FileUpload>
-            <div v-if="form.applyDocument != null && form.applyDocument != ''">
-              <file-item :document="form.applyDocument"></file-item>
+            <div v-if="form.applyDocument && taskName != '保证金申请'">
+              <!-- <file-item :document="form.applyDocument"></file-item> -->
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.applyDocument}`)">
+                {{ getFileName(form.applyDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.applyDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
             </div>
           </el-form-item>
           <el-row :gutter="20">
             <FileUpload v-if="form.remitDocument == null || form.remitDocument == ''" :disabled="taskName != '财务处理'"
               :limit="1" :filePathName="'保证金/汇款凭证'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
               @input="getRemitPath"></FileUpload>
-            <div v-if="form.remitDocument != null && form.remitDocument != ''">
-              <file-item :document="form.remitDocument"></file-item>
+            <div v-if="form.remitDocument && taskName != '财务处理'">
+              <!-- <file-item :document="form.remitDocument"></file-item> -->
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.remitDocument}`)">
+                {{ getFileName(form.remitDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.remitDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
             </div>
           </el-form-item>
           <el-form-item label="财务打款备注" prop="cwComment">
             { required: true, message: '请输入银行卡号', trigger: 'blur' },
           ],
           depositWay: [
-            { required: true, message: '请选择保证金形式', trigger: 'blur' },
+            { required: true, message: '请选择保证金形式', trigger: 'change' },
           ],
         }
       } else if (this.taskName == '分管审批') {
   }
 };
 </script>
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+</style>

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

 <!--
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-04 13:51:00
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-07 14:14:52
 -->
 
 <template>
         this.chooseProject = val[0]
         this.isSelect = true
         this.form.projectId = val[0].projectId
+        let undertakingDeptName = []
+        if (val[0].undertakingDept) {
+          let deptArr = val[0].undertakingDept.split(',');
+          for (let dept of deptArr) {
+            undertakingDeptName.push(this.getDeptName(dept))
+          }
+        }
+        this.chooseProject.undertakingDeptName = undertakingDeptName.join(',');
       }
       this.openProject = false
     },

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

 <!--
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-06 09:08:51
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-07 10:53:47
 -->
 <template>
   <div class="project-wrapper">
         <FileUpload v-if="$route.query.taskName == '项目登记'" ref="orz" :limit="1" :filePathName="'项目任务书'"
           :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setProjectDocument">
         </FileUpload>
-        <div v-if="$route.query.taskName != '项目登记'" class="upload-list">
-          <el-link type="primary" :href="`${baseUrl}${'/profile/upload' + addForm.taskDocument}`" :underline="false" target="_blank">
-            <span class="el-icon-document"> {{ getFileName(addForm.taskDocument) }} </span>
+        <div v-if="addForm.taskDocument && $route.query.taskName != '项目登记'" class="upload-list">
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + addForm.taskDocument}`)">
+            {{ getFileName(addForm.taskDocument) }}
+          </el-link>
+          <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + addForm.taskDocument}`"
+            :underline="false" target="_blank">
+            <span class="el-icon-download">下载文件</span>
           </el-link>
         </div>
       </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-      <div class="headers">
-        项目变更
-        <div class="line"></div>
-        <change-data :taskForm="taskForm" :taskName="$route.query.taskName"></change-data>
-      </div>
     <div slot="footer" class="dialog-footer" style="text-align: center">
       <el-button type="primary" @click="confirmAddForm" :disabled="disabled">提 交</el-button>
       <!-- <el-button @click="cancel" :disabled="disabled">取 消</el-button> -->
 import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 import chooseContract from '../components/chooseContract.vue';
-import changeData from '../inProgress/changeData.vue';
 export default {
-  components: { chooseContract, changeData },
+  components: { chooseContract },
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   props: {
     disabled: {
   },
   data() {
     return {
-      baseUrl:process.env.VUE_APP_BASE_API,
+      baseUrl: process.env.VUE_APP_BASE_API,
       openContract: false,
       registerTime: undefined,
       // 查询参数
 .el-radio__input.is-disabled.is-checked .el-radio__inner {
   border-color: var(--current-color);
 }
-
-.headers {
-  position: relative;
-  font-weight: bold;
-  font-size: 18px;
-  padding-left: 40px;
-  padding-bottom: 40px;
-
-  .line {
-    position: absolute;
-    left: 22px;
-    top: 5px;
-    width: 5px;
-    height: 14px;
-    border-radius: 10px;
-    background-color: #2893e5;
-  }
-}
-
 </style>

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

  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-04 17:38:50
+ * @LastEditTime: 2024-06-07 10:55:28
 -->
 <template>
   <div class="app-container">
         <el-col :span="12" :xs="24">
           <el-form-item label="部门负责人：" prop="deptLeader">
             <el-select v-model="form.deptLeader" multiple clearable style="width:100%">
-              <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName" :value="item.userId">
+              <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+                :value="item.userId">
               </el-option>
             </el-select>
           </el-form-item>
         <el-col :span="12" :xs="24">
           <el-form-item label="现场负责人：" prop="siteLeader">
             <el-select v-model="form.siteLeader" filterable clearable style="width:100%">
-              <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName" :value="item.userId"
-                v-if="item.nickName != 'admin'">
+              <el-option v-for="item in $store.state.user.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-col :span="12" :xs="24">
           <el-form-item label="组织交底文档：" prop="organizeDocument">
-            <FileUpload v-if="$route.query.taskName == '项目安排'" ref="orz" :limit="1" :filePathName="'组织交底文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
-              @input="setOrganizeDocument">
+            <FileUpload v-if="$route.query.taskName == '项目安排'" ref="orz" :limit="1" :filePathName="'组织交底文件'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setOrganizeDocument">
             </FileUpload>
-            <div v-if="$route.query.taskName != '项目安排'" class="upload-list">
-              <el-link type="primary" :href="`${baseUrl}${'/profile/upload' + form.organizeDocument}`" :underline="false"
-                target="_blank">
-                <span class="el-icon-document"> {{ getFileName(form.organizeDocument) }} </span>
+            <div v-if="form.organizeDocument && $route.query.taskName != '项目安排'" class="upload-list">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.organizeDocument}`)">
+                {{ getFileName(form.organizeDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.organizeDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
               </el-link>
             </div>
-            <!-- <button class="preview-btn" type="primary" size="mini" plain @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">在线预览</button> -->
           </el-form-item>
         </el-col>
       </el-row>
     initForm() {
       getProject(this.taskForm.formId).then(res => {
         this.form = res.data;
-        console.log( this.form);
         if (this.form.undertakingDept != null && this.form.undertakingDept != "" && this.form.undertakingDept != undefined) {
           this.form.deptId = this.form.undertakingDeptName.split(',')
         }
 
     },
     handleFileDelete() {
-      console.log(this);
       // this.$refs.orz.handleDelete(0);
     },
   }
 </script>
 
 <style lang="scss" scoped>
-.upload-list {
-  
-}
+.upload-list {}
 </style>

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

  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-03 16:10:57
+ * @LastEditTime: 2024-06-07 11:49:08
 -->
 <template>
   <div class="app-container">
             this.$modal.msgError('请签名');
             return
           }
-
         }
         updateProjectComment(this.form)
         const params = { taskId: this.taskForm.taskId };

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

     },
     // 查询项目
     getProjectById() {
-      getProject(this.$route.query.formId).then(response => {
+      getProject(this.taskForm.formId).then(response => {
         this.chooseProject = response.data;
         this.isSelect = true;
         this.form.disclosureAccepter = response.data.projectLeader;

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

  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-03 17:06:45
+ * @LastEditTime: 2024-06-07 10:00:28
 -->
 <template>
   <div class="app-container" v-loading="loading">
-    <el-button type="warning" icon="el-icon-printer" @click="printOpen = true"
-      >打印</el-button
-    >
-    <el-dialog
-      title="结算表格预览"
-      :visible.sync="printOpen"
-      width="65%"
-      append-to-body
-    >
-      <settle-print
-        :form="form"
-        :chooseProject="chooseProject"
-        :workList="settleWorkList"
-        :settleList="oldSettleSumList"
-        @cancel="printOpen = false"
-      ></settle-print>
+    <el-button type="warning" icon="el-icon-printer" @click="printOpen = true">打印</el-button>
+    <el-dialog title="结算表格预览" :visible.sync="printOpen" width="65%" append-to-body>
+      <settle-print :form="form" :chooseProject="chooseProject" :workList="settleWorkList"
+        :settleList="oldSettleSumList" @cancel="printOpen = false"></settle-print>
     </el-dialog>
     <el-row :gutter="20">
       <el-col :span="19" :xs="24">
           项目信息
           <div class="line"></div>
         </div>
-        <el-form
-          ref="settleForm"
-          :model="form"
-          :rules="rules"
-          label-width="160px"
-          :disabled="disabled"
-        >
+        <el-form ref="settleForm" :model="form" :rules="rules" label-width="160px" :disabled="disabled">
           <el-form-item label="项目编号" prop="projectId">
-            <el-button
-              icon="el-icon-plus"
-              size="mini"
-              type="primary"
-              @click="prOpen = true"
-              >选择项目</el-button
-            >
-            <!-- <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
-              :disabled="taskName != '结算发起'" clearable style="width: 100%">
-              <el-option v-for="item in projectList" :key="item.value"
-                :label="item.projectNumber + '-' + item.projectName" :value="item.projectId">
-              </el-option>
-            </el-select> -->
-            <el-descriptions
-              border
-              v-if="isSelect"
-              style="margin-top: 10px"
-              :column="2"
-            >
-              <el-descriptions-item
-                label="项目编号"
-                label-class-name="my-label"
-              >
+            <el-button icon="el-icon-plus" size="mini" type="primary" @click="prOpen = true">选择项目</el-button>
+            <el-descriptions border v-if="isSelect" style="margin-top: 10px" :column="2">
+              <el-descriptions-item label="项目编号" label-class-name="my-label">
                 {{ chooseProject.projectNumber }}
               </el-descriptions-item>
-              <el-descriptions-item
-                label="项目名称"
-                label-class-name="my-label"
-              >
+              <el-descriptions-item label="项目名称" label-class-name="my-label">
                 {{ chooseProject.projectName }}
               </el-descriptions-item>
-              <el-descriptions-item
-                label="合同编码"
-                label-class-name="my-label"
-              >
+              <el-descriptions-item label="合同编码" label-class-name="my-label">
                 {{ chooseProject.contractCode }}
               </el-descriptions-item>
-              <el-descriptions-item
-                label="合同编号"
-                label-class-name="my-label"
-              >
+              <el-descriptions-item label="合同编号" label-class-name="my-label">
                 {{ chooseProject.contractNumber }}
               </el-descriptions-item>
-              <el-descriptions-item
-                label="项目负责人"
-                label-class-name="my-label"
-              >
-                {{
-                  chooseProject.projectLeaderUser
-                    ? chooseProject.projectLeaderUser.nickName
-                    : ""
-                }}
+              <el-descriptions-item label="项目负责人" label-class-name="my-label">
+                {{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : "" }}
               </el-descriptions-item>
-              <el-descriptions-item
-                label="甲方单位"
-                label-class-name="my-label"
-              >
+              <el-descriptions-item label="甲方单位" label-class-name="my-label">
                 {{ chooseProject.partyA }}
               </el-descriptions-item>
               <el-descriptions-item label="联系人" label-class-name="my-label">
                 {{ chooseProject.contactPerson }}
               </el-descriptions-item>
-              <el-descriptions-item
-                label="联系电话"
-                label-class-name="my-label"
-              >
+              <el-descriptions-item label="联系电话" label-class-name="my-label">
                 {{ chooseProject.telephone }}
               </el-descriptions-item>
-              <el-descriptions-item
-                label="项目类型"
-                label-class-name="my-label"
-              >
+              <el-descriptions-item label="项目类型" label-class-name="my-label">
                 {{ chooseProject.projectType }}
               </el-descriptions-item>
-              <el-descriptions-item
-                label="项目级别"
-                label-class-name="my-label"
-              >
+              <el-descriptions-item label="项目级别" label-class-name="my-label">
                 {{
-                  chooseProject.projectLevel == "0" ? " 一般项目" : "重大项目"
-                }}
+    chooseProject.projectLevel == "0" ? " 一般项目" : "重大项目"
+  }}
               </el-descriptions-item>
-              <el-descriptions-item
-                label="承担部门"
-                label-class-name="my-label"
-              >
+              <el-descriptions-item label="承担部门" label-class-name="my-label">
                 {{ chooseProject.undertakingDeptName }}
               </el-descriptions-item>
-              <el-descriptions-item
-                label="项目登记人"
-                label-class-name="my-label"
-              >
-                {{ chooseProject.projectRegistrantName }}
+              <el-descriptions-item label="项目登记人" label-class-name="my-label">
+                {{ chooseProject.projectRegistrantUser ? chooseProject.projectRegistrantUser.nickName:"" }}
               </el-descriptions-item>
             </el-descriptions>
           </el-form-item>
           <el-form-item label="工作量上报说明" prop="workloadReport">
-            <el-input
-              v-model="form.workloadReport"
-              type="textarea"
-              :disabled="taskName != '结算发起'"
-              placeholder="请输入工作量上报说明"
-            />
+            <el-input v-model="form.workloadReport" type="textarea" :disabled="taskName != '结算发起'"
+              placeholder="请输入工作量上报说明" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
             </el-col>
           </el-row>
           <el-form-item label="原始上报数据" prop="">
-            <FileUpload
-              v-if="taskName == '结算发起'"
-              :limit="1"
-              :filePathName="'项目结算/原始数据'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
-              @input="setSettleDocument"
-            >
+            <FileUpload v-if="taskName == '结算发起'" :limit="1" :filePathName="'项目结算/原始数据'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setSettleDocument">
             </FileUpload>
-            <div v-if="taskName != '结算发起'" class="upload-list">
-              <el-link
-                :href="`${baseUrl}${'/profile/upload' + form.settleDocument}`"
-                :underline="false"
-                target="_blank"
-              >
+            <div v-if="form.settleDocument && taskName != '结算发起'" class="upload-list">
+              <!-- <el-link :href="`${baseUrl}${'/profile/upload' + form.settleDocument}`" :underline="false"
+                target="_blank">
                 <span class="el-icon-document" style="color: #00f">
                   {{ getFileName(form.settleDocument) }}
                 </span>
+              </el-link> -->
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.settleDocument}`)">
+                {{ getFileName(form.settleDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.settleDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
               </el-link>
             </div>
           </el-form-item>
           <el-form-item label="项目管理部审核结算单" prop="">
-            <FileUpload
-              v-if="taskName == '项目管理部结算'"
-              :limit="1"
-              :filePathName="'项目结算/项目管理部审核结算单'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
-              @input="setModifyDocument"
-            >
+            <FileUpload v-if="taskName == '项目管理部结算'" :limit="1" :filePathName="'项目结算/项目管理部审核结算单'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setModifyDocument">
             </FileUpload>
-            <div
-              v-if="taskName != '项目管理部结算' && form.modifyDocument"
-              class="upload-list"
-            >
-              <el-link
-                :href="`${baseUrl}${'/profile/upload' + form.modifyDocument}`"
-                :underline="false"
-                target="_blank"
-              >
+            <div v-if="taskName != '项目管理部结算' && form.modifyDocument" class="upload-list">
+              <el-link :href="`${baseUrl}${'/profile/upload' + form.modifyDocument}`" :underline="false"
+                target="_blank">
                 <span class="el-icon-document" style="color: #00f">
                   {{ getFileName(form.modifyDocument) }}
                 </span>
             </div>
           </el-form-item>
           <el-form-item label="分管领导审核结算单" prop="">
-            <FileUpload
-              v-if="taskName == '分管审核'"
-              :limit="1"
-              :filePathName="'项目结算/分管领导审核结算单'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
-              @input="setFinalDocument"
-            >
+            <FileUpload v-if="taskName == '分管审核'" :limit="1" :filePathName="'项目结算/分管领导审核结算单'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setFinalDocument">
             </FileUpload>
-            <div
-              v-if="taskName != '分管审核' && form.finalDocument"
-              class="upload-list"
-            >
-              <el-link
-                :href="`${baseUrl}${'/profile/upload' + form.finalDocument}`"
-                :underline="false"
-                target="_blank"
-              >
+            <div v-if="taskName != '分管审核' && form.finalDocument" class="upload-list">
+              <el-link :href="`${baseUrl}${'/profile/upload' + form.finalDocument}`" :underline="false" target="_blank">
                 <span class="el-icon-document" style="color: #00f">
                   {{ getFileName(form.finalDocument) }}
                 </span>
                   {{ index + 1 }}
                 </td>
                 <td>
-                  <tr>
-                    <td>
-                      <el-button
-                        size="mini"
-                        type="primary"
-                        icon="el-icon-plus"
-                        @click="handleChoosePrice(work, index)"
-                        >选择工作内容</el-button
-                      >
-                    </td>
-                  </tr>
-                  <tr>
-                    <td>
-                      <el-input
-                        v-model="work.content"
-                        type="textarea"
-                        clearable
-                        :autosize="{ minRows: 4, maxRows: 10 }"
-                      ></el-input>
-                    </td>
-                  </tr>
-                </td>
-                <td>
-                  {{ work.scale == "" ? "无" : work.scale }}
-                </td>
-                <td>
-                  {{ work.unit }}
-                </td>
-                <td>
-                  {{ work.groundType == "0" ? "一般地类" : "复杂地类" }}
-                </td>
-                <td>
-                  {{ work.price }}
-                </td>
-                <td>
-                  <el-input-number
-                    :precision="2"
-                    style="width: 100px"
-                    v-model="work.workload"
-                    clearable
-                    @blur="calculateSettle(work)"
-                    :controls="false"
-                  ></el-input-number>
-                </td>
-                <td>
-                  <div style="display: flex">
-                    <el-input-number
-                      :precision="2"
-                      style="width: 100px"
-                      v-model="work.coefficient"
-                      clearable
-                      @blur="calculateSettle(work)"
-                      :controls="false"
-                    ></el-input-number>
-                    <el-popover
-                      placement="top-start"
-                      title="系数备注"
-                      width="200"
-                      trigger="click"
-                    >
-                      <div v-html="work.noteTip"></div>
-                      <i
-                        class="el-icon-info"
-                        slot="reference"
-                        @click="getCoefficientRemark(work, work.workType)"
-                      ></i>
-                    </el-popover>
-                  </div>
-                </td>
-                <td>
-                  <!-- <el-input-number style="width:100px" v-model="work.settle" clearable :controls="false"></el-input-number> -->
-                  {{ work.settle }}
-                </td>
+              <tr>
                 <td>
-                  <el-input
-                    v-model="work.remark"
-                    type="textarea"
-                    clearable
-                    :autosize="{ minRows: 4, maxRows: 10 }"
-                  ></el-input>
+                  <el-button size="mini" type="primary" icon="el-icon-plus"
+                    @click="handleChoosePrice(work, index)">选择工作内容</el-button>
                 </td>
+              </tr>
+              <tr>
                 <td>
-                  <el-button
-                    type="text"
-                    size="mini"
-                    style="color: #f56c6c"
-                    @click="deletWorkItem(index, settleWorkList)"
-                    >删除行</el-button
-                  >
+                  <el-input v-model="work.content" type="textarea" clearable
+                    :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
                 </td>
               </tr>
+              </td>
+              <td>
+                {{ work.scale == "" ? "无" : work.scale }}
+              </td>
+              <td>
+                {{ work.unit }}
+              </td>
+              <td>
+                {{ work.groundType == "0" ? "一般地类" : "复杂地类" }}
+              </td>
+              <td>
+                {{ work.price }}
+              </td>
+              <td>
+                <el-input-number :precision="2" style="width: 100px" v-model="work.workload" clearable
+                  @blur="calculateSettle(work)" :controls="false"></el-input-number>
+              </td>
+              <td>
+                <div style="display: flex">
+                  <el-input-number :precision="2" style="width: 100px" v-model="work.coefficient" clearable
+                    @blur="calculateSettle(work)" :controls="false"></el-input-number>
+                  <el-popover placement="top-start" title="系数备注" width="200" trigger="click">
+                    <div v-html="work.noteTip"></div>
+                    <i class="el-icon-info" slot="reference" @click="getCoefficientRemark(work, work.workType)"></i>
+                  </el-popover>
+                </div>
+              </td>
+              <td>
+                <!-- <el-input-number style="width:100px" v-model="work.settle" clearable :controls="false"></el-input-number> -->
+                {{ work.settle }}
+              </td>
+              <td>
+                <el-input v-model="work.remark" type="textarea" clearable
+                  :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+              </td>
+              <td>
+                <el-button type="text" size="mini" style="color: #f56c6c"
+                  @click="deletWorkItem(index, settleWorkList)">删除行</el-button>
+              </td>
+              </tr>
               <tr>
                 <td :colspan="8">结算费用合计</td>
                 <td>{{ settleSumTr.amount }}</td>
                 <td>
-                  <el-input
-                    v-model="settleSumTr.remark"
-                    type="textarea"
-                    clearable
-                    :autosize="{ minRows: 2, maxRows: 10 }"
-                  ></el-input>
+                  <el-input v-model="settleSumTr.remark" type="textarea" clearable
+                    :autosize="{ minRows: 2, maxRows: 10 }"></el-input>
                 </td>
               </tr>
             </table>
-            <el-button
-              icon="el-icon-plus"
-              type="primary"
-              plain
-              size="mini"
-              @click="addWorkList"
-            ></el-button>
+            <el-button icon="el-icon-plus" type="primary" plain size="mini" @click="addWorkList"></el-button>
           </el-form-item>
 
           <!-- 结算汇总 -->
                   {{ index + 1 }}
                 </td>
                 <td>
-                  <el-input
-                    v-model="work.content"
-                    type="textarea"
-                    clearable
-                    :autosize="{ minRows: 2, maxRows: 10 }"
-                  >
+                  <el-input v-model="work.content" type="textarea" clearable :autosize="{ minRows: 2, maxRows: 10 }">
                   </el-input>
                 </td>
                 <td>
-                  <el-input-number
-                    :min="0"
-                    :precision="2"
-                    style="width: 200px"
-                    v-model="work.amount"
-                    clearable
-                    :controls="false"
-                    @blur="calculateActualSumSettle()"
-                  ></el-input-number>
+                  <el-input-number :min="0" :precision="2" style="width: 200px" v-model="work.amount" clearable
+                    :controls="false" @blur="calculateActualSumSettle()"></el-input-number>
                   <!-- {{ work.amount }} -->
                 </td>
                 <td>
-                  <el-input
-                    v-model="work.remark"
-                    type="textarea"
-                    clearable
-                    :autosize="{ minRows: 2, maxRows: 10 }"
-                  >
+                  <el-input v-model="work.remark" type="textarea" clearable :autosize="{ minRows: 2, maxRows: 10 }">
                   </el-input>
                 </td>
                 <td>
-                  <el-button
-                    type="text"
-                    size="mini"
-                    style="color: #f56c6c"
-                    @click="deletWorkItem(index, settleSumList)"
-                    >删除行</el-button
-                  >
+                  <el-button type="text" size="mini" style="color: #f56c6c"
+                    @click="deletWorkItem(index, settleSumList)">删除行</el-button>
                 </td>
               </tr>
             </table>
-            <el-button
-              icon="el-icon-plus"
-              type="primary"
-              plain
-              size="mini"
-              @click="addSumWorkList"
-            ></el-button>
+            <el-button icon="el-icon-plus" type="primary" plain size="mini" @click="addSumWorkList"></el-button>
             <h3>表2：部门结算金额</h3>
             <table border="1">
               <tr>
               </tr>
               <tr v-for="(dept, index) in deptSettleList" :key="index">
                 <td :rowspan="deptSettleList.length" v-if="index == 0">
-                  {{ actualSumSettle }}
+                  {{ Number(actualSumSettle).toFixed(2) }}
                 </td>
                 <td>
                   {{ index + 1 }}
                 </td>
                 <td>
-                  <el-input
-                    v-model="dept.content"
-                    type="textarea"
-                    clearable
-                    :autosize="{ minRows: 2, maxRows: 10 }"
-                  >
-                  </el-input>
+                  <!-- <el-input v-model="dept.content" type="textarea" clearable :autosize="{ minRows: 2, maxRows: 10 }">
+                  </el-input> -->
+                  <el-select v-model="dept.content" placeholder="请选择" filterable clearable style="width:100%;">
+                    <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName"
+                      :value="item.deptName">
+                    </el-option>
+                  </el-select>
                 </td>
                 <td>
-                  <el-input-number
-                    :precision="2"
-                    style="width: 200px"
-                    v-model="dept.amount"
-                    clearable
-                    :controls="false"
-                    @blur="calculateDeptAmount(index)"
-                  ></el-input-number>
+                  <el-input-number :precision="2" style="width: 200px" v-model="dept.amount" clearable :controls="false"
+                    @blur="calculateDeptAmount(index)"></el-input-number>
                 </td>
                 <td>
-                  <el-input
-                    v-model="dept.remark"
-                    type="textarea"
-                    clearable
-                    :autosize="{ minRows: 2, maxRows: 10 }"
-                  >
+                  <el-input v-model="dept.remark" type="textarea" clearable :autosize="{ minRows: 2, maxRows: 10 }">
                   </el-input>
                 </td>
                 <td>
-                  <el-button
-                    type="text"
-                    size="mini"
-                    style="color: #f56c6c"
-                    @click="deletWorkItem(index, deptSettleList)"
-                    >删除行</el-button
-                  >
+                  <el-button type="text" size="mini" style="color: #f56c6c"
+                    @click="deletWorkItem(index, deptSettleList)">删除行</el-button>
                 </td>
               </tr>
-              <!-- <tr>
-                <td :colspan="2">实际结算总金额</td>
-                <td :colspan="3">
-                  {{actualSumSettle}}
-                  <el-input-number :precision="2" style="width: 100%" v-model="actualSumSettle" clearable
-                    :controls="false"></el-input-number>
-                </td>
-              </tr> -->
               <tr>
                 <td :colspan="2">结算说明</td>
                 <td :colspan="3">
-                  <el-input
-                    v-model="form.settleComment"
-                    type="textarea"
-                    clearable
-                    :autosize="{ minRows: 2, maxRows: 10 }"
-                  >
+                  <el-input v-model="form.settleComment" type="textarea" clearable placeholder="请输入说明"
+                    :autosize="{ minRows: 2, maxRows: 10 }">
                   </el-input>
                 </td>
               </tr>
             </table>
-            <el-button
-              icon="el-icon-plus"
-              type="primary"
-              plain
-              size="mini"
-              @click="addDeptSettleList"
-            ></el-button>
+            <el-button icon="el-icon-plus" type="primary" plain size="mini" @click="addDeptSettleList"></el-button>
           </el-form-item>
 
           <!-- 结算审核情况 -->
               <div class="line"></div>
             </div>
             <el-form-item label="综合事务部(设备领用情况)">
-              <el-input
-                v-model="form.zhComment"
-                type="textarea"
-                :disabled="taskName != '综合事务部处理'"
-                clearable
-                :autosize="{ minRows: 4, maxRows: 10 }"
-              >
+              <el-input v-model="form.zhComment" type="textarea" :disabled="taskName != '综合事务部处理'" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }">
               </el-input>
             </el-form-item>
             <el-row>
               </el-col>
             </el-row>
             <el-form-item label="技术质量部(质量及工作量)">
-              <el-input
-                v-model="form.jsComment"
-                type="textarea"
-                :disabled="taskName != '技术质量部审核'"
-                clearable
-                :autosize="{ minRows: 4, maxRows: 10 }"
-              >
+              <el-input v-model="form.jsComment" type="textarea" :disabled="taskName != '技术质量部审核'" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }">
               </el-input>
             </el-form-item>
             <el-row>
               </el-col>
             </el-row>
             <el-form-item label="项目管理部(结算)">
-              <el-input
-                v-model="form.xmComment"
-                type="textarea"
-                :disabled="taskName != '项目管理部结算'"
-                clearable
-                :autosize="{ minRows: 4, maxRows: 10 }"
-              >
+              <el-input v-model="form.xmComment" type="textarea" :disabled="taskName != '项目管理部结算'" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }">
               </el-input>
             </el-form-item>
             <el-row>
               </el-col>
             </el-row>
             <el-form-item label="项目承担部门(确认)">
-              <el-input
-                v-model="form.deptComment"
-                type="textarea"
-                :disabled="taskName != '结算发起人确认'"
-                clearable
-                :autosize="{ minRows: 4, maxRows: 10 }"
-              >
+              <el-input v-model="form.deptComment" type="textarea" :disabled="taskName != '结算发起人确认'" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }">
               </el-input>
             </el-form-item>
             <el-row>
               </el-col>
             </el-row>
             <el-form-item label="经营发展部(校核)">
-              <el-input
-                v-model="form.jyComment"
-                type="textarea"
-                :disabled="taskName != '经营发展部校核'"
-                clearable
-                :autosize="{ minRows: 4, maxRows: 10 }"
-              >
+              <el-input v-model="form.jyComment" type="textarea" :disabled="taskName != '经营发展部校核'" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }">
               </el-input>
             </el-form-item>
             <el-row>
               </el-col>
             </el-row>
             <el-form-item label="分管领导(审核)">
-              <el-input
-                v-model="form.managerComment"
-                type="textarea"
-                :disabled="taskName != '分管审核'"
-                clearable
-                :autosize="{ minRows: 4, maxRows: 10 }"
-              >
+              <el-input v-model="form.managerComment" type="textarea" :disabled="taskName != '分管审核'" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }">
               </el-input>
             </el-form-item>
             <el-row>
               </el-col>
             </el-row>
             <el-form-item label="总经理(审批)">
-              <el-input
-                v-model="form.gmComment"
-                type="textarea"
-                :disabled="taskName != '总经理审批'"
-                clearable
-                :autosize="{ minRows: 4, maxRows: 10 }"
-              >
+              <el-input v-model="form.gmComment" type="textarea" :disabled="taskName != '总经理审批'" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }">
               </el-input>
             </el-form-item>
             <el-row>
         </el-form>
         <div style="text-align: center" v-if="!disabled">
           <el-button type="warning" @click="preserve">保存</el-button>
-          <el-button type="primary" @click="submitNextFlow"
-            >提交下一个流程</el-button
-          >
+          <el-button type="primary" @click="submitNextFlow">提交下一个流程</el-button>
         </div>
       </el-col>
       <el-col :span="5" :xs="24">
     </el-row>
 
     <el-drawer title="选择单价" :visible.sync="drawer" direction="rtl">
-      <choose-price
-        :row="clickWork"
-        @getPrice="getPrice"
-        @cancel="drawer = false"
-      ></choose-price>
+      <choose-price :row="clickWork" @getPrice="getPrice" @cancel="drawer = false"></choose-price>
     </el-drawer>
 
-    <el-dialog
-      title="选择项目"
-      :visible.sync="prOpen"
-      width="70%"
-      append-to-body
-    >
+    <el-dialog title="选择项目" :visible.sync="prOpen" width="70%" append-to-body>
       <choose-project @chooseProject="confirmProject"></choose-project>
     </el-dialog>
   </div>
       actualSumSettle: "",
       clickWork: {},
       deptId: undefined,
+      deptList: []
     };
   },
   created() {
         }
         setTimeout(() => {
           this.loading = false;
+          this.deptList = this.$store.state.user.deptList
         }, 500);
       });
     },
             this.addSettleFn();
             this.$message.success("保存成功");
           }
-        }else{
+        } else {
           this.$message.error('请完善表单必填项')
         }
       });
           } else if (this.taskName == "总经理审批") {
             this.getNextFlowNodeFn();
           }
-        }else{
+        } else {
           this.$message.error('请完善表单必填项')
         }
       });
               );
             }
           });
-          let deptArr = this.chooseProject.undertakingDept.split(",");
-          let undertakingDept = [];
-          for (let dept of deptArr) {
-            getDept(dept).then((res) => {
-              if (res.data) {
-                undertakingDept.push(res.data.deptName);
-                this.$set(
-                  this.chooseProject,
-                  "undertakingDeptName",
-                  undertakingDept.join(",")
-                );
-              }
-            });
-          }
         });
       } else {
         this.isSelect = false;
       if (index >= 0 && index < arr.length) {
         arr.splice(index, 1);
       }
+      this.calculateSumSettle();
+      this.calculateActualSumSettle();
     },
     calculateSettle(work) {
       let sum = work.workload * work.coefficient * work.price;
       if (val.length == 1) {
         this.prOpen = false;
         this.chooseProject = val[0];
-        this.$set(this.form,'projectId',val[0].projectId)
+        console.log(val[0]);
+        let undertakingDeptName = []
+        if (val[0].undertakingDept) {
+          let deptArr = val[0].undertakingDept.split(',');
+          for (let dept of deptArr) {
+            undertakingDeptName.push(this.getDeptName(dept))
+          }
+        }
+        this.chooseProject.undertakingDeptName = undertakingDeptName.join(',');
+        this.$set(this.form, 'projectId', val[0].projectId)
         this.isSelect = true;
       } else {
         this.$message.error("项目只能选择一个！");

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

   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="18" :xs="24">
-        <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="130px">
           <el-form-item label="项目编号：" prop="projectId" v-if="taskForm.procDefName == '技术交底'">
             <el-input v-model="chooseProject.projectNumber" placeholder="请输入项目编号" disabled style="width: 300px" />
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
           <el-form-item label="初始技术方案" prop="technicalDocument">
             <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}`"
+            <!-- <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-link> -->
+            <div v-if="form.technicalDocument && taskName != '方案上传'">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.technicalDocument}`)">
+                {{ getFileName(form.technicalDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.technicalDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
+            </div>
           </el-form-item>
           <el-form-item label="方案说明" prop="designDescription">
             <el-input type="textarea" v-model="form.designDescription" placeholder="请输入方案说明"
           <el-form-item label="修改技术方案" prop="modifyDocument">
             <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}`"
+            <!-- <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-link> -->
+            <div v-if="form.modifyDocument && taskName != '技术审核'">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.modifyDocument}`)">
+                {{ getFileName(form.modifyDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.modifyDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
+            </div>
           </el-form-item>
           <el-form-item label="技术部审核意见" prop="technicalComment">
             <el-input type="textarea" v-model="form.technicalComment" placeholder="请输入技术审核意见"
           <el-form-item label="最终技术方案" prop="finalDocument">
             <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}`"
+            <!-- <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-link> -->
+            <div v-if="form.finalDocument && taskName != '总工审核'">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.finalDocument}`)">
+                {{ getFileName(form.finalDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.finalDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
+            </div>
           </el-form-item>
           <el-form-item label="总工程师审核意见" prop="manageComment">
             <el-input type="textarea" v-model="form.manageComment" placeholder="请输入总工审核意见"
     },
     // 查询项目
     getProjectById() {
-      getProject(this.$route.query.formId).then(response => {
+      getProject(this.taskForm.formId).then(response => {
         this.chooseProject = response.data;
         this.isSelect = true
       });

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

  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-03 17:07:45
+ * @LastEditTime: 2024-06-06 15:45:51
 -->
 <template>
   <div class="app-container">
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+        console.log(row);
       const ids = row.procInsId || this.ids;// 暂不支持删除多个流程
-      this.$confirm('是否确认删除流程定义编号为"' + ids + '"的数据项?', "警告", {
+      this.$confirm('删除后,流程将会取消,是否确定删除?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"

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

       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="设备id" align="center" prop="deviceId" /> -->
       <el-table-column label="设备状态" align="center" prop="status">
           <el-tag :type="statusTypeStyle(scope.row.status)">{{ statusTypeText(scope.row.status) }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="出厂编号" align="center" prop="code" />
+      <el-table-column label="设备品牌" align="center" prop="brand" />
       <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="code" />
       <el-table-column label="购置时间" align="center" prop="acquisitionTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.acquisitionTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="购买价格（元）" align="center" prop="cost" />
-      <el-table-column label="预计使用年限" align="center" prop="expectLife" />
-      <el-table-column label="设备品牌" align="center" prop="brand" />
-      <el-table-column label="单日成本（元）" align="center" prop="dayCost" />
+      <!-- <el-table-column label="预计使用年限" align="center" prop="expectLife" /> -->
+      <!-- <el-table-column label="单日成本（元）" align="center" prop="dayCost" />
       <el-table-column label="存放地点" align="center" prop="place" />
-      <el-table-column label="管理部门" align="center" prop="dept.deptName" />
+      <el-table-column label="管理部门" align="center" prop="dept.deptName" /> -->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 

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

             @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="部门">
-          <el-select v-model="queryParams.deptId" clearable>
+          <el-select v-model="queryParams.deptId" clearable @change="handleQuery">
             <el-option v-for="item in deptList" :key="item.id" :label="item.label" :value="item.id">
             </el-option>
           </el-select>
           <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
             v-hasPermi="['system:user:remove']">删除</el-button>
         </el-col>
-        <el-col :span="1.5">
+        <!-- <el-col :span="1.5">
           <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
             v-hasPermi="['system:user:import']">导入</el-button>
-        </el-col>
+        </el-col> -->
         <el-col :span="1.5">
           <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
             v-hasPermi="['system:user:export']">导出</el-button>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
       </el-row>
 
-      <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" border :data="userList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column label="序号" width="50" align="center" prop="userId">
           <template slot-scope="scope">
         <el-table-column label="岗级" align="center" key="postLevel" v-if="columns[5].visible"
           :show-overflow-tooltip="true">
           <template slot-scope="scope">
-              {{ selectDictLabel(dict.type.sys_user_postlevel,scope.row.postLevel) +  selectDictLabel(dict.type.sys_user_salarylevel,scope.row.salaryLevel)}}
+            {{ selectDictLabel(dict.type.sys_user_postlevel, scope.row.postLevel) +
+      selectDictLabel(dict.type.sys_user_salarylevel, scope.row.salaryLevel) }}
           </template>
         </el-table-column>
         <el-table-column label="职称" align="center" key="titles" prop="titles" v-if="columns[6].visible"
           :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ selectDictLabel(dict.type.sys_user_titles,scope.row.titles) }}
+            {{ selectDictLabel(dict.type.sys_user_titles, scope.row.titles) }}
           </template>
         </el-table-column>
         <el-table-column label="执业证书" align="center" key="certificates" prop="certificates" v-if="columns[7].visible"
             <span>{{ parseTime(scope.row.contractSign, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="合同期满" align="center" key="contractExpire" prop="contractExpire" v-if="columns[8].visible"
-          :show-overflow-tooltip="true">
+        <el-table-column label="合同期满" align="center" key="contractExpire" prop="contractExpire"
+          v-if="columns[8].visible" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.contractExpire, '{y}-{m}-{d}') }}</span>
           </template>
                 value-format="yyyy-MM" />
             </el-form-item>
             <el-form-item label="政治面貌" prop="politicalAffiliation">
-              <el-select v-model="form.politicalAffiliation" multiple clearable placeholder="请选择政治面貌" style="width:100%;">
+              <el-select v-model="form.politicalAffiliation" multiple clearable placeholder="请选择政治面貌"
+                style="width:100%;">
                 <el-option v-for="dict in dict.type.sys_user_political" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>
               this.getList();
             });
           } else {
+            this.form.certificates = this.form.certificates.length == 0? '' : this.form.certificates;
+            this.form.politicalAffiliation = this.form.politicalAffiliation.length == 0 ? '' : this.form.politicalAffiliation;
             addUser(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

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

  * @Author: ysh
  * @Date: 2024-03-22 14:50:46
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-20 15:17:11
+ * @LastEditTime: 2024-06-07 16:03:41
 -->
 <template>
   <div class="bg" v-loading="loading">
       </div>
     </div>
     <el-row class="app-container">
-      <el-col :span="6" class="userInfo">
+      <el-col :span="8" class="userInfo">
         <div class="text-center">
           <div class="avatar">
             <img :src="avatar" class="user-avatar" />
           </div>
-          <div class="user-name">{{ this.form.nickName }}</div>
+          <div class="user-name">{{ form.nickName }}</div>
           <div class="user-sex">
-            {{ getAgeByIdCard(this.form.idCard) + '岁' }} {{ this.form.sex == '0' ? ' 男' : ' 女' }}
+            {{ getAgeByIdCard(form.idCard) + '岁' }} {{ form.sex == '0' ? ' 男' : ' 女' }}
             <el-tag :type="form.status == '在职' ? 'success' : 'warning'">{{ form.status }}</el-tag>
           </div>
         </div>
             <svg-icon icon-class="dept" class="info-icon"></svg-icon>
             <div class="item-label">部门：</div>
           </div>
+          <div>{{ form.dept ? form.dept.deptName : '' }}</div>
+        </div>
+        <div class="info-item">
+          <div class="item-label">
+            <svg-icon icon-class="post" class="info-icon"></svg-icon>
+            <div class="item-label">职务：</div>
+          </div>
           <div>{{ postData }}</div>
         </div>
         <div class="info-item">
           <div>{{ form.homePlace }}</div>
         </div>
       </el-col>
-      <el-col :span="17" class="stateInfo">
+      <el-col :span="15" class="stateInfo">
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <!-- <el-tab-pane label="负责项目" name="1">
             <projectInfo></projectInfo>
           }
         }
       }
-      this.postData = '中水成勘测绘公司-' + postArr.join('-')
+      this.postData = postArr.join('/')
 
       if (this.form.status == '0') {
         this.form.status = '在职'

oa-ui/src/views/oa/staff/salary.vue

         </template>
       </el-table-column>
     </el-table>
-
+<!-- 
     <pagination v-if="tabelOpen" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize" @pagination="getList" />
+      :limit.sync="queryParams.pageSize" @pagination="getList" /> -->
 
     <!-- 添加或修改cmc岗位工资对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 999,
         postLevel: null,
         salaryLevel: null,
         salary: null

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

       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="设备id" align="center" prop="deviceId" /> -->
       <el-table-column label="设备状态" align="center" prop="status">
           <el-tag :type="statusTypeStyle(scope.row.status)">{{ statusTypeText(scope.row.status) }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="出厂编号" align="center" prop="code" />
-      <el-table-column label="设备名称" align="center" prop="name" />
-      <el-table-column label="设备类别" align="center" prop="type" />
+      <!-- <el-table-column label="出厂编号" align="center" prop="code" /> -->
       <el-table-column label="设备品牌" align="center" prop="brand" />
+      <el-table-column label="设备名称" align="center" prop="name" />
+      <!-- <el-table-column label="设备类别" align="center" prop="type" /> -->
       <el-table-column label="规格型号" align="center" prop="series" />
       <el-table-column label="购置时间" align="center" prop="acquisitionTime" width="180">
         <template slot-scope="scope">
         </template>
       </el-table-column>
       <el-table-column label="购买价格（元）" align="center" prop="cost" />
-      <el-table-column label="预计使用年限" align="center" prop="expectLife" />
+      <!-- <el-table-column label="预计使用年限" align="center" prop="expectLife" />
       <el-table-column label="单日成本（元）" align="center" prop="dayCost" />
       <el-table-column label="存放地点" align="center" prop="place" />
-      <el-table-column label="管理部门" align="center" prop="dept.deptName" />
+      <el-table-column label="管理部门" align="center" prop="dept.deptName" /> -->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 

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

             <FileUpload v-if="form.tenderId == null" ref="zbFile" :limit="1" :filePathName="'投标文件'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getUploadPathBidDocument"></FileUpload>
             <div v-if="form.tenderId != null">
-              <FileUpload v-if="!isView" ref="zb" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" :isShowTip="false"
-                :filePathName="'投标文件'" :isModify="true" @input="getUploadPathBidDocument"></FileUpload>
-              <el-link type="primary" @click="toPath(`${baseUrl}${'/profile/upload' + form.bidDocument}`)">
-                {{ getFileName(form.bidDocument) }}
-              </el-link>
-              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.bidDocument}`"
-                :underline="false" target="_blank">
-                <span class="el-icon-download">下载文件</span>
-              </el-link>
+              <FileUpload v-if="!isView" ref="zb" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+                :isShowTip="false" :filePathName="'投标文件'" :isModify="true" @input="getUploadPathBidDocument">
+              </FileUpload>
+              <div v-if="form.bidDocument">
+                <el-link type="primary" @click="toPath(`${baseUrl}${'/profile/upload' + form.bidDocument}`)">
+                  {{ getFileName(form.bidDocument) }}
+                </el-link>
+                <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.bidDocument}`"
+                  :underline="false" target="_blank">
+                  <span class="el-icon-download">下载文件</span>
+                </el-link>
+              </div>
             </div>
           </el-descriptions-item>
           <el-descriptions-item :span="3">
             <FileUpload v-if="form.tenderId == null" ref="bsFile" :limit="1" :filePathName="'投标文件'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getUploadPathTenderDocument"></FileUpload>
             <div v-if="form.tenderId != null">
-              <FileUpload v-if="!isView" ref="bs" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" :isShowTip="false"
-                :filePathName="'投标文件'" :isModify="true" @input="getUploadPathTenderDocument"></FileUpload>
-              <el-link type="primary" @click="toPath(`${baseUrl}${'/profile/upload' + form.tenderDocument}`)">
-                {{ getFileName(form.tenderDocument) }}
-              </el-link>
-              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.tenderDocument}`"
-                :underline="false" target="_blank">
-                <span class="el-icon-download">下载文件</span>
-              </el-link>
+              <FileUpload v-if="!isView" ref="bs" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+                :isShowTip="false" :filePathName="'投标文件'" :isModify="true" @input="getUploadPathTenderDocument">
+              </FileUpload>
+              <div v-if="form.tenderDocument">
+                <el-link type="primary" @click="toPath(`${baseUrl}${'/profile/upload' + form.tenderDocument}`)">
+                  {{ getFileName(form.tenderDocument) }}
+                </el-link>
+                <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.tenderDocument}`"
+                  :underline="false" target="_blank">
+                  <span class="el-icon-download">下载文件</span>
+                </el-link>
+              </div>
             </div>
           </el-descriptions-item>
         </el-descriptions>
       title: "",
       // 是否显示弹出层
       open: false,
-      isView:true,
+      isView: true,
       // 对话框属性
       dialogProperty: {
         dialogWidth: '1200px',