java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

新增改单

dev-xx
qb 1 year ago
parent
91ea6be4f8
commit
58922d7c84
4 changed files with 138 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      src/api/distribution/CreateOrder.js
  2. 28
      src/option/waybill/TemporaryStorageList.js
  3. 105
      src/views/distribution/inventory/CreateOrder.vue
  4. 50
      src/views/waybill/TemporaryStorageList.vue

22
src/api/distribution/CreateOrder.js
Unescape View File

@ -88,3 +88,25 @@ export const postFindWaybillDetail = data => {
data,
});
};
/**
* 改单
*/
export const postUpdateWaybill = data => {
return request({
url: '/api/logpm-trunkline/openOrder/updateWaybill',
method: 'post',
data,
});
};
/**
* 改单验证
*/
export const postUpdateWaybillVerify = data => {
return request({
url: '/api/logpm-trunkline/openOrder/updateWaybillVerify',
method: 'post',
data,
});
};

28
src/option/waybill/TemporaryStorageList.js
Unescape View File

@ -17,7 +17,7 @@ export const columnList = [
{
prop: 'orderCode',
label: '订单自编号',
type: 1,
type: 2,
values: '',
width: '150',
checkarr: [],
@ -38,7 +38,7 @@ export const columnList = [
{
prop: 'dealerName',
label: '商场名称',
type: 1,
type: 2,
values: '',
width: '130',
checkarr: [],
@ -48,7 +48,7 @@ export const columnList = [
{
prop: 'storeName',
label: '门店名称',
type: 1,
type: 2,
values: '',
width: '130',
checkarr: [],
@ -58,7 +58,17 @@ export const columnList = [
{
prop: 'siteName',
label: '基地',
type: 1,
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'brand',
label: '品牌',
type: 2,
values: '',
width: '130',
checkarr: [],
@ -88,7 +98,7 @@ export const columnList = [
{
prop: 'trainNumber',
label: '客户车次',
type: 1,
type: 2,
values: '',
width: '130',
checkarr: [],
@ -108,7 +118,7 @@ export const columnList = [
{
prop: 'customerName',
label: '顾客姓名',
type: 1,
type: 2,
values: '',
width: '130',
checkarr: [],
@ -118,7 +128,7 @@ export const columnList = [
{
prop: 'customerPhone',
label: '顾客电话',
type: 1,
type: 2,
values: '',
width: '130',
checkarr: [],
@ -128,7 +138,7 @@ export const columnList = [
{
prop: 'customerAddress',
label: '顾客地址',
type: 1,
type: 2,
values: '',
width: '180',
checkarr: [],
@ -208,7 +218,7 @@ export const columnList = [
{
prop: 'serviceNum',
label: '服务号',
type: 1,
type: 2,
values: '',
width: '130',
checkarr: [],

105
src/views/distribution/inventory/CreateOrder.vue
Unescape View File

@ -130,7 +130,7 @@
<el-row>
<el-form-item label="发货单位:" prop="shipper">
<SelectBox
:input="handleFindClientInfo(query.shipper, 'shipper')"
:input="handleFindClientInfo('shipper')"
v-model="query.shipper"
placeholder="发货单位"
ref="shipper"
@ -151,7 +151,7 @@
<el-form-item label="发货人:" prop="shipperName">
<SelectBox
:input="handleFindClientInfo(query.shipper, 'shipper')"
:input="handleFindClientInfo('shipper')"
v-model="query.shipperName"
placeholder="发货人"
ref="shipperName"
@ -174,7 +174,7 @@
<el-row>
<el-form-item label="联系电话:" prop="shipperMobile">
<SelectBox
:input="handleFindClientInfo(query.shipper, 'shipper')"
:input="handleFindClientInfo('shipper')"
v-model="query.shipperMobile"
placeholder="联系电话"
ref="shipperMobile"
@ -207,7 +207,7 @@
<el-row>
<el-form-item label="发货单位:" prop="consignee">
<SelectBox
:input="handleFindClientInfo(query.consignee, 'consignee')"
:input="handleFindClientInfo('consignee')"
v-model="query.consignee"
placeholder="收货人"
ref="consignee"
@ -228,7 +228,7 @@
<el-form-item label="收货人:" prop="consigneeName">
<SelectBox
:input="handleFindClientInfo(query.consignee, 'consignee')"
:input="handleFindClientInfo('consignee')"
v-model="query.consigneeName"
placeholder="收货人"
ref="consigneeName"
@ -251,7 +251,7 @@
<el-row>
<el-form-item label="联系电话:" prop="consigneeMobile">
<SelectBox
:input="handleFindClientInfo(query.consignee, 'consignee')"
:input="handleFindClientInfo('consignee')"
v-model="query.consigneeMobile"
placeholder="联系电话"
ref="consigneeMobile"
@ -810,6 +810,8 @@ import {
postOpenOrderOpenWaybill,
getOpenOrderAdvanceFindWarehouseList,
postFindWaybillDetail,
postUpdateWaybill,
postUpdateWaybillVerify,
} from '@/api/distribution/CreateOrder.js';
// 获取vue实例
@ -1286,8 +1288,8 @@ const details = reactive<any>({
listNode: '',
// 页面请求的问题
form: {},
/** 修改 -- goodsList里的id, 区别：新增 / 删除 */
goodsListIds: [],
/** 修改 -- 深拷贝goodsList, 区别：新增 / 删除 / 修改 */
deepCloneGoodsList: [],
/** 提交数据 */
submitData: {},
});
@ -1423,7 +1425,7 @@ const initPageInfo = async () => {
else {
console.log('111 :>> ', 111);
info.value.maxNum = 0;
details.goodsListIds = [];
details.deepCloneGoodsList = [];
details.goodsList = data.warehouseWaybill.detailList.map(val => {
val.num = Number(val.num);
val.volume = Number(val.volume);
@ -1431,7 +1433,6 @@ const initPageInfo = async () => {
val.price = Number(val.price);
val.subtotalFreight = Number(val.subtotalFreight);
details.goodsListIds.push(val.id);
val.goodsName = val.productName;
// 计算运费小计
@ -1440,9 +1441,10 @@ const initPageInfo = async () => {
// 计算件数最大值
info.value.maxNum += val.num;
console.log('val :>> ', val);
details.deepCloneGoodsList.push({ ...val });
return val;
});
console.log('details.goodsListIds :>> ', details.goodsListIds);
console.log('details.deepCloneGoodsList :>> ', details.deepCloneGoodsList);
}
}
};
@ -1682,24 +1684,40 @@ const handleComputed = (row: any) => {
let _ant = null;
/** 查询客户信息 */
const handleFindClientInfo = (value, type) => {
const handleFindClientInfo = type => {
if (_ant) clearTimeout(_ant);
_ant = setTimeout(async () => {
if (value) {
try {
details.loadingObj.consignerLoading = true;
const res = await postOpenOrderFindClientInfo({ clientName: value });
const { code, data } = res.data;
if (code !== 200) return;
if (type === 'consignee') {
details.consignerOptions = data || [];
} else {
details.shipperOptions = data || [];
}
} catch (error) {
} finally {
details.loadingObj.consignerLoading = false;
try {
details.loadingObj.consignerLoading = true;
console.log('details.query :>> ', details.query);
/** 发货人搜索信息 */
let shipperQuery = {
clientName: details.query.shipper,
linkMan: details.query.shipperName,
linkPhone: details.query.shipperMobile,
};
/** 寄货人搜索信息 */
let consignerQuery = {
clientName: details.query.consignee,
linkMan: details.query.consigneeName,
linkPhone: details.query.consigneeMobile,
};
const submitData = type === 'consignee' ? consignerQuery : shipperQuery;
const res = await postOpenOrderFindClientInfo(submitData);
const { code, data } = res.data;
if (code !== 200) return;
if (type === 'consignee') {
details.consignerOptions = data || [];
} else {
details.shipperOptions = data || [];
}
} catch (error) {
} finally {
details.loadingObj.consignerLoading = false;
}
clearTimeout(_ant);
}, 1000);
@ -1824,6 +1842,8 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
advanceIds: info.value.advanceIds,
...details.totalObj,
huilaiPay: 1,
addList: [],
removeList: [],
};
const { destination } = submitData;
@ -1845,7 +1865,7 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
let numFlag = false;
for (const iterator of submitData.goodsList) {
for (const iterator of details.goodsList) {
if (iterator.subtotalFreight <= 0 || !iterator.subtotalFreight) {
numFlag = true;
break;
@ -1876,15 +1896,37 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
res = await postOpenOrderOpenWaybill(submitData);
} else {
for (let iterator of submitData.goodsList) {
// 查看每一项是否存在Id
submitData.waybillId = details.pageInfo.id;
const oldGoodsList = [...details.deepCloneGoodsList];
for (let iterator of details.goodsList) {
// 查看每一项是否存在Id updateType: 1新增; 2修改
if (iterator.id) {
// 存在则证明为老数据
// 根据存在的数据, 筛选被删除的数据
const _item = oldGoodsList.splice(
oldGoodsList.findIndex(val => val.id === iterator.id),
1
);
// 检测是否被修改
let _flag = false;
for (const key in iterator) {
_flag = iterator[key] !== _item[key];
// 检测到不一致则退出循环
if (_flag) break;
}
if (_flag) submitData.addList.push({ ...iterator, updateType: 2 });
} else {
submitData.addList.push({ ...iterator, updateType: 1 });
}
}
submitData.addList = submitData.goodsList;
submitData.removeList = [];
submitData.removeList = oldGoodsList;
delete submitData.goodsList;
@ -1895,6 +1937,7 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
// 记录提交参数
details.submitData = submitData;
res = await postUpdateWaybill(submitData);
}
const { code, msg } = res.data;
if (code !== 200) return;

50
src/views/waybill/TemporaryStorageList.vue
Unescape View File

@ -78,27 +78,25 @@
</el-row>
<!-- 表格 -->
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="details.columnList"
:tableData="data"
:loading="loadingObj.list"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<el-button type="text" @click="handleShowPackageOrderList(slotProps.scope)">
包明细
</el-button>
</template>
<!-- 列表模块 -->
<tablecmt
:columnList="details.columnList"
:tableData="data"
:loading="loadingObj.list"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<el-button type="text" @click="handleShowPackageOrderList(slotProps.scope)">
包明细
</el-button>
</template>
</tablecmt>
</el-row>
</template>
</tablecmt>
<!-- 分页模块 -->
<el-row class="el-fy">
@ -867,7 +865,7 @@ const searchHide = () => {
/** 表格表头输入框搜索 */
const inputsc = (index, row) => {
details.query[row.prop] = index;
index === '' ? delete details.query[row.prop] : (details.query[row.prop] = index);
initOnLoad();
};
@ -889,12 +887,10 @@ const btnsc = () => {};
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
details.query[row.prop] = index;
if (!index) delete details.query[row.prop];
if (row.prop === 'certificateTypeName') {
details.query['certificateType'] = index;
if (!index) delete details.query['certificateType'];
}
index === ''
? delete details.query[row.prop.replace('Name', '')]
: (details.query[row.prop.replace('Name', '')] = index);
initOnLoad();
};

Write Preview
Loading…
Cancel
Save