{{ item.rawMaterialName }}
@@ -117,7 +117,9 @@ export default {
}
},
mounted() {
- this.options = this.rawMaterialList;
+ if (this.rawMaterialList.length < 0) {
+ this.$store.dispatch('category/getRawMaterialMap')
+ }
},
computed: {
...mapGetters(['rawMaterialList'])
diff --git a/klp-ui/src/components/KLPService/VendorSelect/index.vue b/klp-ui/src/components/KLPService/VendorSelect/index.vue
index 9127320b..02a6a853 100644
--- a/klp-ui/src/components/KLPService/VendorSelect/index.vue
+++ b/klp-ui/src/components/KLPService/VendorSelect/index.vue
@@ -47,7 +47,7 @@ export default {
this.vendorLoading = true;
listSupplier({
pageNum: 1,
- pageSize: 10,
+ pageSize: 20,
name: query
}).then(response => {
this.vendorList = response.rows;
diff --git a/klp-ui/src/components/KLPService/WarehouseTree/index.vue b/klp-ui/src/components/KLPService/WarehouseTree/index.vue
index 0d4a2eca..5a3b19cd 100644
--- a/klp-ui/src/components/KLPService/WarehouseTree/index.vue
+++ b/klp-ui/src/components/KLPService/WarehouseTree/index.vue
@@ -56,7 +56,7 @@ export default {
};
-
+ -->
diff --git a/klp-ui/src/components/KLPUI/KLPTable/index.vue b/klp-ui/src/components/KLPUI/KLPTable/index.vue
new file mode 100644
index 00000000..62e8ba0d
--- /dev/null
+++ b/klp-ui/src/components/KLPUI/KLPTable/index.vue
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/klp-ui/src/components/Pagination/index.vue b/klp-ui/src/components/Pagination/index.vue
index 56f5a6b9..13573cb3 100644
--- a/klp-ui/src/components/Pagination/index.vue
+++ b/klp-ui/src/components/Pagination/index.vue
@@ -8,6 +8,7 @@
:page-sizes="pageSizes"
:pager-count="pagerCount"
:total="total"
+ small
v-bind="$attrs"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -46,7 +47,7 @@ export default {
},
layout: {
type: String,
- default: 'total, sizes, prev, pager, next, jumper'
+ default: 'total, sizes, prev, pager, next'
},
background: {
type: Boolean,
diff --git a/klp-ui/src/components/dvplanSelect/index.vue b/klp-ui/src/components/dvplanSelect/index.vue
index 1e50f59b..c4389034 100644
--- a/klp-ui/src/components/dvplanSelect/index.vue
+++ b/klp-ui/src/components/dvplanSelect/index.vue
@@ -148,7 +148,7 @@
// 查询参数
queryParams: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 20,
planCode: null,
planName: null,
planType: this.planType,
diff --git a/klp-ui/src/components/dvsubjectSelect/multi.vue b/klp-ui/src/components/dvsubjectSelect/multi.vue
index 99334b53..a7f5127a 100644
--- a/klp-ui/src/components/dvsubjectSelect/multi.vue
+++ b/klp-ui/src/components/dvsubjectSelect/multi.vue
@@ -93,7 +93,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 20,
subjectCode: null,
subjectName: null,
subjectType: this.subjectType,
diff --git a/klp-ui/src/components/dvsubjectSelect/single.vue b/klp-ui/src/components/dvsubjectSelect/single.vue
index 414cc484..1cea4ae9 100644
--- a/klp-ui/src/components/dvsubjectSelect/single.vue
+++ b/klp-ui/src/components/dvsubjectSelect/single.vue
@@ -89,7 +89,7 @@
// 查询参数
queryParams: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 20,
subjectCode: null,
subjectName: null,
subjectType: this.subjectType,
diff --git a/klp-ui/src/components/machinerySelect/index.vue b/klp-ui/src/components/machinerySelect/index.vue
index 638d5e5b..1579a1d2 100644
--- a/klp-ui/src/components/machinerySelect/index.vue
+++ b/klp-ui/src/components/machinerySelect/index.vue
@@ -145,7 +145,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 20,
machineryCode: null,
machineryName: null,
machineryBrand: null,
diff --git a/klp-ui/src/components/machinerySelect/single.vue b/klp-ui/src/components/machinerySelect/single.vue
index 9cbd3b1f..7d20e77c 100644
--- a/klp-ui/src/components/machinerySelect/single.vue
+++ b/klp-ui/src/components/machinerySelect/single.vue
@@ -157,7 +157,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 20,
machineryCode: null,
machineryName: null,
machineryBrand: null,
diff --git a/klp-ui/src/components/userSelect/multi.vue b/klp-ui/src/components/userSelect/multi.vue
index f35c0b5e..61fa5d81 100644
--- a/klp-ui/src/components/userSelect/multi.vue
+++ b/klp-ui/src/components/userSelect/multi.vue
@@ -150,7 +150,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 20,
userName: undefined,
phonenumber: undefined,
status: undefined,
diff --git a/klp-ui/src/components/userSelect/single.vue b/klp-ui/src/components/userSelect/single.vue
index 81365588..5404bfff 100644
--- a/klp-ui/src/components/userSelect/single.vue
+++ b/klp-ui/src/components/userSelect/single.vue
@@ -153,7 +153,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 20,
userName: undefined,
phonenumber: undefined,
status: undefined,
diff --git a/klp-ui/src/main.js b/klp-ui/src/main.js
index ced9cc70..5c8dc618 100644
--- a/klp-ui/src/main.js
+++ b/klp-ui/src/main.js
@@ -39,6 +39,7 @@ import DictTag from '@/components/DictTag'
import VueMeta from 'vue-meta'
// 字典数据组件
import DictData from '@/components/DictData'
+import KLPTable from '@/components/KLPUI/KLPTable/index.vue'
// 全局方法挂载
Vue.prototype.getDicts = getDicts
@@ -60,7 +61,7 @@ Vue.component('Editor', Editor)
Vue.component('FileUpload', FileUpload)
Vue.component('ImageUpload', ImageUpload)
Vue.component('ImagePreview', ImagePreview)
-
+Vue.component('KLPTable', KLPTable)
Vue.use(vueFlvPlayer)
Vue.use(directive)
diff --git a/klp-ui/src/views/components/FlowTable.vue b/klp-ui/src/views/components/FlowTable.vue
index 9219bb0d..76ee7aed 100644
--- a/klp-ui/src/views/components/FlowTable.vue
+++ b/klp-ui/src/views/components/FlowTable.vue
@@ -65,7 +65,7 @@ export default {
todoList: [],
queryParams: {
pageNum: 1,
- pageSize: 10
+ pageSize: 20
},
dateRange: []
}
diff --git a/klp-ui/src/views/demo/demo/index.vue b/klp-ui/src/views/demo/demo/index.vue
index 6ff47247..f496e69d 100644
--- a/klp-ui/src/views/demo/demo/index.vue
+++ b/klp-ui/src/views/demo/demo/index.vue
@@ -243,7 +243,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 20,
testKey: undefined,
value: undefined,
createTime: undefined,
diff --git a/klp-ui/src/views/finance/document/components/detail.vue b/klp-ui/src/views/finance/document/components/detail.vue
index 6a61e1b3..3f47782c 100644
--- a/klp-ui/src/views/finance/document/components/detail.vue
+++ b/klp-ui/src/views/finance/document/components/detail.vue
@@ -230,7 +230,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 20,
voucherNo: undefined,
lineNo: undefined,
entryDate: undefined,
diff --git a/klp-ui/src/views/finance/document/index.vue b/klp-ui/src/views/finance/document/index.vue
index ce392053..c088c234 100644
--- a/klp-ui/src/views/finance/document/index.vue
+++ b/klp-ui/src/views/finance/document/index.vue
@@ -136,7 +136,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 20,
docNo: undefined,
docType: undefined,
docDate: undefined,
diff --git a/klp-ui/src/views/finance/jounery/index.vue b/klp-ui/src/views/finance/jounery/index.vue
index ec9e6520..89996758 100644
--- a/klp-ui/src/views/finance/jounery/index.vue
+++ b/klp-ui/src/views/finance/jounery/index.vue
@@ -155,7 +155,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 20,
journalDate: undefined,
summary: undefined,
transType: undefined,
diff --git a/klp-ui/src/views/finance/pay/index.vue b/klp-ui/src/views/finance/pay/index.vue
index 6aea7a8e..3f63ac64 100644
--- a/klp-ui/src/views/finance/pay/index.vue
+++ b/klp-ui/src/views/finance/pay/index.vue
@@ -156,7 +156,7 @@
-
+