|
|
|
|
@ -402,14 +402,7 @@
|
|
|
|
|
class="goodsNameRow" |
|
|
|
|
v-for="val in item.goodsListOptions" |
|
|
|
|
:key="val.goodsId" |
|
|
|
|
@click=" |
|
|
|
|
() => { |
|
|
|
|
item.goodsName = val.goodsName; |
|
|
|
|
item.goodsId = val.goodsId; |
|
|
|
|
handleFindPrice(item); |
|
|
|
|
handleCloseSelcet(); |
|
|
|
|
} |
|
|
|
|
" |
|
|
|
|
@click="handleChooseGoods(item, val)" |
|
|
|
|
> |
|
|
|
|
{{ val.goodsName }} |
|
|
|
|
</div> |
|
|
|
|
@ -866,18 +859,14 @@
|
|
|
|
|
</el-tabs> |
|
|
|
|
|
|
|
|
|
<div class="overflow"> |
|
|
|
|
<el-row> |
|
|
|
|
<div class="avue-crud__header"> |
|
|
|
|
<!-- 头部左侧按钮模块 --> |
|
|
|
|
<div class="avue-crud__left"></div> |
|
|
|
|
<!-- 头部右侧按钮模块 --> |
|
|
|
|
<div class="avue-crud__right"> |
|
|
|
|
<el-button icon="el-icon-refresh" @click="init" circle></el-button> |
|
|
|
|
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button> |
|
|
|
|
<el-button icon="Search" @click="searchHide" circle></el-button> |
|
|
|
|
</div> |
|
|
|
|
<!-- <div class="flex-c-sb"> |
|
|
|
|
<div class="avue-crud__left"></div> |
|
|
|
|
<div class="avue-crud__right"> |
|
|
|
|
<el-button icon="el-icon-refresh" @click="init" circle></el-button> |
|
|
|
|
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button> |
|
|
|
|
<el-button icon="Search" @click="searchHide" circle></el-button> |
|
|
|
|
</div> |
|
|
|
|
</el-row> |
|
|
|
|
</div> --> |
|
|
|
|
<!-- 表格 --> |
|
|
|
|
<!-- 列表模块 --> |
|
|
|
|
<tablecmt |
|
|
|
|
@ -976,7 +965,6 @@ import {
|
|
|
|
|
deepClone, |
|
|
|
|
isNumber, |
|
|
|
|
setNodeHeight, |
|
|
|
|
getWinHeight, |
|
|
|
|
debounce, |
|
|
|
|
getObjType, |
|
|
|
|
} from '@/utils/util'; |
|
|
|
|
@ -2265,172 +2253,172 @@ const resetForm = (formEl: FormInstance | undefined) => {
|
|
|
|
|
const handleSubmit = (formEl: FormInstance | undefined) => { |
|
|
|
|
if (!formEl) return; |
|
|
|
|
formEl.validate(async valid => { |
|
|
|
|
if (valid) { |
|
|
|
|
try { |
|
|
|
|
// 开启loading |
|
|
|
|
details.loadingObj.submitLoadingBtn = true; |
|
|
|
|
if (!valid) return false; |
|
|
|
|
try { |
|
|
|
|
// 开启loading |
|
|
|
|
details.loadingObj.submitLoadingBtn = true; |
|
|
|
|
|
|
|
|
|
// 检测货物名称和件数是否正确填写 |
|
|
|
|
const _flag = details.goodsList.every(val => { |
|
|
|
|
if (!val.goodsName || !isNumber(val.num) || val.num === 0) return false; |
|
|
|
|
return true; |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
// 检测货物名称和件数是否正确填写 |
|
|
|
|
const _flag = details.goodsList.every(val => { |
|
|
|
|
if (!val.goodsName || !isNumber(val.num) || val.num === 0) return false; |
|
|
|
|
return true; |
|
|
|
|
if (!_flag) { |
|
|
|
|
return ElMessage({ |
|
|
|
|
type: 'warning', |
|
|
|
|
message: '请填写正确的货物名称和件数', |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (!_flag) { |
|
|
|
|
return ElMessage({ |
|
|
|
|
type: 'warning', |
|
|
|
|
message: '请填写正确的货物名称和件数', |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
const submitData = { |
|
|
|
|
...details.query, |
|
|
|
|
waybillDetailList: details.goodsList, |
|
|
|
|
advanceIds: info.value.advanceIds, |
|
|
|
|
...details.totalObj, |
|
|
|
|
huilaiPay: 1, |
|
|
|
|
addList: [], |
|
|
|
|
removeList: [], |
|
|
|
|
}; |
|
|
|
|
const submitData = { |
|
|
|
|
...details.query, |
|
|
|
|
waybillDetailList: details.goodsList, |
|
|
|
|
advanceIds: info.value.advanceIds, |
|
|
|
|
...details.totalObj, |
|
|
|
|
huilaiPay: 1, |
|
|
|
|
addList: [], |
|
|
|
|
removeList: [], |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
submitData.customerTrain = details.query.trainNumber; |
|
|
|
|
submitData.customerTrain = details.query.trainNumber; |
|
|
|
|
|
|
|
|
|
const { destination } = submitData; |
|
|
|
|
const { destination } = submitData; |
|
|
|
|
|
|
|
|
|
if (destination.length === 1) { |
|
|
|
|
return ElMessage({ message: '请选择正确到站地址', type: 'warning' }); |
|
|
|
|
} |
|
|
|
|
if (destination.length === 1) { |
|
|
|
|
return ElMessage({ message: '请选择正确到站地址', type: 'warning' }); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 筛选到站 |
|
|
|
|
const _findeLocation = details.regionOptione |
|
|
|
|
.find(val => val.value === destination[0]) |
|
|
|
|
.children.find(val => val.value === destination[1]); |
|
|
|
|
// 筛选到站 |
|
|
|
|
const _findeLocation = details.regionOptione |
|
|
|
|
.find(val => val.value === destination[0]) |
|
|
|
|
.children.find(val => val.value === destination[1]); |
|
|
|
|
|
|
|
|
|
let _item: any = {}; |
|
|
|
|
if (destination.length === 2) { |
|
|
|
|
_item = _findeLocation; |
|
|
|
|
} else { |
|
|
|
|
_item = _findeLocation.children.find(val => val.value === destination[2]); |
|
|
|
|
} |
|
|
|
|
let _item: any = {}; |
|
|
|
|
if (destination.length === 2) { |
|
|
|
|
_item = _findeLocation; |
|
|
|
|
} else { |
|
|
|
|
_item = _findeLocation.children.find(val => val.value === destination[2]); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
submitData.destination = _item.label; |
|
|
|
|
submitData.destinationCode = _item.value; |
|
|
|
|
submitData.destination = _item.label; |
|
|
|
|
submitData.destinationCode = _item.value; |
|
|
|
|
|
|
|
|
|
let numFlag = false; |
|
|
|
|
let numFlag = false; |
|
|
|
|
|
|
|
|
|
for (const iterator of details.goodsList) { |
|
|
|
|
if (iterator.subtotalFreight <= 0 || !iterator.subtotalFreight) { |
|
|
|
|
numFlag = true; |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
for (const iterator of details.goodsList) { |
|
|
|
|
if (iterator.subtotalFreight <= 0 || !iterator.subtotalFreight) { |
|
|
|
|
numFlag = true; |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (numFlag) return ElMessage.warning('小计费用存在异常'); |
|
|
|
|
if (numFlag) return ElMessage.warning('小计费用存在异常'); |
|
|
|
|
|
|
|
|
|
const _content = handleDetectionPayWay(); |
|
|
|
|
if (_content) return ElMessage.warning(_content); |
|
|
|
|
submitData.goodsName = submitData.waybillDetailList.map(val => val.goodsName).join(','); |
|
|
|
|
const _content = handleDetectionPayWay(); |
|
|
|
|
if (_content) return ElMessage.warning(_content); |
|
|
|
|
submitData.goodsName = submitData.waybillDetailList.map(val => val.goodsName).join(','); |
|
|
|
|
|
|
|
|
|
let res: any = {}; |
|
|
|
|
// 新增提交 |
|
|
|
|
if (details.pageInfo.type !== 'edit') { |
|
|
|
|
submitData.addList = details.goodsList; |
|
|
|
|
submitData.removeList = []; |
|
|
|
|
let res: any = {}; |
|
|
|
|
// 新增提交 |
|
|
|
|
if (details.pageInfo.type !== 'edit') { |
|
|
|
|
submitData.addList = details.goodsList; |
|
|
|
|
submitData.removeList = []; |
|
|
|
|
|
|
|
|
|
delete submitData.goodsList; |
|
|
|
|
delete submitData.goodsList; |
|
|
|
|
|
|
|
|
|
submitData.waybillType = 1; |
|
|
|
|
if (typeof submitData.receipt === 'object') |
|
|
|
|
submitData.receipt = submitData.receipt.join(','); |
|
|
|
|
submitData.waybillType = 1; |
|
|
|
|
if (typeof submitData.receipt === 'object') |
|
|
|
|
submitData.receipt = submitData.receipt.join(','); |
|
|
|
|
|
|
|
|
|
// 记录提交参数 |
|
|
|
|
details.submitData = submitData; |
|
|
|
|
// 记录提交参数 |
|
|
|
|
details.submitData = submitData; |
|
|
|
|
|
|
|
|
|
// 有数据开单 |
|
|
|
|
if (details.orderStatus === 'haveData') res = await postOpenOrderOpenWaybill(submitData); |
|
|
|
|
else res = await postOpenOrderOpenZeroWaybill(submitData); |
|
|
|
|
} else { |
|
|
|
|
submitData.waybillId = details.pageInfo.id; |
|
|
|
|
// 有数据开单 |
|
|
|
|
if (details.orderStatus === 'haveData') res = await postOpenOrderOpenWaybill(submitData); |
|
|
|
|
else { |
|
|
|
|
submitData.waybillType = 2; |
|
|
|
|
|
|
|
|
|
const oldGoodsList = [...details.deepCloneGoodsList]; |
|
|
|
|
res = await postOpenOrderOpenZeroWaybill(submitData); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
submitData.waybillId = details.pageInfo.id; |
|
|
|
|
|
|
|
|
|
for (let iterator of details.goodsList) { |
|
|
|
|
// 查看每一项是否存在Id updateType: 1新增; 2修改 |
|
|
|
|
if (iterator.id) { |
|
|
|
|
// 存在则证明为老数据 |
|
|
|
|
const oldGoodsList = [...details.deepCloneGoodsList]; |
|
|
|
|
|
|
|
|
|
// 根据存在的数据, 筛选被删除的数据 |
|
|
|
|
const _item = oldGoodsList.splice( |
|
|
|
|
oldGoodsList.findIndex(val => val.id === iterator.id), |
|
|
|
|
1 |
|
|
|
|
); |
|
|
|
|
for (let iterator of details.goodsList) { |
|
|
|
|
// 查看每一项是否存在Id updateType: 1新增; 2修改 |
|
|
|
|
if (iterator.id) { |
|
|
|
|
// 存在则证明为老数据 |
|
|
|
|
|
|
|
|
|
// 检测是否被修改 |
|
|
|
|
let _flag = false; |
|
|
|
|
// 根据存在的数据, 筛选被删除的数据 |
|
|
|
|
const _item = oldGoodsList.splice( |
|
|
|
|
oldGoodsList.findIndex(val => val.id === iterator.id), |
|
|
|
|
1 |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
for (const key in iterator) { |
|
|
|
|
_flag = iterator[key] !== _item[key]; |
|
|
|
|
// 检测到不一致则退出循环 |
|
|
|
|
if (_flag) break; |
|
|
|
|
} |
|
|
|
|
// 检测是否被修改 |
|
|
|
|
let _flag = false; |
|
|
|
|
|
|
|
|
|
if (_flag) submitData.addList.push({ ...iterator, updateType: 2 }); |
|
|
|
|
} else { |
|
|
|
|
submitData.addList.push({ ...iterator, updateType: 1 }); |
|
|
|
|
for (const key in iterator) { |
|
|
|
|
_flag = iterator[key] !== _item[key]; |
|
|
|
|
// 检测到不一致则退出循环 |
|
|
|
|
if (_flag) break; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
submitData.removeList = oldGoodsList; |
|
|
|
|
|
|
|
|
|
delete submitData.goodsList; |
|
|
|
|
|
|
|
|
|
submitData.waybillType = 1; |
|
|
|
|
if (typeof submitData.receipt === 'object') |
|
|
|
|
submitData.receipt = submitData.receipt.join(','); |
|
|
|
|
|
|
|
|
|
// 记录提交参数 |
|
|
|
|
details.submitData = submitData; |
|
|
|
|
const response = await postUpdateWaybillVerify(submitData); |
|
|
|
|
if (response.data.code !== 200) return; |
|
|
|
|
|
|
|
|
|
if (!response.data.data) return ElMessage.warning('没有更改的数据'); |
|
|
|
|
|
|
|
|
|
ElMessageBox.alert(response.data.data.replaceAll(';', ' <br /> '), '被更改数据', { |
|
|
|
|
dangerouslyUseHTMLString: true, |
|
|
|
|
confirmButtonText: '确认', |
|
|
|
|
callback: async (action: Action) => { |
|
|
|
|
try { |
|
|
|
|
details.loadingObj.submitLoadingBtn = true; |
|
|
|
|
|
|
|
|
|
const res = await postUpdateWaybill(submitData); |
|
|
|
|
const { code, msg } = res.data; |
|
|
|
|
if (code !== 200) return; |
|
|
|
|
if (msg) ElMessage.success(msg); |
|
|
|
|
|
|
|
|
|
back(); |
|
|
|
|
} catch (error) { |
|
|
|
|
console.log('error :>> ', error); |
|
|
|
|
} finally { |
|
|
|
|
details.loadingObj.submitLoadingBtn = false; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
}); |
|
|
|
|
if (_flag) submitData.addList.push({ ...iterator, updateType: 2 }); |
|
|
|
|
} else { |
|
|
|
|
submitData.addList.push({ ...iterator, updateType: 1 }); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
const { code, msg } = res.data; |
|
|
|
|
if (code !== 200) return; |
|
|
|
|
if (msg) ElMessage.success(msg); |
|
|
|
|
|
|
|
|
|
// 开启提示框, 是否继续开单 |
|
|
|
|
if (details.pageInfo.type === 'add') details.popUpShow.titleVisited = true; |
|
|
|
|
} catch (error) { |
|
|
|
|
console.log('error :>> ', error); |
|
|
|
|
} finally { |
|
|
|
|
$store.commit('EDIT_REFRESHITEM', { title: 'TemporaryStorageList', status: true }); |
|
|
|
|
details.loadingObj.submitLoadingBtn = false; |
|
|
|
|
submitData.removeList = oldGoodsList; |
|
|
|
|
|
|
|
|
|
delete submitData.goodsList; |
|
|
|
|
|
|
|
|
|
submitData.waybillType = 1; |
|
|
|
|
if (typeof submitData.receipt === 'object') |
|
|
|
|
submitData.receipt = submitData.receipt.join(','); |
|
|
|
|
|
|
|
|
|
// 记录提交参数 |
|
|
|
|
details.submitData = submitData; |
|
|
|
|
const response = await postUpdateWaybillVerify(submitData); |
|
|
|
|
if (response.data.code !== 200) return; |
|
|
|
|
|
|
|
|
|
if (!response.data.data) return ElMessage.warning('没有更改的数据'); |
|
|
|
|
|
|
|
|
|
ElMessageBox.alert(response.data.data.replaceAll(';', ' <br /> '), '被更改数据', { |
|
|
|
|
dangerouslyUseHTMLString: true, |
|
|
|
|
confirmButtonText: '确认', |
|
|
|
|
callback: async (action: Action) => { |
|
|
|
|
try { |
|
|
|
|
details.loadingObj.submitLoadingBtn = true; |
|
|
|
|
|
|
|
|
|
const res = await postUpdateWaybill(submitData); |
|
|
|
|
const { code, msg } = res.data; |
|
|
|
|
if (code !== 200) return; |
|
|
|
|
if (msg) ElMessage.success(msg); |
|
|
|
|
|
|
|
|
|
back(); |
|
|
|
|
} catch (error) { |
|
|
|
|
console.log('error :>> ', error); |
|
|
|
|
} finally { |
|
|
|
|
details.loadingObj.submitLoadingBtn = false; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
console.log('error submit!'); |
|
|
|
|
return false; |
|
|
|
|
const { code, msg } = res.data; |
|
|
|
|
if (code !== 200) return; |
|
|
|
|
if (msg) ElMessage.success(msg); |
|
|
|
|
|
|
|
|
|
// 开启提示框, 是否继续开单 |
|
|
|
|
if (details.pageInfo.type === 'add') details.popUpShow.titleVisited = true; |
|
|
|
|
} catch (error) { |
|
|
|
|
console.log('error :>> ', error); |
|
|
|
|
} finally { |
|
|
|
|
$store.commit('EDIT_REFRESHITEM', { title: 'TemporaryStorageList', status: true }); |
|
|
|
|
details.loadingObj.submitLoadingBtn = false; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}; |
|
|
|
|
@ -2571,6 +2559,30 @@ const handleFindPrice = async (condition?: any) => {
|
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 选择货物 */ |
|
|
|
|
const handleChooseGoods = (item, val) => { |
|
|
|
|
// if (item.id) |
|
|
|
|
let message = ''; |
|
|
|
|
for (let i = 0; i < details.goodsList.length; i++) { |
|
|
|
|
const value = details.goodsList[i]; |
|
|
|
|
|
|
|
|
|
if (value.goodsId === val.goodsId) { |
|
|
|
|
message = '该货物已添加'; |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (message) { |
|
|
|
|
item.goodsName = ''; |
|
|
|
|
return ElMessage.warning(message); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
item.goodsName = val.goodsName; |
|
|
|
|
item.goodsId = val.goodsId; |
|
|
|
|
handleFindPrice(item); |
|
|
|
|
handleCloseSelcet(); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
watch( |
|
|
|
|
$route, |
|
|
|
|
async () => { |
|
|
|
|
|
