修改成果归档

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

@@ -49,12 +49,12 @@
           </el-form-item>
           <el-form-item label="备注说明" prop="submitSituation">
             <el-input type="textarea" v-model="form.submitSituation" placeholder="请输入备注说明"
-              :disabled="taskName != '成果上传'" />
+              :disabled="taskName != '成果上传'" :autosize="{ minRows: 4 }" />
           </el-form-item>
           <el-divider></el-divider>
           <el-form-item label="部门检查员检查" prop="produceComment">
             <el-input type="textarea" v-model="form.produceComment" placeholder="请输入部门检查员检查意见"
-              :disabled="taskName != '部门检查'" />
+              :disabled="taskName != '部门检查'" :autosize="{ minRows: 4 }" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -76,7 +76,7 @@
           </el-form-item>
           <el-form-item label="质量检查员审核" prop="qualityComment">
             <el-input type="textarea" v-model="form.qualityComment" placeholder="请输入质量检查员审核意见"
-              :disabled="taskName != '质检审核'" />
+              :disabled="taskName != '质检审核'" :autosize="{ minRows: 4 }" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -93,7 +93,7 @@
           </el-row>
           <el-form-item label="技术质量部负责人审核" prop="deptComment">
             <el-input type="textarea" v-model="form.deptComment" placeholder="请输入技术质量部负责人审核意见"
-              :disabled="taskName != '技术部审核'" />
+              :disabled="taskName != '技术部审核'" :autosize="{ minRows: 4 }" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -113,7 +113,7 @@
           </el-form-item>
           <el-form-item label="技术质量部归档" prop="archiveComment">
             <el-input type="textarea" v-model="form.archiveComment" placeholder="请输入技术质量部归档意见"
-              :disabled="taskName != '成果归档'" />
+              :disabled="taskName != '成果归档'" :autosize="{ minRows: 4 }" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -130,9 +130,8 @@
           </el-row>
         </el-form>
         <div style="text-align: center;">
-          <el-button type="primary" @click="submitForm" :disabled="taskName == '成果归档' && hasArchievement == false">确
-            定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitForm" :disabled="taskName == '成果归档' && hasArchievement == false">提
+            交</el-button>
         </div>
       </el-col>
       <el-col :span="6" :xs="24">
@@ -266,6 +265,7 @@ export default {
     };
   },
   mounted() {
+    this.initRules();
     this.initForm();
     if (this.$route.query.projectId) {
       getProject(this.$route.query.projectId).then(res => {
@@ -344,6 +344,36 @@ export default {
         }
       })
     },
+    initRules() {
+      if (this.taskName == '成果上传') {
+        this.rules = {
+          submitTime: [
+            { required: true, message: '请选择成果提交日期', trigger: 'change' }
+          ]
+        }
+      } else if (this.taskName == '部门检查') {
+        this.rules = {
+          produceComment: [
+            { required: true, message: '请填写检查意见', trigger: 'blur' }
+          ]
+        }
+      } else if (this.taskName == '质检审核') {
+        this.rules = {
+          receiveTime: [
+            { required: true, message: '请选择资料接收时间', trigger: 'change' }
+          ],
+          qualityComment: [
+            { required: true, message: '请填写审核意见', trigger: 'blur' }
+          ]
+        }
+      } else if (this.taskName == '技术部审核') {
+        this.rules = {
+          deptComment: [
+            { required: true, message: '请填写审核意见', trigger: 'blur' }
+          ]
+        }
+      }
+    },
     /** 查询cmc成果归档列表 */
     getList() {
       this.loading = true;
@@ -493,6 +523,12 @@ export default {
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
+              if (this.taskName == '成果上传') {
+                const params = { taskId: this.taskForm.taskId };
+                this.checkSendUser = true;
+                this.completeOpen = true;
+                this.completeTitle = "流程审批";
+              }
               if (this.taskName == '部门检查') {
                 this.$set(this.taskForm.variables, "approval", this.chooseProject.qualityInspectorUser.userId);
                 complete(this.taskForm).then(response => {
@@ -595,3 +631,6 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+</style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-23 17:08:16
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-15 14:32:16
+ * @LastEditTime: 2024-06-03 09:40:19
 -->
 <template>
   <div>
@@ -18,11 +18,14 @@
     <safe-form :key="'safe'+taskForm.taskId" :taskForm="taskForm" v-else-if="taskForm.procDefName == '安全交底'"></safe-form>
     <settle-form :key="'fb'+taskForm.taskId" :taskForm="taskForm" :taskName="''" :disabled="true"
       v-else-if="taskForm.procDefName == '项目结算'"></settle-form>
-    <budget-info :key="'budget'+taskForm.taskId" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目预算'"></budget-info>
+    <!-- <budget-in :key="'budget'+taskForm.taskId" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目预算'"></budget-in> -->
+    <budget-tab :key="'budget'+taskForm.taskId" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目预算'"></budget-tab>
     <contract-form :key="'cj'+taskForm.taskId" :taskForm="taskForm" :taskName="''" :formDisabled="true"
       v-else-if="taskForm.procDefName == '承接合同评审'"></contract-form>
     <sub-contract :key="'sub'+taskForm.taskId" :taskForm="taskForm" :taskName="''" :formDisabled="true"
       v-else-if="taskForm.procDefName == '分包合同评审'"></sub-contract>
+    <archive-form :key="'arc'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '成果归档'"></archive-form>
+    <borrow-form :key="'bor'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '借款审批'"></borrow-form>
   </div>
 </template>
 
@@ -41,6 +44,9 @@ import SettleForm from '@/views/flowable/form/settleForm.vue';
 import BudgetInfo from '../budget/budgetInfo.vue';
 import ContractForm from '../business/contractForm.vue';
 import SubContract from '../business/subContract.vue';
+import ArchiveForm from '../archiveForm.vue';
+import BorrowForm from '../finance/borrowForm.vue';
+import BudgetTab from '../projectProcess/budgetTab.vue';
 export default {
   props: {
     passingParam: {
@@ -66,7 +72,10 @@ export default {
     SettleForm,
     BudgetInfo,
     ContractForm,
-    SubContract
+    SubContract,
+    ArchiveForm,
+    BorrowForm,
+    BudgetTab
   },
   data() {
     return {

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

@@ -138,7 +138,7 @@
           <div v-if="form.borrowUsage == 0 || form.borrowUsage == 1">
             <el-form-item label="部门负责人意见" prop="deptComment">
               <el-input type="textarea" v-model="form.deptComment" placeholder="请输入部门负责人意见"
-                :disabled="taskName != '部门审核'" />
+                :disabled="taskName != '部门审核'" :autosize="{ minRows: 4}" />
             </el-form-item>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
@@ -154,7 +154,7 @@
             </el-row>
             <el-form-item label="项目部校核意见" prop="xmComment" v-if="form.borrowUsage == '0'">
               <el-input type="textarea" v-model="form.xmComment" placeholder="请输入项目部校核意见"
-                :disabled="taskName != '项目部审核'" />
+                :disabled="taskName != '项目部审核'" :autosize="{ minRows: 4}" />
             </el-form-item>
             <el-row v-if="form.borrowUsage == '0'">
               <el-col :span="6" :xs="24" :offset="12">
@@ -170,7 +170,7 @@
             </el-row>
             <el-form-item label="分管领导审核意见" prop="managerComment">
               <el-input type="textarea" v-model="form.managerComment" placeholder="请输入分管领导审核意见"
-                :disabled="taskName != '分管审核'" />
+                :disabled="taskName != '分管审核'" :autosize="{ minRows: 4}" />
             </el-form-item>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
@@ -186,7 +186,7 @@
             </el-row>
             <el-form-item label="总经理审批意见" prop="zjlComment">
               <el-input type="textarea" v-model="form.zjlComment" placeholder="请输入总经理审批意见"
-                :disabled="taskName != '总经理审核'" />
+                :disabled="taskName != '总经理审核'" :autosize="{ minRows: 4}" />
             </el-form-item>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
@@ -230,7 +230,7 @@
             </div>
           </el-form-item>
           <el-form-item label="财务部支付备注" prop="cwComment">
-            <el-input type="textarea" v-model="form.cwComment" placeholder="请输入财务部支付备注" :disabled="taskName != '财务处理'" />
+            <el-input type="textarea" v-model="form.cwComment" placeholder="请输入财务部支付备注" :disabled="taskName != '财务处理'" :autosize="{ minRows: 4}" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">

oa-ui/src/views/flowable/form/inProgress/achiData.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="mt20">
-    <div class="nav-btn">
+  <div class="mt20" style="width:99%">
+    <div class="nav-btn" v-if="taskName != ''">
       <div>
         <el-button class="mb20" type="primary" plain size="mini" icon="el-icon-plus" @click="addAchi">成果汇交</el-button>
       </div>
@@ -9,7 +9,7 @@
       </div>
     </div>
 
-    <el-table :data="achiList" style="width: 100%">
+    <el-table :data="achiList" style="width: 100%" class="custom-table">
       <el-table-column type="index" label="序号" width="50" />
       <el-table-column label="成果汇交时间" prop="submitTime" width="100" />
       <el-table-column label="生产部门检查员" prop="produceInspector" width="120">
@@ -46,6 +46,10 @@
         </template>
       </el-table-column>
     </el-table>
+
+    <el-dialog title=" 成果明细" :visible.sync="open" append-to-body width="65%">
+      
+    </el-dialog>
   </div>
 </template>
 
@@ -57,17 +61,24 @@ import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
 import { todoList } from "@/api/flowable/todo";
 import { Snowflake } from '@/utils/snowFlake.js'
 import { MessageBox } from 'element-ui'
+import archiveForm from '../archiveForm.vue';
 export default {
+  components: { archiveForm },
   props: {
     taskForm: {
       type: Object,
       required: true
+    },
+    taskName: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
       achiList: [],
       definitionList: [],
+      open:false,
     }
   },
   mounted() {
@@ -101,7 +112,7 @@ export default {
       });
     },
     handleLook(row) {
-
+      this.open = true
     },
     addAchi() {
       let row = this.definitionList[0];
@@ -156,4 +167,11 @@ export default {
   display: flex;
   justify-content: space-between;
 }
+
+.custom-table {
+  display: block;
+  /* 确保表格不会超出容器 */
+  overflow-x: auto;
+  /* 横向滚动条 */
+}
 </style>

oa-ui/src/views/flowable/form/inProgress/borrowData.vue

@@ -1,18 +1,12 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 14:45:08
- * @LastEditors: 
- * @LastEditTime: 2024-05-31 16:27:30
--->
-<!--
- * @Author: ysh
- * @Date: 2024-04-25 17:17:53
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-28 17:45:52
+ * @LastEditTime: 2024-06-03 11:46:33
 -->
 <template>
   <div class="mt20">
-    <div class="nav-btn">
+    <div class="nav-btn" v-if="taskName != ''">
       <div>
         <el-button class="mb20" type="primary" plain size="mini" icon="el-icon-plus"
           @click="addBorrowFlow">新增借款</el-button>
@@ -104,6 +98,10 @@ export default {
     taskForm: {
       type: Object,
       required: true
+    },
+    taskName: {
+      type: String,
+      default: ''
     }
   },
   data() {

oa-ui/src/views/flowable/form/inProgress/settleData.vue

@@ -2,11 +2,11 @@
  * @Author: ysh
  * @Date: 2024-05-10 14:45:03
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-31 14:51:49
+ * @LastEditTime: 2024-06-03 11:45:29
 -->
 <template>
   <div class="mt20">
-    <div class="nav-btn">
+    <div class="nav-btn" v-if="taskName != ''">
       <div>
         <el-button class="mb20" type="primary" plain size="mini" icon="el-icon-plus"
           @click="addSettleFlow">结算申请</el-button>
@@ -16,7 +16,7 @@
       </div>
     </div>
 
-    <el-table :data="dataList" style="width: 100%">
+    <el-table :data="dataList" style="width: 100%" class="custom-table">
       <el-table-column type="index" label="序号" width="50" />
       <el-table-column label="上报人" prop="reporterName" />
       <el-table-column label="申请时间" prop="reportTime" width="100" />
@@ -231,4 +231,11 @@ export default {
   display: flex;
   justify-content: space-between;
 }
+
+.custom-table {
+  display: block;
+  /* 确保表格不会超出容器 */
+  overflow-x: auto;
+  /* 横向滚动条 */
+}
 </style>

oa-ui/src/views/index.vue

@@ -85,7 +85,7 @@
         </div>
       </el-col>
       <el-col :span="8" :xs="24">
-        <div class="header">项目流转</div>
+        <div class="header">XXXX</div>
         <div class="project-content">
 
         </div>

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

@@ -267,7 +267,7 @@
           <div class="line"></div>
         </div>
         <div class="info mt20">
-          <el-descriptions class="descriptions" border :column="2" style="text-align: center;">
+          <el-descriptions class="descriptions xmsc" border :column="2" style="text-align: center;">
             <el-descriptions-item :span="2">
               <template slot="label">
                 <svg-icon slot="prefix" icon-class="form" />
@@ -364,7 +364,7 @@
                 <svg-icon slot="prefix" icon-class="date" />
                 成果汇交
               </template>
-              {{'xxxx'}}
+              <achi-data :taskForm="taskForm" class="table-warpper"></achi-data>
             </el-descriptions-item>
             <el-descriptions-item :span="2">
               <template slot="label">
@@ -407,8 +407,9 @@ import TechnicalTab from '../../flowable/form/projectProcess/technicalTab.vue';
 import SettleData from '../../flowable/form/inProgress/settleData.vue';
 import BorrowData from '../../flowable/form/inProgress/borrowData.vue';
 import BudgetTab from '../../flowable/form/projectProcess/budgetTab.vue';
+import achiData from "../../flowable/form/inProgress/achiData.vue";
 export default {
-  components: { budgetInfo, SafeTab, TechnicalTab, SettleData, BorrowData, BudgetTab },
+  components: { budgetInfo, SafeTab, TechnicalTab, SettleData, BorrowData, BudgetTab, achiData },
   created() {
     this.getUserList();
     this.getDeviceList();
@@ -635,10 +636,15 @@ export default {
   /* 如果需要垂直居中 */
 }
 
+.table-warpper {
+  max-width: 1422px;
+}
+
 ::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 {