修改结算、借款、合同退回，以及审核人错误的问题

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

@@ -154,29 +154,6 @@ public class CmcBorrowController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcBorrow cmcBorrow)
     {
-        if (cmcBorrow.getDeptComment() != null && cmcBorrow.getManagerComment() == null) {
-            cmcBorrow.setDeptUserId(getLoginUser().getUserId());
-            cmcBorrow.setDeptTime(new Date());
-        }
-        if (cmcBorrow.getManagerComment() != null && cmcBorrow.getZjlComment() == null) {
-            cmcBorrow.setManagerUserId(getLoginUser().getUserId());
-            cmcBorrow.setManagerTime(new Date());
-        }
-        if (cmcBorrow.getZjlComment() != null && cmcBorrow.getDszComment() == null && cmcBorrow.getLendTime() == null) {
-            cmcBorrow.setZjlUserId(getLoginUser().getUserId());
-            cmcBorrow.setZjlTime(new Date());
-        }
-        if (cmcBorrow.getDszComment() != null && cmcBorrow.getLendTime() == null) {
-            cmcBorrow.setDszUserId(getLoginUser().getUserId());
-            cmcBorrow.setDszTime(new Date());
-        }
-        if (cmcBorrow.getUnionComment() != null && cmcBorrow.getLendTime() == null) {
-            cmcBorrow.setUnionUserId(getLoginUser().getUserId());
-            cmcBorrow.setUnionTime(new Date());
-        }
-        if (cmcBorrow.getLendTime() != null) {
-            cmcBorrow.setCwUserId(getLoginUser().getUserId());
-        }
         return toAjax(cmcBorrowService.updateCmcBorrow(cmcBorrow));
     }
 

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

@@ -145,12 +145,6 @@ public class CmcContractController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcContract cmcContract)
     {
-        if (cmcContract.getManagerComment() != null && cmcContract.getGmComment() == null && getLoginUser().getUserId() != 22) {
-            cmcContract.setManagerUserId(getLoginUser().getUserId());
-        }
-        if (cmcContract.getGmComment() != null && cmcContract.getSignDate() == null && getLoginUser().getUserId() != 22) {
-            cmcContract.setGmUserId(getLoginUser().getUserId());
-        }
         return toAjax(cmcContractService.updateCmcContract(cmcContract));
     }
 

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

@@ -146,12 +146,6 @@ public class CmcSubContractController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcSubContract cmcSubContract)
     {
-        if (cmcSubContract.getManagerComment() != null && cmcSubContract.getGmComment() == null && getLoginUser().getUserId() != 22) {
-            cmcSubContract.setManagerUserId(getLoginUser().getUserId());
-        }
-        if (cmcSubContract.getGmComment() != null && cmcSubContract.getSignDate() == null && getLoginUser().getUserId() != 22) {
-            cmcSubContract.setGmUserId(getLoginUser().getUserId());
-        }
         return toAjax(cmcSubContractService.updateCmcSubContract(cmcSubContract));
     }
 

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: 2024-12-06 16:51:17
+ * @LastEditTime: 2024-12-10 17:08:05
 -->
 <template>
   <div class="app-container">
@@ -356,10 +356,10 @@
         </el-form>
         <div style="text-align: center;" v-if="taskName">
           <el-button type="warning" @click="saves()" :disabled="formDisabled" v-if="taskName == '合同拟稿'">保 存</el-button>
-          <el-button type="primary" @click="submitForm" :disabled="formDisabled">提 交</el-button>
           <el-button type="danger" @click="returnOpen = true" :disabled="formDisabled"
             v-if="taskName == '分管审核' || taskName == '总经理审核'">退
             回</el-button>
+          <el-button type="primary" @click="submitForm" :disabled="formDisabled">提 交</el-button>
         </div>
       </el-col>
       <el-col :span="6" :xs="24" v-if="flowDisabled">
@@ -391,7 +391,8 @@
       <sub-contract :taskForm="subContractId" :taskName="''" :formDisabled="true" :flowDisabled="false"></sub-contract>
     </el-drawer>
     <el-dialog title="退回" :visible.sync="returnOpen" width="40%" append-to-body>
-      <return-btn :taskForm="taskForm" :comment="taskName == '分管审核' ? form.managerComment : form.gmComment" @goBack="$emit('goBack')" @saves="" @cancel="returnOpen = false"></return-btn>
+      <return-btn :taskForm="taskForm" :comment="taskName == '分管审核' ? form.managerComment : form.gmComment"
+        @goBack="$emit('goBack')" @saves="" @cancel="returnOpen = false"></return-btn>
     </el-dialog>
   </div>
 </template>
@@ -575,12 +576,16 @@ export default {
     }
     else if (this.taskName == '分管审核') {
       this.managerUser = this.$store.getters.name;
+      this.form.managerUserId = this.$store.getters.userId;
       this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
     else if (this.taskName == '总经理审核') {
       this.gmUser = this.$store.getters.name;
+      this.form.gmUserId = this.$store.getters.userId;
       this.gmTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
+    console.log(this.form);
+
     this.getProjectList();
     this.getPartyAList();
     this.getDeptList();
@@ -938,11 +943,15 @@ export default {
       if (!this.isDocumentValid) {
         return;
       }
-      console.log(this.commentList);
-      
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.formTotal != 0) {
+            if (this.taskName == '分管审核') {
+              this.form.managerUserId = this.$store.getters.userId;
+            }
+            else if (this.taskName == '总经理审核') {
+              this.form.gmUserId = this.$store.getters.userId;
+            }
             const params = { taskId: this.taskForm.taskId };
             this.updateContractData();
             this.updateRelatedProject();
@@ -960,7 +969,7 @@ export default {
                   });
                 })
               }
-              else if (this.taskName == '线上会审' ) {
+              else if (this.taskName == '线上会审') {
                 for (let comment of this.commentList) {
                   updateContractComment(comment);
                 }
@@ -1037,6 +1046,7 @@ export default {
     updateContractData() {
       this.workList = this.$refs.workTableRef.workList;
       this.paymentList = this.$refs.paymentRef.paymentList;
+      console.log(this.form);
       updateContract(this.form).then(response => {
         this.$modal.msgSuccess("保存成功");
         this.open = false;

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: 2024-12-06 16:50:54
+ * @LastEditTime: 2024-12-10 17:11:17
 -->
 <template>
   <div class="app-container">
@@ -326,10 +326,10 @@
         </el-form>
         <div style="text-align: center;" v-if="flowDisabled">
           <el-button type="warning" @click="saves()" :disabled="formDisabled" v-if="taskName == '合同拟稿'">保 存</el-button>
-          <el-button type="primary" @click="submitForm" :disabled="formDisabled">提 交</el-button>
           <el-button type="danger" @click="returnOpen = true" :disabled="formDisabled"
             v-if="taskName == '分管审核' || taskName == '总经理审核'">退
             回</el-button>
+          <el-button type="primary" @click="submitForm" :disabled="formDisabled">提 交</el-button>
         </div>
       </el-col>
       <el-col :span="6" :xs="24" v-if="flowDisabled">
@@ -564,10 +564,12 @@ export default {
     }
     else if (this.taskName == '分管审核') {
       this.managerUser = this.$store.getters.name;
+      this.form.managerUserId = this.$store.getters.userId;
       this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
     else if (this.taskName == '总经理审核') {
       this.gmUser = this.$store.getters.name;
+      this.form.gmUserId = this.$store.getters.userId;
       this.gmTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
     this.getProjectList();
@@ -839,7 +841,7 @@ export default {
         if (this.form.partnerId && this.form.partnerId instanceof Array)
           this.form.partnerId = this.form.partnerId.join(',')
         updateSubContract(this.form).then(response => {
-          this.$modal.msgSuccess("修改成功");
+          this.$modal.msgSuccess("表单修改成功");
           this.open = false;
           this.getList();
           this.updateChooseProjectList()
@@ -849,7 +851,7 @@ export default {
         if (this.form.partnerId && this.form.partnerId.length)
           this.form.partnerId = this.form.partnerId.join(',')
         addSubContract(this.form).then(response => {
-          this.$modal.msgSuccess("新增成功");
+          this.$modal.msgSuccess("表单新增成功");
           this.open = false;
           this.getList();
           this.initForm();
@@ -893,8 +895,14 @@ export default {
           if (this.formTotal != 0) {
             if (this.form.partnerId)
               this.form.partnerId = this.form.partnerId.join(',')
+            if (this.taskName == '分管审核') {
+              this.form.managerUserId = this.$store.getters.userId;
+            }
+            else if (this.taskName == '总经理审核') {
+              this.form.gmUserId = this.$store.getters.userId;
+            }
             updateSubContract(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess("表单修改成功");
               this.open = false;
               this.getList();
               this.updateChooseProjectList()

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

@@ -422,26 +422,32 @@ export default {
   created() {
     if (this.taskName == '部门审核') {
       this.deptUser = this.$store.getters.name;
+      this.form.deptUserId = this.$store.getters.userId;
       this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
     if (this.taskName == '分管审核') {
       this.managerUser = this.$store.getters.name;
+      this.form.managerUserId = this.$store.getters.userId;
       this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
     if (this.taskName == '总经理审核') {
       this.zjlUser = this.$store.getters.name;
+      this.form.zjlUserId = this.$store.getters.userId;
       this.zjlTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
     if (this.taskName == '董事长批准') {
       this.dszUser = this.$store.getters.name;
+      this.form.dszUserId = this.$store.getters.userId;
       this.dszTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
     if (this.taskName == '党工团审核') {
       this.unionUser = this.$store.getters.name;
+      this.form.unionUserId = this.$store.getters.userId;
       this.unionTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
     if (this.taskName == '财务处理') {
       this.cwUser = this.$store.getters.name;
+      this.form.cwUserId = this.$store.getters.userId;
       this.lendTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
     this.form.applyDate = new Date();
@@ -947,4 +953,8 @@ table {
     padding: .0625rem;
   }
 }
+::v-deep .el-descriptions-item__label.is-bordered-label {
+  width: 110px;
+}
+
 </style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-25 14:04:14
+ * @LastEditTime: 2024-12-10 13:45:36
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -10,6 +10,11 @@
       <el-col :span="flowDisabled ? 19 : 24" :xs="24">
         <el-button type="success" icon="el-icon-printer" @click="printOpen = true">打印</el-button>
         <h2 class="text-center">项目结算表</h2>
+        <div class="mt20 mb20" v-if="showAlter && flowDisabled">
+          <el-alert title="任务被退回，请修改后重新提交" type="error" :closable="false">
+            <return-comment :taskForm="taskForm" @isReturn="isReturn"></return-comment>
+          </el-alert>
+        </div>
         <div class="headers">
           项目信息
           <div class="line"></div>
@@ -177,7 +182,7 @@
                   {{ index + 1 }}
                 </td>
                 <td>
-              <tr>
+              <tr v-if="taskName == '结算发起'">
                 <td>
                   <el-button size="mini" type="primary" icon="el-icon-plus" :disabled="isModify"
                     @click="handleChoosePrice(work, index)">选择工作内容</el-button>
@@ -455,6 +460,7 @@
         <el-button type="success" icon="el-icon-printer" @click="printOpen = true">打印</el-button>
         <div style="text-align: center" v-if="!disabled">
           <el-button type="warning" @click="preserve">保存</el-button>
+          <el-button type="danger" v-if="taskName == '经营发展部校核' || taskName == '分管审核' || taskName == '总经理审批' || taskName == '董事长批准'" @click="returnOpen = true">退 回</el-button>
           <el-button type="primary" @click="submitNextFlow" v-if="taskName != '董事长批准'">提交下一个流程</el-button>
           <el-button type="primary" @click="submitNextFlow" v-else>结算批准</el-button>
         </div>
@@ -480,6 +486,10 @@
     <el-dialog title="选择项目" :visible.sync="prOpen" width="70%" append-to-body>
       <choose-project @chooseProject="confirmProject"></choose-project>
     </el-dialog>
+    <el-dialog title="退回" :visible.sync="returnOpen" width="40%" append-to-body>
+      <return-btn :taskForm="taskForm" :comment="commentByRole()" @goBack="$emit('goBack')" @saves=""
+        @cancel="returnOpen = false"></return-btn>
+    </el-dialog>
   </div>
 </template>
 
@@ -507,13 +517,17 @@ import { getDept } from "@/api/system/dept";
 import { getContract } from "@/api/oa/contract/contract";
 import ChooseProject from "./components/chooseProject.vue";
 import projectContractInfo from "./projectContractInfo.vue";
+import ReturnComment from '@/views/flowable/form/components/flowBtn/returnComment.vue';
+import ReturnBtn from '@/views/flowable/form/components/flowBtn/returnBtn.vue';
 export default {
   components: {
     flow,
     ChoosePrice,
     SettlePrint,
     ChooseProject,
-    projectContractInfo
+    projectContractInfo,
+    ReturnComment,
+    ReturnBtn
   },
   props: {
     taskName: {
@@ -607,6 +621,8 @@ export default {
       exceedAmount: 0,
       isModify: false, //是否可以修改结算工作量
       projectId: '',
+      showAlter: true,
+      returnOpen: false,
     };
   },
   created() {
@@ -1121,6 +1137,20 @@ export default {
         }
       });
     },
+    isReturn(val) {
+      this.showAlter = val
+    },
+    commentByRole() {
+      if (this.taskName == '经营发展部校核') {
+        return this.form.jyComment
+      } else if (this.taskName == '分管审核') {
+        return this.form.managerComment
+      } else if (this.taskName == '总经理审批') {
+        return this.form.gmComment
+      } else if (this.taskName == '董事长批准') {
+        return this.form.dszComment
+      }
+    }
   },
 };
 </script>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: wrh
- * @LastEditTime: 2024-10-22 15:20:14
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-12-10 15:46:32
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -10,6 +10,11 @@
       <el-col :span="flowDisabled ? 19 : 24" :xs="24">
         <el-button type="success" icon="el-icon-printer" @click="printOpen = true">打印</el-button>
         <h2 class="text-center">其他结算表</h2>
+        <div class="mt20 mb20" v-if="showAlter && flowDisabled">
+          <el-alert title="任务被退回，请修改后重新提交" type="error" :closable="false">
+            <return-comment :taskForm="taskForm" @isReturn="isReturn"></return-comment>
+          </el-alert>
+        </div>
         <div class="headers">
           项目信息
           <div class="line"></div>
@@ -167,7 +172,7 @@
                 <td style="width: 280px">备注</td>
                 <td style="width: 100px">操作</td>
               </tr>
-              <tr v-for="(  work, index  ) in   settleSumList  " :key="index">
+              <tr v-for="(  work, index  ) in settleSumList  " :key="index">
                 <td>
                   {{ index + 1 }}
                 </td>
@@ -203,7 +208,7 @@
                 <td style="width: 280px">备注</td>
                 <td style="width: 100px">操作</td>
               </tr>
-              <tr v-for="(  dept, index  ) in   deptSettleList  " :key="index">
+              <tr v-for="(  dept, index  ) in deptSettleList  " :key="index" v-if="dept.content != '实际结算总金额'">
                 <td :rowspan="deptSettleList.length" v-if="index == 0">
                   {{ Number(actualSumSettle).toFixed(2) }}
                 </td>
@@ -215,7 +220,7 @@
                   </el-input> -->
                   <el-select v-model="dept.content" placeholder="请选择" filterable clearable style="width:100%;"
                     :disabled="isModify">
-                    <el-option v-for="item  in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+                    <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
                       :value="item.deptName">
                     </el-option>
                   </el-select>
@@ -260,7 +265,7 @@
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ form.managerUserName ? "" : getUserName(form.managerUserId) }} </span>
+                  <span class="auditor"> {{ form.managerUserName ? form.managerUserName : getUserName(form.managerUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -277,7 +282,7 @@
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ form.gmUserName ? "" : getUserName(form.gmUserId) }} </span>
+                  <span class="auditor"> {{ form.gmUserName ? form.gmUserName : getUserName(form.gmUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -292,6 +297,7 @@
         <el-button type="success" icon="el-icon-printer" @click="printOpen = true">打印</el-button>
         <div style="text-align: center" v-if="!disabled">
           <el-button type="warning" @click="preserve">保存</el-button>
+          <el-button type="danger" v-if="taskName != '结算发起'" @click="returnOpen = true">退 回</el-button>
           <el-button type="primary" @click="submitNextFlow" v-if="taskName != '总经理审批'">提交下一个流程</el-button>
           <el-button type="primary" @click="submitNextFlow" v-else>结算批准</el-button>
         </div>
@@ -314,6 +320,10 @@
       <choose-price :row="clickWork" @getPrice="getPrice" @cancel="drawer = false"></choose-price>
     </el-drawer>
 
+    <el-dialog title="退回" :visible.sync="returnOpen" width="40%" append-to-body>
+      <return-btn :taskForm="taskForm" :comment="commentByRole()" @goBack="$emit('goBack')" @saves=""
+        @cancel="returnOpen = false"></return-btn>
+    </el-dialog>
   </div>
 </template>
 
@@ -333,12 +343,15 @@ import { getUserByPost } from "@/api/system/post";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept, } from "@/api/system/post.js";
 import SettlePrint from "./components/print/settlePrint.vue";
-import { getDept } from "@/api/system/dept";
+import ReturnComment from '@/views/flowable/form/components/flowBtn/returnComment.vue';
+import ReturnBtn from '@/views/flowable/form/components/flowBtn/returnBtn.vue';
 export default {
   components: {
     flow,
     ChoosePrice,
     SettlePrint,
+    ReturnComment,
+    ReturnBtn
   },
   props: {
     taskName: {
@@ -419,6 +432,8 @@ export default {
       deptId: undefined,
       deptList: [],
       isModify: false, //是否可以修改结算工作量
+      showAlter: true,
+      returnOpen: false,
     };
   },
   created() {
@@ -479,7 +494,7 @@ export default {
           }
           this.settleSumList = settleSummaryResponse.rows.filter((item) => item.tableNumber == "0");
           this.deptSettleList = settleSummaryResponse.rows.filter(
-            (item) => item.tableNumber == "1"
+            (item) => item.tableNumber == "1" && item.content != '实际结算总金额'
           );
           this.calculateActualSumSettle();
         }
@@ -493,8 +508,9 @@ export default {
       } else if (res.total == 0) {
         this.flag = false;
         if (this.taskName == "结算发起") {
-          this.form.reporter = this.$store.state.user.id;
+          this.form.reporter = this.$store.getters.userId;
           this.form.reportTime = parseTime(new Date(), "{y}-{m}-{d}");
+          this.deptId = this.$store.getters.deptId;
         }
       }
       this.loading = false;
@@ -504,6 +520,8 @@ export default {
     // 获取当前处理人
     getCurrentUser() {
       if (this.taskName == "分管审核") {
+        console.log(this.$store.state.user.name);
+        
         this.form.managerUserName = this.$store.state.user.name;
         this.form.managerUserId = this.$store.state.user.id;
         this.form.managerTime = parseTime(new Date(), "{y}-{m}-{d}");
@@ -734,6 +752,8 @@ export default {
         item.settleId = settleId;
         addSettleSummary(item);
       }
+      let obj = { settleId: settleId, content: '实际结算总金额', amount: (this.actualSumSettle).toFixed(2), tableNumber: 1 }
+      addSettleSummary(obj)
     },
 
     // 更新数据
@@ -788,6 +808,16 @@ export default {
         }
       });
     },
+    isReturn(val) {
+      this.showAlter = val
+    },
+    commentByRole() {
+      if (this.taskName == '分管审核') {
+        return this.form.managerComment
+      } else if (this.taskName == '总经理审批') {
+        return this.form.gmComment
+      }
+    }
   },
 };
 </script>

oa-ui/src/views/oa/contract/components/edit.vue

@@ -107,23 +107,47 @@
 
       <el-divider></el-divider>
 
-      <el-form-item label="拟稿日期" prop="draftTime">
-        <el-date-picker clearable v-model="form.draftTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择拟稿日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="分管审批日期" prop="managerTime">
-        <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择分管审批日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="总经理审批日期" prop="gmTime">
-        <el-date-picker clearable v-model="form.gmTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择总经理审批日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="签订日期" prop="signDate">
-        <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期">
-        </el-date-picker>
-      </el-form-item>
+      <el-row>
+          <el-form-item label="拟稿日期" prop="draftTime">
+          <el-date-picker clearable v-model="form.draftTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择拟稿日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="分管审批日期" prop="managerTime">
+            <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择分管审批日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="分管审核意见" prop="managerComment">
+            <el-input type="textarea" v-model="form.managerComment" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="总经理审批日期" prop="gmTime">
+            <el-date-picker clearable v-model="form.gmTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择总经理审批日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="总经理审批意见" prop="gmComment">
+            <el-input type="textarea" v-model="form.gmComment" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-form-item label="签订日期" prop="signDate">
+          <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-row>
       <el-form-item label="评审方式">
         <el-tag :type="form.commentType == '2' ? 'success' : 'warning'">
           {{ getCommentType(form.commentType) }}</el-tag>

oa-ui/src/views/oa/contract/components/subEdit.vue

@@ -82,23 +82,47 @@
 
 
       <el-divider></el-divider>
-      <el-form-item label="拟稿日期" prop="draftTime">
-        <el-date-picker clearable v-model="form.draftTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择拟稿日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="分管审批日期" prop="managerTime">
-        <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择分管审批日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="总经理审批日期" prop="gmTime">
-        <el-date-picker clearable v-model="form.gmTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择总经理审批日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="签订日期" prop="signDate">
-        <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期">
-        </el-date-picker>
-      </el-form-item>
+      <el-row>
+          <el-form-item label="拟稿日期" prop="draftTime">
+          <el-date-picker clearable v-model="form.draftTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择拟稿日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="分管审批日期" prop="managerTime">
+            <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择分管审批日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="分管审核意见" prop="managerComment">
+            <el-input type="textarea" v-model="form.managerComment" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="总经理审批日期" prop="gmTime">
+            <el-date-picker clearable v-model="form.gmTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择总经理审批日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="总经理审批意见" prop="gmComment">
+            <el-input type="textarea" v-model="form.gmComment" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-form-item label="签订日期" prop="signDate">
+          <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-row>
       <el-form-item label="评审方式">
         <el-tag :type="form.commentType == '2' ? 'success' : 'warning'">
           {{ getCommentType(form.commentType) }}</el-tag>