diff --git a/src/api/waybill/orderDetails.js b/src/api/waybill/orderDetails.js new file mode 100644 index 00000000..a61f7c3a --- /dev/null +++ b/src/api/waybill/orderDetails.js @@ -0,0 +1,13 @@ +import request from '@/axios'; + +/** + * 查看订单详情 + * @returns + */ +export const postFindListByWaybillId = data => { + return request({ + url: '/api/logpm-trunkline/waybillOrder/findListByWaybillId', + method: 'post', + data, + }); +}; diff --git a/src/option/waybill/TemporaryStorageList.js b/src/option/waybill/TemporaryStorageList.js index f1d16efe..6ce4e06f 100644 --- a/src/option/waybill/TemporaryStorageList.js +++ b/src/option/waybill/TemporaryStorageList.js @@ -208,7 +208,7 @@ export const columnList = [ sortable: true, }, { - prop: 'totalVolume', + prop: 'createTime', label: '创建时间', type: 1, values: '', @@ -438,7 +438,7 @@ export const packageListColumnList = [ sortable: true, }, { - prop: 'totalVolume', + prop: 'createTime', label: '创建时间', type: 1, values: '', diff --git a/src/option/waybill/orderDetails.js b/src/option/waybill/orderDetails.js index a33c2f1f..577159a1 100644 --- a/src/option/waybill/orderDetails.js +++ b/src/option/waybill/orderDetails.js @@ -16,7 +16,7 @@ export const packageListColumnList = [ fixed: true, }, { - prop: 'billladingCode', + prop: 'waybillNo', label: '运单号', type: 1, values: '', @@ -27,7 +27,7 @@ export const packageListColumnList = [ head: false, }, { - prop: 'carNumber', + prop: 'orderCode', label: '订单自编号', type: 1, values: '', @@ -37,17 +37,7 @@ export const packageListColumnList = [ sortable: true, }, { - prop: 'orderPackageCode', - label: '包条码', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, - { - prop: 'driverPhone', + prop: 'totalNum', label: '总件数', type: 1, values: '', @@ -57,7 +47,7 @@ export const packageListColumnList = [ sortable: true, }, { - prop: 'warehouseName', + prop: 'createTime', label: '创建时间', type: 1, values: '', diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue index 51ff5a01..826242ee 100644 --- a/src/views/distribution/inventory/CreateOrder.vue +++ b/src/views/distribution/inventory/CreateOrder.vue @@ -201,7 +201,11 @@ - + @@ -278,7 +282,11 @@ - + @@ -455,6 +463,7 @@ :min="0" :step="0.1" v-model="query.deliveryFee" + @input="e => handleRefreshText('deliveryFee', e, 0)" > @@ -466,6 +475,7 @@ :min="0" :step="0.1" v-model="query.pickupFee" + @input="e => handleRefreshText('pickupFee', e, 0)" > @@ -477,6 +487,7 @@ :min="0" :step="0.1" v-model="query.warehouseManagementFee" + @input="e => handleRefreshText('warehouseManagementFee', e, 0)" > @@ -488,6 +499,7 @@ :min="0" :step="0.1" v-model="query.storageFee" + @input="e => handleRefreshText('storageFee', e, 0)" > @@ -501,6 +513,7 @@ :min="0" :step="0.1" v-model="query.handlingFee" + @input="e => handleRefreshText('handlingFee', e, 0)" > @@ -511,6 +524,7 @@ :min="0" :step="0.1" v-model="query.otherFee" + @input="e => handleRefreshText('otherFee', e, 0)" > @@ -1517,14 +1531,17 @@ const onLoad = async (idsArr = []) => { }); info.value.maxNum = _maxNum; + details.query.goodsCode = '-' + _maxNum; + if (data.defaultPayWay) { data.payWay = data.defaultPayWay; } else { details.query.payWay = data.payWayList.find(val => val.dictValue === '到付').dictKey || '2'; } details.query.transportType = '1'; - details.goodsCode = data['totalNum']; + // details.goodsCode = data['totalNum']; console.log('details.query', details.query); + console.log('info.value :>> ', info.value); // // instance.proxy.$forceUpdate(); } catch (error) { console.log('error :>> ', error); @@ -1871,6 +1888,13 @@ const destinationWarehouseNameChange = val => { /** 计算行合计 */ const handleComputed = (row: any) => { // if (!row.price) return; + row.num = row.num || 0; + row.price = row.price || 0; + row.volume = row.volume || 0; + row.weight = row.weight || 0; + + console.log('row :>> ', row); + if (row.chargeType === 1) row.subtotalFreight = computeNumber(row.num, '*', row.price).result; else if (row.chargeType === 2) row.subtotalFreight = computeNumber(row.volume, '*', row.price).result; @@ -2011,6 +2035,13 @@ const handlePayWay = (number?: number) => { } }; +const handleRefreshText = (key, value, refreshValue?: string | number) => { + console.log('key :>> ', key); + if (value) return; + query.value[key] = 1; + console.log('query :>> ', query); +}; + /** 重置数据 */ const resetForm = (formEl: FormInstance | undefined) => { console.log('formEl :>> ', formEl); diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue index 5d52d16c..7bc013d7 100644 --- a/src/views/waybill/CreateZeroOrder.vue +++ b/src/views/waybill/CreateZeroOrder.vue @@ -1597,6 +1597,8 @@ const destinationWarehouseNameChange = val => { /** 计算行合计 */ const handleComputed = (row: any) => { + details.query.goodsCode = '-' + details.totalObj.totalCount; + console.log('details.totalObj.totalCount :>> ', details.totalObj.totalCount); if (!row.price) return; if (row.chargeType === 1) row.subtotalFreight = computeNumber(row.num, '*', row.price).result; else if (row.chargeType === 2) diff --git a/src/views/waybill/EditCustomerInfo.vue b/src/views/waybill/EditCustomerInfo.vue index 65539240..631fbd10 100644 --- a/src/views/waybill/EditCustomerInfo.vue +++ b/src/views/waybill/EditCustomerInfo.vue @@ -139,7 +139,10 @@ const handleSubmit = () => { const { code, msg } = res.data; if (code === 200) { if (msg) ElMessage({ message: msg, type: 'success' }); - $store.commit('DEL_TAG_CURRENT'); + $store.commit('EDIT_REFRESHITEM', { + title: 'TemporaryStorageList', + status: true, + }); $router.back(); return; } else { diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue index a012aa7b..554b2613 100644 --- a/src/views/waybill/TemporaryStorageList.vue +++ b/src/views/waybill/TemporaryStorageList.vue @@ -116,9 +116,7 @@ > @@ -460,7 +458,7 @@ import { import { getLazyTreeAll } from '@/api/base/region'; import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util'; -import { columnList, packageListColumnList } from '@/option/waybill/TemporaryStorageList'; +import { columnList } from '@/option/waybill/TemporaryStorageList'; import { useRouter } from 'vue-router'; import print from '@/utils/print'; import { ElMessage } from 'element-plus'; @@ -519,10 +517,6 @@ const details = reactive({ /** 列表数据 */ haveDataData: [], notHaveDataData: [], - /** 包明细表头 */ - packageListColumnList, - /** 包明细数据 */ - packageListData: [], /** 页面loading */ loadingObj: { /** 列表加载loading */ @@ -1220,6 +1214,7 @@ onActivated(() => { console.log('this.$store :>> ', $store); if ($store.state.isRefresh.refreshObj.TemporaryStorageList) { // 重新请求数据 + details.query = {}; onLoad(); $store.commit('EDIT_REFRESHITEM', { title: 'TemporaryStorageList', status: false }); diff --git a/src/views/waybill/orderDetails.vue b/src/views/waybill/orderDetails.vue index a88c6bde..851e577d 100644 --- a/src/views/waybill/orderDetails.vue +++ b/src/views/waybill/orderDetails.vue @@ -110,30 +110,28 @@ - - - -