diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue index 419f2cbb..614a536c 100644 --- a/src/components/scTable/index.vue +++ b/src/components/scTable/index.vue @@ -326,7 +326,19 @@ export default { exportExcel(type=0) { if (type === 0) { try { - domToExcel(this.$refs.scTable.$el, "表格数据"); + const tableEl = this.$refs.scTable.$el; + const headerCells = Array.from(tableEl.querySelectorAll('thead tr th')); + const opIndex = headerCells.findIndex(th => th.textContent.trim() === '操作'); + if (opIndex === -1) { + domToExcel(tableEl, this.hExportName || "表格数据"); + } else { + const clone = tableEl.cloneNode(true); + clone.querySelectorAll('tr').forEach(row => { + const cells = row.querySelectorAll('th, td'); + if (cells[opIndex]) cells[opIndex].remove(); + }); + domToExcel(clone, this.hExportName || "表格数据"); + } } catch (error) { console.error('导出失败:', error); this.$message.error("导出失败"); diff --git a/src/views/hrm/ep_form.vue b/src/views/hrm/ep_form.vue index 8fe3fbe6..983a7d9b 100644 --- a/src/views/hrm/ep_form.vue +++ b/src/views/hrm/ep_form.vue @@ -7,15 +7,16 @@ @closed="closeDrawer" > - + + 基本信息 @@ -28,8 +29,11 @@ - - + + + 男 + 女 + @@ -37,12 +41,115 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 是 + 否 + + + + + + + + + + + + 工作信息 + + style="width: 100%;"> + + + + + + + + + + + + + + + @@ -68,71 +195,180 @@ - - {{form.user_.username}} - - - - - - - - - - - + - - - - 男 - 女 - - - - - - - + + - - + + + + + + + {{form.user_.username}} - + + + 银行 & 社保 - - - {{form.third_info.dh_face_card_start}} 至 {{form.third_info.dh_face_card_end}} - - + + + + + + + + + + + + + 学历信息 - - {{form.location.area_fix_name}}- - 经纬度({{form.location.xx_detail.longitude}}, {{form.location.xx_detail.latitude}}) - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 职称 & 技能 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -168,6 +404,41 @@ show_atwork: true, belong_dept: '', user: '', + // 新增字段 + workshop: '', + position: '', + office_date: null, + bank_card: '', + start_date: null, + contract_end_date: null, + regular_date: null, + partisan: '', + join_partisan_date: null, + nation: '', + marriage: '', + hukou_type: '', + birthplace: '', + hukou_address: '', + address: '', + zhuanzhi: '', + zhuanzhi_date: null, + zyjt_zhuanzhi: '', + zyjt_zhuanzhi_date: null, + skill_rank: '', + skill_rank_date: null, + full_edu: '', + full_edu_school: '', + full_edu_major: '', + full_edu_time: '', + part_edu: '', + part_edu_school: '', + part_edu_major: '', + part_edu_time: '', + emergency_contact: '', + emergency_phone: '', + honor: '', + first_social_security_date: null, + is_veteran: false, }; export default { emits: ["success", "closed"], @@ -187,7 +458,7 @@ ], visible: false, isSaveing: false, - form: defaultForm, + form: {...defaultForm}, epTypes: { 'employee': "正式员工", "remployee": "相关方", @@ -210,18 +481,9 @@ id_number: [ {required: true, message: '请输入身份证号', trigger: 'blur'}, {pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/, message: '你的身份证格式不正确'}, - /*{ - validator: (rule, value, callback) => { - if (this.form.id_number.length !== 18) { - callback(new Error('请输入正确的身份证号!')); - } - callback(); - } - }*/ ], }, groupsProps: { - // value: "id", multiple: false, emitPath: false, checkStrictly: true, @@ -238,9 +500,7 @@ }; }, mounted() { - // this.getPosts(); this.getGroup(); - }, methods: { getPosts(){ @@ -255,7 +515,7 @@ //加载树数据 async getGroup() { let res = await this.$API.system.dept.list.req({page: 0}); - this.group =genTree(res); + this.group = genTree(res); }, //显示 open(mode) { @@ -271,10 +531,9 @@ submit() { this.$refs.dialogForm.validate((valid) => { if (valid) { - this.form.id_number=this.form.id_number.toUpperCase(); - let ide = IdentityCodeValid( this.form.id_number )//得到 true or false - if(ide){ - debugger; + this.form.id_number = this.form.id_number.toUpperCase(); + let ide = IdentityCodeValid(this.form.id_number); + if (ide) { this.isSaveing = true; if (this.mode === 'add') { this.$API.hrm.employee.create.req(this.form) @@ -301,25 +560,19 @@ return err }) } - }else{ + } else { this.$message.warning("请输入正确的身份证号"); } - - } }); }, //表单注入数据 setData(data) { - //debugger; - // console.log(defaultForm); - // this.form = defaultForm; this.loading = true; - this.$API.hrm.employee.item.req(data.id).then(res=>{ + this.$API.hrm.employee.item.req(data.id).then(res => { this.loading = false; this.form = res - }).catch(e=>{this.loading = false;}) - // Object.assign(this.form, data); + }).catch(e => { this.loading = false; }) }, //设置过滤项 setFilters(filters) { diff --git a/src/views/pum/order.vue b/src/views/pum/order.vue index e1333697..e58ea915 100644 --- a/src/views/pum/order.vue +++ b/src/views/pum/order.vue @@ -9,6 +9,12 @@ v-auth="'pu_order.create'" >新增 + 导出
diff --git a/src/views/pum/plan.vue b/src/views/pum/plan.vue index a52fba4c..580daf20 100644 --- a/src/views/pum/plan.vue +++ b/src/views/pum/plan.vue @@ -9,6 +9,12 @@ v-auth="'pu_plan.create'" >新增 + 导出
diff --git a/src/views/pum/quotation.vue b/src/views/pum/quotation.vue index 7101a691..0ae6dc6e 100644 --- a/src/views/pum/quotation.vue +++ b/src/views/pum/quotation.vue @@ -3,6 +3,7 @@
新增 + 导出
@@ -11,6 +12,7 @@ ref="table" :apiObj="API.pum.quotation.list" row-key="id" + hExportName="报价单" stripe :query="query" @row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}" @@ -50,6 +52,7 @@ const query = ref({}); const drawerVisible = ref(false); const mode = ref('add'); const t_id = ref(null); +const table = ref(null); const handleAdd = () => { mode.value = 'add'; drawerVisible.value = true; diff --git a/src/views/pum/supplier.vue b/src/views/pum/supplier.vue index 87f6bed2..5623005c 100644 --- a/src/views/pum/supplier.vue +++ b/src/views/pum/supplier.vue @@ -9,6 +9,12 @@ v-auth="'supplier.create'" >新增 + 导出
diff --git a/src/views/srm/paperlist.vue b/src/views/srm/paperlist.vue index dd44eb04..1e711343 100644 --- a/src/views/srm/paperlist.vue +++ b/src/views/srm/paperlist.vue @@ -7,6 +7,11 @@ icon="el-icon-plus" @click="handleAdd" > + 导出
- + + 导出
- +