From cf5a784f64188f5dd3ef8a1518a9ef9855d5937b Mon Sep 17 00:00:00 2001
From: TianyangZhang <zty18395607196@163.com>
Date: Fri, 19 Dec 2025 13:26:33 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hrm/empjoin.vue                     |  47 +++++
 src/views/hrm/empjoin_form.vue                | 198 ++++++++++++++++++
 src/views/hrm/{enpneed.vue => empneed.vue}    |  10 +-
 .../{enpneed_form.vue => empneed_form.vue}    |  17 +-
 src/views/ofm/archive.vue                     |   3 +
 src/views/ofm/borrowfile_form.vue             |  11 +-
 src/views/ofm/publicity_form.vue              |  18 +-
 src/views/ofm/seal.vue                        |   2 +-
 src/views/ofm/seal_form.vue                   |  17 +-
 src/views/ofm/vehicle_form.vue                |  12 +-
 src/views/srm/paperse_form.vue                |   8 +-
 src/views/srm/patent_form.vue                 |   8 +-
 src/views/srm/patentlist.vue                  |   9 +
 src/views/srm/plat_form.vue                   |   3 -
 14 files changed, 330 insertions(+), 33 deletions(-)
 create mode 100644 src/views/hrm/empjoin.vue
 create mode 100644 src/views/hrm/empjoin_form.vue
 rename src/views/hrm/{enpneed.vue => empneed.vue} (87%)
 rename src/views/hrm/{enpneed_form.vue => empneed_form.vue} (92%)

diff --git a/src/views/hrm/empjoin.vue b/src/views/hrm/empjoin.vue
new file mode 100644
index 00000000..dc1ae8c8
--- /dev/null
+++ b/src/views/hrm/empjoin.vue
@@ -0,0 +1,47 @@
+<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>
+            </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 './empneed_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/empjoin_form.vue b/src/views/hrm/empjoin_form.vue
new file mode 100644
index 00000000..0e0c9ba3
--- /dev/null
+++ b/src/views/hrm/empjoin_form.vue
@@ -0,0 +1,198 @@
+<template>
+    <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>
+                <el-form-item label="需求岗位" required>
+                    <el-input v-model="formData.post_need"></el-input>
+                </el-form-item>
+                <el-form-item label="需求人数" required>
+                    <el-input-number v-model="formData.count_need" :min="1" :precision="0"></el-input-number>
+                </el-form-item>
+                <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"
+                        type="date"
+                        placeholder="预计到岗日期"
+                        value-format="YYYY-MM-DD"
+                        :readonly="localMode === 'show'"
+                    ></el-date-picker>
+                </el-form-item>
+                <el-form-item label="申请理由" required>
+                    <el-select
+                        v-model="formData.reason"
+                        placeholder="请选择申请理由"
+                        clearable
+                        style="width: 300px"
+                    >
+                        <el-option label="新增人员" :value="0" />
+                        <el-option label="该岗原人员离职或辞职或辞退需补充" :value="1" />
+                        <el-option label="其他原因" :value="2" />
+                    </el-select>
+                 </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>
+            <el-footer>
+                <el-button type="danger"
+                v-if="localMode=='edit'"
+                style="margin-right: 4px;"
+                @click="handleDel"
+                :loading="saveLoading"
+                >删除</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 {
+    name: 'EnpNeedForm',
+    components: {
+        ticketd_b,
+        ticketd
+    },
+    props: {
+        mode: {
+            type: String,
+            default: 'show'
+        },
+        t_id: {
+            type: String,
+            default: ""
+        }
+    },
+    data() {
+        return {
+            formData: {
+            },
+            localMode: this.mode,
+            saveLoading: false,
+            group:[],
+            groupsProps: {
+                multiple: false,
+                emitPath: false,
+                checkStrictly: true,
+            },
+        }
+    },
+    mounted() {
+        this.getGroup();
+        if (this.t_id) {
+            this.getTid();
+        } else {
+            this.initFormData();
+        }
+    },
+    methods: {
+        async initFormData() {
+            try {
+                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;
+                this.formData.employee = res.id;
+                this.localMode = "add";
+            } catch (error) {
+                console.error('初始化表单数据失败:', error);
+            }
+        },
+        async getTid() {
+            try {
+                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";
+                }
+            } catch (error) {
+                console.error('获取离职数据失败:', error);
+            }
+        },
+        handleDel() {
+            this.$confirm(`确定删除吗？`, "提示", {
+				type: "warning",
+			})
+				.then(()=>{
+                    this.$API.hrm.empneed.delete.req(this.formData.id).then(res=>{
+                        this.$message.success("删除成功");
+                        this.$emit('success');
+                    })
+                })
+        },
+        async handleSave() {
+            if (this.localMode == "add") {
+                try {
+                    let res = await this.$API.hrm.empneed.create.req(this.formData);
+                    this.$message.success("提交成功");
+                    this.$emit('success', this.localMode);
+                } catch (error) {
+                    console.error('提交申请失败:', error);
+                    throw error;
+                }
+            } else if (this.localMode == "edit") {
+                this.$message.error("不支持编辑");
+            }
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/hrm/enpneed.vue b/src/views/hrm/empneed.vue
similarity index 87%
rename from src/views/hrm/enpneed.vue
rename to src/views/hrm/empneed.vue
index 8f4f61dc..b2c3b7d8 100644
--- a/src/views/hrm/enpneed.vue
+++ b/src/views/hrm/empneed.vue
@@ -24,14 +24,14 @@
 
                 </template>
             </el-table-column>
-            <el-table-column label="需求岗位" prop="post_name" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="需求岗位" prop="post_need" width="120" 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="arrival_date" width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column label="岗位人员职责描述" prop="duty" width="130" 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="reason" width="150" show-overflow-tooltip></el-table-column>
             <el-table-column label="相关专业及技能要求" prop="professional_requirement" width="200" show-overflow-tooltip></el-table-column>
             </scTable>
         </el-main>
@@ -43,7 +43,7 @@
 <script setup>
 import { ref } from 'vue'
 import API from '@/api'
-import empneed_form from './enpneed_form.vue'
+import empneed_form from './empneed_form.vue'
 import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js";
 const query = ref({});
 const drawerVisible = ref(false);
diff --git a/src/views/hrm/enpneed_form.vue b/src/views/hrm/empneed_form.vue
similarity index 92%
rename from src/views/hrm/enpneed_form.vue
rename to src/views/hrm/empneed_form.vue
index 69eefa33..dc068299 100644
--- a/src/views/hrm/enpneed_form.vue
+++ b/src/views/hrm/empneed_form.vue
@@ -54,15 +54,24 @@
                         :readonly="localMode === 'show'"
                     ></el-date-picker>
                 </el-form-item>
+                <el-form-item label="申请理由" required>
+                    <el-select
+                        v-model="formData.reason"
+                        placeholder="请选择申请理由"
+                        clearable
+                        style="width: 300px"
+                    >
+                        <el-option label="新增人员" :value="0" />
+                        <el-option label="该岗原人员离职或辞职或辞退需补充" :value="1" />
+                        <el-option label="其他原因" :value="2" />
+                    </el-select>
+                 </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"
@@ -183,7 +192,7 @@ export default {
                     this.$message.success("提交成功");
                     this.$emit('success', this.localMode);
                 } catch (error) {
-                    console.error('提交离职申请失败:', error);
+                    console.error('提交人员需求申请失败:', error);
                     throw error;
                 }
             } else if (this.localMode == "edit") {
diff --git a/src/views/ofm/archive.vue b/src/views/ofm/archive.vue
index 088b848e..11d03faf 100644
--- a/src/views/ofm/archive.vue
+++ b/src/views/ofm/archive.vue
@@ -170,6 +170,9 @@ export default {
         reciver: "",
         remark: ""
       },
+      rules: {
+        name: [{ required: true, message: "资料名称", trigger: "blur" }],
+      },
     };
   },
   methods: {
diff --git a/src/views/ofm/borrowfile_form.vue b/src/views/ofm/borrowfile_form.vue
index 407ef87f..4b1098e5 100644
--- a/src/views/ofm/borrowfile_form.vue
+++ b/src/views/ofm/borrowfile_form.vue
@@ -8,7 +8,7 @@
             label-width="100px"
             label-position="left"
             > 
-            <el-form-item label="档案名称">
+            <el-form-item label="档案名称" prop="borrow_file">
                 <xtSelect
                   :apiObj="apiObjM2"
                   :multiple = "true"
@@ -111,9 +111,12 @@ export default {
       fileList: [],
       ticket_data: {},
       rules: {
-        file_name: [
-          { required: true, message: "请选择档案", trigger: "blur" },
-        ],
+        borrow_file: [{ required: true, message: "请选择档案", trigger: "change" }],
+        contacts: [{ required: true, message: "请填写手机号", trigger: "blur" }],
+        borrow_date: [{ required: true, message: "请选择借阅时间", trigger: "change" }],
+        return_date: [{ required: true, message: "请选择归还时间", trigger: "change" }],
+        count: [{ required: true, message: "请选择借阅数量", trigger: "change" }],
+        remark: [{ required: true, message: "请选择用途", trigger: "blur" }],
       },
     };
   },
diff --git a/src/views/ofm/publicity_form.vue b/src/views/ofm/publicity_form.vue
index a2f60c99..cb962ee0 100644
--- a/src/views/ofm/publicity_form.vue
+++ b/src/views/ofm/publicity_form.vue
@@ -11,7 +11,7 @@
             <el-form-item label="送审稿件标题" prop="title">
                 <el-input v-model="addForm.title" clearable :disabled="localMode ==='show'"></el-input>
             </el-form-item>
-            <el-form-item label="文件内容">
+            <el-form-item label="文件内容" prop="pfile">
                 <sc-upload-file
                     v-model="addForm.pfile"
                     :multiple="false"
@@ -175,9 +175,19 @@ export default {
         addForm:{},
         localMode : this.mode,
         rules: {
-        file_name: [
-          { required: true, message: "请选择档案", trigger: "blur" },
-        ],
+        title: [{ required: true, message: "送审稿件标题", trigger: "blur" }],
+        pfile: [{ required: true, message: "文件内容", trigger: "blur" }],
+        participants: [{ required: true, message: "所有撰稿人", trigger: "blur" }],
+        pub_dept: [{ required: true, message: "部室/研究院", trigger: "blur" }],
+        level: [{ required: true, message: "第一撰稿人涉密等级", trigger: "blur" }],
+        content: [{ required: true, message: "稿件内容涉及", trigger: "blur" }],
+        report_purpose: [{ required: true, message: "宣传报道目的", trigger: "blur" }],
+        channel: [{ required: true, message: "宣传渠道", trigger: "blur" }],
+        review: [{ required: true, message: "第一撰稿人自审", trigger: "blur" }],
+        dept_opinion: [{ required: true, message: "所在部室定密意见", trigger: "blur" }],
+        dept_opinion_review: [{ required: true, message: "综合管理部审查意见", trigger: "blur" }],
+        publicity_opinion: [{ required: true, message: "总经理审查意见", trigger: "blur" }],
+
       },
     }
   },
diff --git a/src/views/ofm/seal.vue b/src/views/ofm/seal.vue
index ca43bbf4..64122fa8 100644
--- a/src/views/ofm/seal.vue
+++ b/src/views/ofm/seal.vue
@@ -85,7 +85,7 @@
                                 <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>
+            <el-tag type="info" effect="plain">{{ scope.row.ticket_?.state_?.name }}</el-tag>
 
           </template>
         </el-table-column>
diff --git a/src/views/ofm/seal_form.vue b/src/views/ofm/seal_form.vue
index 63d92325..1e992e84 100644
--- a/src/views/ofm/seal_form.vue
+++ b/src/views/ofm/seal_form.vue
@@ -9,7 +9,7 @@
           <el-input v-model="localForm.contacts" clearable :disabled="localMode ==='show'"></el-input>
       </el-form-item>
 
-      <el-form-item label="印章类型">
+      <el-form-item label="印章类型" prop="seal">
         <el-checkbox-group v-model="localForm.seal" :disabled="localMode ==='show'">
           <el-checkbox label="公章"></el-checkbox>
           <el-checkbox label="法人章"></el-checkbox>
@@ -25,7 +25,7 @@
               style="margin-top: 10;"
             ></el-input>
         </el-form-item>
-          <el-form-item label="是否借出">
+          <el-form-item label="是否借出" prop="is_lending">
             <el-radio-group v-model="localForm.is_lending" :disabled="localMode ==='show'">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
@@ -45,7 +45,7 @@
                   </el-date-picker>
               </div>
           </el-form-item>
-          <el-form-item label="实际归还日期"
+          <el-form-item label="实际归还日期" prop="actual_return_date"
           v-if="['借用中', '结束'].includes(localForm.ticket_?.state_?.name)">
             <el-date-picker
               v-model="localForm.actual_return_date"
@@ -67,7 +67,7 @@
               :disabled="localMode ==='show'">
             </el-input>
           </el-form-item>
-      <el-form-item label="文件内容">
+      <el-form-item label="文件内容" prop="file">
             <sc-upload-file
               v-model="localForm.file"
               :multiple="false"
@@ -133,6 +133,12 @@ export default {
       timeRange: [],
       rules: {
         filename: [{ required: true, message: "请输入文件名称", trigger: "blur" }],
+        contacts: [{ required: true, message: "请输入手机号", trigger: "blur" }],
+        seal: [{ required: true, message: "请选择印章类型", trigger: "blur" }],
+        is_lending: [{ required: true, message: "请选择是否借出", trigger: "change" }],
+        actual_return_date: [{ required: true, message: "请选择实际归还日期", trigger: "change" }],
+        file: [{ required: true, message: "请上传用印文件", trigger: "change" }],
+        file_count: [{ required: true, message: "请输入用印份数", trigger: "change" }]
       },
     };
   },
@@ -157,6 +163,7 @@ export default {
     },
     async submit_b_func() {
 		    let that = this;
+        
 			if(that.localMode == "add") {
 				let res = await that.$API.ofm.lendingseal.create.req(that.localForm);
 				that.localForm.id = res.id;
@@ -170,7 +177,7 @@ export default {
         that.$API.ofm.lendingseal.item.req(that.t_id).then(res=>{
         that.localForm = res;
         that.initTimeRange();
-      if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) {
+      if(res.ticket_&& res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) {
         that.localMode = "edit";
       }else{
         that.localMode = "show";
diff --git a/src/views/ofm/vehicle_form.vue b/src/views/ofm/vehicle_form.vue
index 6f68cf50..a33e1d93 100644
--- a/src/views/ofm/vehicle_form.vue
+++ b/src/views/ofm/vehicle_form.vue
@@ -38,13 +38,13 @@
               <el-input v-model="form.location" clearable :readonly="localMode ==='show'"></el-input>
           </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="出发公里数" prop="start_km">
               <el-input v-model="form.start_km" clearable :readonly="localMode ==='show'" type="number">
                 <template #append>km</template>
               </el-input>
           </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="归还公里数" prop="end_km" v-if="form.ticket_?.state_?.name=='用车中'">
               <el-input v-model="form.end_km" clearable  type="number">
@@ -137,7 +137,13 @@ export default {
       rules: {
         vehreg: [{ required: true, message: "请输入车辆名称", trigger: "blur" }],
         vdate: [{ required: true, message: "请选择时间", trigger: "blur" }],
-        // title: [{ required: true, message: "请输入容纳人数", trigger: "blur" }],
+        reason: [{ required: true, message: "请输入用车事由", trigger: "blur" }],
+        is_city: [{ required: true, message: "请输入用车范围", trigger: "change" }],
+        location: [{ required: true, message: "请输入出发地点", trigger: "blur" }],
+        end_km: [{ required: true, message: "请输入归还公里数", trigger: "change" }],
+        via: [{ required: true, message: "请输入途经地点", trigger: "blur" }],
+        destination: [{ required: true, message: "请输入到达地点", trigger: "blur" }],
+
       },
       timesList:[
          {value:0,label:'00:00-00:30',isSelect:false,sloted:false},
diff --git a/src/views/srm/paperse_form.vue b/src/views/srm/paperse_form.vue
index 4535cf62..79085e0a 100644
--- a/src/views/srm/paperse_form.vue
+++ b/src/views/srm/paperse_form.vue
@@ -138,9 +138,13 @@ export default {
         ticket_:null
       },
       rules: {
-        filename: [{ required: true, message: "请输入文件名称", trigger: "blur" }],
+        paper_name: [{ required: true, message: "请输入文件名称", trigger: "blur" }],
+        orginization: [{ required: true, message: "请输入发布单位", trigger: "blur" }],
+        publication_name: [{ required: true, message: "请输入拟投期刊名称", trigger: "blur" }],
+        author: [{ required: true, message: "请输入文件作者", trigger: "blur" }],
+        paper_type: [{ required: true, message: "请输入拟发表文章类型", trigger: "change" }],
+        affiliated_projects: [{ required: true, message: "请输入所属项目", trigger: "blur" }],
       },
-      
     };
   },
   mounted() {
diff --git a/src/views/srm/patent_form.vue b/src/views/srm/patent_form.vue
index 4486d5cd..39ac2d50 100644
--- a/src/views/srm/patent_form.vue
+++ b/src/views/srm/patent_form.vue
@@ -26,7 +26,7 @@
                 <el-radio :label="false">否</el-radio>
             </el-radio-group>
         </el-form-item>
-      <el-form-item label="拟申请地域">
+      <el-form-item label="拟申请地域" prop="area">
         <el-radio-group v-model="localForm.area" :disabled="localMode ==='show'">
           <el-radio label="国内申请" value="Domestic"></el-radio>
           <el-radio label="国外申请" value="Foreign"></el-radio>
@@ -132,7 +132,11 @@ export default {
       ticketTitle: "专利申请",
       localMode : this.mode,
       rules: {
-        filename: [{ required: true, message: "请输入文件名称", trigger: "blur" }],
+        name: [{ required: true, message: "拟申请专利名称", trigger: "blur" }],
+        author: [{ required: true, message: "请输入发明人", trigger: "blur" }],
+        organization: [{ required: true, message: "请输入发布单位", trigger: "blur" }],
+        type: [{ required: true, message: "请输专利类型", trigger: "blur" }],
+        area: [{ required: true, message: "拟申请地域", trigger: "change" }],
       },
       localForm:{
           name: "",
diff --git a/src/views/srm/patentlist.vue b/src/views/srm/patentlist.vue
index 9540f1cb..dc2608ca 100644
--- a/src/views/srm/patentlist.vue
+++ b/src/views/srm/patentlist.vue
@@ -276,6 +276,15 @@ export default {
             "reexamination":"复审",
             "authorized":"授权"
       },
+      rules: {
+        patent: [{ required: true, message: "专利名称", trigger: "blur" }],
+        pc_type: [{ required: true, message: "专利类型", trigger: "blur" }],
+        organization: [{ required: true, message: "单位", trigger: "blur" }],
+        inventors: [{ required: true, message: "发明人", trigger: "blur" }],
+        affiliated_platforms: [{ required: true, message: "归属平台", trigger: "blur" }],
+        affiliated_projects: [{ required: true, message: "归属项目", trigger: "blur" }],
+
+      },
       query: {},
       editId: null,
       isSaving: false,
diff --git a/src/views/srm/plat_form.vue b/src/views/srm/plat_form.vue
index 04c47963..6ef2c907 100644
--- a/src/views/srm/plat_form.vue
+++ b/src/views/srm/plat_form.vue
@@ -89,9 +89,6 @@ export default {
       ticket_data: {},
       ticketTitle: "平台审批",
       localMode : this.mode,
-      rules: {
-        filename: [{ required: true, message: "请输入文件名称", trigger: "blur" }],
-      },
       localForm: {}
     };
   },

From 58cc8076b3d1302343ea41488b528ec6a49f20d3 Mon Sep 17 00:00:00 2001
From: TianyangZhang <zty18395607196@163.com>
Date: Thu, 25 Dec 2025 09:41:52 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/hrm.js           |  35 ++++++
 src/views/hrm/empjoin.vue      |   1 +
 src/views/hrm/empjoin_form.vue | 194 +++++++++++++++++++--------------
 src/views/hrm/empneed_form.vue |   4 +-
 src/views/srm/patent_form.vue  |   2 +-
 src/views/srm/plat_form.vue    |  35 +++++-
 6 files changed, 185 insertions(+), 86 deletions(-)

diff --git a/src/api/model/hrm.js b/src/api/model/hrm.js
index 9d34f8d8..023e89fb 100644
--- a/src/api/model/hrm.js
+++ b/src/api/model/hrm.js
@@ -231,4 +231,39 @@ export default {
 			}
 		},
 	},
+	empjoin: {
+	    list: {
+			name: "人员交接",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/hrm/empjoin/`,
+					data
+				);
+			}
+		},
+	  item: {
+			name: "人员交接申请",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/hrm/empjoin/${id}/`,
+				);
+			}
+		},
+	  create: {
+			name: "人员交接新增",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/hrm/empjoin/`,
+					data);
+			}
+		},
+		delete: {
+			name: "人员交接删除",
+			req: async function(id){
+				return await http.delete(
+					`${config.API_URL}/hrm/empjoin/${id}/`
+				);
+			}
+		},
+	},
 }
diff --git a/src/views/hrm/empjoin.vue b/src/views/hrm/empjoin.vue
index dc1ae8c8..a5b8e4ec 100644
--- a/src/views/hrm/empjoin.vue
+++ b/src/views/hrm/empjoin.vue
@@ -15,6 +15,7 @@
             @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="入职日期" prop="join_date" 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">
diff --git a/src/views/hrm/empjoin_form.vue b/src/views/hrm/empjoin_form.vue
index 0e0c9ba3..a571a4c2 100644
--- a/src/views/hrm/empjoin_form.vue
+++ b/src/views/hrm/empjoin_form.vue
@@ -2,77 +2,86 @@
     <el-container>
         <el-main class="nopadding">
             <el-form label-width="80px" :model="formData" style="padding: 20px;" :disabled="localMode === 'show'">
-                <el-form-item label="需求部门">
+                <el-form-item label="需求部门" required>
                     <el-cascader
                         v-model="formData.dept_need"
                         :options="group"
                         :props="groupsProps"
                         :show-all-levels="false"
                         clearable
-                        style="width: 100%"
+                        style="width: 220px"
                     ></el-cascader>
                 </el-form-item>
-                <el-form-item label="员工信息" required>
-                    {{ formData.employee_name }}（{{ formData.belong_dept_name }} - {{ formData.post_name }}）
-                </el-form-item>
-                <el-form-item label="需求岗位" required>
-                    <el-input v-model="formData.post_need"></el-input>
-                </el-form-item>
-                <el-form-item label="需求人数" required>
-                    <el-input-number v-model="formData.count_need" :min="1" :precision="0"></el-input-number>
-                </el-form-item>
-                <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-form-item label="日期" required>
                     <el-date-picker
-                        v-model="formData.arrival_date"
+                        v-model="formData.join_date"
                         type="date"
-                        placeholder="预计到岗日期"
+                        placeholder="日期"
                         value-format="YYYY-MM-DD"
                         :readonly="localMode === 'show'"
                     ></el-date-picker>
                 </el-form-item>
-                <el-form-item label="申请理由" required>
-                    <el-select
-                        v-model="formData.reason"
-                        placeholder="请选择申请理由"
-                        clearable
-                        style="width: 300px"
-                    >
-                        <el-option label="新增人员" :value="0" />
-                        <el-option label="该岗原人员离职或辞职或辞退需补充" :value="1" />
-                        <el-option label="其他原因" :value="2" />
-                    </el-select>
-                 </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>
+                <sc-form-table
+                    v-model="formData.person"
+                    :addTemplate="addTemplate"
+                    :hideAdd="hideAdd"
+                    :hideDelete="hideDelete"
+                    placeholder="暂无数据"
+                    >
+                    <el-table-column prop="name" label="姓名" min-width="150">
+                        <template #default="scope">
+                            <el-input
+                                v-model="scope.row.name"
+                                placeholder="请输入姓名"
+                            ></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="gender" label="性别" min-width="150">
+                        <template #default="scope">
+                            <el-select v-model="scope.row.gender" placeholder="请选择">
+                                <el-option label="男" :value="1"></el-option>
+                                <el-option label="女" :value="2"></el-option>
+                            </el-select>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="IDcard" label="身份证号" min-width="150">
+                        <template #default="scope">
+                            <el-input
+                                v-model="scope.row.IDcard"
+                                placeholder="请输入身份证号"
+                            ></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="phone" label="手机号" min-width="150">
+                        <template #default="scope">
+                        <el-input
+                            v-model="scope.row.phone"
+                            placeholder="请输手机号"
+                        ></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="note" label="备注" min-width="150">
+                        <template #default="scope">
+                        <el-input
+                            v-model="scope.row.note"
+                            placeholder="请输入备注"
+                        ></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="post" label="岗位" min-width="150" v-if="['交接部门负责人','结束'].includes(formData.ticket_?.state_?.name)">
+                        <template #default="scope">
+                            <xtSelect
+                                :apiObj="apiObjPost"
+                                v-model="scope.row.post"
+                                v-model:label="scope.row.post_name"
+                                style="width: 150px"
+                                >
+                                <el-table-column label="名称" prop="name"></el-table-column>
+                            </xtSelect>
+                        </template>
+                    </el-table-column>
+                </sc-form-table>    
             <el-footer>
                 <el-button type="danger"
                 v-if="localMode=='edit'"
@@ -81,14 +90,15 @@
                 :loading="saveLoading"
                 >删除</el-button>
                 <ticketd_b 
-                        v-if = "formData.ticket_"
+                        v-if = "formData.ticket_ && localMode=='show'"
                         :t_id="formData.id" 
                         :ticket_="formData.ticket_"
+                        :ticket_data="ticket_data"
                         @success="$emit('success', localMode)" 
                         ref="ticketd_b"
                     ></ticketd_b>
                      <el-button 
-                        v-else
+                        v-if="localMode!='show'"
                         type="primary"
                         style="margin-right: 4px;"
                         @click="handleSave"
@@ -104,10 +114,11 @@
 
 <script>
 import ticketd_b from "@/views/wf/ticketd_b.vue";
-import ticketd from '@/views/wf/ticketd.vue'
+import ticketd from '@/views/wf/ticketd.vue';
+import { genTree } from "@/utils/verificate";
 
 export default {
-    name: 'EnpNeedForm',
+    name: 'EnpJoinForm',
     components: {
         ticketd_b,
         ticketd
@@ -125,55 +136,74 @@ export default {
     data() {
         return {
             formData: {
+                person: [],
             },
+            ticket_data: {},
             localMode: this.mode,
             saveLoading: false,
             group:[],
+            post:[],
+            apiObjPost: this.$API.system.post.list,
+            hideAdd:false,
+            hideDelete:false,
+            addTemplate: {
+                name: "",
+                gender: "",
+                age: "",
+                phone: "",
+                note: "",
+                },
             groupsProps: {
                 multiple: false,
                 emitPath: false,
                 checkStrictly: true,
+                },
+            }
+        },
+    watch: {
+        formData: {
+            handler(val){
+                Object.assign(this.ticket_data,{
+                    person: val.person,
+                })
             },
+        deep: true,
         }
-    },
+  },
     mounted() {
         this.getGroup();
         if (this.t_id) {
             this.getTid();
         } else {
-            this.initFormData();
+            this.localMode = "add";
         }
     },
     methods: {
-        async initFormData() {
-            try {
-                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;
-                this.formData.employee = res.id;
-                this.localMode = "add";
-            } catch (error) {
-                console.error('初始化表单数据失败:', error);
-            }
-        },
         async getTid() {
             try {
-                let res = await this.$API.hrm.empneed.item.req(this.t_id);
+                let res = await this.$API.hrm.empjoin.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 (error) {
-                console.error('获取离职数据失败:', error);
+                console.error('获取数据失败:', error);
             }
         },
+        async getGroup() {
+            let res = await this.$API.system.dept.list.req({ page: 0 });
+            this.group = genTree(res);
+        },
+        async getPost() {
+            let res = await this.$API.hrm.post.list.req({ page: 0 });
+            this.post = res;
+        },
         handleDel() {
             this.$confirm(`确定删除吗？`, "提示", {
 				type: "warning",
 			})
 				.then(()=>{
-                    this.$API.hrm.empneed.delete.req(this.formData.id).then(res=>{
+                    this.$API.hrm.empjoin.delete.req(this.formData.id).then(res=>{
                         this.$message.success("删除成功");
                         this.$emit('success');
                     })
@@ -182,7 +212,8 @@ export default {
         async handleSave() {
             if (this.localMode == "add") {
                 try {
-                    let res = await this.$API.hrm.empneed.create.req(this.formData);
+                    console.log('formData', this.formData);
+                    let res = await this.$API.hrm.empjoin.create.req(this.formData);
                     this.$message.success("提交成功");
                     this.$emit('success', this.localMode);
                 } catch (error) {
@@ -192,7 +223,12 @@ export default {
             } else if (this.localMode == "edit") {
                 this.$message.error("不支持编辑");
             }
-        }
+        },
+        handleQuery() {
+			this.$refs.table.queryData(this.query);
+		},
+        
+
     }
 }
 </script>
\ No newline at end of file
diff --git a/src/views/hrm/empneed_form.vue b/src/views/hrm/empneed_form.vue
index dc068299..21e033ec 100644
--- a/src/views/hrm/empneed_form.vue
+++ b/src/views/hrm/empneed_form.vue
@@ -81,14 +81,14 @@
                 :loading="saveLoading"
                 >删除</el-button>
                 <ticketd_b 
-                        v-if = "formData.ticket_"
+                        v-if = "formData.ticket_ && localMode=='show'"
                         :t_id="formData.id" 
                         :ticket_="formData.ticket_"
                         @success="$emit('success', localMode)" 
                         ref="ticketd_b"
                     ></ticketd_b>
                      <el-button 
-                        v-else
+                        v-if="localMode!='show'"
                         type="primary"
                         style="margin-right: 4px;"
                         @click="handleSave"
diff --git a/src/views/srm/patent_form.vue b/src/views/srm/patent_form.vue
index 39ac2d50..f2d7a96b 100644
--- a/src/views/srm/patent_form.vue
+++ b/src/views/srm/patent_form.vue
@@ -194,7 +194,7 @@ export default {
 		    if (that.t_id) {
 				that.$API.srm.patentinfo.item.req(that.t_id).then(res=>{
           that.localForm = res;
-					if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) {
+					if(res.ticket_.state_ && res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) {
 						that.localMode = "edit";
 					}else{
 						that.localMode = "show";
diff --git a/src/views/srm/plat_form.vue b/src/views/srm/plat_form.vue
index 6ef2c907..3343b8dc 100644
--- a/src/views/srm/plat_form.vue
+++ b/src/views/srm/plat_form.vue
@@ -17,8 +17,15 @@
                 >
                 </el-date-picker>
       </el-form-item>
-      <el-form-item label="归口部门" prop="p_dept">
-          <el-input v-model="localForm.p_dept" clearable :disabled="localMode ==='show'"></el-input>
+      <el-form-item label="需求部门" prop="p_dept">
+          <el-cascader
+              v-model="localForm.p_dept"
+              :options="group"
+              :props="groupsProps"
+              :show-all-levels="false"
+              clearable
+              style="width: 220px"
+          ></el-cascader>
       </el-form-item>
       <el-form-item label="建设期" prop="const">
           <el-input v-model="localForm.const" clearable ></el-input>
@@ -74,7 +81,9 @@
 
 <script>
 import ticketd_b from "@/views/wf/ticketd_b.vue";
-import ticketd from '@/views/wf/ticketd.vue'
+import ticketd from '@/views/wf/ticketd.vue';
+import { genTree } from "@/utils/verificate";
+
 export default {
   props: {
     mode: { type: String, default: "show" }, // add / edit / show
@@ -89,11 +98,25 @@ export default {
       ticket_data: {},
       ticketTitle: "平台审批",
       localMode : this.mode,
-      localForm: {}
+      localForm: {},
+      groupsProps: {
+                multiple: false,
+                emitPath: false,
+                checkStrictly: true,
+            },
+      group:[],
+      rules: {
+          name: [{required: true, message: "请输入名称", trigger: "blur"}],
+          p_dept: [{required: true, message: "请输入部门", trigger: "change"}],
+          city_p: [{required: true, message: "请选择市级平台", trigger: "change"}],
+          const: [{required: true, message: "建设期", trigger: "blur"}],
+          condition: [{required: true, message: "平台基本情况与目标绩效", trigger: "change"}]
+        },
     };
   },
   mounted(){
     let that=this
+    this.getGroup();
     if(that.t_id){
       that.getTid();
     }else{
@@ -114,6 +137,10 @@ export default {
 			    await that.$API.srm.platform.update.req(that.localForm.id, that.localForm);
 			}
 		},
+    async getGroup() {
+            let res = await this.$API.system.dept.list.req({ page: 0 });
+            this.group = genTree(res);
+        },
     getTid (){
 			var that = this;
 		    if (that.t_id) {

From 81557cdd78e177df06f2858ae2b7da936112e585 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 25 Dec 2025 13:54:41 +0800
Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E8=B5=84=E4=BA=A7=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/asm/asset.vue    |  2 +-
 src/views/asm/assetlog.vue | 33 ++++++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/views/asm/asset.vue b/src/views/asm/asset.vue
index 27cc0dd6..ac34d6f1 100644
--- a/src/views/asm/asset.vue
+++ b/src/views/asm/asset.vue
@@ -28,7 +28,7 @@
             :query="query"
             @row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
             >
-            <el-table-column label="卡片编号" prop="card_number" width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column label="资产ID" prop="id" width="200" show-overflow-tooltip></el-table-column>
             <el-table-column label="固定资产名称" prop="name" width="200" show-overflow-tooltip></el-table-column>
             <el-table-column label="规格型号" prop="specification" width="200" show-overflow-tooltip></el-table-column>
             <el-table-column label="资产类别" prop="cate_name" width="100" show-overflow-tooltip></el-table-column>
diff --git a/src/views/asm/assetlog.vue b/src/views/asm/assetlog.vue
index ff4d9d18..e04270eb 100644
--- a/src/views/asm/assetlog.vue
+++ b/src/views/asm/assetlog.vue
@@ -1,12 +1,13 @@
 <template>
     <el-container>
         <el-header>
-            <div class="left-panel"></div>
+            <div class="left-panel">
+                <el-button type="primary" @click="handleAdd('入库')" v-auth="'assetlog.create'">资产入库</el-button>
+            </div>
             <div class="right-panel">
-                <!-- <el-button type="primary" @click="handleAdd">新增</el-button> -->
                 <el-input
                     v-model="query.search"
-                    placeholder="设备信息等"
+                    placeholder="关键词"
                     clearable
                     @keyup.enter="$refs.table.refresh()"
                 ></el-input>
@@ -21,13 +22,13 @@
         <el-main class="nopadding">
             <scTable
             ref="table"
-            :apiObj="API.em.repair.list"
+            :apiObj="API.asm.assetlog.list"
             row-key="id"
             stripe
             :query="query"
-            @row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
+            @row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;drawerTitle=row.type}"
             >
-            <el-table-column label="设备" prop="equipment_fullname" width="300" show-overflow-tooltip></el-table-column>
+            <el-table-column label="操作类型" prop="type" width="100" show-overflow-tooltip></el-table-column>
             <el-table-column label="流程状态" width="300" show-overflow-tooltip>
                 <template #default="scope">
                                 <el-tag :type="actStateEnum[scope.row.ticket_?.act_state]?.type">
@@ -35,21 +36,31 @@
                     </el-tag>
             <el-tag type="info" effect="plain">{{ scope.row.ticket_?.state_.name }}</el-tag>
           </template>
-            </el-table-column>`
-            <el-table-column label="故障类别" prop="fault_cate" width="100" show-overflow-tooltip></el-table-column>`
-            <el-table-column label="故障描述" prop="fault_description"  show-overflow-tooltip></el-table-column>
-            <el-table-column label="维修人" prop="repair_user_name" width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column label="维修开始时间" prop="repair_start_time" width="200" show-overflow-tooltip></el-table-column>
+            </el-table-column>
+            <el-table-column label="启用日期" prop="start_date"  width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column label="保管部门" prop="keep_dept_name" width="160" show-overflow-tooltip></el-table-column>`
+            <el-table-column label="保管人" prop="keeper_name"  width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="资产条数" width="80" show-overflow-tooltip>
+                <template #default="scope">
+                    {{ scope.row.items?.length }}
+                </template>
+            </el-table-column>
+            <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip></el-table-column>
             </scTable>
         </el-main>
     </el-container>
+    <el-drawer :title="drawerTitle" v-model="drawerVisible" :size="'80%'" destroy-on-close>
+        <assetlogin_form :mode="mode" :t_id="t_id"></assetlogin_form>
+    </el-drawer>
 </template>
 <script setup>
 import { ref } from 'vue'
 import API from '@/api'
 import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js";
+import assetlogin_form from './assetlogin_form.vue'
 const query = ref({});
 const drawerVisible = ref(false);
+const drawerTitle = ref('资产入库');
 const mode = ref('add');
 const t_id = ref(null);
 const handleAdd = () => {

From 0d7d4766fc430c3dd8e5cd7e1b107e4ca27be548 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 26 Dec 2025 14:14:00 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/em/equipment.vue   | 12 ++++--------
 src/views/em/equipmentjl.vue | 28 ++++++++++++++--------------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue
index a38bc5d2..8cd2dd46 100644
--- a/src/views/em/equipment.vue
+++ b/src/views/em/equipment.vue
@@ -18,9 +18,9 @@
         <el-table-column type="selection" width="50" />
         <el-table-column label="设备名称" prop="name" width="200" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="设备位号" prop="number">
+        <el-table-column label="设备位号" prop="number" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="型号规格" prop="model">
+        <el-table-column label="型号规格" prop="model" show-overflow-tooltip>
         </el-table-column>
         <el-table-column label="生产厂" prop="factory" show-overflow-tooltip>
         </el-table-column>
@@ -40,12 +40,11 @@
         </el-table-column>
         <el-table-column label="购置日期" prop="buy_date">
         </el-table-column>
-        <el-table-column label="工段运行的方式" prop="indicate_mgroup_running">
+        <el-table-column label="运行规则" prop="indicate_mgroup_running" width="100">
         </el-table-column>
         <el-table-column label="设备负责人" prop="device_people" show-overflow-tooltip>
         </el-table-column>
-        
-        <el-table-column label="更新时间" prop="update_time"></el-table-column>
+        <el-table-column label="更新时间" prop="update_time" width="150"></el-table-column>
         <el-table-column label="状态">
           <template #default="scope">
             <el-tag v-if="scope.row.state === 10" type="success">
@@ -77,9 +76,6 @@
         <el-table-column label="安装位置" show-overflow-tooltip>
           <template #default="scope">{{ scope.row.place }}</template>
         </el-table-column>
-        <el-table-column label="维修记录" show-overflow-tooltip>
-          <template #default="scope">{{ scope.row.description }}</template>
-        </el-table-column>
         <el-table-column label="操作" fixed="right" align="left" width="180">
          <template #default="scope">
             <el-button link type="success" @click="table_print(scope.row)">打印</el-button>
diff --git a/src/views/em/equipmentjl.vue b/src/views/em/equipmentjl.vue
index 16b5667c..625246fc 100644
--- a/src/views/em/equipmentjl.vue
+++ b/src/views/em/equipmentjl.vue
@@ -22,11 +22,11 @@
     <el-main class="nopadding">
       <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query">
         <el-table-column type="selection" width="50" />
-        <el-table-column label="设备名称" prop="name" show-overflow-tooltip>
+        <el-table-column label="设备名称" prop="name" width="200" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="计量编号" prop="number">
+        <el-table-column label="计量编号" prop="number" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="型号规格" prop="model">
+        <el-table-column label="型号规格" prop="model" show-overflow-tooltip>
         </el-table-column>
         <el-table-column label="仪表类型" prop="meter_type">
         </el-table-column>
@@ -34,11 +34,11 @@
         </el-table-column>
         <el-table-column label="出厂编号" prop="number_factory">
         </el-table-column>
-        <el-table-column label="启用日期" prop="use_date">
+        <el-table-column label="启用日期" prop="use_date" width="100">
         </el-table-column>
-        <el-table-column label="用电功率(kw)" prop="power_kw">
+        <el-table-column label="用电功率(kw)" prop="power_kw" width="100">
         </el-table-column>
-        <el-table-column label="设备重要性" prop="importance">
+        <el-table-column label="设备重要性" prop="importance" width="100">
           <template #default="scope">
             <el-tag v-if="scope.row.importance === 10" type="A">
               {{ importance[scope.row.importance] }}
@@ -51,14 +51,14 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="工段运行" prop="indicate_mgroup_running">
+        <el-table-column label="运行规则" prop="indicate_mgroup_running" width="100">
         </el-table-column>
         <el-table-column label="生产厂家" prop="factory" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="检定/校准" prop="check_date" ></el-table-column>
-        <el-table-column label="检定周期/月" prop="cycle" width="70">
+        <el-table-column label="检定/校准" prop="check_date"  width="100"></el-table-column>
+        <el-table-column label="检定周期/月" prop="cycle"  width="100">
         </el-table-column>
-        <el-table-column label="设备状态" width="70">
+        <el-table-column label="设备状态"  width="100">
           <template #default="scope">
             <el-tag v-if="scope.row.state === 10" type="success">
               {{ state_[scope.row.state] }}
@@ -78,10 +78,10 @@
         </el-table-column>
         <el-table-column label="安装位置" prop="place" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="设备负责人" prop="device_people" show-overflow-tooltip>
+        <el-table-column label="设备负责人" prop="device_people"  width="100" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="更新时间" prop="update_time"></el-table-column>
-        <el-table-column label="临期预警(天)" prop="check_days_number"></el-table-column>
+        <el-table-column label="更新时间" prop="update_time"  width="150"></el-table-column>
+        <el-table-column label="临期预警(天)" prop="check_days_number"  width="100"></el-table-column>
         <el-table-column label="检定状态" prop="state_measure" width="100">
           <template #default="scope">
             <el-tag v-if="scope.row.state_measure === 10" type="success">
@@ -98,7 +98,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="下次检定/校准" prop="next_check_date" width="70">
+        <el-table-column label="下次检定/校准" prop="next_check_date"  width="120">
         </el-table-column>
         <el-table-column label="备注" show-overflow-tooltip>
           <template #default="scope">{{ scope.row.description }}</template>

From d19a980d2b570d50fe754ad773fd49d3ea3353b6 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 26 Dec 2025 14:27:23 +0800
Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E4=BA=BA=E5=91=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=A1=A5=E5=85=85=E5=8F=AF=E5=A1=AB=E5=86=99=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/userCenter/user/seting.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/userCenter/user/seting.vue b/src/views/userCenter/user/seting.vue
index fc782367..ea0cd5d2 100644
--- a/src/views/userCenter/user/seting.vue
+++ b/src/views/userCenter/user/seting.vue
@@ -45,7 +45,7 @@
         </el-col>
                 <el-col :md="12" :sm="24">
           <el-form-item label="身份证号">
-            <el-input v-model="form.id_number" disabled></el-input>
+            <el-input v-model="form.id_number"></el-input>
           </el-form-item>
         </el-col>
 		 <el-col :md="12" :sm="24">
@@ -61,12 +61,12 @@
         </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item label="证件照">
-            <sc-upload v-model="form.photo" title="证件照" :disabled="true"></sc-upload>
+            <sc-upload v-model="form.photo" title="证件照"></sc-upload>
           </el-form-item>
         </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item label="签名">
-            <sc-upload v-model="form.signature" title="证件照" :disabled="true"></sc-upload>
+            <sc-upload v-model="form.signature" title="签名"></sc-upload>
             <!-- <el-image :src="form.signature" style="width: 148px; height: 80px"></el-image> -->
           </el-form-item>
         </el-col>