diff --git a/src/option/distribution/zeroAdditionalRecording.js b/src/option/distribution/zeroAdditionalRecording.js
index c0b9bc74..a46cfe0b 100644
--- a/src/option/distribution/zeroAdditionalRecording.js
+++ b/src/option/distribution/zeroAdditionalRecording.js
@@ -237,6 +237,16 @@ export const newColumnList = [
fixed: false,
sortable: true,
},
+ {
+ prop: 'warehouseName',
+ label: '计划目的网点',
+ type: 1,
+ values: '',
+ width: '130',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
{
prop: 'shipperName',
label: '发货单位',
diff --git a/src/router/views/index.js b/src/router/views/index.js
index a6388ac7..32161c70 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -279,13 +279,14 @@ export default [
redirect: '/distribution/inventory/arteryDistrilbutionBillLadingList',
children: [
{
- path: '/distribution/inventory/arteryDistrilbutionBillLadingList',
- name: '干线提货管理',
+ path: '/distribution/inventory/addArteryDistrilbutionBillLadingList',
+ name: '新增干线提货',
meta: {
data: 'data',
+ keepAlive: true,
},
component: () =>
- import('@/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue'),
+ import('@/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue'),
},
{
path: '/distribution/inventory/arteryDistrilbutionBillLadingListDetails',
@@ -1211,7 +1212,7 @@ export default [
{
meta: {
i18n: 'dict',
- keepAlive:false,
+ keepAlive: false,
},
path: '/aftersales/aftersalesWorkOrder',
name: '工单',
@@ -1244,7 +1245,7 @@ export default [
{
meta: {
i18n: 'dict',
- keepAlive:false,
+ keepAlive: false,
},
path: '/aftersales/aftersalesWorkOrderInfo',
name: '工单详情查看',
@@ -1261,7 +1262,7 @@ export default [
{
meta: {
i18n: 'dict',
- keepAlive:false,
+ keepAlive: false,
},
path: '/aftersales/aftersalesWorkOrderend',
name: '工单完结',
@@ -1277,7 +1278,7 @@ export default [
{
meta: {
i18n: 'dict',
- keepAlive:false,
+ keepAlive: false,
},
path: '/aftersales/WorkorderTimeout',
name: '工单超时罚款',
@@ -1317,7 +1318,7 @@ export default [
},
],
},
-
+
{
path: '/aftersales/DataSynchronization',
component: Layout,
diff --git a/src/views/distribution/artery/zeroAdditionalRecording.vue b/src/views/distribution/artery/zeroAdditionalRecording.vue
index 2831b7a3..5dc8ca02 100644
--- a/src/views/distribution/artery/zeroAdditionalRecording.vue
+++ b/src/views/distribution/artery/zeroAdditionalRecording.vue
@@ -149,14 +149,25 @@
-
-
- 移除调度池
-
+
+
+
+ 移除调度池
+
+
+
+ 修改节点
+
+
-
+
@@ -200,6 +211,7 @@
type="primary"
class="submitBtn"
icon="el-icon-circle-check"
+ :loading="details.loadingObj.submitLoading"
@click="handleEditZeroSubmit"
>提 交
@@ -211,7 +223,7 @@
:align-center="true"
>
-
+
- 取消
- 确定(修改客户)
+ 取消
+ 确定(选择节点)
@@ -256,10 +268,15 @@ import {
import { downloadXls } from '@/utils/util';
import { oldColumnList, newColumnList } from '@/option/distribution/zeroAdditionalRecording';
import { ElMessage } from 'element-plus';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
+import { useStore } from 'vuex';
// 路由实例
const $route = useRoute();
+const $router = useRouter();
+
+// 实例化仓库
+const $store = useStore();
const details = reactive({
/** 是否开启搜索 */
@@ -305,7 +322,7 @@ const details = reactive({
oldColumnList,
newColumnList,
/** 订单池数据 */
- oldData: [{}],
+ oldData: [],
/** 调度池数据 */
newData: [],
/** 页面loading */
@@ -313,6 +330,8 @@ const details = reactive({
/** 列表加载loading */
list: false,
newListLoading: false,
+ /** 提交按钮 */
+ submitLoading: false,
},
/** 订单池列表复选框选中的数据 */
oldSelectionList: [],
@@ -353,11 +372,14 @@ const details = reactive({
finalNodeIdArr: [],
/** 运单Id */
loadId: '',
+ /** 弹出层 */
showPopUpObj: {
- editNodeIdDialogVisible: true,
+ editNodeIdDialogVisible: false,
},
/** 选择的Id */
- chooseNodeId: '',
+ finalNodeId: '',
+ /** 确认框的事件类型 add -- 新增 edit -- 修改 */
+ confirmType: 'add',
});
const {
@@ -587,26 +609,33 @@ const setnewcolum = (newarr, headarr, type) => {
const handleAddWaybill = () => {
if (details.oldSelectionList.length === 0) return ElMessage.error('最少选择一条数据');
- for (let item of details.oldSelectionList) {
- console.log('item.stockNum :>> ', item.stockNum);
- item.loadingNum = Number(item.stockNum || 0);
- details.newData.push(item);
- }
+ // 有多个后续节点
+ if (details.finalNodeIdArr.length > 1) {
+ details.confirmType = 'add';
- details.orderCodeList = [
- ...new Set([...details.orderCodeList, ...details.oldSelectionList.map(val => val.orderCode)]),
- ];
+ details.showPopUpObj.editNodeIdDialogVisible = true;
+ } else {
+ const _item = details.finalNodeIdArr[0];
- details.page.pageNum = 1;
- onLoad();
+ for (let item of details.oldSelectionList) {
+ item.finalNodeId = _item.warehouseId;
+ item.warehouseName = _item.warehouseName;
+ item.loadingNum = Number(item.stockNum || 0);
+ details.newData.push(item);
+ }
+
+ details.orderCodeList = [
+ ...new Set([...details.orderCodeList, ...details.oldSelectionList.map(val => val.orderCode)]),
+ ];
+
+ details.page.pageNum = 1;
+ onLoad();
+ }
};
/** 移除运单 */
const handleRemoveWaybill = () => {
if (details.newSelectionList.length === 0) return ElMessage.warning('最少选择一条运单');
- for (const iterator of details.newSelectionList) {
- console.log('111 :>> ', 111);
- }
details.newData = details.newData.filter((val, index) => {
const _flag = !details.newSelectionList.includes(val);
@@ -623,29 +652,114 @@ const handleRemoveWaybill = () => {
onLoad();
};
+/** 清空调度池 */
+const handleRefresh = () => {
+ details.newData = [];
+ details.newSelectionList = [];
+ details.orderCodeList = [];
+ details.page.pageNum = 1;
+ onLoad();
+};
+
+/** 开启修改零担补录节点弹窗 */
+const handleEditNode = () => {
+ if (details.finalNodeIdArr.length <= 1) return ElMessage.error('后续节点数小于2个');
+
+ if (details.newSelectionList.length === 0) return ElMessage.warning('最少选择一条数据');
+
+ details.confirmType = 'edit';
+
+ details.showPopUpObj.editNodeIdDialogVisible = true;
+};
+
+/** 新增提交 */
+const handleAdd = (warehouseName, finalNodeId) => {
+ for (let item of details.oldSelectionList) {
+ item.finalNodeId = details.finalNodeId;
+ item.warehouseName = warehouseName;
+ item.loadingNum = Number(item.stockNum || 0);
+ details.newData.push(item);
+ }
+
+ details.orderCodeList = [
+ ...new Set([...details.orderCodeList, ...details.oldSelectionList.map(val => val.orderCode)]),
+ ];
+
+ details.page.pageNum = 1;
+ onLoad();
+
+ details.showPopUpObj.editNodeIdDialogVisible = false;
+};
+
+const handleEdit = (warehouseName, finalNodeId) => {
+ for (const iterator of details.newSelectionList) {
+ iterator.finalNodeId = finalNodeId;
+ iterator.warehouseName = warehouseName;
+ }
+
+ details.showPopUpObj.editNodeIdDialogVisible = false;
+};
+
+/** 修改零担补录节点 */
+const handleChooseNode = () => {
+ if (!details.finalNodeId) return ElMessage.error('请选择节点');
+
+ const _finalNodeId = details.finalNodeId;
+
+ // 获取节点名称
+ const _warehouseName = details.finalNodeIdArr.find(
+ val => val.warehouseId === _finalNodeId
+ ).warehouseName;
+
+ details.confirmType === 'add'
+ ? handleAdd(_warehouseName, _finalNodeId)
+ : handleEdit(_warehouseName, _finalNodeId);
+};
+
+/** 返回上一页 */
+const back = () => {
+ $router.back();
+
+ $store.commit('DEL_TAG');
+};
+
/** 零担补录提交 */
-const handleEditZeroSubmit = () => {
- if (details.newData.length === 0) return ElMessage.error('请选择运单');
-
- // const _data = details.newData.filter(val => {
- // return val.loadingNum > 0;
- // });
-
- const submitData = {
- loadId: details.loadId,
- zeroSuppleList: [],
- };
-
- for (const iterator of details.newData) {
- submitData.zeroSuppleList.push({
- orderCode: iterator.orderCode,
- waybillNo: iterator.waybillNo,
- enterNum: iterator.stockNum,
- finalNodeId: iterator.nodeId,
+const handleEditZeroSubmit = async () => {
+ try {
+ // 开启提交loading
+ details.loadingObj.submitLoading = true;
+
+ if (details.newData.length === 0) return ElMessage.error('请选择运单');
+
+ const _data = details.newData.filter(val => {
+ return val.loadingNum > 0;
});
- }
- console.log('_data :>> ', _data);
+ const submitData = {
+ loadId: details.loadId,
+ zeroSuppleList: [],
+ };
+
+ for (const iterator of details.newData) {
+ submitData.zeroSuppleList.push({
+ orderCode: iterator.orderCode,
+ waybillNo: iterator.waybillNo,
+ enterNum: iterator.loadingNum,
+ finalNodeId: iterator.finalNodeId,
+ });
+ }
+
+ console.log('submitData :>> ', submitData);
+ const res = await postAddZeroSupple(submitData);
+
+ const { code } = res.data;
+ if (code !== 200) return;
+ } catch (error) {
+ console.log('error :>> ', error);
+ } finally {
+ // 关闭提交loading
+ details.loadingObj.submitLoading = false;
+ }
};
@@ -743,4 +857,8 @@ const handleEditZeroSubmit = () => {
:deep(.el-input-number__increase) {
zoom: 0.8;
}
+
+.el-select {
+ width: 100%;
+}
diff --git a/src/views/distribution/inventory/BookingNote.vue b/src/views/distribution/inventory/BookingNote.vue
index 856c44b9..db295e45 100644
--- a/src/views/distribution/inventory/BookingNote.vue
+++ b/src/views/distribution/inventory/BookingNote.vue
@@ -186,7 +186,7 @@
-
+
件
方
公斤
@@ -200,6 +200,7 @@
v-for="item in details.options"
:key="item.value"
:label="item.label"
+ readonly
:value="item.value"
/>
@@ -210,6 +211,7 @@
v-model="item.num"
controls-position="right"
:precision="0"
+ readonly
:step="0.1"
/>
@@ -219,6 +221,7 @@
v-model="item.volume"
controls-position="right"
:precision="4"
+ readonly
:step="0.1"
/>
@@ -228,6 +231,7 @@
v-model="item.weight"
controls-position="right"
:precision="3"
+ readonly
:step="0.1"
/>
@@ -237,6 +241,7 @@
v-model="item.price"
controls-position="right"
:precision="2"
+ readonly
:step="0.1"
/>
@@ -247,6 +252,7 @@
controls-position="right"
:precision="2"
:step="0.1"
+ readonly
/>
@@ -362,7 +368,7 @@
{{ totalCost }}
-
+
+
+
+
+
+
+
+
+
+
+
+ {
+ this.box = false;
+ this.$router.push('/basicdata/vehicle/basicdataVehicle');
+ }
+ "
+ icon="plus"
+ >
+
+
+
+ {
+ this.box = false;
+ this.$router.push('/basicdata/driverArtery/basicdataDriverArtery');
+ }
+ "
+ icon="plus"
+ >
+
+
+
+ {
+ this.popUpShow.addDistrilbutionLineVisited = true;
+ }
+ "
+ icon="plus"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 运单池
+
+
+
+
+ 添 加
+
+
+
+
+
+
+
+
+
+
+
+ 调度池
+
+
+
+
+ 移 除
+
+
+
+
+
+
合计: 选择数: {{ addInfo.oldSelectionList.length }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ addLineInfo.lineList.splice(index, 1);
+ }
+ "
+ >删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ addLineInfo.lineList.push({});
+ }
+ "
+ >新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
index a334d27b..84d88a6d 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
@@ -1147,18 +1147,25 @@ export default {
async handleSubmit() {},
/** 新增 */
handleAdd() {
- this.title = '新增';
- this.addInfo.form = {};
- this.box = true;
- this.addInfo.isNew = true;
- this.$nextTick(() => {
- // 获取表格实例并赋值高度和宽度
- var bodyContent = document.querySelectorAll('.el-dialog .maboxhi');
- bodyContent.forEach(val => {
- val.style.height = '350px';
- // val.style.width = '45%';
- });
+ this.$router.push({
+ path: '/distribution/inventory/addArteryDistrilbutionBillLadingList',
+ query: {
+ name: '新增提货',
+ },
});
+
+ // this.title = '新增';
+ // this.addInfo.form = {};
+ // this.box = true;
+ // this.addInfo.isNew = true;
+ // this.$nextTick(() => {
+ // // 获取表格实例并赋值高度和宽度
+ // var bodyContent = document.querySelectorAll('.el-dialog .maboxhi');
+ // bodyContent.forEach(val => {
+ // val.style.height = '350px';
+ // // val.style.width = '45%';
+ // });
+ // });
},
/** 修改 */
handleEdit() {
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
index 3ae8f765..b3d5512b 100644
--- a/src/views/distribution/signfor/distributionSignfortreat.vue
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -162,8 +162,8 @@
'装车件数' ||
'签收数' ||
'未签收数' ||
- '未装车件数'||
- '异常装车件数'||
+ '未装车件数' ||
+ '异常装车件数' ||
'异常签收件数'
"
>
@@ -394,7 +394,6 @@
:on-success="ImgSuccessC"
:headers="headers"
multiple
-
>
@@ -1856,11 +1855,11 @@ export default {
type = 5;
this.numberTitle = '未签收详情列表';
break;
- case '异常装车件数':
+ case '异常装车件数':
type = 6;
this.numberTitle = '异常装车详情列表';
break;
- case '异常签收件数':
+ case '异常签收件数':
type = 7;
this.numberTitle = '异常签收详情列表';
break;
@@ -2511,7 +2510,7 @@ export default {
display: flex;
align-items: flex-end;
}
-:deep(.el-upload-list__item-thumbnail){
+:deep(.el-upload-list__item-thumbnail) {
object-fit: fill;
}
diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index a1cde114..806c5888 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/src/views/warehouse/parcelList/distributionParcelList.vue
@@ -260,7 +260,7 @@ export default {
head: false,
},
{
- prop: 'trainNumber',
+ prop: 'carNumber',
label: '客户车次号',
type: 2,
values: '',
@@ -370,7 +370,6 @@ export default {
sortable: true,
},
-
{
prop: 'reservationCode',
label: '预约单编号',
@@ -381,10 +380,8 @@ export default {
fixed: false,
sortable: true,
},
-
-
{
- prop: 'noteNumber',
+ prop: 'trainNumber',
label: '配送车次号',
type: 2,
values: '',
@@ -393,8 +390,6 @@ export default {
fixed: false,
sortable: true,
},
-
-
{
prop: 'driverName',
label: '配送司机',
@@ -405,8 +400,6 @@ export default {
fixed: false,
sortable: true,
},
-
-
{
prop: 'scanTime',
label: '装车时间',
@@ -417,8 +410,6 @@ export default {
fixed: false,
sortable: true,
},
-
-
{
prop: 'scanUser',
label: '实际装车人',
@@ -509,7 +500,7 @@ export default {
fixed: false,
sortable: true,
},
-
+
// {
// prop: 'allocationMsg',
// label: '货位信息',
@@ -761,21 +752,6 @@ export default {
delete this.query[row.prop.replace(/Name/, '')];
delete this.query[row.prop];
}
-
- // // 上架状态
- // if (row.prop === 'orderPackageGroundingStatusName') {
- // this.query.orderPackageGroundingStatus = value;
- // if (value === '') delete this.query.orderPackageGroundingStatus;
- // }
-
- // if (row.prop === 'orderPackageStatusName') {
- // this.query.orderPackageStatus = value;
- // if (value === '') delete this.query.orderPackageStatus;
- // }
-
- // if (value === '') {
- // delete this.query[row.prop];
- // }
this.page.currentPage = 1;
this.onLoad(this.page);
},
diff --git a/vite.config.js b/vite.config.js
index a8678b55..08e6eaf9 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -23,13 +23,13 @@ export default ({ mode, command }) => {
// 新zyc
// target: 'http://192.168.6.116:8777',
// target: 'http://192.168.6.122:8777',
- target: 'http://192.168.10.25:13000',
+ // target: 'http://192.168.10.25:13000',
// target: 'http://192.168.10.25:2888',
// target: 'http://192.168.6.148:9777',
- // target: 'http://192.168.10.57:13000',
+ target: 'http://192.168.10.57:13000',
// tjj
// sst
- // target: 'http://192.168.10.94:8888',
+ // target: 'http://192.168.10.200:13000',
// target: 'http://192.168.10.29:13000',
// target: 'http://h5uapi.huitongys.com',
// target: 'http://test.api.huitongys.com',