From 49c0f1be3c5881cd0db241806387ecc028e67993 Mon Sep 17 00:00:00 2001 From: kilo Date: Tue, 9 May 2023 17:36:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E7=BB=91=E5=AE=9A=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/coderule/basicTenantCode.vue | 142 +++++++++---------- src/views/basic/pda/basicPda.vue | 1 - vue.config.js | 2 +- 3 files changed, 65 insertions(+), 80 deletions(-) diff --git a/src/views/basic/coderule/basicTenantCode.vue b/src/views/basic/coderule/basicTenantCode.vue index a4db520..c1053eb 100644 --- a/src/views/basic/coderule/basicTenantCode.vue +++ b/src/views/basic/coderule/basicTenantCode.vue @@ -5,37 +5,33 @@ - - - - - - - - - - - - - - - 搜索 - 清空 - + 搜索 + 清空 - @@ -99,23 +95,23 @@ - + + :label="item.dictValue" + :value="item.sort"> - + + :label="item.dictValue" + :value="item.sort"> @@ -137,7 +133,7 @@ import {getList, getDetail, add, update, remove} from "@/api/basic/basicTenantCode"; import option from "@/option/basic/basicdataTenantCode"; import {mapGetters} from "vuex"; - // import {getDictionary} from '@/api/system/dict' + import {getDictionaryBiz} from '@/api/system/dict' export default { data() { @@ -171,49 +167,16 @@ export default { option: option, // 表单列表 data: [], - codeType: [{ - value: '1', - label: '运单码' - }, - { - value: '2', - label: '订单码' - }, - { - value: '3', - label: '配送清单码' - } , - { - value: '4', - label: '配载计划码' - }, - { - value: '5', - label: '库位码' - }, - { - value: '6', - label: '托盘码' - }, - { - value: '7', - label: '包件码' - }], - showType: [ - { - value: '1', - label: '二维码' - }, - { - value: '2', - label: '条形码' - }], + codeType: [], + showType: [], } }, + created() { + this.onLoad(this.page); + }, mounted() { this.init(); - this.onLoad(this.page); }, computed: { @@ -228,6 +191,12 @@ export default { }, methods: { init() { + getDictionaryBiz("basic_tenant_code").then(res=>{ + this.codeType = res.data.data + }) + getDictionaryBiz("basic_tenant_code_show").then(res=>{ + this.showType = res.data.data + }) }, searchHide() { this.search = !this.search; @@ -271,6 +240,9 @@ export default { this.box = true getDetail(row.id).then(res => { this.form = res.data.data; + res.data.data.codeType = parseInt(res.data.data.codeType); + res.data.data.showType = parseInt(res.data.data.showType); + this.form = res.data.data; }); }, handleView(row) { @@ -278,13 +250,11 @@ export default { this.view = true; this.box = true; getDetail(row.id).then(res => { - - console.log(res) - console.log(res.data.data.showType) - if (res.data.data.showType){ - this.options.value = res.data.data.showType; - } + res.data.data.codeType = parseInt(res.data.data.codeType); + res.data.data.showType = parseInt(res.data.data.showType); this.form = res.data.data; + + }); }, handleDelete() { @@ -351,12 +321,28 @@ export default { console.log(this.query) getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { const data = res.data.data; + this.codeType.forEach(item=>{ + data.records.forEach(code=>{ + if (item.dictKey === code.codeType){ + code.codeType = item.dictValue; + } + }) + }) + this.showType.forEach(item=>{ + data.records.forEach(show=>{ + if (item.dictKey === show.showType){ + show.showType = item.dictValue; + } + }) + }) this.page.total = data.total; this.data = data.records; + this.loading = false; this.selectionClear(); }); - } + }, + } }; diff --git a/src/views/basic/pda/basicPda.vue b/src/views/basic/pda/basicPda.vue index 4c0e43d..598d154 100644 --- a/src/views/basic/pda/basicPda.vue +++ b/src/views/basic/pda/basicPda.vue @@ -189,7 +189,6 @@ - diff --git a/vue.config.js b/vue.config.js index 8476b50..c7403af 100644 --- a/vue.config.js +++ b/vue.config.js @@ -26,7 +26,7 @@ module.exports = { proxy: { '/api': { //本地服务接口地址 - target: 'http://localhost:8888', + target: 'http://localhost:13000', //远程演示服务地址,可用于直接启动项目 // target: 'https://saber.bladex.vip/api', ws: true, From cd8c742252a958aa0eba46093ab635e98291e8c3 Mon Sep 17 00:00:00 2001 From: kilo Date: Tue, 9 May 2023 17:38:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E7=BB=91=E5=AE=9A=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index c7403af..8476b50 100644 --- a/vue.config.js +++ b/vue.config.js @@ -26,7 +26,7 @@ module.exports = { proxy: { '/api': { //本地服务接口地址 - target: 'http://localhost:13000', + target: 'http://localhost:8888', //远程演示服务地址,可用于直接启动项目 // target: 'https://saber.bladex.vip/api', ws: true,