|
|
|
|
@ -274,7 +274,6 @@
|
|
|
|
|
<!-- 表格列开始 --> |
|
|
|
|
<el-table |
|
|
|
|
:data="dataInfo" |
|
|
|
|
:row-key="name" |
|
|
|
|
border |
|
|
|
|
:height="TabHeight + 'px'" |
|
|
|
|
style="width: 100%" |
|
|
|
|
@ -329,7 +328,7 @@
|
|
|
|
|
</el-table-column> |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
<template v-if="item.type === 3"> |
|
|
|
|
<template v-if="item.type === 3 || item.isZero == '1'"> |
|
|
|
|
<el-table-column |
|
|
|
|
v-if="item.head" |
|
|
|
|
fixed="right" |
|
|
|
|
@ -337,7 +336,7 @@
|
|
|
|
|
width="280" |
|
|
|
|
align="center " |
|
|
|
|
> |
|
|
|
|
<template #default="scope"> |
|
|
|
|
<template #default="props"> |
|
|
|
|
<div :class="ElBtnClass"> |
|
|
|
|
<el-button |
|
|
|
|
:link="ElButtonS[0].link" |
|
|
|
|
@ -345,26 +344,38 @@
|
|
|
|
|
:auto-insert-space="ElButtonS[0].space" |
|
|
|
|
:size="ElButtonS[0].size" |
|
|
|
|
:icon="ElButtonS[0].icon" |
|
|
|
|
@click="DeleteEvent(scope.row)" |
|
|
|
|
>删除</el-button |
|
|
|
|
@click="ViewEvent(props.row)" |
|
|
|
|
>查看包件</el-button |
|
|
|
|
> |
|
|
|
|
<!-- <el-button |
|
|
|
|
:link="ElButtonS[1].link" |
|
|
|
|
:class="ElButtonS[1].class" |
|
|
|
|
:auto-insert-space="ElButtonS[1].space" |
|
|
|
|
:size="ElButtonS[1].size" |
|
|
|
|
:icon="ElButtonS[1].icon" |
|
|
|
|
@click="EditEvent(scope.row)" |
|
|
|
|
>编辑</el-button |
|
|
|
|
> --> |
|
|
|
|
<el-button |
|
|
|
|
v-if="props.row.isZero == '1'" |
|
|
|
|
:link="ElButtonS[1].link" |
|
|
|
|
:class="ElButtonS[1].class" |
|
|
|
|
:auto-insert-space="ElButtonS[1].space" |
|
|
|
|
:size="ElButtonS[1].size" |
|
|
|
|
:icon="ElButtonS[1].icon" |
|
|
|
|
@click="Entering(props.row)" |
|
|
|
|
>在库录入</el-button |
|
|
|
|
> |
|
|
|
|
<el-button |
|
|
|
|
v-if="props.row.isZero == '1'" |
|
|
|
|
:link="ElButtonS[2].link" |
|
|
|
|
:class="ElButtonS[2].class" |
|
|
|
|
:auto-insert-space="ElButtonS[2].space" |
|
|
|
|
:size="ElButtonS[2].size" |
|
|
|
|
:icon="ElButtonS[2].icon" |
|
|
|
|
@click="ViewEvent(scope.row)" |
|
|
|
|
>查看</el-button |
|
|
|
|
@click="QuantityEntry(props.row)" |
|
|
|
|
>数量录入</el-button |
|
|
|
|
> |
|
|
|
|
|
|
|
|
|
<el-button |
|
|
|
|
:link="ElButtonS[4].link" |
|
|
|
|
:class="ElButtonS[4].class" |
|
|
|
|
:auto-insert-space="ElButtonS[4].space" |
|
|
|
|
:size="ElButtonS[4].size" |
|
|
|
|
:icon="ElButtonS[4].icon" |
|
|
|
|
@click="DeleteEvent(props.row)" |
|
|
|
|
>删除</el-button |
|
|
|
|
> |
|
|
|
|
</div> |
|
|
|
|
</template> |
|
|
|
|
@ -681,8 +692,10 @@
|
|
|
|
|
</el-tabs> |
|
|
|
|
<!-- 弹窗组件 --> |
|
|
|
|
<div class="addlalog addlalogS"> |
|
|
|
|
<el-dialog v-model="SjTc" title="司机信息配置"> |
|
|
|
|
<el-table :data="DvInfoData" border style="width: 100%"> |
|
|
|
|
<!-- <el-dialog v-model="SjTc" title="司机信息配置"> --> |
|
|
|
|
<el-dialog v-model="comprehensive" title="零担品类信息"> |
|
|
|
|
<!-- 司机信息弹窗 --> |
|
|
|
|
<el-table v-if="SjTc" :data="DvInfoData" border style="width: 100%"> |
|
|
|
|
<el-table-column prop="driverName" label="司机信息" /> |
|
|
|
|
<el-table-column prop="vehicleNub" label="车辆信息" /> |
|
|
|
|
<el-table-column label="操作"> |
|
|
|
|
@ -691,17 +704,61 @@
|
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
</el-table> |
|
|
|
|
|
|
|
|
|
<!-- EnteringLibrary在库录入 --> |
|
|
|
|
<div Class="iszer"> |
|
|
|
|
<!-- <span style="font-weight: bold; display: block; padding-bottom: 10px" |
|
|
|
|
>在库总数:{{ dataInfo[dataId].handQuantity }}</span |
|
|
|
|
> --> |
|
|
|
|
<el-table v-if="EnteringLibrary" :data="isZeroTable" border style="width: 100%"> |
|
|
|
|
<el-table-column fixed prop="firsts" label="名称" /> |
|
|
|
|
<el-table-column prop="quantity" label="数量" /> |
|
|
|
|
<el-table-column prop="handQuantity" label="在库数量" /> |
|
|
|
|
<el-table-column prop="deliveryQuantity" label="冻结数量" /> |
|
|
|
|
<el-table-column prop="outboundQuantity" label="出库数量" /> |
|
|
|
|
<el-table-column label="可用数量"> |
|
|
|
|
<template #default="props"> |
|
|
|
|
<span> |
|
|
|
|
{{ |
|
|
|
|
props.row.handQuantity - props.row.deliveryQuantity - props.row.outboundQuantity |
|
|
|
|
}}</span |
|
|
|
|
> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<!-- 在库=冻结-出库 --> |
|
|
|
|
|
|
|
|
|
<el-table-column fixed="right" label="数量操作"> |
|
|
|
|
<template #default="scope"> |
|
|
|
|
<el-input-number |
|
|
|
|
size="small" |
|
|
|
|
v-model="scope.row.number" |
|
|
|
|
:min="0" |
|
|
|
|
:max="scope.row.quantity" |
|
|
|
|
@change="isZeroNumber(scope.row)" |
|
|
|
|
/> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
</el-table> |
|
|
|
|
<div class="isZel-btn"> |
|
|
|
|
<el-button v-if="!QuantityEntryStatus" color="#172e60" type="success" @click="ModifyLCL" |
|
|
|
|
>修改(零担订单)</el-button |
|
|
|
|
> |
|
|
|
|
<el-button color="#172e60" type="success" @click="SubmitLoad">提交(零担订单)</el-button> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</el-dialog> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
<script setup lang="ts"> |
|
|
|
|
import { ref, reactive, onMounted, computed, watch, watchEffect } from 'vue'; |
|
|
|
|
import { ref, reactive, onMounted, computed, watch } from 'vue'; |
|
|
|
|
import { useRoute, useRouter } from 'vue-router'; |
|
|
|
|
import { |
|
|
|
|
$_selectStockArticleInfoList, |
|
|
|
|
$_getPackageListByStockArticleId, |
|
|
|
|
getZeroOrderDetail, |
|
|
|
|
$_getDeliveryZeroOrderDetail, |
|
|
|
|
} from '@/api/distribution/distributionStockArticle'; //API |
|
|
|
|
import { getVehicleList } from '@/api/basicdata/basicdataVehicle'; //车辆信息 |
|
|
|
|
import { getDriverList } from '@/api/basicdata/basicdataDriverArtery'; //司机信息 |
|
|
|
|
@ -717,6 +774,7 @@ import {
|
|
|
|
|
} from '@/api/distribution/distributionDeliveryList'; //数据回显 |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; //外协来源 |
|
|
|
|
import type { FormProps } from 'element-plus'; |
|
|
|
|
import { updateEntryNum, entryNum } from '@/api/distribution/distributionParcelNumber'; |
|
|
|
|
const route = useRoute(); |
|
|
|
|
const router = useRouter(); |
|
|
|
|
// 选项卡 |
|
|
|
|
@ -730,6 +788,7 @@ const numTab = ref([
|
|
|
|
|
name: '1', |
|
|
|
|
}, |
|
|
|
|
]); |
|
|
|
|
const num = ref(null); //计步器 |
|
|
|
|
const kind = ref(true); //标签切换 |
|
|
|
|
const currentPage = ref(1); // 默认页码 |
|
|
|
|
const pageSize = ref(20); // 默认每一页几条 |
|
|
|
|
@ -775,6 +834,12 @@ const RouteId = ref(null); //编辑页面的ID参数
|
|
|
|
|
const labelPosition = ref<FormProps['labelPosition']>('right'); |
|
|
|
|
const SoInfoData = ref(); //搜索框 |
|
|
|
|
const parameter = ref({}); //搜索框参数 |
|
|
|
|
const wrapTemp = ref([]); //包件选中项暂存 |
|
|
|
|
const EnteringLibrary = ref(true); //在库录入按钮 |
|
|
|
|
const QuantityEntryS = ref(false); //数量录入按钮 |
|
|
|
|
const isZeroTable = ref([]); //零担表格 |
|
|
|
|
const comprehensive = ref(false); //司机,零担弹窗 |
|
|
|
|
const QuantityEntryStatus = ref(false); //零担数量录入状态 |
|
|
|
|
// 司机选择信息 |
|
|
|
|
// 车辆选项 |
|
|
|
|
// 备货人员 |
|
|
|
|
@ -819,7 +884,8 @@ const StockInfo = ref({
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
const selectable = (row, index) => { |
|
|
|
|
if (row.orderPackageReservationStatusName == '已预约') { |
|
|
|
|
// row.orderPackageReservationStatusName == '已预约' || |
|
|
|
|
if (row.checked) { |
|
|
|
|
return false; //禁用状态 |
|
|
|
|
} else { |
|
|
|
|
return true; //非禁用状态 |
|
|
|
|
@ -975,12 +1041,27 @@ const ElButtonS = ref([
|
|
|
|
|
// 3.size 按钮尺寸默认小尺寸('large'| 'default'| 'small') |
|
|
|
|
// 4.icon 按钮图标 |
|
|
|
|
// 5.table 按钮名称 |
|
|
|
|
|
|
|
|
|
{ |
|
|
|
|
class: 'el-btn-danger', |
|
|
|
|
class: 'el-btn-view', |
|
|
|
|
space: true, |
|
|
|
|
size: 'small', |
|
|
|
|
icon: 'el-icon-delete', |
|
|
|
|
table: '删除', |
|
|
|
|
icon: 'el-icon-view', |
|
|
|
|
table: '查看', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
class: 'el-btn-view', |
|
|
|
|
space: true, |
|
|
|
|
size: 'small', |
|
|
|
|
icon: 'el-icon-view', |
|
|
|
|
table: '在库录入', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
class: 'el-btn-view', |
|
|
|
|
space: true, |
|
|
|
|
size: 'small', |
|
|
|
|
icon: 'DataLine', |
|
|
|
|
table: '数量录入', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
class: 'el-btn-success', |
|
|
|
|
@ -990,11 +1071,11 @@ const ElButtonS = ref([
|
|
|
|
|
table: '编辑', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
class: 'el-btn-view', |
|
|
|
|
class: 'el-btn-danger', |
|
|
|
|
space: true, |
|
|
|
|
size: 'small', |
|
|
|
|
icon: 'el-icon-view', |
|
|
|
|
table: '查看', |
|
|
|
|
icon: 'el-icon-delete', |
|
|
|
|
table: '删除', |
|
|
|
|
}, |
|
|
|
|
]); |
|
|
|
|
// 菜单配置 |
|
|
|
|
@ -1288,7 +1369,7 @@ const menuData = ref([
|
|
|
|
|
label: '操作', |
|
|
|
|
type: 3, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
width: '680', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1534,22 +1615,23 @@ async function OrderSelection(id, DataParameter) {
|
|
|
|
|
genre: 1, //固定参数 |
|
|
|
|
current: currentPage.value, //页码 |
|
|
|
|
size: pageSize.value, //每一页条数 |
|
|
|
|
...DataParameter, |
|
|
|
|
...DataParameter, //搜索参数 |
|
|
|
|
}).then(res => { |
|
|
|
|
loading.value = false; //关闭加载效果 |
|
|
|
|
data.value = res.data.data.records; |
|
|
|
|
// 根据选择的已经有的去匹配已经选择的数据勾选 |
|
|
|
|
console.log(kind.value, 'kind.value'); |
|
|
|
|
|
|
|
|
|
let setIn = setTimeout(() => { |
|
|
|
|
dataInfo.value.forEach(val => { |
|
|
|
|
tableRefs.value[id].toggleRowSelection( |
|
|
|
|
data.value[data.value.findIndex(item => item.id === val.id)], |
|
|
|
|
true |
|
|
|
|
); |
|
|
|
|
const index = data.value.findIndex(item => item.id === val.id); |
|
|
|
|
if (index > -1) { |
|
|
|
|
const item = data.value[index]; |
|
|
|
|
item.checked = true; |
|
|
|
|
tableRefs.value[id].toggleRowSelection(item); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
clearTimeout(setIn); //清除定时器 |
|
|
|
|
}, 0); |
|
|
|
|
clearTimeout(setIn); // 清除定时器 |
|
|
|
|
}, 1); |
|
|
|
|
|
|
|
|
|
//选中已经在订单列表中的数据 |
|
|
|
|
// toggleSelection(false, dataId, data.value); |
|
|
|
|
console.log( |
|
|
|
|
@ -1571,7 +1653,9 @@ function dataTabInfo() {
|
|
|
|
|
} |
|
|
|
|
// 点击新增获取在库订单信息 |
|
|
|
|
const AddInfo = () => { |
|
|
|
|
// dataTmp.value = []; //清空暂存数据 |
|
|
|
|
dataTmp.value = []; |
|
|
|
|
console.log('提交前的参数', dataInfo.value); |
|
|
|
|
console.log('提交前前临时存储', dataTmp.value); |
|
|
|
|
AddLalog.value = true; //展开表单弹窗 |
|
|
|
|
wrapLoading.value = false; //关闭包件弹窗信息 |
|
|
|
|
dataTabInfo(); //请求数据 |
|
|
|
|
@ -1605,41 +1689,80 @@ const selectAll = val => {
|
|
|
|
|
}; |
|
|
|
|
// 弹窗表格单个选中触发事件 |
|
|
|
|
const selectChange = (selection, row) => { |
|
|
|
|
// 1.selection 选中的数组 |
|
|
|
|
// 2.row 选中的当前行 |
|
|
|
|
// 数据编辑包件信息操作 |
|
|
|
|
selection.forEach(item => { |
|
|
|
|
dataTmp.value.push(item); |
|
|
|
|
dataTmp.value = [...new Set(dataTmp.value)]; |
|
|
|
|
}); |
|
|
|
|
console.log(dataTmp.value, '存储好的值'); |
|
|
|
|
// 把选择的数据放到临时存储里面 |
|
|
|
|
// 编辑状态 |
|
|
|
|
if (RouteId.value) { |
|
|
|
|
console.log(selection, 'selection信息'); |
|
|
|
|
let tmp = selection; |
|
|
|
|
tmp = dataTmp.value; |
|
|
|
|
dataTmp.value = tmp; |
|
|
|
|
console.log(dataTmp.value, '存储好的值'); |
|
|
|
|
|
|
|
|
|
console.log(dataTmp, '当前选中的包件信息'); |
|
|
|
|
// wrapLoading为真表示此时弹窗内容是包件信息 |
|
|
|
|
if (wrapLoading.value) { |
|
|
|
|
let packageListInfo = []; |
|
|
|
|
packageListInfo = dataTmp.value; |
|
|
|
|
console.log(dataId.value, 'dataId.value'); |
|
|
|
|
console.log(dataInfo.value[dataId.value], 'dataInfo.value[dataId.value]'); |
|
|
|
|
dataInfo.value[dataId.value].packageListInfo = dataTmp.value; |
|
|
|
|
let packageListInfo = []; //定义参数名保存选中的订单 |
|
|
|
|
// packageListInfo = dataTmp.value;//把临时存储的值赋值给需要提交的字段 |
|
|
|
|
dataTmp.value = selection; //当前选中的值给临时存储起来 |
|
|
|
|
// dataTmp.value = dataInfo.value; |
|
|
|
|
console.log(dataInfo.value, '包件信息选中'); |
|
|
|
|
dataTmp.value = dataInfo.value; |
|
|
|
|
console.log(dataId.value, '当前选中的订单ID下标'); |
|
|
|
|
console.log(dataInfo.value[dataId.value], '当前操作的订单'); |
|
|
|
|
} else { |
|
|
|
|
console.log('在库订单信息'); |
|
|
|
|
console.log('当前为在库订单信息'); |
|
|
|
|
// dataTmp.value = selection; //选中信息暂存起来 |
|
|
|
|
selection.forEach(item => { |
|
|
|
|
item.checked = true; //表示当前已经被选中了 |
|
|
|
|
dataTmp.value.push(item); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
// 新增状态 |
|
|
|
|
selection.forEach(item => { |
|
|
|
|
item.checked = true; //表示当前已经被选中了 |
|
|
|
|
dataTmp.value.push(item); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
// wrapLoading为真表示此时弹窗内容是包件信息 |
|
|
|
|
// 新增包件信息修改 |
|
|
|
|
// 弹窗确认表单信息展示 |
|
|
|
|
const submit = () => { |
|
|
|
|
// 当前为编辑状态 |
|
|
|
|
if (RouteId.value) { |
|
|
|
|
if (!wrapLoading.value) { |
|
|
|
|
dataTmp.value.forEach(item => { |
|
|
|
|
dataInfo.value.push(item); |
|
|
|
|
}); |
|
|
|
|
console.log(dataInfo.value, '要展示的值'); |
|
|
|
|
console.log('触发1'); |
|
|
|
|
} else { |
|
|
|
|
// 编辑的时候需要带上这个参数存放订单下面的包件信息 |
|
|
|
|
let packageListInfo = []; |
|
|
|
|
console.log('触发2'); |
|
|
|
|
dataInfo.value[dataId.value].packageListInfo = dataTmp.value; //把存在的值给当前订单下面 |
|
|
|
|
// dataInfo.value[dataId.value].packageListInfo = wrapData.value; |
|
|
|
|
wrapTemp.value[dataId.value] = dataTmp.value; |
|
|
|
|
console.log(wrapTemp.value, '包件订单被缓存'); |
|
|
|
|
console.log(dataInfo.value[dataId.value].packageListInfo, '被添加到当前订单下面'); |
|
|
|
|
console.log(dataInfo.value, '所有订单信息'); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
// 新增订单 |
|
|
|
|
//选中好的订单提交到要展示的表格 |
|
|
|
|
dataTmp.value.forEach(item => { |
|
|
|
|
dataInfo.value.push(item); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
console.log(dataTmp.value, '暂存数据'); |
|
|
|
|
console.log(selection, '当前选中的信息'); |
|
|
|
|
console.log('提交后的参数', dataInfo.value); |
|
|
|
|
console.log('提交后的临时存储', dataTmp.value); |
|
|
|
|
} |
|
|
|
|
// 展示的信息 |
|
|
|
|
dataInfo.value = removeDuplicates(dataInfo.value); |
|
|
|
|
// 临时存储 |
|
|
|
|
dataTmp.value = removeDuplicates(dataTmp.value); |
|
|
|
|
AddLalog.value = false; //关闭弹窗 |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
// 订单数据去重 |
|
|
|
|
function removeDuplicates(arr) { |
|
|
|
|
const ids = arr.map(obj => obj.id); |
|
|
|
|
return arr.filter((item, index) => ids.indexOf(item.id) === index); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 删除触发事件 |
|
|
|
|
const DeleteEvent = val => { |
|
|
|
|
// 接收点击删除当前行数据 |
|
|
|
|
@ -1721,27 +1844,21 @@ const ViewEvent = val => {
|
|
|
|
|
console.log(res, '订单包件信息'); |
|
|
|
|
if (res.data.code == 200) { |
|
|
|
|
wrapData.value = res.data.data.data.packageList; |
|
|
|
|
|
|
|
|
|
console.log(res, 'res,修改下的包件信息'); |
|
|
|
|
console.log(res.data.data.data, 'res.data.data.data.packageList'); |
|
|
|
|
if (res.data.data.data.packageListIds) { |
|
|
|
|
if (kind.value) { |
|
|
|
|
toggleSelection({ |
|
|
|
|
val: false, |
|
|
|
|
data: res.data.data.data.packageListIds.split(','), |
|
|
|
|
index: 0, |
|
|
|
|
}); //编辑的时候选中已有的数据 |
|
|
|
|
} else { |
|
|
|
|
toggleSelection({ |
|
|
|
|
val: false, |
|
|
|
|
data: res.data.data.data.packageListIds.split(','), |
|
|
|
|
index: 1, |
|
|
|
|
}); //编辑的时候选中已有的数据 |
|
|
|
|
} |
|
|
|
|
let IdTmp = []; //订单ID暂存 |
|
|
|
|
dataInfo.value[dataId.value].packageListInfo = wrapTemp.value[dataId.value]; |
|
|
|
|
//查看当前订单下面包件是缓存值,如果有就读取缓存值,否则就是第一次加载,使用API返回值 |
|
|
|
|
if (dataInfo.value[dataId.value].packageListInfo) { |
|
|
|
|
dataInfo.value[dataId.value].packageListInfo.forEach(item => { |
|
|
|
|
IdTmp.push(item.id); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
toggleSelection({ |
|
|
|
|
val: false, |
|
|
|
|
data: IdTmp.length ? IdTmp : res.data.data.data.packageListIds.split(','), |
|
|
|
|
index: kind.value ? 0 : 1, |
|
|
|
|
}); //编辑的时候选中已有的数据 |
|
|
|
|
} |
|
|
|
|
// AddLalog.value = false; //关闭弹窗 |
|
|
|
|
editLoading.value = false; //关闭加载效果 |
|
|
|
|
console.log(wrapData.value, '包件表格信息'); |
|
|
|
|
console.log(res); |
|
|
|
|
}); |
|
|
|
|
@ -1759,19 +1876,73 @@ const ViewEvent = val => {
|
|
|
|
|
toggleSelection({ index: 1 }); //外协下面包件全选 |
|
|
|
|
} |
|
|
|
|
console.log(tableRefs, 'tableRefs'); |
|
|
|
|
|
|
|
|
|
console.log(res.data.data.records, '查看下面的包件'); |
|
|
|
|
}); |
|
|
|
|
// 新增 查看订单流程 |
|
|
|
|
console.log('当前为新增状态'); |
|
|
|
|
console.log(val, val.id, '查看包件事件'); |
|
|
|
|
//临时存储下标用于查询包件对应的下标 |
|
|
|
|
|
|
|
|
|
console.log(dataId.value, 'dataId.value下标'); |
|
|
|
|
console.log(wrapDataInfo.value[dataId.value], '当前订单下面的包件信息'); |
|
|
|
|
console.log(wrapDataInfo, '订单'); |
|
|
|
|
editLoading.value = false; //关闭加载效果 |
|
|
|
|
} |
|
|
|
|
editLoading.value = false; //关闭加载效果 |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
// 在库录入 |
|
|
|
|
const Entering = val => { |
|
|
|
|
dataId.value = findIndexById(val.id); //记录当前点击的订单 |
|
|
|
|
comprehensive.value = true; //开启弹窗 |
|
|
|
|
EnteringLibrary.value = true; //显示零担 |
|
|
|
|
QuantityEntryStatus.value = false; //关闭零担录入 |
|
|
|
|
console.log('在库录入', val); |
|
|
|
|
|
|
|
|
|
getZeroOrderDetail(val.id).then(res => { |
|
|
|
|
console.log(res, '在库录入返回信息'); |
|
|
|
|
isZeroTable.value = res.data.data; |
|
|
|
|
}); |
|
|
|
|
}; |
|
|
|
|
// 数量录入 |
|
|
|
|
const QuantityEntry = val => { |
|
|
|
|
dataId.value = findIndexById(val.id); //记录当前点击的订单 |
|
|
|
|
comprehensive.value = true; //开启弹窗 |
|
|
|
|
QuantityEntryStatus.value = true; //此时开启零担录入 |
|
|
|
|
EnteringLibrary.value = true; //显示零担 |
|
|
|
|
getZeroOrderDetail(val.id).then(res => { |
|
|
|
|
console.log(res, '数量录入返回信息'); |
|
|
|
|
isZeroTable.value = res.data.data; |
|
|
|
|
}); |
|
|
|
|
}; |
|
|
|
|
// 修改零担数量 |
|
|
|
|
const ModifyLCL = () => { |
|
|
|
|
updateEntryNum(isZeroTable.value).then(res => { |
|
|
|
|
console.log(res, '修改零担'); |
|
|
|
|
console.log(isZeroTable.value, '修改零担的值'); |
|
|
|
|
}); |
|
|
|
|
comprehensive.value = false; //开启弹窗 |
|
|
|
|
QuantityEntryStatus.value = false; //此时开启零担录入 |
|
|
|
|
EnteringLibrary.value = false; //显示零担 |
|
|
|
|
}; |
|
|
|
|
// 零担提交 |
|
|
|
|
const SubmitLoad = () => { |
|
|
|
|
// 新增订单 |
|
|
|
|
// QuantityEntryStatus为真表示此时此刻操作的是数量录入提交 |
|
|
|
|
if (QuantityEntryStatus.value) { |
|
|
|
|
dataInfo.value[dataId.value].parcelListVOS = isZeroTable.value; |
|
|
|
|
console.log(dataInfo.value[dataId.value], '当前零担信息'); |
|
|
|
|
} |
|
|
|
|
entryNum(isZeroTable.value).then(res => { |
|
|
|
|
console.log(res, '提交零担'); |
|
|
|
|
console.log(isZeroTable.value, '提交零担的值'); |
|
|
|
|
}); |
|
|
|
|
comprehensive.value = false; //关闭弹窗 |
|
|
|
|
EnteringLibrary.value = false; //关闭零担 |
|
|
|
|
QuantityEntryStatus.value = false; //此时开启零担录入 |
|
|
|
|
}; |
|
|
|
|
// 零担数量操作 |
|
|
|
|
const isZeroNumber = val => { |
|
|
|
|
console.log(val, '当前操作数据'); |
|
|
|
|
val.number = val.number; |
|
|
|
|
}; |
|
|
|
|
// 刷新功能触发事件 |
|
|
|
|
const refresh = () => { |
|
|
|
|
@ -2002,6 +2173,7 @@ const merge = (val, kindS) => {
|
|
|
|
|
if (val == 'submit') { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
comprehensive.value = true; //开启弹窗 |
|
|
|
|
SjTc.value = true; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
@ -2034,26 +2206,7 @@ const moveUpVehictle = row => {
|
|
|
|
|
DataSubmit.value.masterDriverName = DvInfoData.value[0].driverName; //主司机 |
|
|
|
|
DataSubmit.value.masterVehicleNub = DvInfoData.value[0].vehicleNub; //主车牌 |
|
|
|
|
}; |
|
|
|
|
// 弹窗确认表单信息展示 |
|
|
|
|
const submit = () => { |
|
|
|
|
// 当前为编辑状态 |
|
|
|
|
if (RouteId.value) { |
|
|
|
|
if (!wrapLoading.value) { |
|
|
|
|
dataInfo.value = dataTmp.value; //选中好的订单提交到要展示的表格 |
|
|
|
|
console.log(data.value, '准备好的值'); |
|
|
|
|
} else { |
|
|
|
|
// 编辑的时候需要带上这个参数存放订单下面的包件信息 |
|
|
|
|
let packageListInfo = []; |
|
|
|
|
dataInfo.value[dataId.value].packageListInfo = wrapData.value; |
|
|
|
|
|
|
|
|
|
console.log(dataInfo.value[dataId.value].packageListInfo, '被添加到当前订单下面'); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
// 新增订单 |
|
|
|
|
dataInfo.value = dataTmp.value; //选中好的订单提交到要展示的表格 |
|
|
|
|
} |
|
|
|
|
AddLalog.value = false; //关闭弹窗 |
|
|
|
|
}; |
|
|
|
|
// 最后提交订单 |
|
|
|
|
const SubmitCommercial = () => { |
|
|
|
|
// kind为假就说明目前是在外协页面 |
|
|
|
|
@ -2067,9 +2220,15 @@ const SubmitCommercial = () => {
|
|
|
|
|
if (!state.value) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
// 如果订单下面没有选择包件就默认给每个订单包件下面添加packageListInfo字段为空数组 |
|
|
|
|
dataInfo.value.forEach(item => { |
|
|
|
|
if (!item.packageListInfo) { |
|
|
|
|
item.packageListInfo = []; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
DataSubmit.value.stockArticle = dataInfo.value; //订单列表 |
|
|
|
|
// 提交 |
|
|
|
|
// 编辑修改 |
|
|
|
|
// 编辑修改 |
|
|
|
|
if (RouteId.value) { |
|
|
|
|
if (!kind.value) { |
|
|
|
|
delete DataSubmit.value.allocationInfo; //如果为外协删掉此参数 |
|
|
|
|
@ -2297,9 +2456,11 @@ const SubmitCommercial = () => {
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 新增数据弹窗组件样式 |
|
|
|
|
:deep(.addlalog) { |
|
|
|
|
// 弹窗 |
|
|
|
|
|
|
|
|
|
.el-dialog__header { |
|
|
|
|
border-bottom: 1px solid #172e607d; |
|
|
|
|
margin-right: 0; |
|
|
|
|
@ -2313,6 +2474,7 @@ const SubmitCommercial = () => {
|
|
|
|
|
transition: transform 1s; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
.el-dialog__header button:hover { |
|
|
|
|
i { |
|
|
|
|
transform: rotate(360deg); |
|
|
|
|
@ -2611,4 +2773,17 @@ const SubmitCommercial = () => {
|
|
|
|
|
margin-top: 18px; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
.iszer { |
|
|
|
|
:deep(.cell) { |
|
|
|
|
display: flex; |
|
|
|
|
padding: 0; |
|
|
|
|
align-items: center; |
|
|
|
|
justify-content: center; |
|
|
|
|
} |
|
|
|
|
.isZel-btn { |
|
|
|
|
display: flex; |
|
|
|
|
justify-content: flex-end; |
|
|
|
|
margin-top: 26px; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
</style> |
|
|
|
|
|
