From d492850f1cc64ddcfaf43798af9c76c2505414fd Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 一月 2025 18:24:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/stock/components/newWarehouse.vue | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/admin/src/views/stock/components/newWarehouse.vue b/admin/src/views/stock/components/newWarehouse.vue
index 70386ad..e2f076b 100644
--- a/admin/src/views/stock/components/newWarehouse.vue
+++ b/admin/src/views/stock/components/newWarehouse.vue
@@ -9,30 +9,33 @@
<el-form-item label="浠撳簱鍚嶇О" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏�" v-trim />
</el-form-item>
- <el-form-item label="鎵�鍦ㄤ綅缃�" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏�" v-trim />
+ <el-form-item label="鎵�鍦ㄤ綅缃�" prop="position">
+ <el-input v-model="form.position" placeholder="璇疯緭鍏�" v-trim />
</el-form-item>
- <el-form-item label="璐熻矗浜�" prop="name">
- <el-select v-model="form.name" placeholder="璇烽�夋嫨">
- <el-option label="寮犱笁" :value="1"></el-option>
- <el-option label="鏉庡洓" :value="1"></el-option>
- <el-option label="鐜嬩簩" :value="1"></el-option>
+ <el-form-item label="璐熻矗浜�" prop="userId">
+ <el-select v-model="form.userId" filterable placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in userList"
+ :key="item.id"
+ :label="item.realname"
+ :value="item.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 label="鎺掑簭鐮�(鍗囧簭)" prop="sortnum">
+ <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim />
</el-form-item>
- <el-form-item label="鐘舵��" prop="name">
+ <el-form-item label="鐘舵��" prop="status">
<el-switch
- v-model="form.name"
+ v-model="form.status"
active-color="#13ce66"
inactive-color="#ff4949"
- active-value="100"
- inactive-value="0">
+ :active-value="0"
+ :inactive-value="1">
</el-switch>
</el-form-item>
- <el-form-item label="澶囨敞" prop="name">
- <el-input v-model="form.name" type="textarea" :autosize="{ minRows: 2, maxRows: 4}" placeholder="璇疯緭鍏�" v-trim />
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input v-model="form.remark" type="textarea" :autosize="{ minRows: 2, maxRows: 4}" placeholder="璇疯緭鍏�" v-trim />
</el-form-item>
</el-form>
</GlobalWindow>
@@ -41,6 +44,7 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
+ import { getUserList } from '@/api/system/user'
export default {
name: 'newWarehouse',
extends: BaseOpera,
@@ -51,18 +55,32 @@
form: {
id: '',
name: '',
+ position: '',
+ userId: '',
+ sortnum: '',
+ remark: '',
+ status: 0
},
// 楠岃瘉瑙勫垯
rules: {
- name: [{ required: true, message: '璇疯緭鍏ラ」鐩悕绉�', trigger: 'blur' }]
+ name: [{ required: true, message: '浠撳簱鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }]
},
+ userList: []
}
},
created() {
this.config({
- api: '/project/ywProject',
- 'field.id': 'id'
+ api: '/ywWarehouse'
})
+ this.getUser()
+ },
+ methods: {
+ getUser() {
+ getUserList({})
+ .then(res => {
+ this.userList = res
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3