禅道bug修复

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

@@ -64,6 +64,7 @@
                             placeholder="请选择工程名称"
                             v-model="addOrEditForm.proId"
                             :disabled="queryDetailId !== ''"
+                            @change="handleProIdChange"
                         >
                             <el-option
                                 :key="item.value"
@@ -78,9 +79,31 @@
 
             <el-row>
                 <el-col :span="24">
+                    <el-form-item
+                        label="法定代表人授权书"
+                        v-show="isShanghai === 0"
+                    >
+                        <UploadFileFormData
+                            :limit="3"
+                            uploadTip=" "
+                            :file-size="20"
+                            :multiple="true"
+                            :file-type="[
+                                'jpg',
+                                'png',
+                                'jpeg',
+                                'pdf',
+                                'doc',
+                                'docx',
+                            ]"
+                            :file-list.sync="addOrEditForm.businessLicense"
+                        />
+                    </el-form-item>
+
                     <el-form-item
                         label="法定代表人授权书"
                         prop="businessLicense"
+                        v-show="isShanghai === 1"
                     >
                         <UploadFileFormData
                             :limit="3"
@@ -186,6 +209,7 @@ export default {
             subSelectList: [], // 分包商下拉列表
             lotProjectSelectList: [], // 标段工程下拉列表
             editUploadFileList: [],
+            isShanghai: 0, // 是否上海项目
         }
     },
     methods: {
@@ -315,6 +339,15 @@ export default {
                 )
             }
         },
+
+        // 工程选择
+        handleProIdChange(val) {
+            const proItem = this.lotProjectSelectList.find(
+                (item) => item.value === val,
+            )
+
+            this.isShanghai = proItem.isShanghai
+        },
     },
 
     async created() {
@@ -330,6 +363,7 @@ export default {
             return {
                 value: item.id,
                 label: item.proName,
+                isShanghai: item.isShanghai,
             }
         })
     },

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

@@ -106,8 +106,57 @@
             </el-row>
             <el-row v-if="formType === 2 || formType === 3">
                 <el-col :span="24">
+                    <el-form-item
+                        v-show="isShanghai === 0"
+                        label="农民工工资已支付完成承诺书"
+                    >
+                        <UploadFileFormData
+                            :limit="3"
+                            :file-size="20"
+                            :multiple="true"
+                            v-if="formType === 2"
+                            :uploadTip="
+                                formType === 3
+                                    ? ''
+                                    : '身份证、银行卡扫描件，承诺书、劳动合同或用工协议扫描件'
+                            "
+                            :file-list.sync="addOrEditForm.businessLicense"
+                            :file-type="[
+                                'jpg',
+                                'png',
+                                'jpeg',
+                                'pdf',
+                                'doc',
+                                'docx',
+                            ]"
+                        />
+
+                        <template v-if="formType === 3">
+                            <div
+                                :key="item.url"
+                                class="files-content"
+                                v-for="item in addOrEditForm.businessLicense"
+                            >
+                                <el-tag
+                                    @click="onHandlePreviewFile(item)"
+                                    style="cursor: pointer"
+                                >
+                                    {{ item.name }}
+                                </el-tag>
+
+                                <span
+                                    class="cursor-blue"
+                                    @click="onHandleDownloadFile(item)"
+                                >
+                                    下载
+                                </span>
+                            </div>
+                        </template>
+                    </el-form-item>
+
                     <el-form-item
                         prop="businessLicense"
+                        v-show="isShanghai === 1"
                         label="农民工工资已支付完成承诺书"
                     >
                         <UploadFileFormData
@@ -237,6 +286,7 @@ export default {
             subSelectList: [],
             teamSelectList: [],
             lotProjectSelectList: [],
+            isShanghai: 0,
         }
     },
     methods: {
@@ -356,9 +406,17 @@ export default {
             ).label
         },
         onChangeProIdFun(val) {
-            this.addOrEditForm.proName = this.lotProjectSelectList.find(
+            const proItem = this.lotProjectSelectList.find(
                 (item) => item.value === val,
-            ).label
+            )
+            this.addOrEditForm.proName = proItem.label
+            this.isShanghai = proItem.isShanghai
+            // this.addOrEditForm.proName = this.lotProjectSelectList.find(
+            //     (item) => item.value === val,
+            // ).label
+            // this.isShanghai = this.lotProjectSelectList.find(
+            //     (item) => item.value === val,
+            // ).isShanghai
         },
 
         // 获取班组和工程
@@ -378,6 +436,7 @@ export default {
                 return {
                     value: item.id,
                     label: item.proName,
+                    isShanghai: item.isShanghai,
                 }
             })
         },

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

@@ -2,6 +2,7 @@
     <!-- 农民工实名制工资信息报审表 -->
     <div class="section-container">
         <div class="table-container">
+            <!-- 搜索 -->
             <el-form
                 :inline="true"
                 label-width="auto"

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

@@ -105,6 +105,10 @@
                             "
                         />
 
+                        <template v-else-if="item.prop === 'isAccord'">
+                            {{ scope.row[item.prop] == 1 ? '是' : '否' }}
+                        </template>
+
                         <span v-else>{{ scope.row[item.prop] }}</span>
                     </template>
                 </el-table-column>
@@ -271,24 +275,44 @@ export default {
         async onHandleEditWagePay() {
             this.isEdit = !this.isEdit
             if (!this.isEdit) {
-                const editData = this.wagePayListData.map((item) => {
+                // 校验其中代扣/代缴、实发工资是否符合要求
+                const validData = this.wagePayListData.map((item) => {
                     return {
-                        id: item.id,
                         deductMoney: item.deductMoney,
                         actualMoney: item.actualMoney,
                     }
                 })
 
-                // console.log(editData)
+                const reg = /^[0-9]\d*(\.\d{1,2})?$/
-                const res = await saveThreeAndOneMonthlyWagePaymentAPI(
+                const valid = validData.every((item) => {
-                    JSON.stringify(editData),
+                    return (
-                )
+                        reg.test(item.deductMoney) && reg.test(item.actualMoney)
+                    )
+                })
+                if (!valid) {
+                    this.$modal.msgError(
+                        '代扣/代缴、实发工资金额必须为数字且最多两位小数',
+                    )
+                    this.isEdit = true
+                    return false
+                } else {
+                    const editData = this.wagePayListData.map((item) => {
+                        return {
+                            id: item.id,
+                            deductMoney: item.deductMoney,
+                            actualMoney: item.actualMoney,
+                        }
+                    })
 
-                console.log(res)
+                    // console.log(editData)
+                    const res = await saveThreeAndOneMonthlyWagePaymentAPI(
+                        JSON.stringify(editData),
+                    )
 
-                if (res.code === 200) {
+                    if (res.code === 200) {
-                    this.$modal.msgSuccess('修改成功')
+                        this.$modal.msgSuccess('修改成功')
-                    this.getThreeAndOneMonthlyWagePaymentList()
+                        this.getThreeAndOneMonthlyWagePaymentList()
+                    }
                 }
             }
         },
@@ -302,6 +326,10 @@ export default {
             if (!reg.test(value)) {
                 // this.$message.error('请输入正确的金额')
                 this.$modal.msgError(`第${index + 1}行${label}金额输入错误`)
+                // this.columnData[index][prop] = 0
+
+                // 修改输入框的值为0
+                this.wagePayListData[index][prop] = ''
                 // 获取对应的输入框引用
                 if (inputElement && inputElement.length > 0) {
                     // 获得焦点