工资卡见证完善

src/api/construction-person/red-green-light-mange/wage-card-witness.js

@@ -5,7 +5,7 @@ import requestFormData from '@/utils/request_formdata'
 export const getPersonWageCardListAPI = (data) => {
     return request({
         url: '/bmw/workerWageCard/list',
-        method: 'get',
+        method: 'GET',
         params: data,
     })
 }
@@ -13,17 +13,8 @@ export const getPersonWageCardListAPI = (data) => {
 // 工资卡见证 获取工资卡详情接口
 export const getContractDetailAPI = (id) => {
     return request({
-        url: `/bmw/workerContract/${id}`,
+        url: `/bmw/workerWageCard/select/${id}`,
-        method: 'get',
+        method: 'POST',
-    })
-}
-
-// 工资卡见证 获取工资卡详情列表接口(历史工资卡信息)
-export const getContractDetailListAPI = (data) => {
-    return request({
-        url: `/bmw/workerContract/workerList`,
-        method: 'get',
-        params: data,
     })
 }
 
@@ -31,7 +22,7 @@ export const getContractDetailListAPI = (data) => {
 export const uploadWageCardAPI = (data) => {
     return requestFormData({
         url: '/bmw/workerWageCard/edit',
-        method: 'post',
+        method: 'POST',
         data,
     })
 }
@@ -39,6 +30,6 @@ export const uploadWageCardAPI = (data) => {
 export const getWageCarDetailLookFileAPI = (id) => {
     return request({
         url: `/bmw/workerWageCard/lookFile/${id}`,
-        method: 'post',
+        method: 'POST',
     })
 }

src/views/basic-manage/team-manage/team-entry-and-exit/entry-and-exit-form.vue

@@ -8,7 +8,7 @@
             检测到分包下存在2个班组，12名施工人员未出场
         </div>
         <el-form
-            label-width="220px"
+            :label-width="formType === 2 ? '220px' : '120px'"
             ref="addOrEditFormRef"
             :model="addOrEditForm"
             :rules="addOrEditFormRules"

src/views/basic-manage/team-manage/team-entry-and-exit/index.vue

@@ -31,18 +31,14 @@
                 </el-button>
             </template>
 
-            <!-- 标段工程数量 -->
+            <!-- 出入场状态-->
-            <template :slot="item" slot-scope="{ data }" v-for="item in slots">
+            <template slot="teamEinStatus" slot-scope="{ data }">
-                <span
+                <el-tag
-                    :style="{
+                    size="mini"
-                        color: data[item] === '已上传' ? '#67C23A' : '#F56C6C',
+                    :type="data.teamEinStatus == 1 ? 'success' : 'danger'"
-                    }"
-                    :key="item"
-                    style="font-size: 12px"
-                    @click="onHandleViewLotProject(data)"
                 >
-                    {{ data[item] }}
+                    {{ data.teamEinStatus == 1 ? '在场' : '出场' }}
-                </span>
+                </el-tag>
             </template>
 
             <template slot="handle" slot-scope="{ data }">
@@ -113,9 +109,6 @@ export default {
             formType: 1,
             editFormData: {},
             getTeamEntryListAPI,
-            slots: {
-                idCard: 'idCard',
-            },
         }
     },
     methods: {

src/views/construction-person/red-green-light-mange/wage-card-witness/wage-card-upload.vue

@@ -290,8 +290,7 @@ export default {
                                 )
                                 .map((j) => j.id)
 
-                            params.bmWorkerWageCard.delIds =
+                            params.delIds = fileIdList.join(',')
-                                fileIdList.join(',')
                         }
                     }
 
@@ -364,24 +363,15 @@ export default {
                 this.queryDetailsId,
             )
 
-            if (res.length > 0) {
+            if (res && Object.keys(res).length > 0) {
-                const {
+                const { id, files, bankName, bankCardCode, bankBranchName } =
-                    files,
+                    res
-                    contractCode,
-                    wageCriterion,
-                    wageApprovedWay,
-                    contractTermType,
-                    contractStopDate,
-                    contractStartDate,
-                } = res[0]
 
-                this.contractInfoForm = {
+                this.salaryCardInfoForm = {
-                    contractCode,
+                    id,
-                    wageCriterion,
+                    bankName,
-                    wageApprovedWay,
+                    bankCardCode,
-                    contractStopDate,
+                    bankBranchName,
-                    contractTermType,
-                    contractStartDate,
                 }
 
                 if (files && files.length > 0) {