guoyuepeng
/
qa-prevention-xgf-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/pet' into dev 

# Conflicts:
#	pages/mine/information/index.vue
hyx_2024-10-18_BUG
water_xu 2024-07-30 16:24:27 +08:00
parent 99deba7cf2 f88d4e0856
commit 2f1884a903
4 changed files with 240 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/electronic_work_card/index.vue
View File

@ -19,7 +19,7 @@
<u-cell title="联系电话" :value="info.PHONE"></u-cell>
<u-cell title="人员类型" :value="info.ISFLOW === '1' ? '流动人员' : '固定人员'">
</u-cell>
<u-cell title="二维码" v-show="!CODE_TYPE && info.STATUS === '2' && info.CORPINFO_ID">
<u-cell title="二维码" v-show="!CODE_TYPE && info.CORPINFO_ID">
<template #value>
<u--image :src="info.code" width="100upx" height="100upx" @click="fnPreview(info.code)">
</u--image>

67
pages/mine/information/index.vue
View File

@ -10,8 +10,8 @@
<u-cell title="姓名" :value="info.NAME"></u-cell>
<u-cell title="性别" :value="info.SEX === '1' ? '女' : '男'">
<template #value>
{{ info.SEX === '1' ? '女' : '' }}
{{ info.SEX === '0' ? '男' : '' }}
{{info.SEX === '1' ? '女' : ''}}
{{info.SEX === '0' ? '男' : ''}}
</template>
</u-cell>
<u-cell title="出生年月" :value="info.DATE_OF_BIRTH"></u-cell>
@ -40,13 +40,11 @@
<u-cell title="联系电话" :value="info.PHONE"></u-cell>
<u-cell title="婚姻状况" :value="info.MARITALSTATUS == 0 ? '未婚':'已婚'"></u-cell>
<u-cell title="政治面貌" :value="info.zzName"></u-cell>
<view v-if="info.POLITICAL_STATUS == 'zhonggongdangyuan'">
<u-cell title="入党时间" :value="info.POLITICAL_TIME"></u-cell>
</view>
<u-cell v-if="info.POLITICAL_STATUS == 'zhonggongdangyuan'" title="入党时间" :value="info.POLITICAL_TIME"></u-cell>
<u-cell title="是否缴纳社保" :value="info.IS_SOCIAL_NAME"></u-cell>
<view v-if="info.IS_SOCIAL==='1'">
<u-cell title="社会保障号" :value="info.SOCIAL_NUMBER"></u-cell>
<u-cell title="社会保障卡照片">
<!-- 用v-if会出现渲染问题导致出现两行相同的数据 所以改成v-show modify by water_xu 2024.7.19 -->
<u-cell title="社会保障号" v-show="info.IS_SOCIAL==='1'" :value="info.SOCIAL_NUMBER"></u-cell>
<u-cell title="社会保障卡照片" v-show="info.IS_SOCIAL==='1'" >
<template #value>
<view v-for="(item,index) in socialPhotoFile" :key="index"
style="display: flex;justify-content: space-between">
@ -55,10 +53,8 @@
</view>
</template>
</u-cell>
</view>
<u-cell title="是否签订劳动合同" :value="info.IS_SIGN_LABOR_NAME"></u-cell>
<view v-if="info.IS_SIGN_LABOR==='1'">
<u-cell title="合同图片">
<u-cell title="合同图片" v-show="info.IS_SIGN_LABOR==='1'">
<template #value>
<view v-for="(item,index) in contractFile" :key="index"
style="display: flex;justify-content: space-between">
@ -67,11 +63,9 @@
</view>
</template>
</u-cell>
</view>
<u-cell title="是否缴纳商业保险" :value="info.ISPAY_NAME"></u-cell>
<view v-if="info.ISPAY==='1'">
<u-cell title="商业保险单号" :value="info.ISPAY_NUMBER"></u-cell>
<u-cell title="保险图片">
<u-cell title="商业保险单号" v-show="info.ISPAY==='1'" :value="info.ISPAY_NUMBER"></u-cell>
<u-cell title="保险图片" v-show="info.ISPAY==='1'">
<template #value>
<view v-for="(item,index) in insuranceFile" :key="index"
style="display: flex;justify-content: space-between">
@ -80,11 +74,9 @@
</view>
</template>
</u-cell>
</view>
<u-cell title="是否按期缴纳工伤保险" :value="info.IS_INJURIES_PAY_NAME"></u-cell>
<view v-if="info.IS_INJURIES_PAY==='1'">
<u-cell title="工伤保险有效期" :value="info.IS_INJURIES_PAY_TIME"></u-cell>
<u-cell title="工伤保险凭证">
<u-cell title="工伤保险有效期" v-show="info.IS_INJURIES_PAY==='1'" :value="info.IS_INJURIES_PAY_TIME"></u-cell>
<u-cell title="工伤保险凭证" v-show="info.IS_INJURIES_PAY==='1'">
<template #value>
<view v-for="(item,index) in injuriesPayTiemFile" :key="index"
style="display: flex;justify-content: space-between">
@ -93,11 +85,9 @@
</view>
</template>
</u-cell>
</view>
<u-cell title="岗位名称(工种)" :value="info.POST_ID"></u-cell>
<u-cell title="是否参加三级安全培训" :value="info.IS_LEVEL_THREE_NAME"></u-cell>
<view v-if="info.IS_LEVEL_THREE==='1'">
<u-cell title="三级安全培训照片">
<u-cell title="三级安全培训照片" v-show="info.IS_LEVEL_THREE==='1'">
<template #value>
<view v-for="(item,index) in photosOfLevel" :key="index"
style="display: flex;justify-content: space-between">
@ -106,7 +96,6 @@
</view>
</template>
</u-cell>
</view>
<u-cell title="是否流动人员" :value="info.ISFLOW_NAME"></u-cell>
</u-cell-group>
</view>
@ -114,22 +103,22 @@
</template>
<script>
import {
import {
getUserInfo,
getEmployedBy
} from "../../../api";
} from "../../../api";
export default {
export default {
data() {
return {
info: {},
userCardIDPhotoFile: [],
socialPhotoFile: [],
injuriesPayTiemFile: [],
photosOfLevel: [],
contractFile: [],
injuriesPayTiemFile:[],
photosOfLevel:[],
contractFile:[],
insuranceFile: [],
EMPLOYMENT_APPLY_MANAGEMENT_ID: '',
EMPLOYMENT_APPLY_MANAGEMENT_ID:'',
}
},
onNavigationBarButtonTap(e) {
@ -163,9 +152,9 @@ export default {
let Employed = await getEmployedBy({
showCount: 10,
currentPage: 1,
DEPART_STATE: '0'
DEPART_STATE:'0'
})
if (Employed.varList.length > 0) {
if(Employed.varList.length>0){
Employed.varList.forEach(item => {
console.log(item.EMPLOYMENT_APPLY_MANAGEMENT_ID);
this.EMPLOYMENT_APPLY_MANAGEMENT_ID = item.EMPLOYMENT_APPLY_MANAGEMENT_ID
@ -173,7 +162,7 @@ export default {
}
let resData = await getUserInfo({
CORPINFO_ID: this.userInfo.CORPINFO_ID,
EMPLOYMENT_APPLY_MANAGEMENT_ID: this.EMPLOYMENT_APPLY_MANAGEMENT_ID
EMPLOYMENT_APPLY_MANAGEMENT_ID:this.EMPLOYMENT_APPLY_MANAGEMENT_ID
})
this.info = resData.pd
for (let i = 0; i < resData.userCardIDPhotoFile.length; i++) {
@ -195,7 +184,7 @@ export default {
this.photosOfLevel.push(this.$filePath + resData.photosOfLevel[i].FILEPATH)
}
for (let i = 0; i < resData.insuranceFile.length; i++) {
for (let i = 0; i < resData.insuranceFile.length; i++){
this.insuranceFile.push(this.$filePath + resData.insuranceFile[i].FILEPATH)
}
@ -219,14 +208,14 @@ export default {
} else if (this.info.IS_SIGN_LABOR === '1') {
this.info.IS_SIGN_LABOR_NAME = '是'
}
if (this.info.IS_LEVEL_THREE === '0') {
if (this.info.IS_LEVEL_THREE === '0'){
this.info.IS_LEVEL_THREE_NAME = '否'
} else if (this.info.IS_LEVEL_THREE === '1') {
} else if (this.info.IS_LEVEL_THREE === '1'){
this.info.IS_LEVEL_THREE_NAME = '是'
}
if (this.info.ISPAY === '1') {
if (this.info.ISPAY === '1'){
this.info.ISPAY_NAME = '是'
} else {
}else {
this.info.ISPAY_NAME = '否'
}
if (resData.userPhotoFile.length > 0) {
@ -234,7 +223,7 @@ export default {
}
}
},
}
}
</script>
<style scoped>

28
pages/related_party_units/add.vue
View File

@ -270,7 +270,8 @@
setRelatedPartyRegistration,
setUploadAttachments,
getEMPLOYMENTAPPLYMANAGEMENTID,
getEmployedBy
getEmployedBy,
removeUploadAttachments
} from "../../api";
export default {
@ -347,6 +348,7 @@
contractFile: [],
ISPAY: '',
ISPAY_NAME: '',
imgDelKey:'',
IS_BF: '',
IS_BF_NAME: '',
IS_INJURIES_PAY: '',
@ -624,6 +626,11 @@
} else if (this.form.IS_SOCIAL === '1') {
this.form.IS_SOCIAL_NAME = '是'
}
if (this.form.MARITALSTATUS === '0') {
this.form.MARITALSTATUS_NAME = '未婚'
} else if (this.form.MARITALSTATUS === '1') {
this.form.MARITALSTATUS_NAME = '已婚'
}
if (this.form.IS_SIGN_LABOR === '0') {
this.form.IS_SIGN_LABOR_NAME = '否'
} else if (this.form.IS_SIGN_LABOR === '1') {
@ -664,16 +671,19 @@
this.form.ISFLOW_NAME = '是'
}
this.$set(this.form, 'userPhoto', [{
url: this.$filePath + resData.userPhotoFile[0].FILEPATH
url: this.$filePath + resData.userPhotoFile[0].FILEPATH,
id: resData.userPhotoFile[0].IMGFILES_ID
}])
for (let i = 0; i < resData.userCardIDPhotoFile.length; i++) {
let ogj = {}
ogj.url = this.$filePath + resData.userCardIDPhotoFile[i].FILEPATH
ogj.id = resData.userCardIDPhotoFile[i].IMGFILES_ID
this.form.userCardIDFileList.push(ogj)
}
for (let i = 0; i < resData.socialPhotoFile.length; i++) {
let ogj = {}
ogj.url = this.$filePath + resData.socialPhotoFile[i].FILEPATH
ogj.id = resData.socialPhotoFile[i].IMGFILES_ID
this.form.socialFileList.push(ogj)
}
this.getDataCertificateInformation()
@ -850,6 +860,8 @@
}
},
fnUserPhotoDelete(event) {
var id = this.form.userPhoto[event.index].id
this.form.imgDelKey = this.form.imgDelKey + id + ','
this.form.userPhoto.splice(event.index, 1)
},
fnAttachmentToLaborContractAfterRead(event) {
@ -917,6 +929,8 @@
}
},
fnUserCardIDAttachmentsDelete(event) {
var id = this.form.userCardIDFileList[event.index].id
this.form.imgDelKey = this.form.imgDelKey + id + ','
this.form.userCardIDFileList.splice(event.index, 1)
},
//政治面貌 POLITICAL_STATUS
@ -944,6 +958,8 @@
}
},
fnSocialAttachmentsDelete(event) {
var id = this.form.socialFileList[event.index].id
this.form.imgDelKey = this.form.imgDelKey + id + ','
this.form.socialFileList.splice(event.index, 1)
},
@ -1002,6 +1018,10 @@
},
fnSubmit() {
let fileUrl = ''
let imgDelKey = String(this.form.imgDelKey)
if (imgDelKey.length > 0){
this.form.imgDelKey = imgDelKey.replace(/undefined,/g,'').slice(0, -1)
}
this.$refs.form.validate().then(async () => {
if (await this.fnIDCardDeduplication()) return
if (await this.fnPhoneNumberDeduplication()) return
@ -1030,6 +1050,8 @@
uni.$u.toast('工商或社保全无人员，不可进入本系统相关方人员管理！');
return;
}
// 开始上传图片
// 头像
for (let i = 0; i < this.form.userPhoto.length; i++) {
let resData = await setUploadAttachments({
filePath: this.form.userPhoto[i].url,
@ -1075,6 +1097,7 @@
}
})
}
// 身份证
for (let i = 0; i < this.form.userCardIDFileList
.length; i++) { // 14 身份证照片 15 社保卡照片 16上传工伤保险凭证
await setUploadAttachments({
@ -1115,6 +1138,7 @@
CORPINFO_ID: this.CORPINFO_ID,
RELEVANT_UNIT_NAME: this.RELEVANT_UNIT_NAME,
PHOTO: fileUrl,
WORK_SIGN: this.form.IS_SIGN_LABOR,
})
uni.$u.toast('保存成功，请等待相关方审核')
setTimeout(() => {

5
pages/related_party_units/edit.vue
View File

@ -403,6 +403,11 @@
} else if (this.form.IS_SIGN_LABOR === '1') {
this.form.IS_SIGN_LABOR_NAME = '是'
}
if (this.form.MARITALSTATUS === '0') {
this.form.MARITALSTATUS_NAME = '未婚'
} else if (this.form.MARITALSTATUS === '1') {
this.form.MARITALSTATUS_NAME = '已婚'
}
if (this.form.IS_INJURIES_PAY === '0') {
this.form.IS_INJURIES_PAY_NAME = '否'
} else if (this.form.IS_INJURIES_PAY === '1') {