修改OA

oa-ui/src/settings.js

@@ -1,3 +1,9 @@
+/*
+ * @Author: ysh
+ * @Date: 2024-06-21 18:51:44
+ * @LastEditors: 
+ * @LastEditTime: 2024-08-29 14:53:06
+ */
 module.exports = {
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
@@ -22,7 +28,7 @@ module.exports = {
   /**
    * 是否固定头部
    */
-  fixedHeader: false,
+  fixedHeader: true,
 
   /**
    * 是否显示logo

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

@@ -1,3 +1,9 @@
+/*
+ * @Author: ysh
+ * @Date: 2024-06-21 18:51:45
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-29 17:21:06
+ */
 import defaultSettings from '@/settings'
 
 const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings

oa-ui/src/views/flowable/form/business/components/paymentTable.vue

@@ -0,0 +1,157 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-08-29 15:21:42
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-30 17:23:40
+-->
+<template>
+  <div style="width:100%">
+    <table border="1" style="width:100%">
+      <tr>
+        <td :colspan="8" style="background-color: #f8f8f9;line-height:40px"><strong>表2：合同回款计划</strong></td>
+      </tr>
+      <tr>
+        <td style="width: 50px;">序号</td>
+        <td style="min-width:350px">回款条件</td>
+        <td>回款比例（%）</td>
+        <td>回款金额（元）</td>
+        <td>预计时间</td>
+        <td>备注</td>
+      </tr>
+      <tr v-for="(payment, index) in paymentList" :key="index">
+        <td>
+          {{ index + 1 }}
+        </td>
+        <td>
+          <el-input v-model="payment.paymentCondition" type="textarea" clearable :autosize="{ minRows: 4 }"
+            :disabled="taskName != '合同拟稿'"></el-input>
+        </td>
+        <td>
+          <el-input-number style="width:100px" :controls="false" v-model="payment.paymentPercentage" clearable
+            :disabled="taskName != '合同拟稿'" @blur="calculatePaymentAmount(payment)"></el-input-number>
+        </td>
+        <td>
+          <el-input-number style="width:150px" :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" type="date"
+            placeholder="选择日期" :disabled="taskName != '合同拟稿'">
+          </el-date-picker>
+        </td>
+        <td>
+          <el-input v-model="payment.remark" type="textarea" clearable :autosize="{ minRows: 4 }"
+            :disabled="taskName != '合同拟稿'"></el-input>
+        </td>
+        <td v-show="taskName == '合同拟稿'">
+          <div class="delete-btn" @click="deletPaymentItem(index)">
+            <i class="el-icon-circle-close"></i>
+          </div>
+        </td>
+      </tr>
+    </table>
+    <el-button icon="el-icon-plus" size="mini" @click="addPaymentList()" type="primary" plain
+      :disabled="taskName != '合同拟稿'"></el-button>
+  </div>
+</template>
+
+<script>
+import { listContractPayment, addContractPayment, delContractPayment } from "@/api/oa/contract/contractPayment";
+export default {
+  dicts: ['cmc_scale_grade', 'cmc_unit'],
+  props: {
+    contractId: {
+      type: String,
+      default: ''
+    },
+    taskName: {
+      type: String,
+      default: ''
+    },
+    amount: {
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {
+      paymentList: [{
+        paymentCondition: "",
+        paymentPercentage: "",
+        paymentAmount: "",
+        paymentTime: undefined,
+        remark: "",
+      }],
+    }
+  },
+  watch: {
+    contractId() {
+      this.initTable()
+    },
+    amount() {
+      this.paymentList.forEach(payment => {
+        this.calculatePaymentAmount(payment)
+      })
+    }
+  },
+  created() {
+    this.initTable()
+  },
+  methods: {
+    initTable() {
+      if (!this.contractId) return
+      listContractPayment({ pageNum: 1, pageSize: 100, contractId: this.contractId }).then(res => {
+        if (res.rows.length > 0)
+          this.paymentList = res.rows;
+      });
+    },
+    deletPaymentItem(index) {
+      let arr = this.paymentList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+    },
+    addPaymentList() {
+      this.paymentList.push({
+        paymentCondition: "",
+        paymentPercentage: "",
+        paymentAmount: "",
+        paymentTime: undefined,
+        remark: "",
+      });
+    },
+    calculatePaymentAmount(payment) {
+      let amount = (payment.paymentPercentage / 100) * this.amount
+      this.$set(payment, 'paymentAmount', Number(amount))
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.delete-btn {
+  color: #F56C6C;
+  cursor: pointer;
+
+  i {
+    font-size: 25px;
+  }
+}
+
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+  border: 1px solid #a5abb0;
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 5px;
+  }
+}
+</style>

oa-ui/src/views/flowable/form/business/components/workTable.vue

@@ -0,0 +1,155 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-08-29 15:21:42
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-29 16:01:51
+-->
+<template>
+  <div style="width:100%">
+    <table border="1" style="width:100%">
+      <tr>
+        <td :colspan="8" style="background-color: #f8f8f9;line-height:40px"><strong>表1：合同计划工作量</strong></td>
+      </tr>
+      <tr>
+        <td style="width: 50px;">序号</td>
+        <td style="min-width:250px">工作内容</td>
+        <td style="width:150px">等级或比例尺</td>
+        <td style="width:100px">单位</td>
+        <td style="width:100px">工作量</td>
+        <td>要求完成时间</td>
+        <td>备注</td>
+      </tr>
+      <tr v-for="(work, index) in workList" :key="index">
+        <td>
+          {{ index + 1 }}
+        </td>
+        <td>
+          <el-input v-model="work.content" type="textarea" clearable :autosize="{ minRows: 4 }"
+            :disabled="taskName != '合同拟稿'"></el-input>
+        </td>
+        <td>
+          <el-select v-model="work.scale" placeholder="请选择" clearable :disabled="taskName != '合同拟稿'">
+            <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
+              :value="dict.label" />
+          </el-select>
+        </td>
+        <td>
+          <el-select v-model="work.unit" placeholder="请选择" clearable :disabled="taskName != '合同拟稿'">
+            <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label" :value="dict.label" />
+          </el-select>
+        </td>
+        <td>
+          <el-input-number :controls="false" style="width: 60px" v-model="work.workload" clearable
+            :disabled="taskName != '合同拟稿'"></el-input-number>
+        </td>
+        <td>
+          <el-date-picker style="width: 140px" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
+            placeholder="选择日期" :disabled="taskName != '合同拟稿'">
+          </el-date-picker>
+        </td>
+        <td>
+          <el-input v-model="work.remark" type="textarea" clearable :autosize="{ minRows: 4 }"
+            :disabled="taskName != '合同拟稿'"></el-input>
+        </td>
+        <td v-show="taskName == '合同拟稿'">
+          <div class="delete-btn" @click="deletWorkItem(index)">
+            <i class="el-icon-circle-close"></i>
+          </div>
+        </td>
+      </tr>
+    </table>
+    <el-button class="mb20" icon="el-icon-plus" size="mini" @click="addWorkList()" type="primary" plain
+      :disabled="taskName != '合同拟稿'">
+    </el-button>
+  </div>
+</template>
+
+<script>
+import { listContractWork, addContractWork, delContractWork } from "@/api/oa/contract/contractWork";
+export default {
+  dicts: ['cmc_scale_grade', 'cmc_unit'],
+  props: {
+    contractId: {
+      type: String,
+      default: ''
+    },
+    taskName: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      workList: [{
+        content: "",
+        scale: "",
+        unit: "",
+        workload: "",
+        deadline: undefined,
+        remark: "",
+      }],
+    }
+  },
+  watch: {
+    contractId() {
+      this.initTable()
+    }
+  },
+  created() {
+    this.initTable()
+  },
+  methods: {
+    initTable() {
+      if(!this.contractId) return
+      listContractWork({ pageNum: 1, pageSize: 100, contractId: this.contractId }).then(res => {
+        if (res.rows.length > 0)
+          this.workList = res.rows;
+      });
+    },
+    deletWorkItem(index) {
+      let arr = this.workList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+    },
+    addWorkList() {
+      this.workList.push({
+        content: "",
+        scale: "",
+        unit: "",
+        workload: "",
+        deadline: undefined,
+        remark: "",
+      });
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.delete-btn {
+  color: #F56C6C;
+  cursor: pointer;
+
+  i {
+    font-size: 25px;
+  }
+}
+
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+  border: 1px solid #a5abb0;
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 5px;
+  }
+}
+</style>

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-13 13:57:33
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-30 14:37:25
 -->
 <template>
   <div class="app-container">
@@ -63,16 +63,22 @@
             </el-col>
 
             <el-col :span="12" :xs="24">
-              <el-alert title="后签合同的项目，必须选择关联项目；先签合同的项目不选关联项目" type="error">
+              <el-alert v-show="taskName == '合同拟稿'" title="后签合同的项目，必须选择关联项目；先签合同的项目不选关联项目" type="error">
               </el-alert>
               <el-form-item label="关联项目：" prop="projectIds">
                 <el-button type="primary" size="mini" @click="open = true" v-if="taskName == '合同拟稿'">选择项目</el-button>
               </el-form-item>
               <el-table v-loading="projectloading" :data="chooseProjectList">
+                <el-table-column label="序号" type="index" width="50px"></el-table-column>
                 <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>
                 <el-table-column label="承担部门" align="center" prop="undertakingDeptName"></el-table-column>
+                <el-table-column label="操作" align="center">
+                  <template slot-scope="scope">
+                    <el-button type="text" icon="el-icon-view" @click="clickProjectFn(scope.row)">查看</el-button>
+                  </template>
+                </el-table-column>
               </el-table>
             </el-col>
 
@@ -92,103 +98,15 @@
               </el-link>
             </div>
           </el-form-item>
-          <el-form-item label="合同计划工作量：">
-            <table border="1" style="width:100%">
-              <tr>
-                <td style="width: 50px;">序号</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>
-              <tr v-for="(work, index) in workList" :key="index">
-                <td>
-                  {{ index + 1 }}
-                </td>
-                <td>
-                  <el-input v-model="work.content" type="textarea" clearable :autosize="{ minRows: 4 }"
-                    :disabled="taskName != '合同拟稿'"></el-input>
-                </td>
-                <td>
-                  <el-select v-model="work.scale" placeholder="请选择" clearable :disabled="taskName != '合同拟稿'">
-                    <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
-                      :value="dict.label" />
-                  </el-select>
-                </td>
-                <td>
-                  <el-select v-model="work.unit" placeholder="请选择" clearable :disabled="taskName != '合同拟稿'">
-                    <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label"
-                      :value="dict.label" />
-                  </el-select>
-                </td>
-                <td>
-                  <el-input-number :controls="false" style="width: 60px" v-model="work.workload" clearable
-                    :disabled="taskName != '合同拟稿'"></el-input-number>
-                </td>
-                <td>
-                  <el-date-picker style="width: 140px" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
-                    placeholder="选择日期" :disabled="taskName != '合同拟稿'">
-                  </el-date-picker>
-                </td>
-                <td>
-                  <el-input v-model="work.remark" type="textarea" clearable :autosize="{ minRows: 4 }"
-                    :disabled="taskName != '合同拟稿'"></el-input>
-                </td>
-                <td>
-                  <el-button type="text" style="color:#F56C6C" size="mini" circle @click="deletWorkItem(index)"
-                    :disabled="taskName != '合同拟稿'">删除行</el-button>
-                </td>
-              </tr>
-            </table>
-            <el-button icon="el-icon-plus" size="mini" @click="addWorkList()" type="primary" plain
-              :disabled="taskName != '合同拟稿'"></el-button>
-          </el-form-item>
-          <el-form-item label="合同回款计划：">
-            <table border="1" style="width:100%">
-              <tr>
-                <td style="width: 50px;">序号</td>
-                <td style="width: 250px;">回款条件</td>
-                <td>回款比例（%）</td>
-                <td>回款金额（元）</td>
-                <td>预计时间</td>
-                <td>备注</td>
-              </tr>
-              <tr v-for="(payment, index) in paymentList" :key="index">
-                <td>
-                  {{ index + 1 }}
-                </td>
-                <td>
-                  <el-input v-model="payment.paymentCondition" type="textarea" clearable :autosize="{ minRows: 4 }"
-                    :disabled="taskName != '合同拟稿'"></el-input>
-                </td>
-                <td>
-                  <el-input-number style="width:100px" :controls="false" v-model="payment.paymentPercentage" clearable
-                    :disabled="taskName != '合同拟稿'" @change="calculatePaymentAmount(payment)"></el-input-number>
-                </td>
-                <td>
-                  <el-input-number style="width:150px" :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"
-                    type="date" placeholder="选择日期" :disabled="taskName != '合同拟稿'">
-                  </el-date-picker>
-                </td>
-                <td>
-                  <el-input v-model="payment.remark" type="textarea" clearable :autosize="{ minRows: 4 }"
-                    :disabled="taskName != '合同拟稿'"></el-input>
-                </td>
-                <td>
-                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletPaymentItem(index)"
-                    :disabled="taskName != '合同拟稿'"></el-button>
-                </td>
-              </tr>
-            </table>
-            <el-button icon="el-icon-plus" size="mini" @click="addPaymentList()" type="primary" plain
-              :disabled="taskName != '合同拟稿'"></el-button>
-          </el-form-item>
+          <!-- 表1：合同计划工作量 -->
+          <work-table ref="workTableRef" :contractId="taskForm.formId" :taskName="taskName"></work-table>
+
+          <p class="mb20 mt20"></p>
+
+          <!-- 表2：合同回款计划  -->
+          <payment-table ref="paymentRef" :contractId="taskForm.formId" :amount="form.amount"
+            :taskName="taskName"></payment-table>
+
           <el-form-item label="合同备注" prop="remark">
             <el-input v-model="form.remark" :autosize="{ minRows: 4 }" type="textarea" placeholder="请输入合同备注"
               :disabled="taskName != '合同拟稿'" />
@@ -281,9 +199,10 @@
                     :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)"
-                    :disabled="taskName != '合同拟稿'">删除行</el-button>
+                <td v-show="taskName == '合同拟稿'">
+                  <div class="delete-btn" @click="deletCommentItem(index)">
+                    <i class="el-icon-circle-close"></i>
+                  </div>
                 </td>
               </tr>
             </table>
@@ -436,15 +355,18 @@
       </el-col>
     </el-row>
 
-    <el-dialog title="选择项目" :visible.sync="open" width="70%" append-to-body>
+    <el-dialog title="选择项目" :visible.sync="open" width="60%" append-to-body>
       <choose-project @chooseProject="confirmProject"></choose-project>
     </el-dialog>
-    <el-dialog title="选择投标项目" :visible.sync="tbOpen" width="70%" append-to-body>
+    <el-dialog title="选择投标项目" :visible.sync="tbOpen" width="60%" append-to-body>
       <choose-tender @choose="confirmTender"></choose-tender>
     </el-dialog>
-    <el-dialog title="选择甲方单位" :visible.sync="partyAOpen" width="70%" append-to-body>
+    <el-dialog title="选择甲方单位" :visible.sync="partyAOpen" width="60%" append-to-body>
       <choose-party-a @confirm="confirmPartyA"></choose-party-a>
     </el-dialog>
+    <el-drawer :visible.sync="drawerOpen" title="" :size="'70%'" append-to-body>
+      <projectInfo :needReturn="false"></projectInfo>
+    </el-drawer>
   </div>
 </template>
 
@@ -470,6 +392,9 @@ import { listPartyA } from "@/api/oa/partyA/partyA";
 import FileItem from './fileItem.vue';
 import { mapGetters } from "vuex";
 import ChoosePartyA from '@/views/flowable/form/components/choosePartyA.vue';
+import workTable from './components/workTable.vue';
+import paymentTable from './components/paymentTable.vue';
+import projectInfo from '@/views/oa/project/info'
 export default {
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   components: {
@@ -477,7 +402,9 @@ export default {
     ChooseProject,
     ChooseTender,
     FileItem,
-    ChoosePartyA
+    ChoosePartyA,
+    workTable,
+    paymentTable,projectInfo
   },
   props: {
     taskName: {
@@ -548,27 +475,15 @@ export default {
       rules: {},
       meetingOpen: false,
       commentOpen: false,
+      drawerOpen: false,
       chooseProjectList: [],
       partyAList: [],
       projectList: [],
       deptList: [],
       userList: [],
       users: undefined,
-      workList: [{
-        content: "",
-        scale: "",
-        unit: "",
-        workload: "",
-        deadline: undefined,
-        remark: "",
-      }],
-      paymentList: [{
-        paymentCondition: "",
-        paymentPercentage: "",
-        paymentAmount: "",
-        paymentTime: undefined,
-        remark: "",
-      }],
+      workList: [],
+      paymentList: [],
       placeList: [{ id: '0', name: '301会议室' }, { id: '1', name: '216会议室' }],
       commentList: [
         {
@@ -688,14 +603,6 @@ export default {
               this.isSelect = true
             })
           }
-          listContractWork({ pageNum: 1, pageSize: 100, contractId: this.taskForm.formId }).then(res => {
-            if (res.rows)
-              this.workList = res.rows;
-          });
-          listContractPayment({ pageNum: 1, pageSize: 100, contractId: this.taskForm.formId }).then(res => {
-            if (res.rows)
-              this.paymentList = res.rows;
-          });
           listContractComment({ pageNum: 1, pageSize: 100, contractId: this.taskForm.formId }).then(res => {
             if (res.rows && res.rows.length != 0) {
               this.commentList = res.rows;
@@ -838,25 +745,6 @@ export default {
       }
       return chooseTender.partyA.partyAName.includes(TARGET_COMPANY) ? '院内' : '院外';
     },
-    addWorkList() {
-      this.workList.push({
-        content: "",
-        scale: "",
-        unit: "",
-        workload: "",
-        deadline: undefined,
-        remark: "",
-      });
-    },
-    addPaymentList() {
-      this.paymentList.push({
-        paymentCondition: "",
-        paymentPercentage: "",
-        paymentAmount: "",
-        paymentTime: undefined,
-        remark: "",
-      });
-    },
     addCommentList() {
       this.commentList.push({
         deptId: "",
@@ -866,24 +754,6 @@ export default {
         commentTime: undefined,
       });
     },
-    deletWorkItem(index) {
-      let arr = this.workList;
-      if (arr.length == 1) {
-        return;
-      }
-      if (index >= 0 && index < arr.length) {
-        arr.splice(index, 1);
-      }
-    },
-    deletPaymentItem(index) {
-      let arr = this.paymentList;
-      if (arr.length == 1) {
-        return;
-      }
-      if (index >= 0 && index < arr.length) {
-        arr.splice(index, 1);
-      }
-    },
     setCommentDocument(val) {
       let arr = val.split('/upload');
       this.clickTd.document = arr[1];
@@ -1104,6 +974,8 @@ export default {
       });
     },
     updateContractData() {
+      this.workList = this.$refs.workTableRef.workList;
+      this.paymentList = this.$refs.paymentRef.paymentList;
       updateContract(this.form).then(response => {
         this.$modal.msgSuccess("修改成功");
         this.open = false;
@@ -1222,10 +1094,6 @@ export default {
         this.$set(this.form, 'partyAId', val[0].partyAId)
       }
     },
-    calculatePaymentAmount(payment) {
-      let amount = (payment.paymentPercentage / 100) * this.form.amount
-      this.$set(payment, 'paymentAmount', Number(amount))
-    },
     reviewWord(url) {
       this.$router.push({
         path: '/preview',
@@ -1233,6 +1101,10 @@ export default {
           url: url
         }
       })
+    },
+    clickProjectFn(row) {
+      this.$router.replace({ query: { ...this.$route.query, projectId: row.projectId } });
+      this.drawerOpen = true;
     }
   }
 }
@@ -1241,11 +1113,21 @@ export default {
 <style lang="scss" scoped>
 @import "@/assets/styles/element-reset.scss";
 
+.delete-btn {
+  color: #F56C6C;
+  cursor: pointer;
+
+  i {
+    font-size: 25px;
+  }
+}
+
 table {
   /*边框*/
   /* border: 1px solid black; */
   text-align: center;
   border-collapse: collapse;
+  border: 1px solid #a5abb0;
 
   /*设置背景颜色*/
   /* background-color: #bfa; */
@@ -1275,4 +1157,15 @@ table {
 .ele-upload-list__item-content-action .el-link {
   margin-right: 10px;
 }
+
+::v-deep .el-descriptions-item__label.is-bordered-label {
+  color: #5a5757;
+  background: rgba($color: #a9adb3, $alpha: 0.1);
+  width: 150px;
+  min-width: 150px;
+}
+
+::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
+  border: 1px solid #cdd0d3;
+}
 </style>

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-08-07 09:41:32
+ * @LastEditTime: 2024-08-28 15:51:59
 -->
 <template>
   <div class="app-container">
@@ -11,7 +11,7 @@
         <h2 class="text-center">分包合同评审表</h2>
         <el-form ref="form" :model="form" :rules="rules" label-width="130px" :formDisabled="formDisabled">
           <el-divider></el-divider>
-          <el-form-item label="项目编号：" prop="projectId">
+          <el-form-item label="关联项目：" prop="projectId">
             <el-button type="primary" size="mini" @click="open = true" v-if="taskName == '合同拟稿'">选择项目</el-button>
             <el-table :data="chooseProjectList" border v-if="isSelect">
               <el-table-column type="index" width="50" label="序号" />
@@ -43,7 +43,7 @@
             <el-col :span="16" :xs="24">
               <el-form-item label="承接单位" prop="partnerId">
                 <el-select allow-create v-model="form.partnerId" multiple filterable placeholder="请选择"
-                  style="width: 84%;" disabled clearable>
+                  :style="taskName == '合同拟稿' ? {width: '84%' }: {width: '100%' }" disabled clearable>
                   <el-option v-for="item in partnerList" :key="item.value" :label="item.partnerName"
                     :value="item.partnerId">
                   </el-option>
@@ -83,104 +83,112 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-form-item label="合同计划工作量：">
-            <table border="1">
-              <tr>
-                <td style="width:50px;">序号</td>
-                <td>工作内容</td>
-                <td>等级或比例尺</td>
-                <td>单位</td>
-                <td>工作量</td>
-                <td>要求完成时间</td>
-                <td>备注</td>
-              </tr>
-              <tr v-for="(work, index) in workList" :key="index">
-                <td>
-                  {{ index + 1 }}
-                </td>
-                <td>
-                  <el-input v-model="work.content" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"
-                    :disabled="taskName != '合同拟稿'"></el-input>
-                </td>
-                <td>
-                  <el-select v-model="work.scale" placeholder="请选择" clearable :disabled="taskName != '合同拟稿'">
-                    <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
-                      :value="dict.label" />
-                  </el-select>
-                </td>
-                <td>
-                  <el-select v-model="work.unit" placeholder="请选择" clearable :disabled="taskName != '合同拟稿'">
-                    <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label"
-                      :value="dict.label" />
-                  </el-select>
-                </td>
-                <td>
-                  <el-input v-model="work.workload" clearable :disabled="taskName != '合同拟稿'"></el-input>
-                </td>
-                <td>
-                  <el-date-picker style="width: 140px" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
-                    placeholder="选择日期" :disabled="taskName != '合同拟稿'">
-                  </el-date-picker>
-                </td>
-                <td>
-                  <el-input v-model="work.remark" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"
-                    :disabled="taskName != '合同拟稿'"></el-input>
-                </td>
-                <td>
-                  <el-button type="text" style="color:#F56C6C" size="mini" circle @click="deletWorkItem(index)"
-                    :disabled="taskName != '合同拟稿'">删除行</el-button>
-                </td>
-              </tr>
-            </table>
-            <el-button icon="el-icon-plus" size="mini" @click="addWorkList()" type="primary" plain
-              :disabled="taskName != '合同拟稿'"></el-button>
-          </el-form-item>
-          <el-form-item label="合同付款计划：">
-            <table border="1">
-              <tr>
-                <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>
-              <tr v-for="(payment, index) in paymentList" :key="index">
-                <td>
-                  {{ index + 1 }}
-                </td>
-                <td>
-                  <el-input v-model="payment.paymentCondition" type="textarea" clearable
-                    :autosize="{ minRows: 4, maxRows: 10 }" :disabled="taskName != '合同拟稿'"></el-input>
-                </td>
-                <td>
-                  <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-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>
-                </td>
-                <td>
-                  <el-input v-model="payment.remark" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"
-                    :disabled="taskName != '合同拟稿'"></el-input>
-                </td>
-                <td>
-                  <el-button type="text" style="color:#F56C6C" size="mini" @click="deletPaymentItem(index)"
-                    :disabled="taskName != '合同拟稿'">删除行</el-button>
-                </td>
-              </tr>
-            </table>
-            <el-button icon="el-icon-plus" size="mini" @click="addPaymentList()" type="primary" plain
-              :disabled="taskName != '合同拟稿'"></el-button>
-          </el-form-item>
+          <table border="1" style="width:100%">
+            <tr>
+              <td :colspan="8" style="background-color: #f8f8f9;line-height:40px"><strong>表1：合同计划工作量</strong></td>
+            </tr>
+            <tr>
+              <td style="width: 50px;">序号</td>
+              <td style="min-width:250px">工作内容</td>
+              <td style="width:150px">等级或比例尺</td>
+              <td style="width:100px">单位</td>
+              <td style="width:100px">工作量</td>
+              <td>要求完成时间</td>
+              <td>备注</td>
+            </tr>
+            <tr v-for="(work, index) in workList" :key="index">
+              <td>
+                {{ index + 1 }}
+              </td>
+              <td>
+                <el-input v-model="work.content" type="textarea" clearable :autosize="{ minRows: 4 }"
+                  :disabled="taskName != '合同拟稿'"></el-input>
+              </td>
+              <td>
+                <el-select v-model="work.scale" placeholder="请选择" clearable :disabled="taskName != '合同拟稿'">
+                  <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
+                    :value="dict.label" />
+                </el-select>
+              </td>
+              <td>
+                <el-select v-model="work.unit" placeholder="请选择" clearable :disabled="taskName != '合同拟稿'">
+                  <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label"
+                    :value="dict.label" />
+                </el-select>
+              </td>
+              <td>
+                <el-input v-model="work.workload" clearable :disabled="taskName != '合同拟稿'"></el-input>
+              </td>
+              <td>
+                <el-date-picker style="width: 140px" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
+                  placeholder="选择日期" :disabled="taskName != '合同拟稿'">
+                </el-date-picker>
+              </td>
+              <td>
+                <el-input v-model="work.remark" type="textarea" clearable :autosize="{ minRows: 4 }"
+                  :disabled="taskName != '合同拟稿'"></el-input>
+              </td>
+              <td v-show="taskName == '合同拟稿'">
+                <div class="delete-btn" @click="deletWorkItem(index)">
+                  <i class="el-icon-circle-close"></i>
+                </div>
+              </td>
+            </tr>
+          </table>
+          <el-button icon="el-icon-plus" size="mini" @click="addWorkList()" type="primary" plain
+            :disabled="taskName != '合同拟稿'"></el-button>
+
+          <p class="mb20 mt20"></p>
+
+          <!-- 表2：合同回款计划  -->
+          <table border="1" style="width:100%">
+            <tr>
+              <td :colspan="8" style="background-color: #f8f8f9;line-height:40px"><strong>表2：合同回款计划</strong></td>
+            </tr>
+            <tr>
+              <td style="width: 50px;">序号</td>
+              <td style="min-width:350px">回款条件</td>
+              <td>回款比例（%）</td>
+              <td>回款金额（元）</td>
+              <td>预计时间</td>
+              <td>备注</td>
+            </tr>
+            <tr v-for="(payment, index) in paymentList" :key="index">
+              <td>
+                {{ index + 1 }}
+              </td>
+              <td>
+                <el-input v-model="payment.paymentCondition" type="textarea" clearable
+                  :autosize="{ minRows: 4 }" :disabled="taskName != '合同拟稿'"></el-input>
+              </td>
+              <td>
+                <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-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>
+              </td>
+              <td>
+                <el-input v-model="payment.remark" type="textarea" clearable :autosize="{ minRows: 4 }"
+                  :disabled="taskName != '合同拟稿'"></el-input>
+              </td>
+              <td v-show="taskName == '合同拟稿'">
+                <div class="delete-btn" @click="deletPaymentItem(index)">
+                  <i class="el-icon-circle-close"></i>
+                </div>
+              </td>
+            </tr>
+          </table>
+          <el-button icon="el-icon-plus" size="mini" @click="addPaymentList()" type="primary" plain
+            :disabled="taskName != '合同拟稿'"></el-button>
           <el-form-item label="合同备注" prop="remark">
-            <el-input type="textarea" v-model="form.remark" placeholder="请输入合同备注" :disabled="taskName != '合同拟稿'" />
+            <el-input type="textarea" v-model="form.remark" :autosize="{ minRows: 4 }" placeholder="请输入合同备注" :disabled="taskName != '合同拟稿'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="11">
@@ -204,7 +212,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>
@@ -233,7 +241,7 @@
                   </el-select>
                 </td>
                 <td>
-                  <el-input v-model="comment.comment" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"
+                  <el-input v-model="comment.comment" type="textarea" clearable :autosize="{ minRows: 4 }"
                     :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)"></el-input>
                 </td>
                 <!-- 线上会审附件 -->
@@ -253,7 +261,8 @@
                             {{ getFileName(comment.document) }}
                           </span>
                         </el-link>
-                        <div class="ele-upload-list__item-content-action" v-if="taskName == '线上会审' && 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>
@@ -269,9 +278,10 @@
                     :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)"
-                    :disabled="taskName != '合同拟稿'">删除行</el-button>
+                <td v-show="taskName == '合同拟稿'">
+                  <div class="delete-btn" @click="deletCommentItem(index)">
+                    <i class="el-icon-circle-close"></i>
+                  </div>
                 </td>
               </tr>
             </table>
@@ -345,7 +355,7 @@
             </table>
           </el-form-item>
           <el-form-item label="分管审批意见" prop="remark">
-            <el-input v-model="form.managerComment" type="textarea" placeholder="请输入分管审批意见"
+            <el-input v-model="form.managerComment" type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入分管审批意见"
               :disabled="taskName != '分管审核'" />
           </el-form-item>
           <el-row>
@@ -1050,7 +1060,7 @@ export default {
             })
 
           }
-        }else{
+        } else {
           this.$message.error('必填项未填写完毕')
         }
       });
@@ -1259,6 +1269,15 @@ export default {
 <style lang="scss" scoped>
 @import "@/assets/styles/element-reset.scss";
 
+.delete-btn {
+  color: #F56C6C;
+  cursor: pointer;
+
+  i {
+    font-size: 25px;
+  }
+}
+
 table {
   /*边框*/
   /* border: 1px solid black; */

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

@@ -2,14 +2,15 @@
  * @Author: ysh
  * @Date: 2024-06-18 17:38:50
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-20 16:33:37
+ * @LastEditTime: 2024-08-30 11:25:29
 -->
 <template>
   <div>
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="单位名称" prop="partyAName">
-        <el-input v-model="queryParams.partyAName" placeholder="请输入单位名称" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.partyAName" placeholder="请输入单位名称" clearable @keyup.enter.native="handleQuery()"/>
       </el-form-item>
+      <el-form-item style="margin-bottom:0;display:none;"> <el-input></el-input> </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
@@ -129,7 +130,7 @@ export default {
       this.loading = true;
       if (this.projectSource == '0') {
         this.queryParams.partyAName = '中国电建集团成都勘测设计研究院有限公司'
-      } else {
+      } else if (this.projectSource == '1') {
         this.queryParams.partyAName = null
       }
       listPartyA(this.queryParams).then(response => {

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

@@ -118,8 +118,7 @@
           <el-row :gutter="20">
             <el-col :span="8" :xs="24">
               <el-form-item label="申请金额" prop="applyAmount">
-                <el-input v-model="form.applyAmount" placeholder="请输入申请金额" :disabled="taskName != '借款申请'"
-                  @blur="VerificationAmount" />
+                <el-input v-model="form.applyAmount" placeholder="请输入申请金额" :disabled="taskName != '借款申请'" />
                 <span style="color:#E74C3C" v-if="exceed && form.borrowUsage == 0">超过预算金额：{{ getMoreAmount('0')
                   }}</span>
               </el-form-item>
@@ -490,7 +489,7 @@ export default {
       }
     },
     initForm() {
-      listBorrowDetail({ pageSize:999, borrowId: this.taskForm.formId }).then(res => {
+      listBorrowDetail({ pageSize: 999, borrowId: this.taskForm.formId }).then(res => {
         if (res.rows.length != 0) {
           this.detailList = res.rows
         }
@@ -599,7 +598,10 @@ export default {
       });
     },
     /** 提交按钮 */
-    submitForm() {
+    async submitForm() {
+      if (this.taskName == '借款申请') {
+        await this.VerificationAmount();
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.borrowUsage == '0' && !this.form.projectId) {
@@ -678,6 +680,7 @@ export default {
           }
         }
       });
+
     },
     handleComplete(taskForm) {
       complete(taskForm).then(response => {
@@ -782,7 +785,6 @@ export default {
         sum = sum + Number(user[name1]);
       }
       this.form[name2] = sum.toFixed(2);
-      this.VerificationAmount();
     },
     getBorrowPath(val) {
       let arr = val.split('/upload')
@@ -822,17 +824,20 @@ export default {
     VerificationAmount() {
       if (this.isSelect) {
         if (this.form.applyAmount > (this.totalBudget - this.hasBorrow)) {
-          this.$confirm('借款总额已经超过项目预算，将走《超预算或预算外支付（报销）》流程', '提示', {
+          return this.$confirm('借款总额已经超过项目预算，将走《超预算或预算外支付（报销）》流程', '提示', {
             confirmButtonText: '确定',
             type: 'warning'
           }).then(() => {
             this.exceed = true;
             this.$set(this.taskForm.variables, "exceed", true);
+            return '1'
+          }).catch(() => {
             return
           })
         } else {
           this.exceed = false;
           this.$set(this.taskForm.variables, "exceed", false);
+          return
         }
       }
     },

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

@@ -2,13 +2,19 @@
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-20 16:34:35
+ * @LastEditTime: 2024-08-29 14:31:38
 -->
 <template>
   <div class="project-wrapper">
     <!-- 项目登记 -->
     <h2 style="text-align: center" id="scrollToMe">项目登记</h2>
     <el-form ref="projectAdd" :model="addForm" :rules="rules" label-width="130px" :disabled="disabled">
+      <el-form-item label="项目来源：" prop="projectSource">
+        <el-radio-group v-model="addForm.projectSource" @change="changeProjectSource">
+          <el-radio label="0" border>院内</el-radio>
+          <el-radio label="1" border>院外</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item label="项目编号：" prop="projectNumber">
         <el-input v-model="addForm.projectNumber"></el-input>
       </el-form-item><el-form-item label="项目名称：" prop="projectName">
@@ -21,12 +27,6 @@
         <el-radio v-model="addForm.projectLevel" label="0" border>一般项目</el-radio>
         <el-radio v-model="addForm.projectLevel" label="1" border>重大项目</el-radio>
       </el-form-item>
-      <el-form-item label="项目来源：" prop="projectSource">
-        <el-radio-group v-model="addForm.projectSource" @change="changeProjectSource">
-          <el-radio label="0" border>院内</el-radio>
-          <el-radio label="1" border>院外</el-radio>
-        </el-radio-group>
-      </el-form-item>
       <el-form-item label="合同编码：">
         <el-input v-model="chooseContractInfo.contractCode">
           <el-button slot="append" @click="openContract = true">选择</el-button>
@@ -270,33 +270,27 @@ export default {
       this.openContract = false;
     },
     // 暂存
-    save() {
+    async save() {
       // 新增项目数据
       if (this.formTotal == 0) {
-        this.$refs['projectAdd'].validate((vaild) => {
-          if (vaild) {
-            this.addForm.projectId = this.taskForm.formId;
-            addProject(this.addForm).then(response => {
-              this.$modal.msgSuccess("项目登记成功");
-              this.getList();
-            });
-            let contractId = this.chooseContractInfo.contractId ? this.chooseContractInfo.contractId : ''
-            let pcobj = { projectId: this.taskForm.formId, contractId }
-            if (contractId != '') {
-              addProjectContract(pcobj).then(response => {
-                this.$modal.msgSuccess("合同关联成功");
-              })
-            }
-          } else {
-            let dom = document.getElementById('scrollToMe')
-            dom.scrollIntoView({ behavior: 'smooth' });
-          }
-        })
+        this.addForm.projectId = this.taskForm.formId;
+        await addProject(this.addForm)
+        this.$modal.msgSuccess("新增项目成功");
+        this.getList();
+        let contractId = this.chooseContractInfo.contractId ? this.chooseContractInfo.contractId : ''
+        let pcobj = { projectId: this.taskForm.formId, contractId }
+        if (contractId != '') {
+          await addProjectContract(pcobj)
+          this.$modal.msgSuccess("合同关联成功");
+        }
+        // setTimeout(() => {
+        //   this.$router.go(0);
+        // }, 500);
+        this.initProjectForm();
       } else {
         // 修改项目数据
-        updateProject(this.addForm).then(
-          this.$modal.msgSuccess("保存成功")
-        );
+        await updateProject(this.addForm)
+        this.$modal.msgSuccess("保存成功")
       }
     },
     async confirmAddForm() {
@@ -307,10 +301,28 @@ export default {
       }
       this.$set(this.taskForm.variables, "approval", approvalId);
       this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
-      this.save()
       // 获取下一个流程节点
       this.$refs['projectAdd'].validate((vaild) => {
         if (vaild) {
+          if (this.formTotal == 0) {
+            this.addForm.projectId = this.taskForm.formId;
+            addProject(this.addForm).then(response => {
+              this.$modal.msgSuccess("项目登记成功");
+              this.getList();
+            });
+            let contractId = this.chooseContractInfo.contractId ? this.chooseContractInfo.contractId : ''
+            let pcobj = { projectId: this.taskForm.formId, contractId }
+            if (contractId != '') {
+              addProjectContract(pcobj).then(response => {
+                this.$modal.msgSuccess("合同关联成功");
+              })
+            }
+          } else {
+            // 修改项目数据
+            updateProject(this.addForm).then(
+              this.$modal.msgSuccess("保存成功")
+            );
+          }
           const params = { taskId: this.taskForm.taskId };
           getNextFlowNode(params).then(res => {
             complete(this.taskForm).then(response => {
@@ -318,6 +330,9 @@ export default {
               this.$emit('goBack');
             });
           })
+        } else {
+          let dom = document.getElementById('scrollToMe')
+          dom.scrollIntoView({ behavior: 'smooth' });
         }
       })
 

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-08 17:48:47
+ * @LastEditTime: 2024-08-28 10:13:07
 -->
 <template>
   <div class="app-container">
@@ -29,7 +29,7 @@
 import { mapGetters } from 'vuex';
 import { parseTime } from "@/utils/ruoyi";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
-import { getProjectComment, addProjectComment } from "@/api/oa/project/projectComment"
+import { getProjectComment, addProjectComment, updateProjectComment } from "@/api/oa/project/projectComment"
 import { listProject, getProject, addProject, updateProject, delProject, submitProject, modifyProject } from "@/api/oa/project/project";
 import { getUsersManageLeaderByDept } from '@/api/system/post'
 export default {
@@ -61,7 +61,8 @@ export default {
         jyComment: [{ required: true, message: "请输入审核意见", trigger: "blur" }]
       },
       jyApprovalTime: "",
-      managerList: []
+      managerList: [],
+      formTotal: 0,
     }
   },
   created() {
@@ -78,6 +79,7 @@ export default {
     initForm() {
       getProjectComment(this.taskForm.formId).then(res => {
         if (res.data) {
+          this.formTotal = 1;
           this.form = res.data
           if (this.form.jyUser) {
             this.form.jyApproverName = this.form.jyUser.nickName
@@ -114,7 +116,11 @@ export default {
     },
     confirm() {
       this.form.projectId = this.taskForm.formId
-      addProjectComment({ projectId: this.taskForm.formId, jyComment: this.form.jyComment })
+      if (this.formTotal) {
+        updateProjectComment(this.form)
+      } else {
+        addProjectComment({ projectId: this.taskForm.formId, jyComment: this.form.jyComment })
+      }
       const params = { taskId: this.taskForm.taskId };
       // 获取下一个流程节点
       getNextFlowNode(params).then(res => {

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

@@ -0,0 +1,396 @@
+<template>
+  <div class="app-container">
+    <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+      <el-form-item label="投标项目名称" prop="tenderId">
+        <el-button type="primary" size="mini" @click="tbOpen = true">选择投标项目</el-button>
+        <el-button type="danger" size="mini" @click="form.tenderId = null" v-if="form.tenderId != null">删除投标项目</el-button>
+        <el-descriptions border v-if="form.tenderId" style="margin-top: 10px;" :column="1">
+          <el-descriptions-item label="投标项目名称" label-class-name="my-label" :span="3">
+            {{ chooseTender.projectName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="项目来源" label-class-name="my-label">
+            {{ getProjectSource(chooseTender) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="联系人" label-class-name="my-label">
+            {{ chooseTender.aPerson }}
+          </el-descriptions-item>
+          <el-descriptions-item label="联系电话" label-class-name="my-label">
+            {{ chooseTender.aPhone }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-form-item>
+      <el-form-item label="合同名称" prop="contractName">
+        <el-input style="width: 100%;" v-model="form.contractName" placeholder="请输入合同名称"></el-input>
+      </el-form-item>
+      <el-form-item label="甲方单位" prop="partyAId">
+        <el-select v-model="form.partyAId" filterable placeholder="请选择" disabled style="width: 90%;">
+          <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName" :value="item.partyAId">
+          </el-option>
+        </el-select>
+        <el-button type="primary" @click="partyAOpen = true" size="mini">选择单位</el-button>
+      </el-form-item>
+      <el-form-item label="合同编码" prop="contractCode">
+        <el-input style="width: 100%;" v-model="form.contractCode" placeholder="请输入合同编码"></el-input>
+      </el-form-item>
+      <el-form-item label="合同编号" prop="contractNumber">
+        <el-input style="width:  100%;" v-model="form.contractNumber" placeholder="请输入合同编号"></el-input>
+      </el-form-item>
+      <el-form-item label="合同金额" prop="amount">
+        <el-input style="width:50%;" v-model="form.amount" placeholder="请输入合同金额">
+          <template slot="append">元</template>
+        </el-input>
+      </el-form-item>
+      <el-form-item style="text-align: left;" label="履约保证金" prop="deposit">
+        <el-input style="width:50%;" v-model="form.deposit" placeholder="请输入履约保证金">
+          <template slot="append">元</template>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="合同文件" prop="contractDocument">
+        <FileUpload ref="contractFile" :limit="1" :filePathName="'承接合同/合同文件'" :isModify="true" :isShowTip="false"
+          :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getContractPath">
+        </FileUpload>
+        <div>
+          <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="关联项目：" prop="projectIds">
+        <el-button type="primary" size="mini" @click="open = true" icon="el-icon-plus">新增关联项目</el-button>
+        <el-table v-loading="projectloading" :data="connectProjectList">
+          <el-table-column label="序号" type="index" width="50px"></el-table-column>
+          <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>
+          <el-table-column label="承担部门" align="center" prop="undertakingDeptName"></el-table-column>
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scope">
+              <el-button type="text" icon="el-icon-view" @click="clickProjectFn(scope.row)">查看</el-button>
+              <el-button type="text" style="color:#F56C6C;" icon="el-icon-delete"
+                @click="handleDelete(scope.$index,scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form-item>
+      <el-form-item label="关联分包合同：">
+
+      </el-form-item>
+      <!-- 表1：工作量计划-->
+      <work-table ref="workTableRef" :contractId="form.contractId" :taskName="'合同拟稿'"></work-table>
+
+      <p class="mb20 mt20"></p>
+      <!-- 表2：回款计划 -->
+      <payment-table ref="paymentRef" :contractId="form.contractId" :amount="form.amount"
+        :taskName="'合同拟稿'"></payment-table>
+
+      <el-form-item label="合同备注" prop="remark">
+        <el-input v-model="form.remark" :autosize="{ minRows: 4 }" type="textarea" placeholder="请输入合同备注" />
+      </el-form-item>
+
+
+      <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-form-item label="评审方式">
+        <el-tag :type="form.commentType == '2' ? 'success' : 'warning'">
+          {{ getCommentType(form.commentType) }}</el-tag>
+      </el-form-item>
+      <el-form-item label="" label-width="0" v-if="form.commentType == '2'">
+        <table border="1" style="width:100%;">
+          <tr>
+            <td style="width: 50px;">序号</td>
+            <td>会审部门</td>
+            <td>会审人</td>
+            <td>会审意见</td>
+            <td style="width: 200px;">会审附件</td>
+            <td style="width: 100px;">日期</td>
+          </tr>
+          <tr v-for="(comment, index) in commentList" :key="index">
+            <td>
+              {{ index + 1 }}
+            </td>
+            <td>
+              {{ getDeptName(comment.deptId) }}
+            </td>
+            <td>
+              {{ getUserName(comment.userId) }}
+            </td>
+            <td>
+              {{ comment.comment }}
+            </td>
+            <td>
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + comment.document}`)">
+                {{ getFileName(comment.document) }}
+              </el-link>
+            </td>
+            <td>
+              <el-date-picker v-model="comment.commentTime" type="date" value-format="yyyy-MM-dd" style="width:140px;"
+                placeholder="选择日期"></el-date-picker>
+            </td>
+          </tr>
+        </table>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer text-center">
+      <el-button type="primary" @click="submitForm">修 改</el-button>
+      <el-button @click="$emit('cancel')">取 消</el-button>
+    </div>
+
+    <el-dialog title="选择项目" :visible.sync="open" width="60%" append-to-body>
+      <choose-project @chooseProject="confirmProject"></choose-project>
+    </el-dialog>
+    <el-dialog title="选择投标项目" :visible.sync="tbOpen" width="60%" append-to-body>
+      <choose-tender @choose="confirmTender"></choose-tender>
+    </el-dialog>
+    <el-drawer :visible.sync="partyAOpen" title="选择甲方单位" :size="'40%'" append-to-body>
+      <div class="app-container">
+        <choose-party-a @confirm="confirmPartyA"></choose-party-a>
+      </div>
+    </el-drawer>
+    <el-drawer :visible.sync="drawerOpen" title="" :size="'70%'" append-to-body>
+      <projectInfo :needReturn="false"></projectInfo>
+    </el-drawer>
+  </div>
+
+</template>
+
+<script>
+import { listContractWork, addContractWork, delContractWork } from "@/api/oa/contract/contractWork";
+import { listContractPayment, addContractPayment, delContractPayment } from "@/api/oa/contract/contractPayment";
+import { listContractComment, addContractComment, updateContractComment } from "@/api/oa/contract/contractComment";
+import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
+import { listProjectContract, addProjectContract, delProjectContract } from "@/api/oa/contract/projectContract";
+import { listProject, getProject } from "@/api/oa/project/project";
+import { listPartyA } from "@/api/oa/partyA/partyA";
+import chooseProject from "@/views/flowable/form/components/chooseProject.vue";
+import chooseTender from "@/views/flowable/form/components/chooseTender.vue";
+import ChoosePartyA from '@/views/flowable/form/components/choosePartyA.vue';
+import WorkTable from '@/views/flowable/form/business/components/workTable.vue';
+import paymentTable from '@/views/flowable/form/business/components/paymentTable.vue';
+import projectInfo from '@/views/oa/project/info'
+export default {
+  components: { chooseProject, chooseTender, ChoosePartyA, WorkTable, paymentTable, projectInfo },
+  props: {
+    form: {
+      type: Object
+    },
+  },
+  data() {
+    return {
+      baseUrl: process.env.VUE_APP_BASE_API,
+      open: false,
+      tbOpen: false,
+      partyAOpen: false,
+      drawerOpen: false,
+      commentList: [],
+      workList: [],
+      paymentList: [],
+      partyAList: [],
+      chooseTender: {},
+      rules: {
+        contractCode: [
+          { required: true, message: '请输入合同编码', trigger: 'blur' },
+        ],
+        amount: [
+          { required: true, message: '请输入合同金额', trigger: 'blur' },
+        ],
+      },
+      projectloading: false,
+      connectProjectList: [],
+      projectContractForm: {
+        projectIds: [],
+      },
+    }
+  },
+  watch: {
+    'form.contractId'() {
+      this.init();
+    }
+  },
+  created() {
+    this.getPartyAList();
+    this.init();
+  },
+  methods: {
+    init() {
+      const contractId = this.form.contractId;
+      this.chooseTender = this.form.tender;
+      const tenderId = this.form.tenderId;
+      listContractComment({ pageNum: 1, pageSize: 100, contractId: contractId }).then(res => {
+        if (res.rows && res.rows.length != 0) {
+          this.commentList = res.rows;
+        }
+      })
+      listProjectContract({ contractId: contractId }).then(res => {
+        if (res.rows) {
+          let list = []
+          for (let row of res.rows) {
+            getProject(row.projectId).then(response => {
+              list.push(response.data)
+            })
+          }
+          this.connectProjectList = list;
+          this.projectloading = false;
+        }
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.contractId != null) {
+            for (let comment of this.commentList) {
+              updateContractComment(comment);
+            }
+            this.updateContractData();
+            this.updateRelatedProject();
+            this.$emit('cancel')
+          }
+        }
+      });
+    },
+    // 查询业主单位列表
+    getPartyAList() {
+      listPartyA({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.partyAList = response.rows;
+      })
+    },
+    getCommentType(row) {
+      let name = '';
+      if (row == '0') {
+        name = '无须评审'
+      } else if (row == '1') {
+        name = '会议评审'
+      } else {
+        name = '线上评审'
+      }
+      return name
+    },
+    getProjectSource(chooseTender) {
+      const TARGET_COMPANY = '中国电建集团成都勘测设计研究院有限公司';
+      if (!chooseTender || !chooseTender.partyA || !chooseTender.partyA.partyAName) {
+        return '';
+      }
+      return chooseTender.partyA.partyAName.includes(TARGET_COMPANY) ? '院内' : '院外';
+    },
+    confirmProject(val) {
+      this.open = false
+      for (let v of val) {
+        this.projectContractForm.projectIds.push(v.projectId);
+        this.connectProjectList.push(v)
+      }
+    },
+    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
+      this.form.partyAId = val.partyAId
+    },
+    confirmPartyA(val) {
+      this.partyAOpen = false
+      if (val && val.length > 1) {
+        return this.$message.error('请选择一个甲方单位')
+      }
+      if (val) {
+        this.getPartyAList();
+        this.$set(this.form, 'partyAId', val[0].partyAId)
+      }
+    },
+    getContractPath(val) {
+      let arr = val.split('/upload')
+      this.form.contractDocument = arr[1]
+      if (val == "") {
+        this.form.contractDocument = ""
+      }
+    },
+    updateContractData() {
+      this.workList = this.$refs.workTableRef.workList;
+      this.paymentList = this.$refs.paymentRef.paymentList;
+      updateContract(this.form).then(response => {
+        this.$modal.msgSuccess("修改成功");
+        this.open = false;
+        delContractWork(this.form.contractId).then(res => {
+          for (let work of this.workList) {
+            work.contractId = this.form.contractId
+            addContractWork(work);
+          }
+        })
+        delContractPayment(this.form.contractId).then(res => {
+          for (let payment of this.paymentList) {
+            payment.contractId = this.form.contractId
+            addContractPayment(payment);
+          }
+        })
+      });
+    },
+    updateRelatedProject() {
+      delProjectContract(this.form.contractId).then(() => {
+        for (let projectId of this.projectContractForm.projectIds) {
+          addProjectContract({ projectId: projectId, contractId: this.form.contractId });
+        }
+      })
+    },
+    clickProjectFn(row) {
+      this.$router.replace({ query: { ...this.$route.query, projectId: row.projectId } });
+      this.drawerOpen = true;
+    },
+    handleDelete(index, row) {
+      this.connectProjectList.splice(index, 1)
+      this.projectContractForm.projectIds.splice(row.contractId)
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 5px;
+  }
+}
+
+::v-deep .el-descriptions-item__label.is-bordered-label {
+  color: #5a5757;
+  background: rgba($color: #a9adb3, $alpha: 0.1);
+  width: 150px;
+  min-width: 150px;
+}
+
+::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
+  border: 1px solid #cdd0d3;
+}
+</style>

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

@@ -1,8 +1,14 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-06-21 18:52:00
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-28 17:30:44
+-->
 <!--
  * @Author: ysh
  * @Date: 2024-03-18 09:05:41
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-06 14:38:13
+ * @LastEditTime: 2024-08-28 16:13:14
 -->
 <template>
   <div class="app-container">
@@ -22,18 +28,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:contract: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:contract: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:contract:remove']">删除</el-button>
-      </el-col> -->
       <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-plus" size="mini" @click="handleRegister"
           v-hasPermi="['oa:contract:add']">登记承接合同</el-button>
@@ -98,8 +92,6 @@
             v-hasPermi="['oa:contract:query']">查看</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:contract:edit']">修改</el-button>
-          <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:contract:remove']">删除</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -108,85 +100,11 @@
       @pagination="getList" />
 
     <!-- 添加或修改cmc合同评审对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
-        <el-form-item label="合同名称" prop="contractName">
-          {{ form.contractName }}
-        </el-form-item>
-        <el-form-item label="合同编号" prop="contractNumber">
-          {{ form.contractNumber }}
-        </el-form-item>
-        <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-form-item label="评审方式">
-          <el-tag :type="form.commentType == '2' ? 'success' : 'warning'">
-            {{ getCommentType(form.commentType) }}</el-tag>
-        </el-form-item>
-        <el-form-item label="" label-width="0" v-if="form.commentType == '2'">
-          <table border="1" style="width:100%;">
-            <tr>
-              <td style="width: 50px;">序号</td>
-              <td>会审部门</td>
-              <td>会审人</td>
-              <td>会审意见</td>
-              <td style="width: 200px;">会审附件</td>
-              <!-- <td style="width: 90px;">签名</td> -->
-              <td style="width: 100px;">日期</td>
-            </tr>
-            <tr v-for="(comment, index) in commentList" :key="index">
-              <td>
-                {{ index + 1 }}
-              </td>
-              <td>
-                {{ getDeptName(comment.deptId) }}
-              </td>
-              <td>
-                {{ getUserName(comment.userId) }}
-              </td>
-              <td>
-                {{ comment.comment }}
-              </td>
-              <td>
-                <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + comment.document}`)">
-                  {{ getFileName(comment.document) }}
-                </el-link>
-              </td>
-              <!-- <td>
-                <span class="auditor">{{ comment.commentUser ? comment.commentUser.nickName : '' }}</span>
-              </td> -->
-              <td>
-                <el-date-picker v-model="comment.commentTime" type="date" value-format="yyyy-MM-dd" style="width:140px;"
-                  placeholder="选择日期"></el-date-picker>
-              </td>
-            </tr>
-          </table>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer text-center">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+    <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
+      <contract-edit :form="form" @cancel="open = false"></contract-edit>
     </el-dialog>
     <!-- 查看详情 -->
-    <el-dialog :title="title" :visible.sync="openInfo" width="80%" append-to-body>
-      <!-- <contract-info :form="form"></contract-info> -->
+    <el-dialog :title="title" :visible.sync="openInfo" width="70%" append-to-body>
       <contract-form :taskForm="taskForm" :taskName="''" :flowDisabled="false"></contract-form>
     </el-dialog>
   </div>
@@ -201,8 +119,9 @@ import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
 import { todoList, getNextFlowNodeByStart } from "@/api/flowable/todo";
 import { Snowflake } from '@/utils/snowFlake.js'
 import { listContractComment, addContractComment, updateContractComment } from "@/api/oa/contract/contractComment";
+import contractEdit from './components/edit.vue'
 export default {
-  components: { contractInfo, ContractForm },
+  components: { contractInfo, ContractForm, contractEdit },
   name: "Contract",
   data() {
     return {
@@ -334,7 +253,7 @@ export default {
       getContract(contractId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改承接合同评审_日期";
+        this.title = "修改承接合同评审";
         listContractComment({ pageNum: 1, pageSize: 100, contractId: contractId }).then(res => {
           if (res.rows && res.rows.length != 0) {
             this.commentList = res.rows;
@@ -456,17 +375,3 @@ export default {
   }
 };
 </script>
-<style lang="scss" scoped>
-table {
-  /*边框*/
-  /* border: 1px solid black; */
-  text-align: center;
-  border-collapse: collapse;
-
-  /*设置背景颜色*/
-  /* background-color: #bfa; */
-  td {
-    padding: 5px;
-  }
-}
-</style>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: wrh
- * @LastEditTime: 2024-08-20 17:09:10
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-30 15:34:36
 -->
 <template>
   <div class="project-wrapper">
@@ -252,6 +252,7 @@ import { todoList, getNextFlowNodeByStart } from "@/api/flowable/todo";
 import { Snowflake } from '@/utils/snowFlake.js'
 
 export default {
+  name:'Project',
   computed: {
     ...mapGetters(['deptId', 'userId'])
   },

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="header">
-      <el-button icon="el-icon-d-arrow-left" plain type="primary" class="back" @click="goBack">返回</el-button>
+      <el-button icon="el-icon-d-arrow-left" plain type="primary" class="back" @click="goBack" v-show="needReturn">返回</el-button>
       <el-button type="success" plain @click="printOpen = true" class="print" icon="el-icon-printer">打印任务通知单</el-button>
       <h1>{{ '【' + project.projectNumber + '】' + project.projectName }}</h1>
       <el-button icon="el-icon-search" type="primary" class="records" @click="clickRecords">流转记录</el-button>
@@ -138,6 +138,7 @@
                   <el-table-column label="单位" prop="unit" />
                   <el-table-column label="工作量" prop="workload" />
                   <el-table-column label="要求完成时间" prop="deadline" />
+                  <el-table-column label="备注" prop="remark" />
                 </el-table>
               </div>
             </el-descriptions-item>
@@ -499,7 +500,8 @@
       </div>
     </el-dialog>
     <el-dialog title="打印预览" :visible.sync="printOpen" width="1000px" append-to-body>
-      <project-print :project="project" :workList="workList" :projectComment="projectComment" @cancel="printOpen = false"></project-print>
+      <project-print :project="project" :workList="workList" :projectComment="projectComment"
+        @cancel="printOpen = false"></project-print>
     </el-dialog>
     <el-drawer title="流程图" :visible.sync="drawerOpen" direction="rtl">
       <div class="app-container">
@@ -543,6 +545,12 @@ import projectPrint from '@/views/flowable/form/components/print/projectPrint.vu
 
 export default {
   components: { budgetInfo, SafeTab, TechnicalTab, PlanTab, SettleData, BorrowData, BudgetTab, achiData, choosePeople, flow, RowDetail, projectPrint },
+  props: {
+    needReturn: {
+      type: Boolean,
+      default: true
+    }
+  },
   created() {
     this.getUserList();
     this.getDeviceList();
@@ -609,7 +617,7 @@ export default {
           if (this.project.projectLeader == this.$store.state.user.id) {
             this.isProjectLeader = true;
           }
-          let deptArr =  [];
+          let deptArr = [];
           if (this.project.undertakingDept && this.project.undertakingDept.trim() !== '') {
             deptArr = (this.project.undertakingDept.split(',')).map(Number)
           }

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

@@ -130,13 +130,13 @@
             </template>
           </el-table-column>
           <el-table-column label="合同签订" align="center" key="contractSign" prop="contractSign" v-if="columns[7].visible"
-            :show-overflow-tooltip="true" sortable>
+            :show-overflow-tooltip="true" sortable :sort-method="sortContractSign">
             <template slot-scope="scope">
               <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" sortable>
+            v-if="columns[8].visible" :show-overflow-tooltip="true" sortable :sort-method="sortContractExpire">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.contractExpire, '{y}-{m}-{d}') }}</span>
             </template>
@@ -230,7 +230,7 @@
             </el-form-item>
             <el-form-item label="入职年月" prop="entryDate">
               <el-date-picker v-model="form.entryDate" type="date" placeholder="请输入入职年月" style="width:100%;"
-                format="yyyy-MM-dd" />
+              value-format="yyyy-MM-dd" />
             </el-form-item>
             <el-form-item label="合同签订" prop="contractSign">
               <el-date-picker v-model="form.contractSign" type="date" placeholder="请输入合同签订" style="width:100%;"
@@ -852,6 +852,36 @@ export default {
       let res = Number(a.status) - Number(b.status)
       return res
     },
+    sortContractSign(a, b) {
+      a = a.contractSign;
+      b = b.contractSign;
+      if (!a && b) return 1; // 如果a为空且b不为空，则a排在b前面  
+      if (a && !b) return -1; // 如果a不为空且b为空，则b排在a前面  
+      if (!a && !b) return 0; // 如果a和b都为空，则它们相等，排序位置不变  
+      // 将字符串转换为日期对象进行比较  
+      const dateA = new Date(a);
+      const dateB = new Date(b);
+      // 如果日期有效，则比较日期；如果无效，则将它们视为大于有效日期  
+      if (isNaN(dateA.getTime())) return 1; // a不是有效日期，则b（假设为有效日期）应该排在a前面  
+      if (isNaN(dateB.getTime())) return -1; // b不是有效日期，则a（假设为有效日期）应该排在b前面  
+      // 比较两个日期  
+      return dateA - dateB;
+    },
+    sortContractExpire(a, b) {
+      a = a.contractExpire;
+      b = b.contractExpire;
+      if (!a && b) return -1; // 如果a为空且b不为空，则a排在b前面  
+      if (a && !b) return 1; // 如果a不为空且b为空，则b排在a前面  
+      if (!a && !b) return 0; // 如果a和b都为空，则它们相等，排序位置不变  
+      // 将字符串转换为日期对象进行比较  
+      const dateA = new Date(a);
+      const dateB = new Date(b);
+      // 如果日期有效，则比较日期；如果无效，则将它们视为大于有效日期  
+      if (isNaN(dateA.getTime())) return 1; // a不是有效日期，则b（假设为有效日期）应该排在a前面  
+      if (isNaN(dateB.getTime())) return -1; // b不是有效日期，则a（假设为有效日期）应该排在b前面  
+      // 比较两个日期  
+      return dateA - dateB;
+    },
     sortGraduateSchool(a, b) {
 
     },