From 2096ac6f7379d75001b610c2de1fa380abd09519 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 12 十二月 2023 16:13:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/foundation/classification/index.vue | 59 +++++++++++++++++++++++++++--------------------------------
1 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/admin-web/src/views/foundation/classification/index.vue b/admin-web/src/views/foundation/classification/index.vue
index 6913db5..115890d 100644
--- a/admin-web/src/views/foundation/classification/index.vue
+++ b/admin-web/src/views/foundation/classification/index.vue
@@ -17,7 +17,12 @@
</el-col>
</el-row>
<!--娣诲姞/缂栬緫寮圭獥-->
- <edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false" @search="refreshData" />
+ <edit
+ v-if="editSetting.show"
+ :setting="editSetting"
+ @close="editSetting.show = false"
+ @search="refreshData"
+ />
</el-card>
</el-container>
</el-container>
@@ -37,11 +42,10 @@
import items from './items';
import edit from './edit';
import * as finsystenant from '@/api/baseSetting/finsystenant';
-import { getTree } from '@/api/foudation/classification';
+import {getTree} from '@/api/foudation/classification';
import myImport from '@/views/components/myImport';
-import { getBaseUrl } from '@/utils/base';
-import {getType} from '@/api/system/dict/type'
-import {getDicts} from '@/api/system/dict/data'
+import {getBaseUrl} from '@/utils/base';
+import {getDicts} from '@/api/system/dict/data';
export default {
name: 'index',
@@ -110,9 +114,9 @@
},
// 鍒椾俊鎭�
columns: [
- { title: '鍒嗙被鍚嶇О', field: 'categoryName', align: 'center' },
- { title: '绫诲埆', field: 'classification', align: 'left' },
- { title: '鏄剧ず椤哄簭', field: 'orderNumber', align: 'center', width: '80px' },
+ { title: '鍒嗙被鍚嶇О', field: 'categoryName', align: 'left', minWidth: 140 },
+ { title: '绫诲埆', field: 'classification', align: 'center', width: 100 },
+ { title: '鏄剧ず椤哄簭', field: 'orderNumber', align: 'center', width: 100 },
{
field: 'states',
title: '鐘舵��',
@@ -145,7 +149,7 @@
// 鎿嶄綔淇℃伅
operation: {
show: true, // 鏄剧ず鎿嶄綔鍒�
- width: '150', // 鍒楀
+ width: '160', // 鍒楀
attr: [
{
title: '缂栬緫',
@@ -178,13 +182,13 @@
// 鑾峰彇鏈烘瀯鏍�
this.initTreeData();
// 绫诲埆瀛楀吀
- getDicts('GOODS_PRICE').then(res=>{
- this.items[1].options = res.map(v=>{
- v.label=v.dict_label
- v.value=v.dict_value
- return v
- })
- })
+ getDicts('GOODS_PRICE').then((res) => {
+ this.items[1].options = res.map((v) => {
+ v.label = v.dict_label;
+ v.value = v.dict_value;
+ return v;
+ });
+ });
},
methods: {
//瀵煎叆
@@ -203,14 +207,8 @@
// 宸︿晶鏍戝垵濮嬪寲
initTreeData() {
getTree().then((res) => {
- console.log(res, 'restree');
- console.log(this.importSetting, 'this.importSetting');
const content = res || [];
- // this.treeDataList.splice(0, this.treeDataList.length)
this.treeDataList = content;
- // if (content.length > 0) {
- // this.importSetting.fileSettings.data = {pid: content[0].id}
- // }
});
},
updState(row) {
@@ -236,20 +234,18 @@
})
.then((res) => {
this.$message.success('鍒犻櫎鎴愬姛锛�');
- this.search();
+ this.refreshData();
})
.catch(() => {});
},
showAdd() {
- if (!this.editSetting.orgId) {
- this.$message.warning('璇峰厛閫夋嫨宸︿晶鏈烘瀯')
- } else {
- this.editSetting.pid = this.p.id;
+ if (this.p && this.p) {
+ this.editSetting.pid = this.p.id;
+ }
this.editSetting.id = null;
this.editSetting.info = null;
this.editSetting.title = '鏂板';
this.editSetting.show = true;
- }
},
showAudit(row) {
this.editSetting.id = row.id;
@@ -258,7 +254,6 @@
this.editSetting.show = true;
},
nodeClick(param) {
- console.log(param, 'param');
param = param || {};
this.p = Object.assign(
{},
@@ -280,14 +275,14 @@
// 鏌ヨtable鍒楄〃
search(pageNum) {
if (pageNum != undefined) {
- this.$refs.myTable.search({pageNum});
+ this.$refs.myTable.search({ pageNum });
} else {
this.$refs.myTable.search();
}
},
refreshData() {
- this.initTreeData()
- this.search()
+ this.initTreeData();
+ this.search();
},
fifterForm(params) {
this.filterFrom = Object.assign(this.filterFrom, params);
--
Gitblit v1.9.1