接口调试以及权限字符调试

src/api/synthesize-query/person-count.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 综合查询 获取人员统计列表
 export const getPersonCountListAPI = (data) => {
     return request({
-        url: '/bmw/workerLight/xxx',
+        url: '/bmw/workerStatistics/getWorkerStatisticsTable',
         method: 'GET',
         params: data,
     })

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

@@ -99,3 +99,12 @@ export const saveThreeAndOneMonthlyWagePaymentAPI = (data) => {
         data,
     })
 }
+
+// 综合查询 三表一册 农名工工资支付表 更新操作
+export const updateThreeAndOneMonthlyWagePaymentAPI = (data) => {
+    return request({
+        url: '/bmw/pmProject/updateSalary',
+        method: 'POST',
+        data,
+    })
+}

src/views/construction-person/attendance-manage/card-replacement-apply/index.vue

@@ -25,7 +25,7 @@
                     size="mini"
                     type="primary"
                     icon="el-icon-plus"
-                    v-hasPermi="['attendance:machine:add']"
+                    v-hasPermi="['card:replacement:add']"
                     @click="onHandleAddCardReplacementApply(1, null)"
                 >
                     新增
@@ -39,7 +39,7 @@
                     type="primary"
                     icon="el-icon-edit"
                     v-if="data.checkStatus === 2"
-                    v-hasPermi="['attendance:machine:unbind']"
+                    v-hasPermi="['card:replacement:edit']"
                     @click="onHandleEditCardReplacementApply(data)"
                 >
                     修改
@@ -50,7 +50,7 @@
                     type="primary"
                     icon="el-icon-view"
                     v-if="data.checkStatus != 2"
-                    v-hasPermi="['attendance:machine:delete']"
+                    v-hasPermi="['card:replacement:details']"
                     @click="onHandleAuditAndDetail(data)"
                 >
                     详情
@@ -60,7 +60,7 @@
                     type="danger"
                     icon="el-icon-delete"
                     v-if="data.checkStatus === 2"
-                    v-hasPermi="['attendance:machine:delete']"
+                    v-hasPermi="['card:replacement:delete']"
                     @click="onHandleDeleteCardReplacementApply(data)"
                 >
                     删除

src/views/construction-person/attendance-manage/card-replacement-audit/index.vue

@@ -28,7 +28,7 @@
                     type="warning"
                     icon="el-icon-check"
                     v-if="data.checkStatus === 0"
-                    v-hasPermi="['attendance:machine:unbind']"
+                    v-hasPermi="['card:replacement:audit']"
                     @click="onHandleAuditAndDetail(data, 1, '补卡审核')"
                 >
                     待审核
@@ -38,7 +38,7 @@
                     type="primary"
                     icon="el-icon-view"
                     @click="onHandleAuditAndDetail(data, 2, '补卡详情')"
-                    v-hasPermi="['attendance:machine:delete']"
+                    v-hasPermi="['card:replacement:details']"
                 >
                     详情
                 </el-button>

src/views/synthesize-query/person-count/config.js

@@ -3,20 +3,20 @@ export const formLabel = [
         isShow: false, // 是否展示label
         f_type: 'ipt',
         f_label: '姓名',
-        f_model: 'proName',
+        f_model: 'workerName',
     },
 ]
 
 export const columnsList = [
-    { t_props: 'mainProName', t_label: '姓名' },
-    { t_label: '身份证', t_props: 'volLevel' },
+    { t_props: 'workerName', t_label: '姓名' },
+    { t_label: '身份证', t_props: 'idNumber' },
 
     {
         t_label: '联系方式',
-        t_props: 'volLevel',
+        t_props: 'phone',
     },
-    { t_slot: 'proStatus', t_label: '工种' },
-    { t_slot: 'proStatus', t_label: '累计入场工程数量' },
-    { t_slot: 'proStatus', t_label: '累计入场分包数量' },
-    { t_slot: 'proStatus', t_label: '累计入场班组数量' },
+    { t_props: 'postName', t_label: '工种' },
+    { t_props: 'proNum', t_label: '累计入场工程数量' },
+    { t_props: 'subNum', t_label: '累计入场分包数量' },
+    { t_props: 'teamNum', t_label: '累计入场班组数量' },
 ]

src/views/synthesize-query/person-count/index.vue

@@ -7,7 +7,6 @@
             :showRightTools="true"
             ref="personCountTableRef"
             :columnsList="columnsList"
-            :testTableList="testTableList"
             :request-api="getPersonCountListAPI"
         >
             <template slot="handle" slot-scope="{ queryParams }">

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

@@ -143,8 +143,19 @@
                             </template>
                         </el-table-column>
 
-                        <el-table-column align="center" label="操作">
+                        <el-table-column
+                            align="center"
+                            label="操作"
+                            width="180"
+                        >
                             <template slot-scope="scope">
+                                <el-button
+                                    type="text"
+                                    v-if="scope.row.isUpdate == 1"
+                                    @click="onHandleUpdateData(scope.row)"
+                                >
+                                    更新数据
+                                </el-button>
                                 <el-button
                                     type="text"
                                     @click="onHandleOpenDetail(scope.row)"
@@ -325,6 +336,11 @@ export default {
             this.threeOneData = res.rows
             this.total = res.total
         },
+
+        // 更新数据
+        onHandleUpdateData(row) {
+            console.log('row', row)
+        },
     },
 }
 </script>