diff --git a/canteen/pages/delivery/apply.vue b/canteen/pages/delivery/apply.vue index 6cf15d7..3776533 100644 --- a/canteen/pages/delivery/apply.vue +++ b/canteen/pages/delivery/apply.vue @@ -34,14 +34,29 @@ data(){ return { headers: [{ - label: '菜品名称', + label: '物资名称', key: 'material_name' },{ label: '规格', key: 'spec_name' + },{ + key: 'brand', + label: '品牌' + },{ + key: 'quality_level', + label: '品级' + },{ + label: '编号', + key: 'm_sn' + },{ + label: '供应商', + key: 'supplier_name' },{ label: '批次', key: 'purchase_id' + },{ + key: 'delivery_number', + label: '出库数量' }], contents: [], warehouse_list: {} diff --git a/canteen/pages/purchase/launch.vue b/canteen/pages/purchase/launch.vue index d26fba8..f6baf75 100644 --- a/canteen/pages/purchase/launch.vue +++ b/canteen/pages/purchase/launch.vue @@ -213,7 +213,7 @@ m_spec_id: item.spec_id, tax_price: item.tax_price, non_tax_price: item.non_tax_price, - purchase_number: item.purchase_number.value || 0 + purchase_number: Number(item.purchase_number.value) || item.purchase_limit } }); // 对象写法: diff --git a/supplier/pages/offer/index.vue b/supplier/pages/offer/index.vue index d27e347..a784d2c 100644 --- a/supplier/pages/offer/index.vue +++ b/supplier/pages/offer/index.vue @@ -241,16 +241,17 @@ id: item.quotation_id, tax_price: item.tax_price.value, non_tax_price: item.non_tax_price.value, - purchase_limit: item.purchase_limit.value || 1 + purchase_limit: Number(item.purchase_limit.value) || 1 }) }); // 操作状态,是保存还是直接发起 let state = ['待发起', '待审核'][_t]; this.$http(this.API.API_SUPPLIER_QUOTATIONSAVE, { data: list, - state: state + state: state, + q_sn: this.code }).then(res => { - this.$msg(res.data).then(result => { + this.$msg('操作成功').then(result => { this.$toBack(); }) }) @@ -271,7 +272,7 @@ m_spec_id: item.spec_id, tax_price: item.tax_price.value, non_tax_price: item.non_tax_price.value, - purchase_limit: item.purchase_limit.value || 1 + purchase_limit: Number(item.purchase_limit.value) || 1 }) } }); diff --git a/supplier/pages/order/detail.vue b/supplier/pages/order/detail.vue index df458c3..1c5dba7 100644 --- a/supplier/pages/order/detail.vue +++ b/supplier/pages/order/detail.vue @@ -73,7 +73,8 @@ key: 'non_tax_price' }], contents: [], - q_sn: '' // 订单号 + q_sn: '', // 订单号 + show_count: 0 } }, computed: { @@ -93,6 +94,12 @@ this.q_sn = options.q_sn; this.getDetail(); }, + onShow(options){ + this.show_count++; + if(this.show_count > 1){ + this.getDetail(); + } + }, methods: { stateType(val){ let type = 0;