修改工作填报列表页面效果，修改合同文件处按钮错误以及评审意见提交主键重复的问题

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-09 14:54:11
+ * @LastEditTime: 2025-01-15 11:29:57
 -->
 <template>
   <div class="app-container">
@@ -63,9 +63,9 @@
             </el-input>
           </el-form-item>
           <el-form-item label="合同文件" prop="contractDocument">
-            <FileUpload v-if="taskName == '合同拟稿'" :disabled="taskName != '合同拟稿'" ref="contractFile" :limit="1"
-              :filePathName="'承接合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
-              @input="getContractPath">
+            <FileUpload v-if="taskName == '合同拟稿' && !form.contractDocument" :disabled="taskName != '合同拟稿'"
+              ref="contractFile" :limit="1" :filePathName="'承接合同/合同文件'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getContractPath">
             </FileUpload>
             <div v-if="form.contractDocument">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">
@@ -1099,7 +1099,13 @@ export default {
           let approvalList = [];
           for (let comment of this.commentList) {
             comment.contractId = this.form.contractId
-            if (!this.showAlter) { addContractComment(comment); }
+            if (!this.showAlter) {
+              if (comment.commentId) {
+                updateContractComment(comment)
+              } else {
+                addContractComment(comment)
+              }
+            }
             approvalList.push(comment.userId)
           }
           this.$set(this.taskForm.variables, "approvalList", approvalList);

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-09 14:59:44
+ * @LastEditTime: 2025-01-15 11:27:31
 -->
 <template>
   <div class="app-container">
@@ -40,9 +40,9 @@
             <el-input v-model="form.telephone" placeholder="请输入联系电话" :disabled="taskName != '合同拟稿'" />
           </el-form-item>
           <el-form-item label="合同文件" prop="contractDocument">
-            <FileUpload v-if="taskName == '合同拟稿'" :disabled="taskName != '合同拟稿'" ref="contractFile" :limit="1"
-              :filePathName="'分包合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
-              @input="getContractPath">
+            <FileUpload v-if="taskName == '合同拟稿' && !form.contractDocument" :disabled="taskName != '合同拟稿'"
+              ref="contractFile" :limit="1" :filePathName="'分包合同/合同文件'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getContractPath">
             </FileUpload>
             <div v-if="form.contractDocument">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">
@@ -1000,7 +1000,13 @@ export default {
         let approvalList = [];
         for (let comment of this.commentList) {
           comment.contractId = this.form.subContractId
-          if (!this.showAlter) { addContractComment(comment); }
+          if (!this.showAlter) {
+            if (comment.commentId) {
+              updateContractComment(comment)
+            } else {
+              addContractComment(comment)
+            }
+          }
           approvalList.push(comment.userId)
         }
         this.$set(this.taskForm.variables, "approvalList", approvalList);

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

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-08-14 14:24:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-09 09:26:23
+ * @LastEditTime: 2025-01-15 10:33:56
 -->
 <template>
   <div class="app-container">
@@ -38,38 +38,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:declare:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:declare:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:declare:remove']"
-        >删除</el-button>
-      </el-col> -->
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['oa:declare:export']">导出</el-button>
@@ -79,13 +47,13 @@
 
     <el-table v-loading="loading" :data="declareList" @selection-change="handleSelectionChange">
       <el-table-column type="index" width="55" align="center" />
-      <!-- <el-table-column label="填报id" align="center" prop="formId" /> -->
       <el-table-column label="项目编号" align="center" prop="project.projectNumber" :formatter="formatterProjectNumber" />
-      <el-table-column label="项目名称" align="center" prop="project.projectName" :formatter="formatterProjectName" />
+      <el-table-column label="项目名称" align="center" prop="project.projectName" width="220px"
+        :formatter="formatterProjectName" />
       <el-table-column label="填报人" align="center" prop="user.nickName" />
       <el-table-column label="工作类别" align="center" prop="workType" />
       <el-table-column label="工作项目" align="center" prop="workItem" />
-      <el-table-column label="工作内容" align="center" prop="workContent" />
+      <el-table-column label="工作内容" align="center" prop="workContent" width="250px" />
       <el-table-column label="工天" align="center" prop="workLoad" />
       <el-table-column label="工天单价" align="center" prop="price" />
       <el-table-column label="系数" align="center" prop="coefficient" />
@@ -94,22 +62,26 @@
           {{ predictMoney(scope.row) }}
         </template>
       </el-table-column>
-      <el-table-column label="一审状态" align="center" prop="checkStatus">
-        <template slot-scope="scope">
-          <el-tag :type="formartType(scope.row.checkStatus)">{{ formatFn(scope.row, 'checkStatus') }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="二审状态" align="center" prop="auditStatus">
-        <template slot-scope="scope">
-          <el-tag :type="formartType(scope.row.auditStatus)">{{ formatFn(scope.row, 'auditStatus') }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="确认状态" align="center" prop="confirmStatus">
+      <el-table-column label="审核状态" align="center">
         <template slot-scope="scope">
-          <el-tag :type="formartType(scope.row.confirmStatus)">{{ formatFn(scope.row, 'confirmStatus') }}</el-tag>
+          <div>
+            <el-tag :type="formatFn(scope.row, 'checkStatus') ? 'success':'warning'" size="mini">一审</el-tag>
+            <i v-if="formatFn(scope.row, 'checkStatus')" class="el-icon-circle-check" style="color:#67C23A"></i>
+            <i v-else class="el-icon-warning-outline" style="color:#E6A23C"></i>
+          </div>
+          <div>
+            <el-tag :type="formatFn(scope.row, 'auditStatus') ? 'success':'warning'" size="mini">二审</el-tag>
+            <i v-if="formatFn(scope.row, 'auditStatus')" class="el-icon-circle-check" style="color:#67C23A"></i>
+            <i v-else class="el-icon-warning-outline" style="color:#E6A23C"></i>
+          </div>
+          <div>
+            <el-tag :type="formatFn(scope.row, 'confirmStatus') ? 'success':'warning'" size="mini">确认</el-tag>
+            <i v-if="formatFn(scope.row, 'confirmStatus')" class="el-icon-circle-check" style="color:#67C23A"></i>
+            <i v-else class="el-icon-warning-outline" style="color:#E6A23C"></i>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column label="填报时间" align="center" prop="submitTime" width="180">
+      <el-table-column label="填报时间" align="center" prop="submitTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.submitTime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -118,13 +90,6 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:declare:edit']">修改</el-button>
-          <!-- <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:declare:remove']"
-          >删除</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -246,7 +211,7 @@ export default {
       if (this.$store.getters.roles.includes('dept')) {
         this.queryParams.projectLeader = null
       }
-      if (this.$store.getters.userId == 1 ) {
+      if (this.$store.getters.userId == 1) {
         this.queryParams.deptId = null
         this.queryParams.projectLeader = null
       }
@@ -370,17 +335,10 @@ export default {
       }, `declare_${new Date().getTime()}.xlsx`)
     },
     formatFn(row, type) {
-      if (type == 'confirmStatus') {
-        if (row[type] && row[type] == '1') {
-          return '已确认'
-        } else {
-          return '待确认'
-        }
-      }
       if (row[type] && row[type] == '1') {
-        return '已审核'
+        return true
       } else {
-        return '待审核'
+        return false
       }
     },
     formartType(val) {