diff --git a/src/option/factory/mt/factoryOrderMain.js b/src/option/factory/mt/factoryOrderMain.js index 2820dc7a..3377add9 100644 --- a/src/option/factory/mt/factoryOrderMain.js +++ b/src/option/factory/mt/factoryOrderMain.js @@ -46,6 +46,7 @@ export default { { label: "仓库类型", prop: "warehouseType", + search:true, type: "input", }, { @@ -141,10 +142,34 @@ export default { viewDisplay: false, hide: true, }, + + { label: "推送状态", prop: "pushStatusName", + search: true, + type: 'select', + dicData: [ + + { + label: '已推送', + value: 1, + }, + { + label: '未推送', + value: 2, + } + + ], + }, + { + label: "推送时间", + prop: "pushTime", type: "input", + addDisplay: false, + editDisplay: false, + viewDisplay: false, + hide: false, }, ] } diff --git a/src/option/factory/mt/packageInfo.js b/src/option/factory/mt/packageInfo.js index 33126a60..8084c8cd 100644 --- a/src/option/factory/mt/packageInfo.js +++ b/src/option/factory/mt/packageInfo.js @@ -32,6 +32,7 @@ export default { { label: "订单自编码", prop: "orderCode", + search: true, type: "input", }, { @@ -52,6 +53,8 @@ export default { { label: "包装编号", prop: "packageCode", + search: true, + type: "input", }, { @@ -88,8 +91,31 @@ export default { { label: "推送状态", prop: "pushStatusName", + search: true, + type: 'select', + dicData: [ + + { + label: '已推送', + value: 1, + }, + { + label: '未推送', + value: 2, + } + + ], + }, + { + label: "推送时间", + prop: "pushTime", type: "input", + addDisplay: false, + editDisplay: false, + viewDisplay:true, + hide: false, }, + { label: "创建人", prop: "createUser", diff --git a/src/page/login/index.vue b/src/page/login/index.vue index 8463977f..04e5c6db 100644 --- a/src/page/login/index.vue +++ b/src/page/login/index.vue @@ -6,32 +6,15 @@ {{ time }}

{{ $t('login.info') }}

- - + +
+ +
diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue index a04b285f..f896f64c 100644 --- a/src/views/distribution/inventory/distributionStockListDetails.vue +++ b/src/views/distribution/inventory/distributionStockListDetails.vue @@ -87,7 +87,7 @@ - +
{ diff --git a/src/views/factory/mt/packageInfo.vue b/src/views/factory/mt/packageInfo.vue index 98a45c0f..0723bf94 100644 --- a/src/views/factory/mt/packageInfo.vue +++ b/src/views/factory/mt/packageInfo.vue @@ -30,9 +30,9 @@ @click="handleDelete" >删 除 --> - 导 出 - + --> 推送 @@ -360,10 +360,13 @@ export default { onLoad(page, params = {}) { this.loading = true; - const { invoiceOrderCode } = this.query; - + const { invoiceOrderCode,pushStatusName,orderCode,packageCode } = this.query; + let values = { invoiceOrderCode: invoiceOrderCode, + pushStatus:pushStatusName, + orderCode:orderCode, + packageCode:packageCode, }; getList(page.currentPage, page.pageSize, values).then(res => { diff --git a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue index b456caa4..9d8c4e27 100644 --- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue +++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue @@ -67,9 +67,9 @@ clearable > @@ -522,6 +522,7 @@ export default { packagingSpecifications: [{ required: true, message: '请输入包装规格', trigger: 'change' }], createInventory: [{ required: true, message: '请输入入库数量', trigger: 'change' }], productUnit: [{ required: true, message: '请选择物品单位', trigger: 'change' }], + actualReceipt: [{ required: true, message: '请选择产品品牌', trigger: 'blur' }], brandId: [{ required: true, message: '请选择品牌', trigger: 'change' }], receiptBatch: [{ required: true, message: '请填写入库批次', trigger: 'blur' }], @@ -596,6 +597,7 @@ export default { this.options.push({ label: da.customerName, + code: da.customerCode, value: da.clientId, }); this.optionCodes.push({ @@ -726,10 +728,12 @@ export default { if (query) { console.log('客户ID', this.form.clientId); if (!!this.form.clientId) { + this.brandList = []; let si = !!this.form.storeId ? this.form.storeId : this.form.clientId; let cl = await getListIdsName(this.page.currentPage, this.page.pageSize, { brandName: query, ids: si, + type: !!this.form.storeId ? 2 : 1 }); console.log('>>>>', cl.data.data); cl.data.data.forEach(i => { @@ -770,22 +774,24 @@ export default { if (num == 1) { const obj = this.options.find(item => item.value === row); console.log('obj>>>>>>>>>>>', obj); - this.optionCodes = [ + this.options = [ { key: obj.value, value: obj.value, - label: obj.code, + label: obj.label, + code: obj.code, }, ]; - this.form.clientCode = obj.value; + this.form.customerCode = obj.code; } else { - const obj = this.optionCodes.find(item => item.value === row); + const obj = this.options.find(item => item.value === row); console.log('obj>>>>>>>>>>>', obj); this.options = [ { key: obj.value, value: obj.value, - label: obj.code, + label: obj.label, + code: obj.code, }, ]; this.form.clientId = obj.value; @@ -796,14 +802,7 @@ export default { // console.log(">><><><<>",i); if (i.value == row) { this.form.customerName = i.label; - //查询客户服务类型 - aa = i.value; - } - }); - this.optionCodes.some(i => { - console.log('>><><><<>', i); - if (i.value == row) { - this.form.clientCode = i.label; + this.form.clientCode = i.code; //查询客户服务类型 aa = i.value; } @@ -862,6 +861,7 @@ export default { if (query) { // this.loading = true; this.options = []; + this.form.customerCode = null; let cl = await getListClient(this.page.currentPage, this.page.pageSize, { clientName: query, }); @@ -888,18 +888,19 @@ export default { async remoteCodeMethod(query) { if (query) { // this.loading = true; - this.optionCodes = []; + this.options = []; + this.form.clientId = null; let cl = await getListClient(this.page.currentPage, this.page.pageSize, { clientCode: query, }); console.log('客户信息1234>>>>', cl.data.data.records); cl.data.data.records.forEach(i => { let st = { - label: i.clientCode, + label: i.clientName, value: i.id, - code: i.clientName, + code: i.clientCode, }; - this.optionCodes.push(st); + this.options.push(st); }); // setTimeout(() => { // this.loading = false @@ -908,7 +909,7 @@ export default { // }) // }, 200) } else { - this.optionCodes = []; + this.options = []; } }, handleEditOwn(row) { @@ -1088,7 +1089,29 @@ export default { this.title = '新增'; // this.form = {} this.box = true; - //查询物料 + //查询品牌 + this.getBingPai(); + }, + async getBingPai(){ + console.log('客户ID', this.form.clientId); + this.brandList = []; + if (!!this.form.clientId) { + let si = !!this.form.storeId ? this.form.storeId : this.form.clientId; + let cl = await getListIdsName(this.page.currentPage, this.page.pageSize, { + ids: si, + type: !!this.form.storeId ? 2 : 1 + }); + console.log('>>>>', cl.data.data); + cl.data.data.forEach(i => { + let st = { + label: i.brandName, + value: i.id, + }; + this.brandList.push(st); + }); + } else { + this.$message.warning('请先填写客户信息，产品品牌信息才能带出！！'); + } }, handleEdit(row) { this.title = '编辑';