From 8ac30411bb33e406e0ed5a2b6e2edaf7ab59f11f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 23 十一月 2024 17:10:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/workorder/components/OperaCategoryWindow.vue | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/admin/src/views/workorder/components/OperaCategoryWindow.vue b/admin/src/views/workorder/components/OperaCategoryWindow.vue
index b3588eb..6b9bb0f 100644
--- a/admin/src/views/workorder/components/OperaCategoryWindow.vue
+++ b/admin/src/views/workorder/components/OperaCategoryWindow.vue
@@ -1,22 +1,16 @@
<template>
<GlobalWindow :title="title" :visible.sync="visible" :confirm-working="isWorking" width="600px" @close="close" @confirm="confirm">
<el-form :model="form" ref="form" :rules="rules">
+ <el-form-item label="鍒嗙被鍚嶇О" prop="name">
+ <el-input v-model="form.name" placeholder="璇疯緭鍏ュ垎绫诲悕绉�" v-trim />
+ </el-form-item>
<el-form-item label="鎵�灞炲垎绫�" prop="parentId">
<el-select :disabled="form.id" v-model="form.parentId" placeholder="涓嶅～涓哄垯涓�绾у垎绫�">
<el-option v-for="op in dataList" :key="op.id" :label="op.name" :value="op.id"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍒嗙被鍚嶇О" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ュ垎绫诲悕绉�" v-trim />
- </el-form-item>
- <!-- <el-form-item label="鐘舵��" prop="status">
- <el-select v-model="form.status" placeholder="璇烽�夋嫨">
- <el-option label="鍚敤" value="0"></el-option>
- <el-option label="绂佺敤" value="1"></el-option>
- </el-select>
- </el-form-item> -->
- <el-form-item label="澶囨敞" prop="remark">
- <el-input type="textarea" v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" v-trim />
+ <el-form-item label="鎺掑簭鐮�(鍗囧簭)" prop="sortnum">
+ <el-input v-model="form.sortnum" oninput="value=value.replace(/^(0+)|[^\d]+/g, '').slice(0, 6)" v-trim />
</el-form-item>
</el-form>
</GlobalWindow>
@@ -38,7 +32,8 @@
name: '',
remark: '',
status: '',
- type: 1
+ sortnum: '',
+ type: 3
},
// 楠岃瘉瑙勫垯
rules: {
@@ -60,7 +55,7 @@
},
methods: {
getList() {
- fetchCateList({}).then(res => {
+ fetchCateList({ type: 3 }).then(res => {
this.dataList = res || []
})
--
Gitblit v1.9.3