diff --git a/common/style/layout.css b/common/style/layout.css index 9a5ad84..615cd2c 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -107,11 +107,26 @@ uni-button:after { text-align-last: justify; text-justify: inter-ideograph;/*兼容ie*/ } +.filter_label_1 { + line-height: 30rpx; +} .filter_input_wraper { flex: 1; height: 80rpx; padding: 5rpx 0; margin-left: 30rpx; + display: flex; + justify-content: flex-start; + align-items: center; +} +.filter_input_wraper_1 { + height: 30rpx; +} +.filter_input_wraper_inn_text { + line-height: 30rpx; + font-size: 28rpx; + color: #606266; + margin-left: 10rpx; } .filter_input { width: 100%; diff --git a/components/SearchBox.vue b/components/SearchBox.vue index 6f54767..2bf4a8e 100644 --- a/components/SearchBox.vue +++ b/components/SearchBox.vue @@ -34,7 +34,8 @@ methods: { handleChange ($event) { this.cur = $event.target.value - this.$emit('input', this.cur) + this.$emit('input', this.cur) + this.$emit('handleChange', this.cur) }, toSearch () { this.$emit('toSearch', this.cur) diff --git a/pages/WarehouseManage/InStoreConfirm.vue b/pages/WarehouseManage/InStoreConfirm.vue index 5da8a90..cfaaddd 100644 --- a/pages/WarehouseManage/InStoreConfirm.vue +++ b/pages/WarehouseManage/InStoreConfirm.vue @@ -10,6 +10,7 @@ @@ -23,6 +24,15 @@ /> + + + + + + + 虚拟库 + + @@ -50,9 +60,8 @@ - + - @@ -70,6 +79,7 @@ return { val1: '', val2: '', + isV: '0', dataList: [], pkId: '', pkObj: {}, @@ -77,24 +87,28 @@ disabled1: false }; }, - created () { - this._boxQuery() - }, methods: { + /** 虚拟库 */ + isVirtual () { + this.isV = this.isV === '0' ? '1' : '0' + }, + handleChange (e) { + this._boxQuery(e) + }, /** 初始化查询 */ async _boxQuery () { - let res = await boxQuery(this.val1, this.val2, '2') + let res = await boxQuery(e, '2') this.dataList = [...res.data] }, /** 确认 */ async _stConfirm () { this.disabled = true - if (!this.val2 || !this.pkId) { + if (!this.pkId) { this.disabled = false return } try { - let res = await stConfirm(this.pkObj, this.val2) + let res = await stConfirm(this.pkObj, this.val2, '2', this.isV) uni.showToast({ title: res.message, icon: 'none' @@ -102,7 +116,7 @@ this.pkId = '' this.pkObj = {} this.disabled = false - this._boxQuery() + this._boxQuery(this.val1) } catch (e) { this.disabled = false diff --git a/pages/WarehouseManage/ReturngoodsInStore.vue b/pages/WarehouseManage/ReturngoodsInStore.vue index 2bcd7a4..8bae475 100644 --- a/pages/WarehouseManage/ReturngoodsInStore.vue +++ b/pages/WarehouseManage/ReturngoodsInStore.vue @@ -10,6 +10,7 @@ @@ -23,6 +24,21 @@ /> + + + + + + + 虚拟库 + + + + 木箱料号 + + + + @@ -50,8 +66,7 @@ - - + @@ -69,30 +84,36 @@ return { val1: '', val2: '', + val3: '', + isV: '0', dataList: [], pkId: '', pkObj: {}, disabled: false }; }, - created () { - this._boxQuery() - }, methods: { + /** 虚拟库 */ + isVirtual () { + this.isV = this.isV === '0' ? '1' : '0' + }, + handleChange (e) { + this._boxQuery(e) + }, /** 初始化查询 */ - async _boxQuery () { - let res = await boxQuery(this.val1, this.val2, '3') + async _boxQuery (e) { + let res = await boxQuery(e, '3') this.dataList = [...res.data] }, /** 确认 */ async _stConfirm () { this.disabled = true - if (!this.val2 || !this.pkId) { + if (!this.pkId) { this.disabled = false return } try { - let res = await stConfirm(this.pkObj, this.val2) + let res = await stConfirm(this.pkObj, this.val2, '3', this.isV, this.val3) uni.showToast({ title: res.message, icon: 'none' @@ -100,7 +121,7 @@ this.pkId = '' this.pkObj = {} this.disabled = false - this._boxQuery() + this._boxQuery(this.val1) } catch (e) { this.disabled = false diff --git a/pages/WarehouseManage/ScrapInStore.vue b/pages/WarehouseManage/ScrapInStore.vue index 52cac2f..2ead091 100644 --- a/pages/WarehouseManage/ScrapInStore.vue +++ b/pages/WarehouseManage/ScrapInStore.vue @@ -10,6 +10,7 @@ @@ -23,6 +24,15 @@ /> + + + + + + + 虚拟库 + + @@ -50,8 +60,7 @@ - - + @@ -69,30 +78,35 @@ return { val1: '', val2: '', + isV: '0', dataList: [], pkId: '', pkObj: {}, disabled: false }; }, - created () { - this._boxQuery() - }, methods: { + /** 虚拟库 */ + isVirtual () { + this.isV = this.isV === '0' ? '1' : '0' + }, + handleChange (e) { + this._boxQuery(e) + }, /** 初始化查询 */ - async _boxQuery () { - let res = await boxQuery(this.val1, this.val2, '1') + async _boxQuery (e) { + let res = await boxQuery(e, '1') this.dataList = [...res.data] }, /** 确认 */ async _stConfirm () { this.disabled = true - if (!this.val2 || !this.pkId) { + if (!this.pkId) { this.disabled = false return } try { - let res = await stConfirm(this.pkObj, this.val2) + let res = await stConfirm(this.pkObj, this.val2, '1', this.isV) uni.showToast({ title: res.message, icon: 'none' @@ -100,7 +114,7 @@ this.pkId = '' this.pkObj = {} this.disabled = false - this._boxQuery() + this._boxQuery(this.val1) } catch (e) { this.disabled = false diff --git a/pages/WarehouseManage/SemifinishedOutStore.vue b/pages/WarehouseManage/SemifinishedOutStore.vue index 5a9d82c..8db3ff9 100644 --- a/pages/WarehouseManage/SemifinishedOutStore.vue +++ b/pages/WarehouseManage/SemifinishedOutStore.vue @@ -62,7 +62,7 @@ - + @@ -104,18 +104,18 @@ }, /** 初始化查询 */ async _outcoolIOQuery () { - let res = await outcoolIOQuery(this.val2, this.index, this.val1) + let res = await outcoolIOQuery(this.val2, this.index) this.dataList = [...res.data] }, /** 确认 */ async _outconfirmInstor () { this.disabled = true - if (!this.pkId) { + if (!this.pkId || !this.val1) { this.disabled = false return } try { - let res = await outconfirmInstor(this.pkObj) + let res = await outconfirmInstor(this.pkObj, this.val1) uni.showToast({ title: res.message, icon: 'none' diff --git a/pages/home/home.vue b/pages/home/home.vue index b730912..d72c244 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -24,7 +24,11 @@ export default { data() { return { +<<<<<<< HEAD menu: [{url: '/pages/ProductManage/SboProdProgress', name: '生箔生产进度'}, {url: '/pages/ProductManage/SboProcess', name: '生箔工序'}, {url: '/pages/ProductManage/BakeProcess', name: '烘烤工序'}, {url: '/pages/ProductManage/PointManage', name: '点位管理'}, {url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/WarehouseManage/SemifinishedInStore', name: '半成品入库'}, {url: '/pages/WarehouseManage/SemifinishedOutStore', name: '半成品出库'}, {url: '/pages/WarehouseManage/ReturngoodsInStore', name: '退货入库'}, {url: '/pages/WarehouseManage/ScrapInStore', name: '报废入库'}, {url: '/pages/WarehouseManage/InStoreConfirm', name: '入库确认'}, {url: '/pages/WarehouseManage/ProdDeliveryConfirm', name: '生产区发货确认'}, {url: '/pages/WarehouseManage/XuniDeliveryConfirm', name: '虚拟区发货确认'}, {url: '/pages/WarehouseManage/EmptyInStore', name: '空载具入库'}, {url: '/pages/WarehouseManage/EmptyOutStore', name: '空载具出库'}] +======= + menu: [{url: '/pages/ProductManage/SboProdProgress', name: '生箔生产进度'}, {url: '/pages/ProductManage/SboProcess', name: '生箔工序'}, {url: '/pages/ProductManage/BakeProcess', name: '烘烤工序'}, {url: '/pages/ProductManage/PointManage', name: '点位管理'}, {url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/WarehouseManage/SemifinishedInStore', name: '半成品入库'}, {url: '/pages/WarehouseManage/SemifinishedOutStore', name: '半成品出库'}, {url: '/pages/WarehouseManage/ReturngoodsInStore', name: '退货入库'}, {url: '/pages/WarehouseManage/ScrapInStore', name: '报废入库'}, {url: '/pages/WarehouseManage/InStoreConfirm', name: '生产入库'}] +>>>>>>> 622a0f92be7f55d52a19e61e766a1a4fd6beb281 }; }, mounted () { diff --git a/utils/getData2.js b/utils/getData2.js index 6a68972..eec2eaf 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -122,15 +122,15 @@ export const outcoolIOQuery = (name, area, code) => request({ url:'api/pda/coolOut/coolIOQuery', data: { container_name: name, - product_area: area, - point_code: code + product_area: area } }) // 1.2确认出库 export const outconfirmInstor = (raw_jo, code, is_bake) => request({ url:'api/pda/coolOut/confirmInstor', data: { - raw_jo: raw_jo + raw_jo: raw_jo, + point_code: code } }) @@ -142,21 +142,23 @@ export const boxQuery = (no, option, code) => request({ url:'api/pda/st/boxQuery', data: { box_no: no, - option: option, - point_code: code + option: option } }) -// 1.2确认出库 -export const stConfirm = (box_jo, code) => request({ +// 1.2确认入库 +export const stConfirm = (box_jo, code, option, is, mcode) => request({ url:'api/pda/st/confirm', data: { box_jo: box_jo, - point_code: code + point_code: code, + option: option, + is_virtual: is, + material_code: mcode } }) /** - * 入库确认 + * 生产入库 */ // 1.3补码 export const stPrint = (box_jo) => request({