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 35669e1..08b0d64 100644
--- a/src/views/basic/pda/basicPda.vue
+++ b/src/views/basic/pda/basicPda.vue
@@ -190,7 +190,6 @@
-