diff --git a/pages/electronic_work_card/index.vue b/pages/electronic_work_card/index.vue
index 10e1722..f3f2eb4 100644
--- a/pages/electronic_work_card/index.vue
+++ b/pages/electronic_work_card/index.vue
@@ -19,7 +19,7 @@
-
+
diff --git a/pages/mine/information/index.vue b/pages/mine/information/index.vue
index c0d5d89..d1f7abd 100644
--- a/pages/mine/information/index.vue
+++ b/pages/mine/information/index.vue
@@ -42,8 +42,9 @@
-
-
+
+
+
@@ -53,7 +54,7 @@
-
+
@@ -63,8 +64,8 @@
-
-
+
+
@@ -74,8 +75,8 @@
-
-
+
+
@@ -86,7 +87,7 @@
-
+
diff --git a/pages/related_party_units/add.vue b/pages/related_party_units/add.vue
index 87206ca..82a2923 100644
--- a/pages/related_party_units/add.vue
+++ b/pages/related_party_units/add.vue
@@ -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,
@@ -1064,7 +1086,7 @@
}
})
}
- for (let i = 0; i < this.form.insuranceFile.length; i++) {
+ for (let i = 0; i < this.form.insuranceFile.length; i++) {
await setUploadAttachments({
filePath: this.form.insuranceFile[i].url,
name: 'files',
@@ -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(() => {
diff --git a/pages/related_party_units/edit.vue b/pages/related_party_units/edit.vue
index 2fffab5..46034ca 100644
--- a/pages/related_party_units/edit.vue
+++ b/pages/related_party_units/edit.vue
@@ -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') {