更新项目数据、菜单权限

oa-back/sql/sql.sql

@@ -887,6 +887,7 @@ create table sys_role_menu (
 -- ----------------------------
 insert into `sys_role_menu` values (2, 4);
 insert into `sys_role_menu` values (2, 12);
+insert into `sys_role_menu` values (2, 13);
 insert into `sys_role_menu` values (2, 137);
 insert into `sys_role_menu` values (2, 139);
 insert into `sys_role_menu` values (2, 142);
@@ -1121,9 +1122,15 @@ insert into `sys_role_menu` values (10, 1147);
 insert into `sys_role_menu` values (10, 1148);
 insert into `sys_role_menu` values (10, 1152);
 insert into `sys_role_menu` values (11, 140);
+insert into `sys_role_menu` values (11, 141);
 insert into `sys_role_menu` values (11, 142);
 insert into `sys_role_menu` values (11, 1128);
 insert into `sys_role_menu` values (11, 1132);
+insert into `sys_role_menu` values (11, 1133);
+insert into `sys_role_menu` values (11, 1134);
+insert into `sys_role_menu` values (11, 1135);
+insert into `sys_role_menu` values (11, 1136);
+insert into `sys_role_menu` values (11, 1137);
 insert into `sys_role_menu` values (11, 1138);
 insert into `sys_role_menu` values (11, 1142);
 
@@ -1999,8 +2006,8 @@ INSERT INTO `cmc_project` VALUES ('1648881410631270463', '2024W13', '雅砻江
 INSERT INTO `cmc_project` VALUES ('1648881410631270464', '2024W14', '金沙江金沙水电站2024年度泥沙淤积断面及生态流量监测断面测量服务项目合同', 61, '0', '1', '0170', '李女士', '18780188294', '泥沙监测', '0', 13, '110', 59, 61, NULL, '2024-05-22', NULL, '2024-05-22', '2024-05-05', '2024-05-11', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881410631270465', '2024C29', '南江兴马抽水蓄能电站可研阶段地形图测绘项目', 71, '0', '0', '0230', '龙宇杰、闫勇', '15198088143、13880937699', '地形图测绘', '0', 13, '107,110', 59, 71, NULL, '2024-06-18', NULL, '2024-06-19', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881410631270466', '2024C30', '理塘呷洼抽水蓄能电站预可阶段地形图测绘工作', 145, '0', '0', '0230', '龙宇杰、赵程', '15198088143、18428311670', '地形图测绘', '0', 13, '107,115', 59, 145, NULL, '2024-06-19', NULL, '2024-06-20', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `cmc_project` VALUES ('1648881410631270467', '2024C31', '阳嘎拉转存料场、大严洞转存料场及砂石加工系统', NULL, '0', '0', '0230', '龙宇杰、李辉', '15198088143、13880707006', '地形图测绘', '0', 15, NULL, NULL, NULL, NULL, '2024-07-08', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881410631270467', '2024W15', '水口集团公司水口电站2024年大坝控制网复测服务', 101, '0', '1', '0065', '黄云挥', '18965039555', '施工测量控制网', '0', 22, '112', 59, 103, NULL, '2024-06-21', NULL, '2024-06-24', '2024-07-01', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `cmc_project` VALUES ('1648881410631270468', '2024C31', '阳嘎拉转存料场、大严洞转存料场及砂石加工系统', NULL, '0', '0', '0230', '龙宇杰、李辉', '15198088143、13880707006', '地形图测绘', '0', 15, NULL, NULL, NULL, NULL, '2024-07-08', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881410643853314', '2023W13', '拉萨水环境项目测绘工作', 71, '0', '1', '0183', '祝仁广、刘建', '13699402077、13880783828', '地形图测绘', '0', 13, '110', 11, 71, NULL, '2023-04-07', NULL, '2023-04-07', '2023-04-07', '2023-06-16', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881410660630529', '2023C34', '阆中抽水蓄能电站规划阶段测绘工作', 144, '0', '0', '0230', '龙宇杰、徐敬武', '15198088143、13540266919', '地形图测绘', '0', 13, '107,115', 112, 144, NULL, '2023-03-29', NULL, '2023-03-30', '2023-04-03', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `cmc_project` VALUES ('1648881410677407746', '2023W12', '云南昭通激光数据采集项目', 32, '0', '1', '0259', '宁瑶', NULL, '激光扫描', '0', 13, '107', 11, 32, NULL, '2023-03-24', NULL, '2023-03-24', '2023-03-24', '2023-03-26', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -4597,8 +4604,8 @@ INSERT INTO `cmc_project_work` VALUES (1977, '1648881410631270465', '枢纽区1:
 INSERT INTO `cmc_project_work` VALUES (1978, '1648881410631270465', '施工区1:2000地形图测绘（含水下地形）', '1:2000', 'km²', '20', '2024-07-15', NULL, '同时提供三维地形面，需要预可阶段地形图接边。');
 INSERT INTO `cmc_project_work` VALUES (1979, '1648881410631270465', 'GNSS控制点', '四等', '点', '10', '2024-07-15', NULL, NULL);
 INSERT INTO `cmc_project_work` VALUES (1980, '1648881410631270465', '高程控制测量', '四等', 'km', '70', '2024-07-15', NULL, '单边');
-INSERT INTO `cmc_project_work` VALUES (1981, '1648881410631270467', '阳嘎拉沟1:1000地形图测绘、三维地形面', '1:1000', 'km²', '4.04', '2024-07-20', NULL, '同时提供三维地形面和DOM');
-INSERT INTO `cmc_project_work` VALUES (1982, '1648881410631270467', '大岩洞区域1:1000地形图测绘、三维地形面', '1:1000', 'km²', '3.91', '2024-07-20', NULL, NULL);
+INSERT INTO `cmc_project_work` VALUES (1981, '1648881410631270468', '阳嘎拉沟1:1000地形图测绘、三维地形面', '1:1000', 'km²', '4.04', '2024-07-20', NULL, '同时提供三维地形面和DOM');
+INSERT INTO `cmc_project_work` VALUES (1982, '1648881410631270468', '大岩洞区域1:1000地形图测绘、三维地形面', '1:1000', 'km²', '3.91', '2024-07-20', NULL, NULL);
 
 -- ----------------------------
 -- 25、cmc车辆信息表

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

@@ -48,7 +48,8 @@
 
     <el-table v-loading="loading" :data="settleList" @selection-change="handleSelectionChange">
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column label="项目id" align="center" prop="projectId" />
+      <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="reporter">
         <template slot-scope="scope">
           {{ getUserName(scope.row.reporter) }}