修改承接合同、分包合同评审中，日期为个人自定义；

修改项目流转中项目登记人为项目安排人

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: wrh
- * @LastEditTime: 2024-08-01 17:13:20
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-05 16:28:56
 -->
 <template>
   <div class="app-container">
@@ -96,10 +96,10 @@
             <table border="1" style="width:100%">
               <tr>
                 <td style="width: 50px;">序号</td>
-                <td style="width:180px">工作内容</td>
-                <td>等级或比例尺</td>
-                <td>单位</td>
-                <td>工作量</td>
+                <td style="min-width:160px">工作内容</td>
+                <td style="width:150px">等级或比例尺</td>
+                <td style="width:100px">单位</td>
+                <td style="width:100px">工作量</td>
                 <td>要求完成时间</td>
                 <td>备注</td>
               </tr>
@@ -194,14 +194,17 @@
               :disabled="taskName != '合同拟稿'" />
           </el-form-item>
           <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
+            <el-col :span="6" :xs="24" :offset="11">
               <el-form-item label="拟稿人：" label-width="120px">
                 <span class="auditor"> {{ form.draftUser ? form.draftUser.nickName : draftUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="日期：" label-width="120px">
-                <span> {{ form.draftTime ? form.draftTime : draftTime }} </span>
+                <!-- <span> {{ form.draftTime ? form.draftTime : draftTime }} </span> -->
+                <el-date-picker v-model="form.draftTime" :disabled="taskName != '合同拟稿'" type="date"
+                  value-format="yyyy-MM-dd" placeholder="选择日期">
+                </el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
@@ -213,7 +216,7 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="线上会审：" v-if="commentOpen">
-            <table border="1">
+            <table border="1" style="width:100%;">
               <tr>
                 <td style="width: 50px;">序号</td>
                 <td>会审部门</td>
@@ -245,15 +248,12 @@
                   <el-input v-model="comment.comment" type="textarea" clearable :autosize="{ minRows: 4 }"
                     :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)"></el-input>
                 </td>
-                <td style="text-align:left;" @click="clickFile(comment)">
+                <td @click="clickFile(comment)">
                   <FileUpload v-if="comment.document == '' || comment.document == null" ref="hs" :limit="1"
                     :filePathName="'承接合同/线上会审意见'"
                     :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)"
                     :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setCommentDocument">
                   </FileUpload>
-
-                  <!-- <el-input v-model="comment.document" clearable
-                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && !comment.commentUser)"></el-input> -->
                   <div v-if="comment.document != '' && comment.document != null">
                     <transition-group class="upload-file-list el-upload-list el-upload-list--text"
                       name="el-fade-in-linear" tag="ul">
@@ -264,12 +264,11 @@
                             {{ getFileName(comment.document) }}
                           </span>
                         </el-link>
-                        <div class="ele-upload-list__item-content-action" v-if="comment.userId == userId">
+                        <div class="ele-upload-list__item-content-action"
+                          v-if="taskName == '线上会审' && comment.userId == userId">
                           <el-link :underline="false" @click="handleFileDelete(comment, 'document')"
                             type="danger">删除</el-link>
                         </div>
-                        <button class="preview-btn" type="primary" size="mini" plain
-                          @click="reviewWord(`${baseUrl}${'/profile/upload' + comment.document}`)">在线预览</button>
                       </li>
                     </transition-group>
                   </div>
@@ -278,7 +277,9 @@
                   <span class="auditor"> {{ comment.commentUser ? comment.commentUser.nickName : '' }} </span>
                 </td>
                 <td>
-                  <span> {{ comment.commentTime }} </span>
+                  <el-date-picker v-model="comment.commentTime"
+                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)" type="date"
+                    value-format="yyyy-MM-dd" style="width:140px;" placeholder="选择日期"></el-date-picker>
                 </td>
                 <td>
                   <el-button type="text" style="color: #F56C6C;" size="mini" @click="deletCommentItem(index)"
@@ -290,7 +291,7 @@
               :disabled="taskName != '合同拟稿'"></el-button>
           </el-form-item>
           <el-form-item label="会议评审：" v-if="meetingOpen">
-            <table border="1">
+            <table border="1" style="width:100%;">
               <tr>
                 <td>评审时间</td>
                 <td>
@@ -362,16 +363,16 @@
               :disabled="taskName != '分管审核'" />
           </el-form-item>
           <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px"
-                v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审'">
+            <el-col :span="6" :xs="24" :offset="11">
+              <el-form-item label="签名：" label-width="120px">
                 <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px"
-                v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审'">
-                <span> {{ form.managerTime ? form.managerTime : managerTime }} </span>
+              <el-form-item label="日期：" label-width="120px">
+                <!-- <span> {{ form.managerTime ? form.managerTime : managerTime }} </span> -->
+                <el-date-picker v-model="form.managerTime" :disabled="taskName != '分管审核'" type="date"
+                  value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
@@ -380,16 +381,16 @@
               :disabled="taskName != '总经理审核'" />
           </el-form-item>
           <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px"
-                v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审' && taskName != '分管审核'">
+            <el-col :span="6" :xs="24" :offset="11">
+              <el-form-item label="签名：" label-width="120px">
                 <span class="auditor"> {{ form.gmUser ? form.gmUser.nickName : gmUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px"
-                v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审' && taskName != '分管审核'">
-                <span> {{ form.gmTime ? form.gmTime : gmTime }} </span>
+              <el-form-item label="日期：" label-width="120px">
+                <!-- <span> {{ form.gmTime ? form.gmTime : gmTime }} </span> -->
+                <el-date-picker v-model="form.gmTime" :disabled="taskName != '总经理审核'" type="date"
+                  value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
@@ -410,21 +411,6 @@
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getSignScanPath">
             </FileUpload>
             <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">
-                    <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
-                      {{ getFileName(form.signScan) }}
-                    </span>
-                  </el-link>
-                  <div class="ele-upload-list__item-content-action" v-if="taskName != ''">
-                    <el-link :underline="false" @click="handleFileDelete(form, 'signScan')" type="danger">删除</el-link>
-                  </div>
-                  <button class="preview-btn" type="primary" size="mini" plain
-                    @click="reviewWord(`${baseUrl}${'/profile/upload' + form.signScan}`)">在线预览</button>
-                </li>
-              </transition-group> -->
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.signScan}`)">
                 {{ getFileName(form.signScan) }}
               </el-link>
@@ -439,7 +425,7 @@
           <el-button type="warning" @click="saves()" :disabled="formDisabled" v-if="taskName == '合同拟稿'">保 存</el-button>
           <el-button type="primary" @click="submitForm" :disabled="formDisabled">提 交</el-button>
         </div>
-      </el-col>` `
+      </el-col>
       <el-col :span="6" :xs="24" v-if="flowDisabled">
         <el-card>
           <h2 style="text-align: center;">流程进度</h2>
@@ -678,7 +664,7 @@ export default {
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
           this.form.drafter = this.$store.getters.userId;
-          this.form.draftTime = parseTime(new Date(), '{y}-{m}-{d}');
+          // this.form.draftTime = parseTime(new Date(), '{y}-{m}-{d}');
           this.projectloading = false;
         }
         else {
@@ -719,7 +705,7 @@ export default {
                     comment.commentUser = undefined;
                   }
                   else {
-                    comment.commentTime = parseTime(new Date(), '{y}-{m}-{d}');
+                    // comment.commentTime = parseTime(new Date(), '{y}-{m}-{d}');
                   }
                 }
               }
@@ -739,13 +725,6 @@ export default {
                   document: '',
                   commentTime: undefined
                 },
-                // {
-                //   deptId: 107,
-                //   userId: '',
-                //   comment: '',
-                //   document: '',
-                //   commentTime: undefined
-                // },
                 {
                   deptId: 109,
                   userId: '',

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-07-30 10:39:04
+ * @LastEditTime: 2024-08-05 16:50:36
 -->
 <template>
   <div class="app-container">
@@ -196,14 +196,16 @@
             <el-input type="textarea" v-model="form.remark" placeholder="请输入合同备注" :disabled="taskName != '合同拟稿'" />
           </el-form-item>
           <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
+            <el-col :span="6" :xs="24" :offset="11">
               <el-form-item label="拟稿人：" label-width="120px">
                 <span class="auditor"> {{ form.draftUser ? form.draftUser.nickName : draftUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="日期：" label-width="120px">
-                <span> {{ form.draftTime ? form.draftTime : draftTime }} </span>
+                <!-- <span> {{ form.draftTime ? form.draftTime : draftTime }} </span> -->
+                <el-date-picker v-model="form.draftTime" :disabled="taskName != '合同拟稿'" type="date"
+                  value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
@@ -264,7 +266,7 @@
                             {{ getFileName(comment.document) }}
                           </span>
                         </el-link>
-                        <div class="ele-upload-list__item-content-action" v-if="comment.userId == userId">
+                        <div class="ele-upload-list__item-content-action" v-if="taskName == '线上会审' && comment.userId == userId">
                           <el-link :underline="false" @click="handleFileDelete(comment, 'document')"
                             type="danger">删除</el-link>
                         </div>
@@ -276,7 +278,9 @@
                   <span class="auditor"> {{ comment.commentUser ? comment.commentUser.nickName : '' }} </span>
                 </td>
                 <td>
-                  <span> {{ comment.commentTime }} </span>
+                  <el-date-picker v-model="comment.commentTime"
+                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)" type="date"
+                    value-format="yyyy-MM-dd" style="width:140px;" placeholder="选择日期"></el-date-picker>
                 </td>
                 <td>
                   <el-button type="text" style="color:#F56C6C" size="mini" circle @click="deletCommentItem(index)"
@@ -358,16 +362,16 @@
               :disabled="taskName != '分管审核'" />
           </el-form-item>
           <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px"
-                v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审'">
+            <el-col :span="6" :xs="24" :offset="11">
+              <el-form-item label="签名：" label-width="120px">
                 <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px"
-                v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审'">
-                <span> {{ form.managerTime ? form.managerTime : managerTime }} </span>
+              <el-form-item label="日期：" label-width="120px">
+                <!-- <span> {{ form.managerTime ? form.managerTime : managerTime }} </span> -->
+                <el-date-picker v-model="form.managerTime" :disabled="taskName != '分管审核'" type="date"
+                  value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
@@ -376,16 +380,16 @@
               :disabled="taskName != '总经理审核'" />
           </el-form-item>
           <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px"
-                v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审' && taskName != '分管审核'">
+            <el-col :span="6" :xs="24" :offset="11">
+              <el-form-item label="签名：" label-width="120px">
                 <span class="auditor"> {{ form.gmUser ? form.gmUser.nickName : gmUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px"
-                v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审' && taskName != '分管审核'">
-                <span> {{ form.gmTime ? form.gmTime : gmTime }} </span>
+              <el-form-item label="日期：" label-width="120px">
+                <!-- <span> {{ form.gmTime ? form.gmTime : gmTime }} </span> -->
+                <el-date-picker v-model="form.gmTime" :disabled="taskName != '总经理审核'" type="date"
+                  value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
@@ -680,7 +684,7 @@ export default {
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
           this.form.drafter = this.$store.getters.userId;
-          this.form.draftTime = parseTime(new Date(), '{y}-{m}-{d}');
+          // this.form.draftTime = parseTime(new Date(), '{y}-{m}-{d}');
         }
         else {
           this.formTotal = 1;
@@ -727,7 +731,7 @@ export default {
                     comment.commentUser = undefined;
                   }
                   else {
-                    comment.commentTime = parseTime(new Date(), '{y}-{m}-{d}');
+                    // comment.commentTime = parseTime(new Date(), '{y}-{m}-{d}');
                   }
                 }
               }

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-31 10:59:19
+ * @LastEditTime: 2024-08-05 14:36:35
 -->
 <template>
   <div class="app-container">

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-07-08 16:16:27
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-30 09:34:50
+ * @LastEditTime: 2024-08-05 14:40:00
 -->
 <template>
   <div class="app-container">
@@ -179,11 +179,12 @@ export default {
     },
     async confirm() {
       this.save();
-      let resData = await getUsersDeptLeaderByDept({ deptId: 105 });
-      let approval;
-      if (resData.data) {
-        approval = resData.data.userId;
-      }
+      // let resData = await getUsersDeptLeaderByDept({ deptId: 105 });
+      // let approval;
+      // if (resData.data) {
+      //   approval = resData.data.userId;
+      // }
+      let approval = this.form.projectRegistrant;
       this.$set(this.taskForm.variables, "approval", approval);
       const params = { taskId: this.taskForm.taskId };
       getNextFlowNode(params).then(res => {