diff --git a/src/api/basicdata/globalc.js b/src/api/basicdata/globalc.js index ebfb7751..5f201008 100644 --- a/src/api/basicdata/globalc.js +++ b/src/api/basicdata/globalc.js @@ -1,13 +1,46 @@ -import request from '@/axios'; - -export const getList = (current, size, params) => { - return request({ - url: '/api/logpm-basicdata/basicdataBrand/list', - method: 'get', - params: { - ...params, - current, - size, +import { getSelect } from '@/api/base/region'; + + let optioner = []; + +export async function useGetGlobalProperties (){ + let shu = []; + let bb = await getSelect(''); + + for (const it of bb.data.data) { + let a = { + value: it.code, + label: it.name, + children: [] + }; + let res = await getSelect(it.code) + let shi = []; + for (const i of res.data.data){ + let b ={ + value: i.code, + label: i.name, + children: [] + } + let er = []; + let res = await getSelect(i.code); + + res.data.data.forEach( l =>{ + let a ={ + value: l.code, + label: l.name, + } + er.push(a); + }) + b.children = er; + shi.push(b); } - }) + a.children= shi; + shu.push(a); + } + optioner = shu; + return shu; } + +export default { useGetGlobalProperties , optioner} ; + + + diff --git a/src/main.js b/src/main.js index 33bce0c7..48c110a9 100644 --- a/src/main.js +++ b/src/main.js @@ -11,7 +11,7 @@ import 'element-plus/dist/index.css'; import Avue from '@smallwei/avue'; import '@smallwei/avue/lib/index.css'; import crudCommon from '@/mixins/crud.js'; -import globalc from '@/api/basicdata/globalc' +import globalc from '@/api/basicdata/globalc.js' import { getScreen } from './utils/util'; import './permission'; import error from './error'; diff --git a/src/option/basicdata/basicClient.js b/src/option/basicdata/basicClient.js index f2d89f03..49077d20 100644 --- a/src/option/basicdata/basicClient.js +++ b/src/option/basicdata/basicClient.js @@ -13,7 +13,7 @@ export default { { label: "创建人", prop: "createUser", - display: false, + display: true, hide: true, }, { diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue index 8779283c..2d3aa286 100644 --- a/src/views/basicdata/brand/basicClient.vue +++ b/src/views/basicdata/brand/basicClient.vue @@ -20,7 +20,7 @@ - +