成果归档信息

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -67,6 +67,13 @@ public class CmcProjectController extends BaseController
                     underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append("、");
                 project.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
             }
+            String qualityInspector = project.getQualityInspector();
+            StringBuilder qualityInspectorName = new StringBuilder();
+            if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
+                for (String inspector : qualityInspector.split(","))
+                    qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append("、");
+                project.setQualityInspectorName(qualityInspectorName.substring(0, qualityInspectorName.length() - 1));
+            }
         }
         return getDataTable(list);
     }

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcArchiveMapper.xml

@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
         <association property="archiveUser"    javaType="SysUser"         resultMap="ArchiveUserResult" />
         <association property="leaderUser"    javaType="SysUser"         resultMap="LeaderUserResult" />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="ProduceUserResult">
@@ -55,15 +56,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName"    column="leader_nick_name"    />
     </resultMap>
 
+    <resultMap type="CmcProject" id="CmcProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
+    </resultMap>
+
     <sql id="selectCmcArchiveVo">
-        select a.archive_id, a.project_id, a.project_leader, a.submit_time, a.submit_situation, a.produce_inspector, u.nick_name as produce_nick_name, a.quality_inspector, u1.nick_name as quality_nick_name,
-               a.dept_leader, u2.nick_name as dept_nick_name, a.archiver, u3.nick_name as archive_nick_name, a.receive_time, a.quality_time, a.produce_time, a.dept_time, a.archive_time,
-               a.produce_comment, a.quality_comment, a.dept_comment, a.archive_comment from cmc_archive as a
+        select a.archive_id, a.project_id, p.project_number, p.project_name, a.project_leader, u4.nick_name as leader_nick_name, a.submit_time, a.submit_situation, a.produce_inspector,
+               u.nick_name as produce_nick_name, a.quality_inspector, u1.nick_name as quality_nick_name, a.dept_leader, u2.nick_name as dept_nick_name, a.archiver,
+               u3.nick_name as archive_nick_name, a.receive_time, a.quality_time, a.produce_time, a.dept_time, a.archive_time, a.produce_comment, a.quality_comment, a.dept_comment,
+               a.archive_comment from cmc_archive as a
         left join sys_user as u on u.user_id = a.produce_inspector
         left join sys_user as u1 on u1.user_id = a.quality_inspector
         left join sys_user as u2 on u2.user_id = a.dept_leader
         left join sys_user as u3 on u3.user_id = a.archiver
         left join sys_user as u4 on u4.user_id = a.project_leader
+        left join cmc_project as p on p.project_id = a.project_id
     </sql>
 
     <select id="selectCmcArchiveList" parameterType="CmcArchive" resultMap="CmcArchiveResult">

oa-back/sql/sql.sql

@@ -924,8 +924,8 @@ insert into `sys_role_menu` values (5, 1085);
 insert into `sys_role_menu` values (5, 1086);
 insert into `sys_role_menu` values (5, 1087);
 insert into `sys_role_menu` values (5, 2048);
+insert into `sys_role_menu` values (6, 10);
+insert into `sys_role_menu` values (6, 136);
 -- insert into `sys_role_menu` values (6, 137);
 -- insert into `sys_role_menu` values (6, 138);
 insert into `sys_role_menu` values (6, 1133);
@@ -943,13 +943,13 @@ insert into `sys_role_menu` values (7, 7);
 insert into `sys_role_menu` values (7, 9);
 -- insert into `sys_role_menu` values (7, 10);
 insert into `sys_role_menu` values (7, 11);
+insert into `sys_role_menu` values (7, 12);
+insert into `sys_role_menu` values (7, 13);
+insert into `sys_role_menu` values (7, 14);
+insert into `sys_role_menu` values (7, 15);
 -- insert into `sys_role_menu` values (7, 16);
+insert into `sys_role_menu` values (7, 17);
+insert into `sys_role_menu` values (7, 18);
 -- insert into `sys_role_menu` values (7, 19);
 insert into `sys_role_menu` values (7, 118);
 insert into `sys_role_menu` values (7, 119);
@@ -969,7 +969,7 @@ insert into `sys_role_menu` values (7, 131);
 -- insert into `sys_role_menu` values (7, 133);
 -- insert into `sys_role_menu` values (7, 134);
 insert into `sys_role_menu` values (7, 135);
+insert into `sys_role_menu` values (7, 136);
 -- insert into `sys_role_menu` values (7, 137);
 -- insert into `sys_role_menu` values (7, 138);
 insert into `sys_role_menu` values (7, 1000);
@@ -1041,9 +1041,9 @@ insert into `sys_role_menu` values (8, 1107);
 insert into `sys_role_menu` values (8, 2049);
 insert into `sys_role_menu` values (8, 2050);
 insert into `sys_role_menu` values (9, 7);
+insert into `sys_role_menu` values (9, 12);
+insert into `sys_role_menu` values (9, 13);
+insert into `sys_role_menu` values (9, 15);
 insert into `sys_role_menu` values (9, 131);
 insert into `sys_role_menu` values (9, 1093);
 insert into `sys_role_menu` values (9, 1097);
@@ -1066,10 +1066,10 @@ insert into `sys_role_menu` values (9, 2050);
 -- insert into `sys_role_menu` values (10, 16);
 insert into `sys_role_menu` values (10, 1148);
 insert into `sys_role_menu` values (10, 1152);
+insert into `sys_role_menu` values (11, 18);
 insert into `sys_role_menu` values (11, 1158);
 insert into `sys_role_menu` values (11, 1162);
+insert into `sys_role_menu` values (12, 17);
 insert into `sys_role_menu` values (12, 1153);
 insert into `sys_role_menu` values (12, 1167);
 
@@ -8716,7 +8716,7 @@ INSERT INTO `cmc_sub_contract` VALUES ('1648881410340216630', '重庆轨道交
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410340525059', '德阳市罗江自然资源局全域1:500数字化地形（地籍）测量（倾斜摄影模型房屋采集生产）技术劳务合同', 9000.00, '0166', NULL, NULL, 23, '2021-03-15', NULL, NULL, '2021-03-19', NULL, NULL, '2', NULL, NULL, '2021-03-18');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410341676430', '甘孜2023C49、楞古2023C19航飞数据采集技术服务协议', 80400.00, '0054', NULL, NULL, 35, '2023-10-19', NULL, NULL, '2023-10-20', NULL, NULL, '2', NULL, NULL, '2023-10-20');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410345701216', '营山县城北综合停车场项目工程勘察钻探劳务合同', 21489.00, '0060', NULL, NULL, 35, '2022-04-20', NULL, NULL, '2023-02-25', NULL, NULL, '2', NULL, NULL, '2022-04-22');
-INSERT INTO `cmc_sub_contract` VALUES ('1648881410349918573', '2020年西华段铁路沿线环境品质提升工程测绘项目技术劳务合同', 43491.00, '0018', NULL, NULL, 23, '2020-09-02', NULL, NULL, '0000-00-00', NULL, NULL, '2', NULL, NULL, '0000-00-00');
+INSERT INTO `cmc_sub_contract` VALUES ('1648881410349918573', '2020年西华段铁路沿线环境品质提升工程测绘项目技术劳务合同', 43491.00, '0018', NULL, NULL, 23, '2020-09-02', NULL, NULL, NULL, NULL, NULL, '2', NULL, NULL, NULL);
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410351880617', '黄河干流若尔盖段应急处置（抢险救灾）工程勘测劳务合同协议', 340000.00, '0091', NULL, NULL, 35, '2022-06-13', NULL, NULL, '2022-06-14', NULL, NULL, '2', NULL, NULL, '2022-06-14');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410353610586', '简阳市50平方公里及以上河道管理范围划定服务测绘合同', 82500.00, '0194', NULL, NULL, 23, '2021-03-01', NULL, NULL, '2021-03-05', NULL, NULL, '2', NULL, NULL, '2021-03-05');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410358908820', '南江县农房融合入库技术服务合同', 250000.00, '0189', NULL, NULL, 23, '2020-06-15', NULL, NULL, '2020-06-19', NULL, NULL, '2', NULL, NULL, '2020-06-17');
@@ -8807,7 +8807,7 @@ INSERT INTO `cmc_sub_contract` VALUES ('1648881410594751720', '中江县猫儿
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410599688292', '2021年佛山项目技术服务技术劳务协议', 753013.50, '0040', NULL, NULL, 35, '2021-11-15', NULL, NULL, '2021-11-18', NULL, NULL, '2', NULL, NULL, '2021-11-18');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410600092328', '老木孔航电枢纽工程库区防洪堤1:1000带状地形图测绘项目技术服务协议', 13311.00, '0186', NULL, NULL, 35, '2022-04-08', NULL, NULL, '2022-04-08', NULL, NULL, '2', NULL, NULL, '2022-04-08');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410606317492', '广西上林、广东台山抽水蓄能电站航空摄影及地形图测绘技术服务协议', 150501.00, '0131', NULL, NULL, 35, '2022-09-22', NULL, NULL, '2022-09-22', NULL, NULL, '2', NULL, NULL, '2022-09-22');
-INSERT INTO `cmc_sub_contract` VALUES ('1648881410606579397', '电脑采购合同', 156525.00, '0031', NULL, NULL, 23, '2020-09-11', NULL, NULL, '0000-00-00', NULL, NULL, '2', NULL, NULL, '2020-09-14');
+INSERT INTO `cmc_sub_contract` VALUES ('1648881410606579397', '电脑采购合同', 156525.00, '0031', NULL, NULL, 23, '2020-09-11', NULL, NULL, NULL, NULL, NULL, '2', NULL, NULL, '2020-09-14');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410606656944', '水土新城排水管网精细化普查项目内窥检测劳务合作协议', 430000.00, '0071', NULL, NULL, 35, '2022-04-13', NULL, NULL, '2022-04-13', NULL, NULL, '2', NULL, NULL, '2022-04-13');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410609994044', '重庆第二机场地形图制图技术服务合同', 813770.00, '0134', NULL, NULL, 23, '2021-03-10', NULL, NULL, '2021-03-23', NULL, NULL, '2', NULL, NULL, '2021-03-11');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410612379753', '红原县规模以下河流管理保护范围划界项目劳务协议', 2540000.00, '0129', NULL, NULL, 35, '2021-02-01', NULL, NULL, '2021-02-08', NULL, NULL, '2', NULL, NULL, '2021-02-03');
@@ -8867,7 +8867,7 @@ INSERT INTO `cmc_sub_contract` VALUES ('1648881410760197810', '金沙江上游
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410765270457', '中国交建马来西亚东海岸铁路项目精测网复测工作劳务合同', 2865155.00, '0165', NULL, NULL, 35, '2024-05-21', NULL, NULL, '2024-05-21', NULL, NULL, '2', NULL, NULL, '2024-05-22');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410765593992', '大竹县城乡规划编制中心大竹县城区地下管网普查项目技术服务协议', 3694600.00, '0146', NULL, NULL, 35, '2021-10-11', NULL, NULL, '2021-10-13', NULL, NULL, '2', NULL, NULL, '2021-10-12');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410766475690', '古蔺县河湖水域岸线管理范围划定项目（04包）测绘合同', 32500.00, '0194', NULL, NULL, 23, '2021-09-02', NULL, NULL, '2021-09-06', NULL, NULL, '2', NULL, NULL, '2021-09-03');
-INSERT INTO `cmc_sub_contract` VALUES ('1648881410768904417', '技术合作框架协议', 0.00, '0077', NULL, NULL, 35, '2024-03-05', NULL, NULL, '0000-00-00', NULL, NULL, '2', NULL, NULL, '2024-03-05');
+INSERT INTO `cmc_sub_contract` VALUES ('1648881410768904417', '技术合作框架协议', 0.00, '0077', NULL, NULL, 35, '2024-03-05', NULL, NULL, NULL, NULL, NULL, '2', NULL, NULL, '2024-03-05');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410772435682', '乳源县天然气管道及配套设施建设项目管网路由地形测绘、规划定桩测量、地下管线普查测绘项目', 220000.00, '0070', NULL, NULL, 35, '2023-08-14', NULL, NULL, '2023-08-14', NULL, NULL, '2', NULL, NULL, '2023-08-14');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410776103430', '叶巴滩混蓄预可研阶段1:1000地形图航空摄影（激光飞行及影像获取）项目劳务协议', 80000.00, '0032', NULL, NULL, 35, '2021-09-16', NULL, NULL, '2021-09-17', NULL, NULL, '2', NULL, NULL, '2021-09-17');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410777374019', '林权档案电子化及存量数据整合建库采购项目技术服务协议', 1239336.00, '0173', NULL, NULL, 35, '2021-11-08', NULL, NULL, '2021-11-10', NULL, NULL, '2', NULL, NULL, '2022-01-10');
@@ -8877,7 +8877,7 @@ INSERT INTO `cmc_sub_contract` VALUES ('1648881410778118960', '邻水县农村
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410784509528', '泸县“房地一体”宅基地使用权、集体建用地使用权及房屋所有权不动产登记项目技术劳务协议书', 30.00, '0132', NULL, NULL, 23, '2021-04-19', NULL, NULL, '2021-04-21', NULL, NULL, '2', NULL, NULL, '2021-04-21');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410785217830', '西藏水电项目内业成图技术服务协议', 226864.00, '0027', NULL, NULL, 35, '2022-06-09', NULL, NULL, '2022-06-10', NULL, NULL, '2', NULL, NULL, '2022-06-10');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410790643629', '佛山市季华路西延线工程（南海丹灶段）项目测量工程劳务合作协议', 743406.00, '0040', NULL, NULL, 35, '2022-08-11', NULL, NULL, '2022-08-12', NULL, NULL, '2', NULL, NULL, '2022-08-12');
-INSERT INTO `cmc_sub_contract` VALUES ('1648881410791104846', '泸定2023C45项目劳务合作协议', 11000.00, '0110', NULL, NULL, 35, '2024-03-19', NULL, NULL, '0000-00-00', NULL, NULL, '2', NULL, NULL, '2024-03-20');
+INSERT INTO `cmc_sub_contract` VALUES ('1648881410791104846', '泸定2023C45项目劳务合作协议', 11000.00, '0110', NULL, NULL, 35, '2024-03-19', NULL, NULL, NULL, NULL, NULL, '2', NULL, NULL, '2024-03-20');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410793778087', '三圣街道办事处拆迁航拍、测绘服务项目技术服务协议', 0.00, '0076', NULL, NULL, 35, '2024-03-12', NULL, NULL, '2024-03-13', NULL, NULL, '2', NULL, NULL, '2024-03-13');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410794810897', '成都市成华区地下管线普查更新探测服务（第2包）技术服务协议', 6810000.00, '0150', NULL, NULL, 35, '2021-10-15', NULL, NULL, '2021-10-15', NULL, NULL, '2', NULL, NULL, '2021-10-15');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410798634855', '简阳放生坝片区砂石储量勘察工程勘察钻探劳务合同', 50400.00, '0012', NULL, NULL, 35, '2022-12-05', NULL, NULL, '2022-12-06', NULL, NULL, '2', NULL, NULL, '2022-12-06');
@@ -8934,7 +8934,7 @@ INSERT INTO `cmc_sub_contract` VALUES ('1648881410917537531', '重庆市万州1:
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410918470335', '成都高新区“实景三维成都”建设服务项目劳务合作协议', 5376428.00, '0030', NULL, NULL, 35, '2024-04-29', NULL, NULL, '2024-04-30', NULL, NULL, '2', NULL, NULL, '2024-04-30');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410920451720', '西部沿海高速公路阳江南联络线（阳东至阳江港高速公路）工程项目地形图测绘劳务合作协议', 1212288.02, '0047', NULL, NULL, 35, '2023-01-06', NULL, NULL, '2023-01-06', NULL, NULL, '2', NULL, NULL, '2023-01-06');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410924202036', '国能四川阿水电力开发有限公司绰斯甲水电站工程测量中心技术服务协议', 10320052.94, '0185', NULL, NULL, 35, '2022-04-15', NULL, NULL, '2022-04-20', NULL, NULL, '2', NULL, NULL, '2022-04-20');
-INSERT INTO `cmc_sub_contract` VALUES ('1648881410924260529', '全站仪采购合同', 98000.00, '0135', NULL, NULL, 23, '2020-05-27', NULL, NULL, '0000-00-00', NULL, NULL, '2', NULL, NULL, '2020-06-09');
+INSERT INTO `cmc_sub_contract` VALUES ('1648881410924260529', '全站仪采购合同', 98000.00, '0135', NULL, NULL, 23, '2020-05-27', NULL, NULL, NULL, NULL, NULL, '2', NULL, NULL, '2020-06-09');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410927459105', '配合测量项目技术服务协议', 179265.00, '0186', NULL, NULL, 35, '2022-05-25', NULL, NULL, '2022-05-27', NULL, NULL, '2', NULL, NULL, '2022-05-27');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410933065606', '拉萨2023W13、查龙2023C91、汤坝2023C56测绘项目技术服务协议', 73471.00, '0088', NULL, NULL, 35, '2023-12-12', NULL, NULL, '2023-12-12', NULL, NULL, '2', NULL, NULL, '2023-12-12');
 INSERT INTO `cmc_sub_contract` VALUES ('1648881410933721371', '阳山县“房地一体”农村不动产登记发证工作服务项目（片区四）合同', 2505600.00, '0089', NULL, NULL, 23, '2020-08-20', NULL, NULL, '2020-08-24', NULL, NULL, '2', NULL, NULL, '2020-08-24');

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

@@ -7,11 +7,6 @@
         <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-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
-              :disabled="taskName != '成果上传'" clearable>
-              <el-option v-for="item in projectList" :key="item.value" :label="item.projectName" :value="item.projectId">
-              </el-option>
-            </el-select> -->
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="2" direction="vertical">
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
               }}</el-descriptions-item>
@@ -327,23 +322,7 @@ export default {
             getProject(res.data.projectId).then(response => {
               this.chooseProject = response.data;
               this.isSelect = true;
-              listProjectContract({ projectId: response.data.projectId }).then(res => {
-                if (res.rows.length > 0) {
-                  for (let row of res.rows) {
-                    getContract(row.contractId).then(res => {
-                      if (res.data) {
-                        if (this.contractCode != '') {
-                          this.contractCode = this.contractCode + '、' + res.data.contractCode;
-                        } else {
-                          this.contractCode = res.data.contractCode;
-                        }
-                      }
-                    })
-                  }
-                }
-                else
-                  this.contractCode = '';
-              })
+              this.getContractByProjectId(this.chooseProject.projectId);
             })
           }
           this.loading = false
@@ -404,34 +383,6 @@ export default {
         this.projectList = response.rows;
       })
     },
-    // 选择项目
-    handleSelectProject(val) {
-      if (val != "" && val != undefined && val != null) {
-        getProject(val).then(response => {
-          this.chooseProject = response.data;
-          this.isSelect = true;
-          listProjectContract({ projectId: response.data.projectId }).then(res => {
-            if (res.rows.length > 0) {
-              for (let row of res.rows) {
-                getContract(row.contractId).then(res => {
-                  if (res.data) {
-                    if (this.contractCode != '') {
-                      this.contractCode = this.contractCode + '、' + res.data.contractCode;
-                    } else {
-                      this.contractCode = res.data.contractCode;
-                    }
-                  }
-                })
-              }
-            }
-            else
-              this.contractCode = '';
-          })
-        })
-      } else {
-        this.isSelect = false
-      }
-    },
     isEmptyObject(obj) {
       for (var key in obj) {
         if (obj.hasOwnProperty(key)) {
@@ -618,6 +569,27 @@ export default {
         else
           this.hasArchievement = false;
       });
+      this.getContractByProjectId(this.chooseProject.projectId);
+    },
+    getContractByProjectId(projectId) {
+      this.contractCode = '';
+      listProjectContract({ projectId: projectId }).then(res => {
+        if (res.rows.length > 0) {
+          for (let row of res.rows) {
+            getContract(row.contractId).then(res => {
+              if (res.data) {
+                if (this.contractCode != '') {
+                  this.contractCode = this.contractCode + '、' + res.data.contractCode;
+                } else {
+                  this.contractCode = res.data.contractCode;
+                }
+              }
+            })
+          }
+        }
+        else
+          this.contractCode = '';
+      })
     },
     gotoFile() {
       this.$router.push({ path: '/file' })

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

@@ -44,17 +44,17 @@
       <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
       <el-table-column label="项目名称" align="center" prop="project.projectName" />
-      <el-table-column label="成果提交日期" align="center" prop="submitTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.submitTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="备注说明" align="center" prop="submitSituation" />
       <el-table-column label="项目负责人" align="center" prop="leaderUser.nickName" />
       <el-table-column label="生产部门检查员" align="center" prop="produceUser.nickName" />
       <el-table-column label="质量检查员" align="center" prop="qualityUser.nickName" />
       <el-table-column label="技术部负责人" align="center" prop="deptUser.nickName" />
       <el-table-column label="归档人" align="center" prop="archiverUser.nickName" />
+      <el-table-column label="成果提交日期" align="center" prop="submitTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.submitTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="资料接收时间" align="center" prop="receiveTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.receiveTime, '{y}-{m}-{d}') }}</span>
@@ -87,7 +87,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
-            v-hasPermi="['oa:technical:view']">查看</el-button>
+            v-hasPermi="['oa:archive:query']">查看</el-button>
         </template>
       </el-table-column>
     </el-table>

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

@@ -66,7 +66,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
-            v-hasPermi="['oa:budget:view']">查看</el-button>
+            v-hasPermi="['oa:budget:query']">查看</el-button>
           <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:budget:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"

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

@@ -29,7 +29,7 @@
       <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column label="合同名称" align="center" prop="subContractName" width="200px" />
       <el-table-column label="分包合同金额" align="center" prop="subAmount" />
-      <el-table-column label="承接单位id" align="center" prop="partnerId" />
+      <el-table-column label="承接单位" align="center" prop="partner.partnerName" />
       <!-- <el-table-column label="承接单位联系人" align="center" prop="contactPerson" /> -->
       <el-table-column label="拟稿人" align="center" prop="drafter">
         <template slot-scope="scope">

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

@@ -95,7 +95,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
-            v-hasPermi="['oa:deposit:view']">查看</el-button>
+            v-hasPermi="['oa:deposit:query']">查看</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:deposit:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"

oa-ui/src/views/oa/device/expense.vue

@@ -62,7 +62,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleView(scope.row)"
-            v-hasPermi="['device:record:view']">查看</el-button>
+            v-hasPermi="['device:record:query']">查看</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['device:record:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"

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

@@ -53,7 +53,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
-            v-hasPermi="['oa:safe:view']">查看</el-button>
+            v-hasPermi="['oa:safe:query']">查看</el-button>
         </template>
       </el-table-column>
     </el-table>

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

@@ -105,7 +105,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
-            v-hasPermi="['oa:settle:view']">查看</el-button>
+            v-hasPermi="['oa:settle:query']">查看</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:settle:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"

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

@@ -89,7 +89,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
-            v-hasPermi="['oa:technical:view']">查看</el-button>
+            v-hasPermi="['oa:technical:query']">查看</el-button>
           <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['oa:technical:remove']">删除</el-button> -->
         </template>