修改甲方单位组件的搜索，新增签名组件，修改成果归档

oa-ui/src/main.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-10 11:08:03
+ * @LastEditTime: 2024-09-18 17:01:43
  */
 import Vue from 'vue'
 
@@ -52,6 +52,8 @@ import VueMeta from 'vue-meta'
 import DictData from '@/components/DictData'
 
 import Tinymce from '@/components/tinymce/index.vue'
+// 签名组件
+import AuditorRow from '@/views/flowable/form/components/auditorRow.vue';
 
 import publicData from '@/assets/datas/publicData'
 
@@ -85,6 +87,7 @@ Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
 Vue.component('tinymce', Tinymce)
 Vue.component('RowTitle', RowTitle)
+Vue.component('AuditorRow', AuditorRow)
 
 Vue.use(directive)
 Vue.use(plugins)

oa-ui/src/views/file/filesProject/achievement.vue

@@ -3,8 +3,8 @@
  * @version: 
  * @Author: ysh
  * @Date: 2022-09-08 17:16:12
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-13 22:42:16
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-09-18 16:03:28
 -->
 <template>
   <div>
@@ -94,15 +94,18 @@
     <el-dialog :title="addTitle" :visible.sync="addOpen" width="50%">
       <el-form :model="form" ref="achiRef" label-width="110px" :rules="rules">
         <el-row :gutter="10">
-          <el-col :span="4">
-            <el-button type="primary" size="mini" @click="openProject = true">选择项目</el-button>
-          </el-col>
           <el-col :span="15">
-            <el-form-item label="项目名称" prop="projectNumber">
-              <el-input v-model="chooseProject.projectNumber" placeholder="请输入项目名称" />
+            <el-form-item label="项目编号" prop="projectNumber">
+              <el-input v-model="form.projectNumber" disabled placeholder="请输入项目编号" />
+            </el-form-item>
+            <el-form-item label="项目名称" prop="projectName">
+              <el-input v-model="form.projectName" disabled placeholder="请输入项目名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="3">
+            <el-button type="primary" size="mini" @click="openProject = true">选择项目</el-button>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="数据年份" prop="dataYear">
               <el-input v-model="form.dataYear" placeholder="请输入数据年份" />
             </el-form-item>
@@ -546,7 +549,7 @@ export default {
     handleDelete(row) {
       const achiIds = row.id;
       const achiName = row.achiName
-      this.$modal.confirm('是否确认删除用户编号为"' + achiName + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认成果名为"' + achiName + '"的数据项？').then(function () {
         return delAchievement(achiIds);
       }).then(() => {
         this.getAchiList();
@@ -757,8 +760,11 @@ export default {
         return
       } else if (val.length == 1) {
         this.chooseProject = val[0]
-        this.chooseProject.projectNumber = this.chooseProject.projectNumber + '-' + this.chooseProject.projectName;
+        // this.chooseProject.projectNumber = this.chooseProject.projectNumber + '-' + this.chooseProject.projectName;
+        this.$set(this.form,'projectNumber',this.chooseProject.projectNumber)
+        this.$set(this.form,'projectName',this.chooseProject.projectName)
         this.form.projectId = val[0].projectId
+        this.$refs.achiRef.validateField('projectNumber')
         this.form.dataYear = val[0].projectNumber.substring(0, 4)
       }
       this.openProject = false

oa-ui/src/views/file/filesProject/project.vue

@@ -36,9 +36,10 @@
         <el-table-column type="selection" width="50px" :reserve-selection="true" />
         <el-table-column prop="isFinished" label="项目状态" align="center">
           <template #default="scope">
-            <el-tag :type="scope.row.isFinished === '1' ? 'warning' : 'success'" disable-transitions>{{ scope.row.isFinished
-              === "1" ? '已结束' : '正在进行'
-            }}</el-tag>
+            <el-tag :type="scope.row.isFinished === '1' ? 'warning' : 'success'" disable-transitions>{{
+        scope.row.isFinished
+          === "1" ? '已结束' : '正在进行'
+      }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="projectNumber" label="项目编号" align="center" />
@@ -52,20 +53,22 @@
         <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="详情" placement="top">
-              <el-button type="text" icon="View" @click="handleLook(scope.row)" v-hasPermi="['oa:archive:query']">
+              <el-button type="text" icon="View" @click="handleLook(scope.row)" v-hasPermi="['file:achievement:query']">
               </el-button>
             </el-tooltip>
             <el-tooltip content="成果" placement="top">
               <el-button type="text" icon="Document" @click="handleLookAchi(scope.row)"
-                v-hasPermi="['oa:archive:query']">
+                v-hasPermi="['file:achievement:query']">
               </el-button>
             </el-tooltip>
             <el-tooltip content="修改" placement="top">
-              <el-button type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-hasPermi="['oa:archive:edit']">
+              <el-button type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)"
+                v-hasPermi="['file:achievement:edit']">
               </el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['oa:archive:remove']">
+              <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['file:achievement:remove']">
               </el-button>
             </el-tooltip>
           </template>
@@ -135,8 +138,8 @@
                 </div>
                 <div>
                   <el-upload ref="uploadProCPKml" class="upload-demo" :headers="upload.headers" action=""
-                    :auto-upload="false" :on-success="successUploadProKml" accept=".kml" :on-change="handleCpUploadChange"
-                    :show-file-list="false">
+                    :auto-upload="false" :on-success="successUploadProKml" accept=".kml"
+                    :on-change="handleCpUploadChange" :show-file-list="false">
                     <el-button type="primary" icon="el-icon-plus"></el-button>
                   </el-upload>
                 </div>
@@ -184,7 +187,8 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="存放地址" prop="storageAddress">
-              <el-select v-model="modifyForm.storageAddress" placeholder="请选择" filterable allow-create clearable style="width: 100%;">
+              <el-select v-model="modifyForm.storageAddress" placeholder="请选择" filterable allow-create clearable
+                style="width: 100%;">
                 <el-option v-for="item, index in storageList" :key="index" :label="item.storageAddress"
                   :value="item.storageAddress" />
               </el-select>
@@ -222,8 +226,8 @@
                 </div>
                 <div>
                   <el-upload ref="uploadProCPKml" class="upload-demo" :headers="upload.headers" action="l"
-                    :auto-upload="false" :on-success="successUploadProKml" accept=".kml" :on-change="handleCpUploadChange"
-                    :show-file-list="false">
+                    :auto-upload="false" :on-success="successUploadProKml" accept=".kml"
+                    :on-change="handleCpUploadChange" :show-file-list="false">
                     <el-button type="primary" icon="el-icon-plus"></el-button>
                   </el-upload>
                 </div>
@@ -480,7 +484,7 @@ export default {
     handleUpdate(row) {
       this.modifyForm = row;
       let leaderObj = this.$store.state.user.userList.find(obj => obj.userId == row.projectLeader);
-      if(leaderObj)
+      if (leaderObj)
         this.modifyForm.projectLeaderName = leaderObj.nickName
       this.modifyOpen = true;
       this.position = [];
@@ -527,9 +531,26 @@ export default {
       this.$refs["projectModifyRef"].validate(valid => {
         if (valid) {
           delete this.modifyForm.params
-          for (let i in this.modifyForm) {
-            this.uploadKmlData.append(i, this.modifyForm[i] == null ? "" : this.modifyForm[i]);
+          // 初始化一个对象来收集要发送的数据  
+          const formDataEntries = [];
+          // 遍历 modifyForm，收集非空、非对象、非特定跳过的字段  
+          for (let key in this.modifyForm) {
+            if (key === 'contract' || key === 'partyA' || key === 'projectPlannerUser' || this.modifyForm[key] instanceof Object) {
+              continue;
+            }
+
+            // 添加字段到 formDataEntries 数组  
+            formDataEntries.push([key, this.modifyForm[key] != null ? this.modifyForm[key] : '']);
           }
+          // 将收集的数据添加到 FormData  
+          formDataEntries.forEach(([key, value]) => {
+            this.uploadKmlData.append(key, value);
+          });
+          // for (let i in this.modifyForm) {
+          //   if (i == 'contract' || i == 'partyA') continue
+          //   if (this.modifyForm[i] instanceof Object) continue
+          //   this.uploadKmlData.append(i, this.modifyForm[i] == null ? '' : this.modifyForm[i]);
+          // }
           // return
           updateProject(this.uploadKmlData).then(response => {
             this.$modal.msgSuccess("修改成功");
@@ -873,6 +894,7 @@ export default {
 
 <style lang="scss" scoped>
 @import "@/assets/styles/element-reset.scss";
+
 .centerBox {
   border: 1px dashed #bccfec;
   padding: 5px;

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

@@ -1,33 +1,39 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-06-21 18:51:51
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-09-18 16:56:44
+-->
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="isFlow ? 18:24" :xs="24">
+      <el-col :span="isFlow ? 18 : 24" :xs="24">
         <h2 class="text-center">成果归档记录表</h2>
         <el-divider></el-divider>
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
           <el-form-item label="项目信息" prop="projectId">
-            <el-button type="primary" size="mini" @click="openProject = true" v-if="taskName == '成果上传'">选择项目</el-button>
+            <el-button type="primary" size="mini" @click="openProject = true" v-if="taskName == '归档发起'">选择项目</el-button>
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="2">
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA.partyAName
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="合同编码" label-class-name="my-label">{{ contractCode
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">{{
-                chooseProject.undertakingDeptName
-              }}</el-descriptions-item>
+      chooseProject.undertakingDeptName
+    }}</el-descriptions-item>
               <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser
-                ? chooseProject.projectLeaderUser.nickName : ''
-              }}</el-descriptions-item>
+      ? chooseProject.projectLeaderUser.nickName : ''
+                }}</el-descriptions-item>
               <el-descriptions-item label="技术负责人" label-class-name="my-label">{{
-                chooseProject.technicalDirectorUser ? chooseProject.technicalDirectorUser.nickName :
-                '' }}</el-descriptions-item>
+      chooseProject.technicalDirectorUser ? chooseProject.technicalDirectorUser.nickName :
+        '' }}</el-descriptions-item>
               <el-descriptions-item label="质检审核员" label-class-name="my-label">{{
-                chooseProject.qualityInspectorName
-              }}</el-descriptions-item>
+      chooseProject.qualityInspectorName
+    }}</el-descriptions-item>
               <!-- <el-descriptions-item label="坐标经度" label-class-name="my-label">{{ chooseProject.kmlLng
               }}</el-descriptions-item>
               <el-descriptions-item label="坐标纬度" label-class-name="my-label">{{ chooseProject.kmlLat
@@ -39,27 +45,27 @@
           </el-form-item>
           <el-form-item label="成果提交日期" prop="submitTime">
             <el-date-picker clearable v-model="form.submitTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择成果提交日期" :disabled="taskName != '成果上传'">
+              placeholder="请选择成果提交日期" :disabled="taskName != '归档发起'">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="备注说明" prop="submitSituation">
-            <el-input type="textarea" v-model="form.submitSituation" placeholder="请输入备注说明" :disabled="taskName != '成果上传'"
-              :autosize="{ minRows: 4 }" />
+            <el-input type="textarea" v-model="form.submitSituation" placeholder="请输入备注说明"
+              :disabled="taskName != '归档发起'" :autosize="{ minRows: 4 }" />
           </el-form-item>
-          <el-divider></el-divider>
-          <el-form-item label="部门检查员检查" prop="produceComment">
+          <!-- <el-divider></el-divider> -->
+          <!-- <el-form-item label="部门检查员检查" prop="produceComment">
             <el-input type="textarea" v-model="form.produceComment" placeholder="请输入部门检查员检查意见"
               :disabled="taskName != '部门检查'" :autosize="{ minRows: 4 }" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px" v-if="taskName != '成果上传'">
+              <el-form-item label="签名：" label-width="120px" v-if="taskName != '归档发起'">
                 <span class="auditor"> {{ form.produceUser ? form.produceUser.nickName : produceUser }}
                 </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px" v-if="taskName != '成果上传'">
+              <el-form-item label="日期：" label-width="120px" v-if="taskName != '归档发起'">
                 <span> {{ form.produceTime ? form.produceTime : produceTime }} </span>
               </el-form-item>
             </el-col>
@@ -75,34 +81,23 @@
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px" v-if="taskName != '成果上传' && taskName != '部门检查'">
+              <el-form-item label="签名：" label-width="120px" v-if="taskName != '归档发起' && taskName != '部门检查'">
                 <span class="auditor"> {{ form.qualityUser ? form.qualityUser.nickName : qualityUser }}
                 </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px" v-if="taskName != '成果上传' && taskName != '部门检查'">
+              <el-form-item label="日期：" label-width="120px" v-if="taskName != '归档发起' && taskName != '部门检查'">
                 <span> {{ form.qualityTime ? form.qualityTime : qualityTime }} </span>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
           <el-form-item label="技术质量与安全部负责人审核" prop="deptComment">
             <el-input type="textarea" v-model="form.deptComment" placeholder="请输入技术质量与安全部负责人审核意见"
-              :disabled="taskName != '技术部审核'" :autosize="{ minRows: 4 }" />
+              :disabled="taskName != '技术质量部审核'" :autosize="{ minRows: 4 }" />
           </el-form-item>
-          <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px" v-if="taskName == '技术部审核' || taskName == '成果归档' || taskName == ''">
-                <span class="auditor"> {{ form.deptUser ? form.deptUser.nickName : deptUser }}
-                </span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px" v-if="taskName == '技术部审核' || taskName == '成果归档' || taskName == ''">
-                <span> {{ form.deptTime ? form.deptTime : deptTime }} </span>
-              </el-form-item>
-            </el-col>
-          </el-row>
+          <auditor-row key="1" :isCurrent="taskName == '技术质量部审核'" :signature="form.deptLeader"
+            :signTime="form.deptTime"></auditor-row>
           <el-form-item label="资料管理">
             <el-button type="success" size="mini" @click="gotoFile" :disabled="taskName != '成果归档'">前往资料管理系统</el-button>
           </el-form-item>
@@ -110,23 +105,11 @@
             <el-input type="textarea" v-model="form.archiveComment" placeholder="请输入技术质量与安全部归档意见"
               :disabled="taskName != '成果归档'" :autosize="{ minRows: 4 }" />
           </el-form-item>
-          <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px" v-if="taskName == '成果归档' || taskName == ''">
-                <span class="auditor"> {{ form.archiveUser ? form.archiveUser.nickName : archiveUser }}
-                </span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="归档日期：" label-width="120px" v-if="taskName == '成果归档' || taskName == ''">
-                <span> {{ form.archiveTime ? form.archiveTime : archiveTime }} </span>
-              </el-form-item>
-            </el-col>
-          </el-row>
+          <auditor-row key="2" :isCurrent="taskName == '成果归档'" :signature="form.archiver" :signTime="form.archiveTime"></auditor-row>
         </el-form>
         <div style="text-align: center;" v-if="isFlow">
-          <el-button type="primary" @click="submitForm" :disabled="taskName == '成果归档' && hasArchievement == false">提
-            交</el-button>
+          <el-button type="primary" @click="submitForm" :disabled="taskName == '成果归档' && hasArchievement == false">
+            提交并结束流程</el-button>
         </div>
       </el-col>
       <el-col :span="6" :xs="24" v-if="isFlow">
@@ -169,12 +152,14 @@ import { flowXmlAndNode } from "@/api/flowable/definition";
 import { getUserByRole } from "@/api/system/role";
 import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
 import { listAchievement } from "@/api/file/achievement";
+import auditorRow from './components/auditorRow.vue';
 
 export default {
   components: {
     FlowUser,
     projectChoose,
-    flow
+    flow,
+    auditorRow
   },
   props: {
     taskName: {
@@ -190,8 +175,8 @@ export default {
       default: true
     }
   },
-  watch:{
-    'taskForm.formId'(){
+  watch: {
+    'taskForm.formId'() {
       this.initForm()
     }
   },
@@ -222,31 +207,6 @@ export default {
       archiveList: [],
       // 弹出层标题
       title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        projectId: null,
-        submitTime: null,
-        submitSituation: null,
-        locationLng: null,
-        locationLat: null,
-        produceInspector: null,
-        qualityInspector: null,
-        deptLeader: null,
-        archiver: null,
-        receiveTime: null,
-        qualityTime: null,
-        produceTime: null,
-        deptTime: null,
-        archiveTime: null,
-        produceComment: null,
-        qualityComment: null,
-        deptComment: null,
-        archiveComment: null
-      },
       // 表单参数
       form: {
         submitTime: undefined,
@@ -289,7 +249,7 @@ export default {
       this.qualityUser = this.$store.getters.name;
       this.qualityTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
-    else if (this.taskName == '技术部审核') {
+    else if (this.taskName == '技术质量部审核') {
       this.deptUser = this.$store.getters.name;
       this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
@@ -298,7 +258,6 @@ export default {
       this.archiveTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
     this.getProjectList();
-    this.getList();
     if (this.isFlow) {
       flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
         this.flowData = res.data;
@@ -335,7 +294,7 @@ export default {
       })
     },
     initRules() {
-      if (this.taskName == '成果上传') {
+      if (this.taskName == '归档发起') {
         this.rules = {
           submitTime: [
             { required: true, message: '请选择成果提交日期', trigger: 'change' }
@@ -356,7 +315,7 @@ export default {
             { required: true, message: '请填写审核意见', trigger: 'blur' }
           ]
         }
-      } else if (this.taskName == '技术部审核') {
+      } else if (this.taskName == '技术质量部审核') {
         this.rules = {
           deptComment: [
             { required: true, message: '请填写审核意见', trigger: 'blur' }
@@ -364,20 +323,6 @@ export default {
         }
       }
     },
-    /** 查询cmc成果归档列表 */
-    getList() {
-      this.loading = true;
-      listArchive(this.queryParams).then(response => {
-        this.archiveList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
     // 查询项目列表
     getProjectList() {
       this.loading = true
@@ -416,63 +361,6 @@ export default {
         });
       }
     },
-    // 表单重置
-    reset() {
-      this.form = {
-        archiveId: null,
-        projectId: null,
-        submitTime: null,
-        submitSituation: null,
-        locationLng: null,
-        locationLat: null,
-        produceInspector: null,
-        qualityInspector: null,
-        deptLeader: null,
-        archiver: null,
-        receiveTime: null,
-        qualityTime: null,
-        produceTime: null,
-        deptTime: null,
-        archiveTime: null,
-        produceComment: null,
-        qualityComment: null,
-        deptComment: null,
-        archiveComment: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.archiveId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加cmc成果归档";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const archiveId = row.archiveId || this.ids
-      getArchive(archiveId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改cmc成果归档";
-      });
-    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -480,16 +368,22 @@ export default {
           if (this.formTotal != 0) {
             updateArchive(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
             });
             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 == '归档发起') {
+                // const params = { taskId: this.taskForm.taskId };
+                // this.checkSendUser = true;
+                // this.completeOpen = true;
+                // this.completeTitle = "流程审批";
+                getUsersDeptLeaderByDept({ deptId: 109 }).then(res => {
+                  let userId = res.data.userId;
+                  this.$set(this.taskForm.variables, "approval", userId);
+                  complete(this.taskForm).then(response => {
+                    this.$modal.msgSuccess(response.msg);
+                    this.$emit('goBack')
+                  });
+                });
               }
               if (this.taskName == '部门检查') {
                 let approvalList = this.chooseProject.qualityInspector.split(',')
@@ -509,7 +403,7 @@ export default {
                   });
                 });
               }
-              if (this.taskName == '技术部审核') {
+              if (this.taskName == '技术质量部审核') {
                 getUserByRole({ roleId: 6 }).then(result => {
                   this.$set(this.taskForm.variables, "approval", result.data[0]);
                   complete(this.taskForm).then(response => {
@@ -529,8 +423,6 @@ export default {
             this.form.archiveId = this.taskForm.formId;
             addArchive(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
@@ -542,22 +434,6 @@ export default {
         }
       });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const archiveIds = row.archiveId || this.ids;
-      this.$modal.confirm('是否确认删除cmc成果归档编号为"' + archiveIds + '"的数据项？').then(function () {
-        return delArchive(archiveIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('oa/archive/export', {
-        ...this.queryParams
-      }, `archive_${new Date().getTime()}.xlsx`)
-    },
     confirmProject(val) {
       if (val.length > 1) {
         this.$message.error('请选择一个项目');
@@ -597,7 +473,7 @@ export default {
       })
     },
     gotoFile() {
-      this.$router.push({ path: '/file' })
+      this.$router.push({ path: '/product/archive/file' })
     },
     typeText(flag) {
       if (flag == true)

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

@@ -0,0 +1,80 @@
+<template>
+  <div>
+    <el-row>
+      <el-col :span="5" :xs="24" :offset="13">
+        <label for="signature" class="labelclass">
+          签名: <span class="auditor font-nomal"> {{ localSignature }}</span>
+        </label>
+      </el-col>
+      <el-col :span="6">
+        <label for="signTime" class="labelclass">
+          日期：<span class="font-nomal"> {{ loaclSignTime }} </span>
+        </label>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { parseTime } from "@/utils/ruoyi";
+export default {
+  props: {
+    signature: {
+      type: Number,
+    },
+    signTime: {
+      type: String,
+      default: ''
+    },
+    isCurrent: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      localSignature: '',
+      loaclSignTime: ''
+    }
+  },
+  watch: {
+    signature(newval) {
+      if (newval)
+        this.localSignature = this.getUserName(newval);
+    },
+    signTime(newval) {
+      if (newval)
+        this.loaclSignTime = newval;
+    }
+  },
+  mounted() {
+    if (this.isCurrent) {
+      this.localSignature = this.$store.getters.name;
+      this.loaclSignTime = parseTime(new Date(), '{y}-{m}-{d}');
+    } else {
+      this.localSignature = this.signature;
+      this.loaclSignTime = this.signTime;
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.labelclass {
+  text-align: right;
+  vertical-align: middle;
+  float: left;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px;
+  padding: 0 12px 0 0;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
+.font-nomal {
+  padding-left: 15px;
+  font-weight: normal;
+  color: #000;
+}
+</style>

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

@@ -2,13 +2,18 @@
  * @Author: ysh
  * @Date: 2024-06-18 17:38:50
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-05 14:09:31
+ * @LastEditTime: 2024-09-18 11:16:02
 -->
 <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-select v-model="queryParams.partyAName" clearable filterable remote reserve-keyword placeholder="请输入单位名称"
+          :remote-method="remoteMethod" :loading="queryLoading" style="width: 400px;" @change="handleQuery()">
+          <el-option v-for="partyA in queryPartyAList" :key="partyA.partyAId" :label="partyA.partyAName"
+            :value="partyA.partyAName">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item style="margin-bottom:0;display:none;"> <el-input></el-input> </el-form-item>
       <el-form-item>
@@ -32,8 +37,8 @@
       <el-table-column label="备注说明" align="center" prop="remark" />
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" :autoScroll="false"
-      @pagination="getList" />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      :autoScroll="false" @pagination="getList" />
     <div>
       已选单位：<el-tag v-for="item in choosePartyA" style="margin: 5px;" :key="item.partyAId">{{ item.partyAName }}</el-tag>
     </div>
@@ -81,6 +86,7 @@ export default {
     return {
       // 遮罩层
       loading: true,
+      queryLoading: true,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -113,7 +119,8 @@ export default {
           { required: true, message: '请输入单位名称', trigger: 'blur' },
         ]
       },
-      choosePartyA: []
+      choosePartyA: [],
+      queryPartyAList: []
     };
   },
   created() {
@@ -139,6 +146,16 @@ export default {
         this.loading = false;
       });
     },
+    remoteMethod(val) {
+      listPartyA({
+        pageNum: 1,
+        pageSize: 30,
+        partyAName: val
+      }).then(res => {
+        this.queryPartyAList = res.rows;
+        this.queryLoading = false;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;

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

@@ -94,7 +94,7 @@
                 </td> -->
                 <td v-if="form.borrowUsage == 0 || form.borrowUsage == 1">
                   <el-input v-model="detail.managerAmount" :disabled="taskName != '分管审核'"
-                    @change="calculateManagerAmount(detail)"></el-input>
+                    @blur="calculateManagerAmount(detail)"></el-input>
                 </td>
                 <td>
                   <el-button type="text" style="color:#F56C6C" icon="el-icon-delete" size="mini" circle
@@ -460,6 +460,9 @@ export default {
         this.rules = {
           managerComment: [
             { required: true, message: '请输入分管领导审核意见', trigger: 'blur' }
+          ],
+          managerAmount:[
+            { required: true, message: '请输入核准金额', trigger: 'blur' }
           ]
         }
       } else if (this.taskName == '总经理审核') {