diff --git a/src/assets/global_images/photo_error.png b/src/assets/global_images/photo_error.png new file mode 100644 index 0000000..31f8ef9 --- /dev/null +++ b/src/assets/global_images/photo_error.png Binary files differ diff --git a/src/assets/global_images/photo_error.png b/src/assets/global_images/photo_error.png new file mode 100644 index 0000000..31f8ef9 --- /dev/null +++ b/src/assets/global_images/photo_error.png Binary files differ diff --git a/src/views/memberManage/addAndUpdatePerson.vue b/src/views/memberManage/addAndUpdatePerson.vue index a410c9b..ac9b139 100644 --- a/src/views/memberManage/addAndUpdatePerson.vue +++ b/src/views/memberManage/addAndUpdatePerson.vue @@ -644,7 +644,7 @@ const id = this.personForm.id this.personForm = { idCardNo: '', // 身份证号 - personCode: this.personForm.personCode, // 人员编号 + personCode: this.personType === '0' ? this.personForm.personCode : '', // 人员编号 name: '', // 姓名 cardCode: '', // 卡编号 cardType: this.personType === '0' ? '游客' : '', // 卡类型 diff --git a/src/assets/global_images/photo_error.png b/src/assets/global_images/photo_error.png new file mode 100644 index 0000000..31f8ef9 --- /dev/null +++ b/src/assets/global_images/photo_error.png Binary files differ diff --git a/src/views/memberManage/addAndUpdatePerson.vue b/src/views/memberManage/addAndUpdatePerson.vue index a410c9b..ac9b139 100644 --- a/src/views/memberManage/addAndUpdatePerson.vue +++ b/src/views/memberManage/addAndUpdatePerson.vue @@ -644,7 +644,7 @@ const id = this.personForm.id this.personForm = { idCardNo: '', // 身份证号 - personCode: this.personForm.personCode, // 人员编号 + personCode: this.personType === '0' ? this.personForm.personCode : '', // 人员编号 name: '', // 姓名 cardCode: '', // 卡编号 cardType: this.personType === '0' ? '游客' : '', // 卡类型 diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue index 780f449..cab8dc2 100644 --- a/src/views/memberManage/listStaff.vue +++ b/src/views/memberManage/listStaff.vue @@ -250,7 +250,7 @@ text: '身份证号', value: 'idCardNo', align: 'center', - width: 200 + width: 180 }, { text: '卡编号', @@ -284,49 +284,44 @@ align: 'center' } ] - if (attendanceEnable === true) { - this.columns.push( + if (attendanceEnable) { + this.columns = this.columns.concat([ { text: '考勤', value: 'isKaoqinName', align: 'center' - }) - this.columns.push( + }, { text: '统计加班', value: 'isOtName', align: 'center' - }) - this.columns.push( + }, { text: '专务', value: 'isZhuanwuName', align: 'center' - }) - this.columns.push( + }, { text: '部门正职领导', value: 'isLeaderName', align: 'center' - }) - this.columns.push( + }, { text: '年假/天', value: 'initAnnualLeave', align: 'center' - }) - this.columns.push( + }, { text: '剩余年假/天', value: 'annualLeave', align: 'center' - }) - this.columns.push( + }, { text: '是否实习生', value: 'personTypeName', align: 'center' - }) + } + ]) } this.fetchSexType()// 获取性别列表 this.fetchDutyType() // 获取职务列表