From 3f69b4dfc585c4dfbc3c07a6acf5cdd838033636 Mon Sep 17 00:00:00 2001
From: liuguocan <527956374@qq.com>
Date: 星期二, 28 十一月 2023 14:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/foundation/material/edit.vue | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/admin-web/src/views/foundation/material/edit.vue b/admin-web/src/views/foundation/material/edit.vue
index 8f8733b..404a19d 100644
--- a/admin-web/src/views/foundation/material/edit.vue
+++ b/admin-web/src/views/foundation/material/edit.vue
@@ -8,7 +8,9 @@
<el-input v-model="formData.goodsName" clearable maxlength="20" show-word-limit style="width: 100%"/>
</el-form-item>
<el-form-item label="鍒嗙被" prop="categoryId">
- <el-input v-model="formData.categoryId" clearable maxlength="20" show-word-limit style="width: 100%"/>
+ <el-select v-model="formData.categoryId" clearable placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option v-for="item in categoryList" :key="item.id" :label="item.categoryName" :value="item.id"></el-option>
+ </el-select>
</el-form-item>
<el-form-item style="margin-left: -100px;" v-for="(m, i) in formData.models">
<el-form-item label="瑙勬牸鍨嬪彿" prop="modelName" style="float: left;">
@@ -38,6 +40,7 @@
import winMd from '@/components/win/win-md'
import myButton from '@/components/myButton/myButton'
import * as finsystenant from '@/api/baseSetting/finsystenant'
+import {mapGetters} from 'vuex'
export default {
components: {winMd, myButton},
@@ -50,15 +53,18 @@
},
data() {
return {
+ categoryList:[],
checkAll: false,
checkedList: [],
formData: {
radio1: '',
code: '',
name: '',
- states: '',
+ states: 1,
summary: '',
categoryId: null,
+ agencyId:'',
+ agencyName:'',
models:[
{
modelName:'',
@@ -73,12 +79,28 @@
}
}
},
+ computed:{
+ ...mapGetters(['userInfo'])
+ },
created() {
+ this.tree_List()
if(this.setting.info){
this.formData = Object.assign({},JSON.parse(this.setting.info))
}
+ if(!this.formData.agencyId) {
+ this.formData.agencyId = this.userInfo.tenantId
+ this.formData.agencyName = this.userInfo.tenantName
+ }
},
methods: {
+ tree_List (){
+ finsystenant.treeList().then(res => {
+ if (res) {
+ console.log(res,'res');
+ this.categoryList = res
+ }
+ })
+ },
addCode(){
this.formData.models.push(
{
--
Gitblit v1.9.1