优化

src/api/synthesize-query/three-and-one.js

@@ -4,7 +4,7 @@ import requestFormData from '@/utils/request_formdata'
 // 综合查询 获取三表一册列表
 export const getThreeAndOneListAPI = (data) => {
     return request({
-        url: '/bmw/pmProject/getThreeForms',
+        url: '/bmw/oneTableOneRoster/getThreeForms',
         method: 'GET',
         params: data,
     })
@@ -13,7 +13,7 @@ export const getThreeAndOneListAPI = (data) => {
 // 综合查询 获取三表一册工程详情
 export const getThreeAndOneProjectDetailAPI = (data) => {
     return request({
-        url: '/bmw/pmProject/getProjectById',
+        url: '/bmw/oneTableOneRoster/getProjectById',
         method: 'GET',
         params: data,
     })
@@ -22,7 +22,7 @@ export const getThreeAndOneProjectDetailAPI = (data) => {
 // 综合查询 获取三表一册每月数据
 export const getThreeAndOneMonthlyDataAPI = (data) => {
     return request({
-        url: '/bmw/pmProject/getProMonthTableList',
+        url: '/bmw/oneTableOneRoster/getProMonthTableList',
         method: 'GET',
         params: data,
     })
@@ -31,7 +31,7 @@ export const getThreeAndOneMonthlyDataAPI = (data) => {
 // 综合查询 获取三表一册单月数据
 export const getThreeAndOneMonthlyDataByIdAPI = (data) => {
     return request({
-        url: '/bmw/pmProject/getProMonthTableById',
+        url: '/bmw/oneTableOneRoster/getProMonthTableById',
         method: 'GET',
         params: data,
     })
@@ -40,7 +40,7 @@ export const getThreeAndOneMonthlyDataByIdAPI = (data) => {
 // 综合查询 获取三表一册单月农名工花名册列表
 export const getThreeAndOneMonthlyRosterListAPI = (data) => {
     return request({
-        url: '/bmw/pmProject/getProMonthTableRosterList',
+        url: '/bmw/oneTableOneRoster/getProMonthTableRosterList',
         method: 'GET',
         params: data,
     })
@@ -49,7 +49,7 @@ export const getThreeAndOneMonthlyRosterListAPI = (data) => {
 // 综合查询 导出三表一册单月农民工实名制工资信息报审表
 export const exportThreeAndOneMonthlySalaryApprovalListAPI = (data) => {
     return request({
-        url: '/bmw/pmProject/getUserSalaryApprovalList',
+        url: '/bmw/oneTableOneRoster/getUserSalaryApprovalList',
         method: 'GET',
         params: data,
     })
@@ -58,7 +58,7 @@ export const exportThreeAndOneMonthlySalaryApprovalListAPI = (data) => {
 // 综合查询 导出三表一册单月分包人员考勤明细表
 export const exportThreeAndOneMonthlyAttDetailsListAPI = (data) => {
     return request({
-        url: '/bmw/pmProject/getUserAttendanceList',
+        url: '/bmw/oneTableOneRoster/getUserAttendanceList',
         method: 'GET',
         params: data,
     })
@@ -67,7 +67,7 @@ export const exportThreeAndOneMonthlyAttDetailsListAPI = (data) => {
 // 综合查询 导出三表一册单月农名工工资支付表
 export const exportThreeAndOneMonthlyWagePaymentListAPI = (data) => {
     return request({
-        url: '/bmw/pmProject/getUserWagePayList',
+        url: '/bmw/oneTableOneRoster/getUserWagePayList',
         method: 'GET',
         params: data,
     })
@@ -76,7 +76,7 @@ export const exportThreeAndOneMonthlyWagePaymentListAPI = (data) => {
 // 综合查询 三表一册封档操作
 export const updateProMonthTableAPI = (data) => {
     return request({
-        url: '/bmw/pmProject/updateProMonthTable',
+        url: '/bmw/oneTableOneRoster/updateProMonthTable',
         method: 'POST',
         data,
     })
@@ -85,7 +85,7 @@ export const updateProMonthTableAPI = (data) => {
 // 综合查询 三表一册回单上传操作
 export const uploadProMonthTableRefundAPI = (data) => {
     return requestFormData({
-        url: '/bmw/pmProject/updateProMonthTableRefund   ',
+        url: '/bmw/oneTableOneRoster/updateProMonthTableRefund   ',
         method: 'POST',
         data,
     })
@@ -94,7 +94,7 @@ export const uploadProMonthTableRefundAPI = (data) => {
 // 综合查询 三表一册 农名工工资支付表 保存操作
 export const saveThreeAndOneMonthlyWagePaymentAPI = (data) => {
     return request({
-        url: '/bmw/pmProject/updateSalary',
+        url: '/bmw/oneTableOneRoster/updateSalary',
         method: 'POST',
         data,
     })
@@ -103,7 +103,7 @@ export const saveThreeAndOneMonthlyWagePaymentAPI = (data) => {
 // 综合查询 三表一册 农名工工资支付表 更新操作
 export const updateThreeAndOneMonthlyWagePaymentAPI = (data) => {
     return request({
-        url: '/bmw/pmProject/updateThreeTableOneRoster',
+        url: '/bmw/oneTableOneRoster/updateThreeTableOneRoster',
         method: 'GET',
         params: data,
     })

src/views/construction-person/attendance-manage/attendance-count/attendance-details.vue

@@ -120,6 +120,7 @@
                                 type="text"
                                 @click="handleCancelAtt(row)"
                                 v-if="row.isAtt == 1 || row.isAtt == 2"
+                                v-hasPermi="['worker:att:cancel']"
                             >
                                 取消考勤
                             </el-button>

src/views/construction-person/entry-and-exit-manage/person-exit/person-exit-form.vue

@@ -57,7 +57,7 @@
 
             <el-row>
                 <el-col :span="24">
-                    <el-form-item label="离场工资结算确认单" prop="fileList">
+                    <el-form-item label="离场工资结算确认单">
                         <UploadFileFormData
                             :limit="3"
                             :file-size="20"

src/views/synthesize-query/three-and-one/month-detail/components/three-one-table.vue

@@ -7,9 +7,9 @@
 
         <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="农民工花名册" name="1" />
-            <el-tab-pane label="农民工实名制工资信息报审表" name="2" />
+            <!-- <el-tab-pane label="农民工实名制工资信息报审表" name="2" /> -->
             <el-tab-pane label="分包人员考勤明细表" name="3" />
-            <el-tab-pane label="农民工工资支付表" name="4" />
+            <!-- <el-tab-pane label="农民工工资支付表" name="4" /> -->
         </el-tabs>
         <div class="section-content">
             <component