diff --git a/components/NumberInput.vue b/components/NumberInput.vue index 8542bcf..6ee8f80 100644 --- a/components/NumberInput.vue +++ b/components/NumberInput.vue @@ -132,4 +132,8 @@ export default { border-radius: 4px; font-size: 14px; } +input { + font-size: 14px; + color: #333; +} diff --git a/pages/common/mater-list.vue b/pages/common/mater-list.vue index da775dd..e1c8a0a 100644 --- a/pages/common/mater-list.vue +++ b/pages/common/mater-list.vue @@ -85,6 +85,7 @@ }, onLoad (options) { this.title = options.title + this.searchList() }, methods: { searchList () { diff --git a/pages/zw/ltzp.vue b/pages/zw/ltzp.vue index bac159d..93380a9 100644 --- a/pages/zw/ltzp.vue +++ b/pages/zw/ltzp.vue @@ -29,12 +29,13 @@ - - 物料单重(kg) + + 物料单重 - + + KG @@ -65,7 +66,29 @@ 料桶编码 - + + + + + + + + + + + @@ -95,8 +118,21 @@ currentData: {}, options: [], index: '', - options1: [], - index1: '', + // options1: [{text:'t1', value: 't1'}, {text:'t2', value: 't2'}], + // index1: '', + materialCode: '', + selectedIndex: 0, + materialOptions: [], + // materialOptions: [ + // 'TB-001', + // 'TB-002', + // 'TB-003', + // 'TB-004', + // 'TB-005', + // 'TB-006', + // 'TB-007', + // 'TB-008' + // ], disabled: false }; }, @@ -112,9 +148,20 @@ } }, methods: { + onInput(e) { + // console.log('输入内容:', e.detail.value) + }, + onPickerChange(e) { + const index = e.detail.value + this.selectedIndex = index + this.materialCode = this.materialOptions[index] + }, selectChange (e) { this.index = e }, + selectChange1 (e) { + this.index1 = e + }, async _suppList () { try { let res = await suppList() @@ -129,8 +176,16 @@ }, /** 料桶编码下拉框*/ async _vehiclelist () { - let res = await vehiclelist() - this.options1 = [...res] + try { + let res = await vehiclelist() + if (res) { + this.materialOptions = res.data.map(item => item.value); + } else { + this.materialOptions = [] + } + } catch (e) { + this.materialOptions = [] + } }, toJump () { uni.navigateTo({ @@ -173,6 +228,8 @@ } } }) + } else { + this._combination() } }, async _combination () { @@ -193,4 +250,122 @@ diff --git a/pages/zw/manual-callmater.vue b/pages/zw/manual-callmater.vue index 38f9b41..93171ab 100644 --- a/pages/zw/manual-callmater.vue +++ b/pages/zw/manual-callmater.vue @@ -53,12 +53,13 @@ - - 数量(kg) + + 数量 - + + KG