新增合同退回操作

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

@@ -1,15 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-  export default {
-    
-  }
-</script>
-
-<style lang="scss" scoped>
-
-</style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-09 14:19:38
+ * @LastEditTime: 2024-12-06 16:51:17
 -->
 <template>
   <div class="app-container">
@@ -13,6 +13,11 @@
         <div style="text-align:right;">
           <el-button type="warning" size="mini" @click="gotoProjectRegister()" icon="el-icon-plus">项目登记、安排生产</el-button>
         </div>
+        <div class="mt20 mb20" v-if="showAlter && flowDisabled">
+          <el-alert title="任务被退回，请修改后重新提交" type="error" :closable="false">
+            <return-comment :taskForm="taskForm" @isReturn="isReturn"></return-comment>
+          </el-alert>
+        </div>
         <el-form ref="form" :model="form" :rules="rules" label-width="130px" :disabled="formDisabled">
           <el-form-item label="投标项目名称：" prop="tenderId">
             <el-button type="primary" size="mini" @click="tbOpen = true" v-if="taskName == '合同拟稿'">选择投标项目</el-button>
@@ -352,6 +357,9 @@
         <div style="text-align: center;" v-if="taskName">
           <el-button type="warning" @click="saves()" :disabled="formDisabled" v-if="taskName == '合同拟稿'">保 存</el-button>
           <el-button type="primary" @click="submitForm" :disabled="formDisabled">提 交</el-button>
+          <el-button type="danger" @click="returnOpen = true" :disabled="formDisabled"
+            v-if="taskName == '分管审核' || taskName == '总经理审核'">退
+            回</el-button>
         </div>
       </el-col>
       <el-col :span="6" :xs="24" v-if="flowDisabled">
@@ -382,6 +390,9 @@
     <el-drawer :visible.sync="subInfoOpen" title="" :size="'55%'" append-to-body>
       <sub-contract :taskForm="subContractId" :taskName="''" :formDisabled="true" :flowDisabled="false"></sub-contract>
     </el-drawer>
+    <el-dialog title="退回" :visible.sync="returnOpen" width="40%" append-to-body>
+      <return-btn :taskForm="taskForm" :comment="taskName == '分管审核' ? form.managerComment : form.gmComment" @goBack="$emit('goBack')" @saves="" @cancel="returnOpen = false"></return-btn>
+    </el-dialog>
   </div>
 </template>
 
@@ -402,31 +413,30 @@ import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept, get
 import { listSubContract, getSubContract, delSubContract, addSubContract, updateSubContract } from "@/api/oa/contract/subContract";
 import { listContractSubcontract, delContractSubcontract, addContractSubcontract } from "@/api/oa/contract/contractSubcontract"
 import flow from '@/views/flowable/task/todo/detail/flow'
-import { definitionStart,flowXmlAndNode } from "@/api/flowable/definition";
-import ChooseProject from '../components/chooseProject.vue';
-import ChooseTender from '../components/chooseTender.vue';
+import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
 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'
-import ChooseSubcontract from '@/views/flowable/form/components/chooseSubcontract.vue';
-import subContract from '@/views/flowable/form/business/subContract.vue';
 import { listDefinition } from "@/api/flowable/definition";
 import { Snowflake } from '@/utils/snowFlake.js'
 import { todoList, getNextFlowNodeByStart } from "@/api/flowable/todo";
+
+import FileItem from './fileItem.vue';
+import ChooseProject from '../components/chooseProject.vue';
+import ChooseTender from '../components/chooseTender.vue';
+import workTable from './components/workTable.vue';
+import paymentTable from './components/paymentTable.vue';
+import subContract from '@/views/flowable/form/business/subContract.vue';
+import ChoosePartyA from '@/views/flowable/form/components/choosePartyA.vue';
+import ChooseSubcontract from '@/views/flowable/form/components/chooseSubcontract.vue';
+import ReturnComment from '@/views/flowable/form/components/flowBtn/returnComment.vue';
+import ReturnBtn from '@/views/flowable/form/components/flowBtn/returnBtn.vue';
+
 export default {
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   components: {
-    flow,
-    ChooseProject,
-    ChooseTender,
-    FileItem,
-    ChoosePartyA,
-    workTable,
-    paymentTable, projectInfo, ChooseSubcontract, subContract
+    flow, ChooseProject, ChooseTender, FileItem, ChoosePartyA, workTable, paymentTable,
+    projectInfo, ChooseSubcontract, subContract, ReturnComment, ReturnBtn
   },
   props: {
     taskName: {
@@ -549,7 +559,9 @@ export default {
       clickTd: {},
       subContractId: {
         formId: ''
-      }
+      },
+      showAlter: true,
+      returnOpen: false,
     };
   },
   created() {
@@ -926,6 +938,8 @@ export default {
       if (!this.isDocumentValid) {
         return;
       }
+      console.log(this.commentList);
+      
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.formTotal != 0) {
@@ -946,7 +960,7 @@ export default {
                   });
                 })
               }
-              else if (this.taskName == '线上会审') {
+              else if (this.taskName == '线上会审' ) {
                 for (let comment of this.commentList) {
                   updateContractComment(comment);
                 }
@@ -1078,7 +1092,7 @@ export default {
           let approvalList = [];
           for (let comment of this.commentList) {
             comment.contractId = this.form.contractId
-            addContractComment(comment);
+            if (!this.showAlter) { addContractComment(comment); }
             approvalList.push(comment.userId)
           }
           this.$set(this.taskForm.variables, "approvalList", approvalList);
@@ -1221,7 +1235,7 @@ export default {
           variables.variables = formData;
           let routePath = this.getRoutePath(row);
           this.$emit('goBack');
-          this.$cache.local.set('contractId',`${this.taskForm.formId}`)
+          this.$cache.local.set('contractId', `${this.taskForm.formId}`)
           definitionStart(row.id, JSON.stringify(variables)).then(res => {
             this.$modal.msgSuccess(res.msg);
             let procInstanceId = res.data;
@@ -1263,6 +1277,9 @@ export default {
       }
       return path
     },
+    isReturn(val) {
+      this.showAlter = val
+    }
   }
 }
 </script>

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

@@ -2,13 +2,18 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-08 09:29:11
+ * @LastEditTime: 2024-12-06 16:50:54
 -->
 <template>
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="flowDisabled ? 18 : 24" :xs="24">
         <h2 class="text-center">分包合同评审表</h2>
+        <div class="mt20 mb20" v-if="showAlter && flowDisabled">
+          <el-alert title="任务被退回，请修改后重新提交" type="error" :closable="false">
+            <return-comment :taskForm="taskForm" @isReturn="isReturn"></return-comment>
+          </el-alert>
+        </div>
         <el-form ref="form" :model="form" :rules="rules" label-width="130px" :formDisabled="formDisabled">
           <el-divider></el-divider>
           <el-form-item label="分包合同名称" prop="subContractName">
@@ -322,6 +327,9 @@
         <div style="text-align: center;" v-if="flowDisabled">
           <el-button type="warning" @click="saves()" :disabled="formDisabled" v-if="taskName == '合同拟稿'">保 存</el-button>
           <el-button type="primary" @click="submitForm" :disabled="formDisabled">提 交</el-button>
+          <el-button type="danger" @click="returnOpen = true" :disabled="formDisabled"
+            v-if="taskName == '分管审核' || taskName == '总经理审核'">退
+            回</el-button>
         </div>
       </el-col>
       <el-col :span="6" :xs="24" v-if="flowDisabled">
@@ -346,6 +354,10 @@
     <el-drawer :visible.sync="formOpen" title="" :size="'55%'" append-to-body>
       <contract-form :taskForm="contractId" :taskName="''" :formDisabled="true" :flowDisabled="false"></contract-form>
     </el-drawer>
+    <el-dialog title="退回" :visible.sync="returnOpen" width="40%" append-to-body>
+      <return-btn :taskForm="taskForm" :comment="taskName == '分管审核' ? form.managerComment : form.gmComment"
+        @goBack="$emit('goBack')" @saves="" @cancel="returnOpen = false"></return-btn>
+    </el-dialog>
   </div>
 </template>
 
@@ -368,14 +380,17 @@ import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept, get
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
-import projectChoose from '../components/chooseProject.vue';
-import FileItem from './fileItem.vue';
 import { mapGetters } from "vuex";
-import ChoosePartner from '../components/choosePartner.vue';
+
+import projectInfo from '@/views/oa/project/info'
+import FileItem from './fileItem.vue';
 import workTable from './components/workTable.vue';
 import paymentTable from './components/paymentTable.vue';
+import projectChoose from '../components/chooseProject.vue';
+import ChoosePartner from '../components/choosePartner.vue';
 import contractForm from '@/views/flowable/form/business/contractForm.vue';
-import projectInfo from '@/views/oa/project/info'
+import ReturnBtn from '@/views/flowable/form/components/flowBtn/returnBtn.vue';
+import ReturnComment from '@/views/flowable/form/components/flowBtn/returnComment.vue';
 export default {
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   components: {
@@ -387,6 +402,8 @@ export default {
     paymentTable,
     contractForm,
     projectInfo,
+    ReturnComment,
+    ReturnBtn
   },
   props: {
     taskName: {
@@ -532,6 +549,8 @@ export default {
         formId: ''
       },
       drawerOpen: false,
+      showAlter: true,
+      returnOpen: false,
     };
   },
   created() {
@@ -971,7 +990,7 @@ export default {
         let approvalList = [];
         for (let comment of this.commentList) {
           comment.contractId = this.form.subContractId
-          addContractComment(comment);
+          if (!this.showAlter) { addContractComment(comment); }
           approvalList.push(comment.userId)
         }
         this.$set(this.taskForm.variables, "approvalList", approvalList);
@@ -989,28 +1008,6 @@ export default {
         handleComplete(this.taskForm);
       }
     },
-    // updateChooseProjectList() {
-    //   this.workList = this.$refs.workTableRef.workList;
-    //   this.paymentList = this.$refs.paymentRef.paymentList;
-    //   const subContractId = this.taskForm.formId
-    //   delProjectSubcontract(subContractId).then(() => {
-    //     this.chooseProjectList.forEach(item => {
-    //       addProjectSubcontract({ subContractId: subContractId, projectId: item.projectId })
-    //     })
-    //   })
-    //   delContractWork(subContractId).then(() => {
-    //     for (let work of this.workList) {
-    //       work.contractId = subContractId;
-    //       addContractWork(work);
-    //     }
-    //   })
-    //   delContractPayment(subContractId).then(() => {
-    //     for (let payment of this.paymentList) {
-    //       payment.contractId = subContractId;
-    //       addContractPayment(payment);
-    //     }
-    //   })
-    // },
     async updateChooseProjectList() {
       this.workList = this.$refs.workTableRef.workList;
       this.paymentList = this.$refs.paymentRef.paymentList;
@@ -1172,6 +1169,9 @@ export default {
       this.$router.replace({ query: { ...this.$route.query, projectId: row.projectId } });
       this.drawerOpen = true;
     },
+    isReturn(val) {
+      this.showAlter = val
+    }
   }
 };
 </script>

oa-ui/src/views/flowable/form/components/flowBtn/returnBtn.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-09-27 15:19:36
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-15 15:30:48
+ * @LastEditTime: 2024-12-06 15:25:39
 -->
 <template>
   <div>
@@ -14,7 +14,7 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item label="退回意见" prop="comment">
-        <el-input  type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
+        <el-input type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
       </el-form-item>
     </el-form>
     <div class="text-center">
@@ -31,21 +31,31 @@ export default {
     taskForm: {
       type: Object,
       require: true
+    },
+    comment: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
       form: {},
       returnTaskList: [],
-      rules:{
-        targetKey:[{ required: true, message: '请选择退回节点', trigger: 'change' }],
-        comment:[{ required: true, message: '请输入意见', trigger: 'blur' }],
+      rules: {
+        targetKey: [{ required: true, message: '请选择退回节点', trigger: 'change' }],
+        comment: [{ required: true, message: '请输入意见', trigger: 'blur' }],
       }
     }
   },
   created() {
     this.handleReturn();
   },
+  mounted() {
+    debugger
+    if(this.comment != ''){
+      this.taskForm.comment = this.comment
+    }
+  },
   methods: {
     /** 可退回任务列表 */
     handleReturn() {

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

@@ -311,7 +311,6 @@ export default {
             for (let comment of this.commentList) {
               updateContractComment(comment);
             }
-            debugger
             if (this.form.partnerId)
               this.form.partnerId = this.form.partnerId.join(',')
             this.updateSubContractFn()

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:52:00
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-25 17:05:16
+ * @LastEditTime: 2024-12-06 16:19:55
 -->
 <template>
   <div class="app-container">
@@ -47,8 +47,8 @@
       <el-table-column label="合同名称" align="center" prop="contractName" width="220px" />
       <el-table-column label="合同金额" align="center" prop="amount" />
       <el-table-column label="甲方单位" align="center" prop="partyA.partyAName" width="220px" />
-      <el-table-column label="合同编码" align="center" prop="contractCode" />
-      <el-table-column label="合同编号" align="center" prop="contractNumber" />
+      <el-table-column label="合同编码（公司）" align="center" prop="contractCode" />
+      <el-table-column label="合同编号（业主）" align="center" prop="contractNumber" />
       <!-- <el-table-column label="履约保证金" align="center" prop="deposit" /> -->
       <el-table-column label="合同文件" align="center" prop="contractDocument" show-overflow-tooltip>
         <template slot-scope="scope">

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

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-03-25 17:38:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-25 15:25:30
+ * @LastEditTime: 2024-10-25 17:01:50
 -->
 <template>
   <div>
@@ -38,7 +38,6 @@
 <script>
 import { listProject } from "@/api/oa/project/project";
 import { listDeclare } from "@/api/oa/declare/declare"
-import { getDeclare } from "../../../api/oa/declare/declare";
 export default {
   data() {
     return {

oa-ui/src/views/statistics/components/borrowStatistics.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-10-18 11:17:48
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-24 15:53:13
+ * @LastEditTime: 2024-10-25 17:20:59
 -->
 <template>
   <div style="width:100%;" v-loading="loading">
@@ -99,7 +99,7 @@ export default {
     initBorrowYearBar() {
       let option = {
         title: {
-          text: '各年借款申请次数',
+          text: '各年借款次数',
           subtext: '共计借款次数：' + Object.values(this.borrowYear).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '次'
         },
         grid: {

oa-ui/src/views/statistics/components/settleStatistics.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-10-18 11:17:48
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-24 16:00:44
+ * @LastEditTime: 2024-10-25 17:20:49
 -->
 <template>
   <div style="width:100%;" v-loading="loading">
@@ -105,7 +105,7 @@ export default {
     initSettleYearBar() {
       let option = {
         title: {
-          text: '各年结算申请次数',
+          text: '各年结算次数',
           subtext: '共计结算次数：' + Object.values(this.settleYear).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '次'
         },
         grid: {

oa-ui/src/views/statistics/components/topHead.vue

@@ -47,7 +47,7 @@
       </div>
       <div class="four item-box" @click="$emit('handleClick', 'borrow')">
         <div class="data-left">
-          <div class="data-title">{{ thisYear }}借款申请次数</div>
+          <div class="data-title">{{ thisYear }}借款次数</div>
           <div class="number">{{ borrowNum.toLocaleString('en-US') }}</div>
           <div>
             <span class="text-1">较去年</span>
@@ -62,7 +62,7 @@
 
       <div class="five item-box" @click="$emit('handleClick', 'settle')">
         <div class="data-left">
-          <div class="data-title">{{ thisYear }}结算申请次数</div>
+          <div class="data-title">{{ thisYear }}结算次数</div>
           <div class="number">{{ settleNum.toLocaleString('en-US') }}</div>
           <div>
             <span class="text-1">较去年</span>