From e71cb8355964473e617784921d43dd61ffd4a882 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 16 Dec 2025 09:03:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20base=20xtSelect=20edit=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E5=BC=B9=E5=87=BA=E9=80=89=E6=8B=A9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/xtSelect/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/xtSelect/index.vue b/src/components/xtSelect/index.vue
index 23e88e31..a6924eb9 100644
--- a/src/components/xtSelect/index.vue
+++ b/src/components/xtSelect/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<el-input ref="inputRef" v-model="selectLabel" :readonly="true" :placeholder="placeholder" @click="showPopover = true">
+		<el-input ref="inputRef" v-model="selectLabel" :readonly="true" :placeholder="placeholder" @click="()=>{if(edit){showPopover = true}}">
 			<template #prefix v-if="edit">
 				<el-button
 					text

From 00f7a66620aeef62dec2e1c53952c07a3e733d7f Mon Sep 17 00:00:00 2001
From: TianyangZhang <zty18395607196@163.com>
Date: Tue, 16 Dec 2025 09:23:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20pum=20=E4=BA=BA=E5=91=98=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/asm.js           |  40 +++++++
 src/api/model/hrm.js           |  37 ++++++-
 src/views/hrm/enpneed.vue      |  56 ++++++++++
 src/views/hrm/enpneed_form.vue |  61 ++++++++++-
 src/views/pum/asset.vue        |  53 +++++++++
 src/views/pum/asset_form.vue   | 195 +++++++++++++++++++++++++++++++++
 6 files changed, 437 insertions(+), 5 deletions(-)
 create mode 100644 src/api/model/asm.js
 create mode 100644 src/views/hrm/enpneed.vue
 create mode 100644 src/views/pum/asset.vue
 create mode 100644 src/views/pum/asset_form.vue

diff --git a/src/api/model/asm.js b/src/api/model/asm.js
new file mode 100644
index 00000000..e034267d
--- /dev/null
+++ b/src/api/model/asm.js
@@ -0,0 +1,40 @@
+import config from "@/config"
+import http from "@/utils/request"
+
+export default {
+	// 固定资产
+	asset: {
+	  list: {
+			name: "供应商审核",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/asm/asset/`,
+					data
+				);
+			}
+		},
+	  item: {
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}asm/asset/${id}/`,
+				);
+			}
+		},
+	  create: {
+			name: "新增",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/asm/asset/`,
+					data);
+			}
+		},
+		delete: {
+			name: "删除",
+			req: async function(id){
+				return await http.delete(
+					`${config.API_URL}/asm/asset/${id}/`
+				);
+			}
+		},
+	},
+}
diff --git a/src/api/model/hrm.js b/src/api/model/hrm.js
index 6acccebf..9d34f8d8 100644
--- a/src/api/model/hrm.js
+++ b/src/api/model/hrm.js
@@ -195,5 +195,40 @@ export default {
 				);
 			}
 		},
-	}
+	},
+	empneed: {
+	    list: {
+			name: "人员需求",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/hrm/empneed/`,
+					data
+				);
+			}
+		},
+	  item: {
+			name: "人员需求申请",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/hrm/empneed/${id}/`,
+				);
+			}
+		},
+	  create: {
+			name: "人员需求新增",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/hrm/empneed/`,
+					data);
+			}
+		},
+		delete: {
+			name: "人员需求删除",
+			req: async function(id){
+				return await http.delete(
+					`${config.API_URL}/hrm/empneed/${id}/`
+				);
+			}
+		},
+	},
 }
diff --git a/src/views/hrm/enpneed.vue b/src/views/hrm/enpneed.vue
new file mode 100644
index 00000000..8f4f61dc
--- /dev/null
+++ b/src/views/hrm/enpneed.vue
@@ -0,0 +1,56 @@
+<template>
+    <el-container>
+        <el-header>
+            <div class="left-panel">
+                <el-button type="primary" @click="handleAdd">新增</el-button>
+            </div>
+        </el-header>
+        <el-main class="nopadding">
+            <scTable
+            ref="table"
+            :apiObj="API.hrm.empneed.list"
+            row-key="id"
+            stripe
+            :query="query"
+            @row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
+            >
+            <el-table-column label="部门" prop="dept_need_name" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="审批状态" width="200" show-overflow-tooltip>
+                <template #default="scope">
+                                <el-tag :type="actStateEnum[scope.row.ticket_?.act_state]?.type">
+                        {{ actStateEnum[scope.row.ticket_?.act_state]?.text }}
+                    </el-tag>
+            <el-tag type="info" effect="plain">{{ scope.row.ticket_?.state_.name }}</el-tag>
+
+                </template>
+            </el-table-column>
+            <el-table-column label="需求岗位" prop="post_name" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="需求人数" prop="count_need" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="工资报酬" prop="salary" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="到岗日期" prop="arrival_date" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="申请理由" prop="reason" width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column label="岗位人员职责描述" prop="duty" width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column label="性别要求" prop="gender" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="学历要求" prop="education" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="相关专业及技能要求" prop="professional_requirement" width="200" show-overflow-tooltip></el-table-column>
+            </scTable>
+        </el-main>
+    </el-container>
+    <el-drawer title="员工需求审核" v-model="drawerVisible" :size="'80%'" destroy-on-close>
+        <empneed_form :mode="mode" :t_id="t_id"></empneed_form>
+    </el-drawer>
+</template>
+<script setup>
+import { ref } from 'vue'
+import API from '@/api'
+import empneed_form from './enpneed_form.vue'
+import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js";
+const query = ref({});
+const drawerVisible = ref(false);
+const mode = ref('add');
+const t_id = ref(null);
+const handleAdd = () => {
+    mode.value = 'add';
+    drawerVisible.value = true;
+}
+</script>
\ No newline at end of file
diff --git a/src/views/hrm/enpneed_form.vue b/src/views/hrm/enpneed_form.vue
index e9c3ff12..69eefa33 100644
--- a/src/views/hrm/enpneed_form.vue
+++ b/src/views/hrm/enpneed_form.vue
@@ -2,6 +2,16 @@
     <el-container>
         <el-main class="nopadding">
             <el-form label-width="80px" :model="formData" style="padding: 20px;" :disabled="localMode === 'show'">
+                <el-form-item label="需求部门">
+                    <el-cascader
+                        v-model="formData.dept_need"
+                        :options="group"
+                        :props="groupsProps"
+                        :show-all-levels="false"
+                        clearable
+                        style="width: 100%"
+                    ></el-cascader>
+                </el-form-item>
                 <el-form-item label="员工信息" required>
                     {{ formData.employee_name }}（{{ formData.belong_dept_name }} - {{ formData.post_name }}）
                 </el-form-item>
@@ -14,6 +24,27 @@
                 <el-form-item label="工资报酬" required>
                     <el-input-number v-model="formData.salary" :min="2000" :precision="0"></el-input-number>
                 </el-form-item>
+                <el-form-item label="性别要求" required>
+                    <el-radio-group v-model="formData.gender">
+                        <el-radio :label="1">男</el-radio>
+                        <el-radio :label="2">女</el-radio>
+                        <el-radio :label="0">不限</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="学历要求" required>
+                    <el-select
+                        v-model="formData.education"
+                        placeholder="请选择学历"
+                        clearable
+                        style="width: 200px"
+                    >
+                        <el-option label="不限" :value="0" />
+                        <el-option label="高中/中专" :value="1" />
+                        <el-option label="大专" :value="2" />
+                        <el-option label="本科" :value="3" />
+                        <el-option label="硕士及以上" :value="4" />
+                    </el-select>
+                 </el-form-item>
                 <el-form-item label="到岗日期" required>
                     <el-date-picker
                         v-model="formData.arrival_date"
@@ -23,6 +54,15 @@
                         :readonly="localMode === 'show'"
                     ></el-date-picker>
                 </el-form-item>
+                <el-form-item label="职责描述" required>
+                    <el-input v-model="formData.duty"></el-input>
+                </el-form-item>
+                <el-form-item label="相关专业及技能要求" required>
+                    <el-input v-model="formData.professional_requirement" type="textarea" :rows="3"></el-input>
+                </el-form-item>
+                <el-form-item label="申请理由" required>
+                    <el-input v-model="formData.reason" type="textarea" :rows="3"></el-input>
+                </el-form-item>
             </el-form>
             <el-footer>
                 <el-button type="danger"
@@ -56,6 +96,7 @@
 <script>
 import ticketd_b from "@/views/wf/ticketd_b.vue";
 import ticketd from '@/views/wf/ticketd.vue'
+import { genTree } from "@/utils/verificate";
 
 export default {
     name: 'EnpNeedForm',
@@ -78,10 +119,17 @@ export default {
             formData: {
             },
             localMode: this.mode,
-            saveLoading: false
+            saveLoading: false,
+            group:[],
+            groupsProps: {
+                multiple: false,
+                emitPath: false,
+                checkStrictly: true,
+            },
         }
     },
     mounted() {
+        this.getGroup();
         if (this.t_id) {
             this.getTid();
         } else {
@@ -103,7 +151,7 @@ export default {
         },
         async getTid() {
             try {
-                let res = await this.$API.hrm.resignation.item.req(this.t_id);
+                let res = await this.$API.hrm.empneed.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";
@@ -117,16 +165,21 @@ export default {
 				type: "warning",
 			})
 				.then(()=>{
-                    this.$API.hrm.resignation.delete.req(this.formData.id).then(res=>{
+                    this.$API.hrm.empneed.delete.req(this.formData.id).then(res=>{
                         this.$message.success("删除成功");
                         this.$emit('success');
                     })
                 })
+        },
+         //加载树数据
+        async getGroup() {
+            let res = await this.$API.system.dept.list.req({ page: 0 });
+            this.group = genTree(res);
         },
         async handleSave() {
             if (this.localMode == "add") {
                 try {
-                    let res = await this.$API.hrm.resignation.create.req(this.formData);
+                    let res = await this.$API.hrm.empneed.create.req(this.formData);
                     this.$message.success("提交成功");
                     this.$emit('success', this.localMode);
                 } catch (error) {
diff --git a/src/views/pum/asset.vue b/src/views/pum/asset.vue
new file mode 100644
index 00000000..c9a86e77
--- /dev/null
+++ b/src/views/pum/asset.vue
@@ -0,0 +1,53 @@
+<template>
+    <el-container>
+        <el-header>
+            <div class="left-panel">
+                <el-button type="primary" @click="handleAdd">新增</el-button>
+            </div>
+
+        </el-header>
+        <el-main class="nopadding">
+            <scTable
+            ref="table"
+            :apiObj="API.hrm.resignation.list"
+            row-key="id"
+            stripe
+            :query="query"
+            @row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
+            >
+            <el-table-column label="姓名" prop="employee_name" width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column label="审批状态" width="200" show-overflow-tooltip>
+                <template #default="scope">
+                                <el-tag :type="actStateEnum[scope.row.ticket_?.act_state]?.type">
+                        {{ actStateEnum[scope.row.ticket_?.act_state]?.text }}
+                    </el-tag>
+            <el-tag type="info" effect="plain">{{ scope.row.ticket_?.state_.name }}</el-tag>
+
+          </template>
+            </el-table-column>`
+            <el-table-column label="部门" prop="belong_dept_name" width="120" show-overflow-tooltip></el-table-column>`
+            <el-table-column label="岗位" prop="post_name" width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column label="身份证号" prop="employee_id_number" width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column label="离职日期" prop="end_date" width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column label="原因" prop="reason" show-overflow-tooltip></el-table-column>
+            </scTable>
+        </el-main>
+    </el-container>
+    <el-drawer title="新供应商审核" v-model="drawerVisible" :size="'80%'" destroy-on-close>
+        <supplieraudit_form :mode="mode" :t_id="t_id"></supplieraudit_form>
+    </el-drawer>
+</template>
+<script setup>
+import { ref } from 'vue'
+import API from '@/api'
+import supplieraudit_form from './supplieraudit_form.vue'
+import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js";
+const query = ref({});
+const drawerVisible = ref(false);
+const mode = ref('add');
+const t_id = ref(null);
+const handleAdd = () => {
+    mode.value = 'add';
+    drawerVisible.value = true;
+}
+</script>
\ No newline at end of file
diff --git a/src/views/pum/asset_form.vue b/src/views/pum/asset_form.vue
new file mode 100644
index 00000000..d903511f
--- /dev/null
+++ b/src/views/pum/asset_form.vue
@@ -0,0 +1,195 @@
+<template>
+    <el-container>
+        <el-main class="nopadding">
+            <el-form label-width="100px" :model="formData" style="padding: 20px;">
+                <el-form-item label="固定资产编号" required>
+                    <el-input v-model="formData.code" placeholder="请输入固定资产编号" :readonly="localMode === 'show'"></el-input>
+                </el-form-item>
+                <el-form-item label="固定资产名称" required>
+                    <el-input v-model="formData.name" :readonly="localMode === 'show'"></el-input>
+                </el-form-item>
+                <el-form-item label="资产型号" required>
+                    <el-input v-model="formData.model" :readonly="localMode === 'show'"></el-input>
+                </el-form-item>
+                <el-form-item label="数量" required>
+                    <el-input v-model="formData.quantity" type="number" min="0" clearable :readonly="localMode === 'show'"></el-input>
+                </el-form-item>
+                <el-form-item label="资产型号" required>
+                    <el-input v-model="formData.model" :readonly="localMode === 'show'"></el-input>
+                </el-form-item>
+                <el-form-item label="资产原值/单价（元）" prop="price" >
+                    <el-input-number
+                        v-model="formData.price"
+                        :precision="2"
+                        :step="0.01"
+                        :min="0"
+                        style="width: 200px"
+                        controls-position="right">
+                    </el-input-number>
+                </el-form-item>
+                <el-form-item label="资产净值/单价（元）" prop="net_value" >
+                    <el-input-number
+                        v-model="formData.net_value"
+                        :precision="2"
+                        :step="0.01"
+                        :min="0"
+                        style="width: 200px"
+                        controls-position="right">
+                    </el-input-number>
+                </el-form-item>
+                <el-form-item label="使用人" required>
+                    <el-input v-model="formData.asm_user" :readonly="localMode === 'show'"></el-input>
+                </el-form-item>
+                <el-form-item label="使用保管人" required>
+                    <el-input v-model="formData.keeper" :readonly="localMode === 'show'"></el-input>
+                </el-form-item>
+                <el-form-item label="使用年限（年）" required>
+                    <el-input v-model="formData.useful_life" type="number" min="0" clearable :readonly="localMode === 'show'"></el-input>
+                </el-form-item>
+                <el-form-item label="存放地点" required>
+                    <el-input v-model="formData.location" :readonly="localMode === 'show'"></el-input>
+                </el-form-item>
+                <el-form-item label="存放部门" required>
+                    <el-input v-model="formData.department" :readonly="localMode === 'show'"></el-input>
+                </el-form-item>
+                <el-form-item label="客商" required>
+                    <el-input v-model="formData.vendor" :readonly="localMode === 'show'"></el-input>
+                </el-form-item>
+                <el-form-item label="固定资产类别" required>
+                    <el-input v-model="formData.category" :readonly="localMode === 'show'"></el-input>
+                </el-form-item>
+                <el-form-item label="启用日期" required>
+                    <el-date-picker
+                        v-model="addForm.start_date"
+                        type="date"
+                        placeholder="选择日期时间"
+                        align="right"
+                        value-format="YYYY-MM-DD"
+                        >
+                        </el-date-picker>
+                </el-form-item>
+                <el-form-item label="到期日期" required>
+                    <el-date-picker
+                        v-model="addForm.expire_date"
+                        type="date"
+                        placeholder="选择日期时间"
+                        align="right"
+                        value-format="YYYY-MM-DD"
+                        >
+                        </el-date-picker>
+                </el-form-item>
+
+                <el-form-item label="计量单位" required>
+                    <el-input v-model="formData.unit" :readonly="localMode === 'show'"></el-input>
+                </el-form-item>
+                <el-form-item label="备注" required>
+                    <el-input v-model="formData.remark" :readonly="localMode === 'show'"></el-input>
+                </el-form-item>
+            </el-form>
+            <el-footer>
+                
+                <el-button type="danger"
+                v-if="localMode=='edit'"
+                v-auth="'asset.delete'"
+                :loading="saveLoading"
+                style="margin-right: 4px;"
+                @click="handleDel"
+                >删除</el-button>
+                <ticketd_b 
+                        v-if ="formData.ticket_"
+                        :t_id="formData.id" 
+                        :ticket_="formData.ticket_"
+                        @success="$emit('success', localMode)" 
+                        ref="ticketd_b"
+                    ></ticketd_b>
+                    <el-button 
+                        v-else
+                        type="primary"
+                        style="margin-right: 4px;"
+                        @click="handleSave"
+                        :loading="saveLoading"
+                        >提交审批</el-button>
+            </el-footer>
+        </el-main>
+        <el-aside width="20%" v-if="formData.ticket_">
+            <ticketd :ticket_="formData.ticket_" @success="$emit('success')"></ticketd>
+        </el-aside>
+    </el-container>
+</template>
+
+<script>
+import ticketd_b from "@/views/wf/ticketd_b.vue";
+import ticketd from '@/views/wf/ticketd.vue'
+
+export default {
+    components: {
+        ticketd_b,
+        ticketd
+    },
+    props: {
+        mode: {
+            type: String,
+            default: 'show'
+        },
+        t_id: {
+            type: String,
+            default: ""
+        }
+    },
+    data() {
+        return {
+            formData: {
+                survery_form_: null
+            },
+            localMode: this.mode,
+            saveLoading: false,
+        }
+    },
+    watch: {
+        mode(newVal) {
+            this.localMode = newVal;
+        }
+    },
+    mounted() {
+        if (this.t_id) {
+            this.getTid();
+        } else {
+            this.localMode = "add";
+        }
+    },
+    methods: {
+        async getTid() {
+            let res = await this.$API.asm.asset.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";
+            }
+        },
+        handleDel() {
+            this.$confirm(`确定删除吗？`, "提示", {
+				type: "warning",
+			})
+				.then(()=>{
+                    this.$API.asm.asset.delete.req(this.formData.id).then(res=>{
+                        this.$message.success("删除成功");
+                        this.$emit('success');
+                    })
+                })
+        },
+        handleSave() {
+            if (this.localMode == "add") {
+                this.saveLoading = true;
+                this.$API.asm.asset.create.req(this.formData).then(res=>{
+                    this.saveLoading = true;
+                    this.$message.success("提交成功");
+                    this.$emit('success', this.localMode);
+                }).catch(e=>{
+                    this.saveLoading = false;
+                })
+            } else if (this.localMode == "edit") {
+                this.$message.error("不支持编辑!")
+            }
+        },
+    }
+}
+</script>
\ No newline at end of file