diff --git a/.env.development b/.env.development index a8c4e2a5..88d1f4fa 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,7 @@ NODE_ENV = development # 标题 # VUE_APP_TITLE = '曲阳金隅安全智能管控平台' # VUE_APP_TITLE = '托克逊能源管理平台' -VUE_APP_TITLE = '中建材光子科技有限公司' +VUE_APP_TITLE = '中建材光芯科技有限公司' # VUE_APP_TITLE = '超低排放系统' VUE_APP_PJ = 'gx' @@ -21,20 +21,28 @@ VUE_APP_PJ = 'gx' # VUE_APP_BASEURL = http://10.50.211.228:2250/ -# VUE_APP_BASEURL = http://127.0.0.1:8887 -# VUE_APP_BASEURL = http://127.0.0.1:226 +VUE_APP_API_BASEURL = http://127.0.0.1:2226/api +VUE_APP_BASEURL = http://127.0.0.1:2226 -# #光子 -# VUE_APP_API_BASEURL = http://tkx.xxhhcty.xyz:8080/api -# VUE_APP_BASEURL = http://tkx.xxhhcty.xyz:8080 +# 托克逊 +# VUE_APP_API_BASEURL = http://10.50.211.228:2250/api +# VUE_APP_BASEURL = http://10.50.211.228:2250/ # 光芯 -VUE_APP_API_BASEURL = http://49.232.14.174:2226/api -VUE_APP_BASEURL = http://49.232.14.174:2226 +# VUE_APP_API_BASEURL = http://127.0.0.1:2226/api +# VUE_APP_BASEURL = http://127.0.0.1:2226 + +# 光芯线上 +# VUE_APP_API_BASEURL = http://gxerp.xxhhcty.xyz:8080/api +# VUE_APP_BASEURL = http://gxerp.xxhhcty.xyz:8080 # # 凌源 bh # VUE_APP_API_BASEURL = http://lybh.xxhhcty.xyz:8080/api # VUE_APP_BASEURL = http://lybh.xxhhcty.xyz:8080/ + +# 凌源 sl +# VUE_APP_API_BASEURL = http://lysl.xxhhcty.xyz:8080/api +# VUE_APP_BASEURL = http://lysl.xxhhcty.xyz:8080/ # 本地端口 VUE_APP_PORT = 2800 diff --git a/package.json b/package.json index ebf02feb..c66416ec 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,7 @@ "private": true, "scripts": { "serve": "vue-cli-service serve", - "build": "vue-cli-service build --report", - "lint": "vue-cli-service lint" + "build": "vue-cli-service build --report" }, "dependencies": { "@element-plus/icons-vue": "2.0.10", @@ -49,40 +48,11 @@ }, "devDependencies": { "@babel/core": "7.21.00", - "@babel/eslint-parser": "7.19.1", "@vue/cli-plugin-babel": "5.0.8", - "@vue/cli-plugin-eslint": "5.0.8", "@vue/cli-service": "5.0.8", - "eslint": "8.35.0", - "eslint-plugin-vue": "9.9.0", "sass": "1.58.3", "sass-loader": "10.1.1" }, - "eslintConfig": { - "root": true, - "env": { - "node": true - }, - "globals": { - "APP_CONFIG": true - }, - "extends": [ - "plugin:vue/vue3-essential" - ], - "parserOptions": { - "parser": "@babel/eslint-parser" - }, - "rules": { - "indent": 0, - "no-tabs": 0, - "no-mixed-spaces-and-tabs": 0, - "vue/no-unused-components": 0, - "vue/multi-word-component-names": 0, - "no-debugger": "off", - "no-console": "off", - "no-trailing-spaces": "off" - } - }, "browserslist": [ "> 1%", "last 2 versions", diff --git a/src/components/scExportBtn/index.vue b/src/components/scExportBtn/index.vue new file mode 100644 index 00000000..12bb6903 --- /dev/null +++ b/src/components/scExportBtn/index.vue @@ -0,0 +1,80 @@ + + + diff --git a/src/views/asm/assetlog.vue b/src/views/asm/assetlog.vue index e04270eb..7b53d92f 100644 --- a/src/views/asm/assetlog.vue +++ b/src/views/asm/assetlog.vue @@ -3,6 +3,7 @@
资产入库 +
\ No newline at end of file diff --git a/src/views/hrm/empcontract.vue b/src/views/hrm/empcontract.vue index 76b4c1e1..b591f826 100644 --- a/src/views/hrm/empcontract.vue +++ b/src/views/hrm/empcontract.vue @@ -1,47 +1,58 @@ \ No newline at end of file +import ExportBtn from '@/components/scExportBtn/index.vue' +import { actStateEnum } from "@/utils/enum.js" +const drawerVisible = ref(false) +const mode = ref('add') +const t_id = ref(null) +const handleAdd = () => { mode.value = 'add'; t_id.value = null; drawerVisible.value = true; } +const exportCols = [ + { header: "部门", key: "dept_need_name", wch: 15 }, + { header: "员工姓名", key: "employee_name", wch: 10 }, + { header: "岗位", key: "post_name", wch: 12 }, + { header: "入职日期", key: "join_date", wch: 12 }, + { header: "合同结束日期", key: "end_contract", wch: 14 }, + { header: "变更次数", key: "counts", wch: 8 }, + { header: "应续签", key: "plan_renewal", wch: 12 }, + { header: "正常续签", key: "normal_renewal", wch: 12 }, + { header: "续签/变更(年)", key: "change_date", wch: 12 }, + { header: "变更原因", key: "change_reason", wch: 25 }, + { header: "审批状态", key: "_act_state_text", wch: 10 }, +] + diff --git a/src/views/hrm/empjoin.vue b/src/views/hrm/empjoin.vue index 01bb1f0a..490d69d4 100644 --- a/src/views/hrm/empjoin.vue +++ b/src/views/hrm/empjoin.vue @@ -1,48 +1,42 @@ \ No newline at end of file +import ExportBtn from '@/components/scExportBtn/index.vue' +import { actStateEnum } from "@/utils/enum.js" +const drawerVisible = ref(false) +const mode = ref('add') +const t_id = ref(null) +const handleAdd = () => { mode.value = 'add'; t_id.value = null; drawerVisible.value = true; } +const exportCols = [ + { header: "部门", key: "dept_need_name", wch: 15 }, + { header: "入职日期", key: "join_date", wch: 12 }, + { header: "审批状态", key: "_act_state_text", wch: 10 }, +] + diff --git a/src/views/hrm/empneed.vue b/src/views/hrm/empneed.vue index b2c3b7d8..9c9aa6fb 100644 --- a/src/views/hrm/empneed.vue +++ b/src/views/hrm/empneed.vue @@ -1,56 +1,58 @@ \ No newline at end of file +import ExportBtn from '@/components/scExportBtn/index.vue' +import { actStateEnum } from "@/utils/enum.js" +const drawerVisible = ref(false) +const mode = ref('add') +const t_id = ref(null) +const handleAdd = () => { mode.value = 'add'; t_id.value = null; drawerVisible.value = true; } +const exportCols = [ + { header: "部门", key: "dept_need_name", wch: 15 }, + { header: "需求岗位", key: "post_need", wch: 12 }, + { header: "需求人数", key: "count_need", wch: 10 }, + { header: "工资报酬", key: "salary", wch: 10 }, + { header: "到岗日期", key: "arrival_date", wch: 12 }, + { header: "岗位职责", key: "duty", wch: 20 }, + { header: "性别要求", key: "gender", wch: 8 }, + { header: "学历要求", key: "education", wch: 10 }, + { header: "申请理由", key: "reason", wch: 20 }, + { header: "专业及技能要求", key: "professional_requirement", wch: 25 }, + { header: "审批状态", key: "_act_state_text", wch: 10 }, +] + diff --git a/src/views/hrm/leave.vue b/src/views/hrm/leave.vue index b1dd758f..538095d8 100644 --- a/src/views/hrm/leave.vue +++ b/src/views/hrm/leave.vue @@ -1,134 +1,116 @@ \ No newline at end of file + diff --git a/src/views/hrm/leave_form.vue b/src/views/hrm/leave_form.vue index 31019337..b22e30a5 100644 --- a/src/views/hrm/leave_form.vue +++ b/src/views/hrm/leave_form.vue @@ -1,218 +1,246 @@ \ No newline at end of file + filteredEmpOptions() { + if (!this.filterKeyword) return this.empOptions; + const kw = this.filterKeyword.toLowerCase(); + return this.empOptions.filter(e => + (e.name || '').toLowerCase().includes(kw) || + (e.belong_dept_name || '').toLowerCase().includes(kw) || + (e.post_name || '').toLowerCase().includes(kw) + ); + }, + }, + watch: { + mode(val) { this.localMode = val; }, + }, + mounted() { + if (this.t_id) { + this.getTid(); + } else { + this.initFormData(); + } + }, + methods: { + async getTid() { + try { + let res = await this.$API.hrm.leave.item.req(this.t_id); + this.formData = res; + if (res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == this.$TOOL.data.get("USER_INFO").id) { + this.localMode = "edit"; + } + } catch (e) { + console.error('获取请假数据失败:', e); + } + }, + async initFormData() { + try { + let userInfo = this.$TOOL.data.get("USER_INFO"); + this.currentDeptId = userInfo.belong_dept; + // 获取当前用户员工信息 + let res = await this.$API.hrm.employee.read.req(); + this.formData.employee_name = res.name; + this.formData.belong_dept_name = res.belong_dept_name; + this.formData.post_name = res.post_name; + // 先加载本部门人员选项 + await this.loadDeptEmployees(); + // 切换为add模式，员工信息默认为空，由用户自行选择 + this.localMode = "add"; + } catch (e) { + console.error('初始化表单数据失败:', e); + } + }, + async loadDeptEmployees() { + if (!this.currentDeptId) return; + try { + let res = await this.$API.hrm.employee.list.req({ page: 0, belong_dept: this.currentDeptId }); + this.empOptions = Array.isArray(res) ? res : (res.results || []); + } catch (e) { + console.error(e); + } + }, + filterEmployee(keyword) { + this.filterKeyword = keyword; + }, + handleEmpChange(id) { + const emp = this.empOptions.find(e => e.id === id); + if (emp) { + this.formData.employee_name = emp.name; + this.formData.belong_dept_name = emp.belong_dept_name || ''; + this.formData.post_name = emp.post_name || ''; + } + }, + handleTypeChange(val) { + this.formData.leave_type_name = LEAVE_TYPE_NAME[val] || '' + }, + handleDel() { + this.$confirm('确定删除吗？', "提示", { type: "warning" }).then(() => { + this.$API.hrm.leave.delete.req(this.formData.id).then(() => { + this.$message.success("删除成功"); + this.$emit('success'); + }) + }) + }, + async handleSave() { + if (this.localMode == "add") { + try { + await this.$API.hrm.leave.create.req(this.formData); + this.$message.success("提交成功"); + this.$emit('success', this.localMode); + } catch (e) { + console.error('请假申请失败:', e); + throw e; + } + } + }, + fileUPSuccess(res) { + this.formData.file = res?.path || '' + }, + }, +}; + diff --git a/src/views/hrm/probation.vue b/src/views/hrm/probation.vue index babf9b03..9f737c87 100644 --- a/src/views/hrm/probation.vue +++ b/src/views/hrm/probation.vue @@ -1,119 +1,83 @@ \ No newline at end of file + diff --git a/src/views/hrm/resignation.vue b/src/views/hrm/resignation.vue index d7a53dcb..085422de 100644 --- a/src/views/hrm/resignation.vue +++ b/src/views/hrm/resignation.vue @@ -1,65 +1,55 @@ - + + + + \ No newline at end of file