diff --git a/src/option/basicdata/basicdataTray.js b/src/option/basicdata/basicdataTray.js
index b42c01fd..57ef814f 100644
--- a/src/option/basicdata/basicdataTray.js
+++ b/src/option/basicdata/basicdataTray.js
@@ -30,7 +30,7 @@ export default {
type: 'input',
addDisplay: false,
editDisplay: false,
- viewDisplay: false,
+ viewDisplay: true,
hide: true,
width: '130',
},
@@ -40,7 +40,7 @@ export default {
type: 'input',
addDisplay: false,
editDisplay: false,
- viewDisplay: false,
+ viewDisplay: true,
hide: true,
width: '130',
},
diff --git a/src/option/distribution/zeroAdditionalRecording.js b/src/option/distribution/zeroAdditionalRecording.js
index 73c935f6..c0b9bc74 100644
--- a/src/option/distribution/zeroAdditionalRecording.js
+++ b/src/option/distribution/zeroAdditionalRecording.js
@@ -287,6 +287,16 @@ export const newColumnList = [
fixed: false,
sortable: true,
},
+ {
+ prop: 'loadingNum',
+ label: '装车件数',
+ type: 6,
+ values: '',
+ width: '130',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
{
prop: 'price',
label: '单价',
diff --git a/src/utils/util.js b/src/utils/util.js
index dd65fdd5..a5015c07 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -335,13 +335,12 @@ export const getTopUrl = () => {
return window.location.href.split('/#/')[0];
};
-
/** 移除标题栏指定地址
* @param {string} value 要移除的地址
*/
-export function AddressClosed(url){
+export function AddressClosed(url) {
console.log(url, store);
- const index = store.getters.tagList.findIndex((item) => item.path == url);
+ const index = store.getters.tagList.findIndex(item => item.path == url);
if (index != -1) {
store.getters.tagList.splice(index, 1);
}
@@ -623,4 +622,7 @@ export function debounce(func, delay) {
})();
}
-
+/** 去除零宽字符 */
+export const removeZeroWidth = str => {
+ return str.replace(/[\u200B-\u200D\uFEFF]/g, '');
+};
diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index 21458146..fa898a17 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -513,10 +513,10 @@ console.log(accessControl, '权限按钮');
// repulse;//打回
// arbitration_completed;//仲裁完结
// information_editing;//信息编辑
-console.log(accessControl.workAdd, '新增按钮权限');
+console.log(accessControl.add, '新增按钮权限');
const PermissionButton = computed(() => {
return {
- workAdd: accessControl.workAdd, //新增
+ workAdd: accessControl.add, //新增
batch_return: accessControl.batch_return, //批量打回
assign: accessControl.assign, //工单指派
apply_arbitration: accessControl.apply_arbitration, //申请仲裁
diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue
index b113fa87..5219fac4 100644
--- a/src/views/aftersales/aftersalesWorkOrderInfo.vue
+++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue
@@ -116,7 +116,7 @@
@@ -670,7 +670,22 @@ const PermissionButton = computed(() => {
information_editing:accessControl.information_editing,//信息编辑
}
});
-
+ // const PermissionButtonS = computed(() => {
+ // return {
+ // workAdd:accessControl.workAdd,//新增
+ // batch_return:accessControl.batch_return,//批量打回
+ // assign:accessControl.assign, //工单指派
+ // apply_arbitration:accessControl.apply_arbitration,//申请仲裁
+ // batch_completion:accessControl.batch_completion,//批量完结
+ // representations:accessControl.representations,//申诉
+ // reply:accessControl.reply,//回复
+ // processing_completed:accessControl.processing_completed,//处理完结
+ // work_order_completion:accessControl.work_order_completion,//完结
+ // repulse:accessControl.repulse,//打回
+ // arbitration_completed:accessControl.arbitration_completed,//仲裁完结
+ // information_editing:accessControl.information_editing,//信息编辑
+ // }
+ // });
// 详情按钮权限
const ButtonPermissions = computed(() => {
// 根据 TabPermissions 的状态，决定每个按钮的显示隐藏逻辑
diff --git a/src/views/distribution/artery/zeroAdditionalRecording.vue b/src/views/distribution/artery/zeroAdditionalRecording.vue
index 179abdec..2831b7a3 100644
--- a/src/views/distribution/artery/zeroAdditionalRecording.vue
+++ b/src/views/distribution/artery/zeroAdditionalRecording.vue
@@ -171,6 +171,18 @@
@selectCheck="newSelectsc"
@selection="newSelectionChange"
>
+
+
+
+
+
({
/** 是否开启搜索 */
@@ -308,6 +349,15 @@ const details = reactive({
form: {},
/** 被选中的零担订单 */
orderCodeList: [],
+ /** 后续节点Id列表 */
+ finalNodeIdArr: [],
+ /** 运单Id */
+ loadId: '',
+ showPopUpObj: {
+ editNodeIdDialogVisible: true,
+ },
+ /** 选择的Id */
+ chooseNodeId: '',
});
const {
@@ -338,6 +388,18 @@ onMounted(() => {
}, 100);
});
+/** 获取最终节点ID */
+const initFinalNodeId = async () => {
+ details.loadId = $route.query.loadId;
+
+ const res = await postFindNextNodeList({ loadId: details.loadId });
+ const { code, data } = res.data;
+ if (code !== 200) return;
+ details.finalNodeIdArr = data;
+};
+
+initFinalNodeId();
+
/** 请求页面数据 */
const onLoad = async (params = {}) => {
try {
@@ -526,8 +588,8 @@ const handleAddWaybill = () => {
if (details.oldSelectionList.length === 0) return ElMessage.error('最少选择一条数据');
for (let item of details.oldSelectionList) {
- item.planNum = item.stockNum;
- item.loadingNum = 0;
+ console.log('item.stockNum :>> ', item.stockNum);
+ item.loadingNum = Number(item.stockNum || 0);
details.newData.push(item);
}
@@ -556,10 +618,35 @@ const handleRemoveWaybill = () => {
}
return _flag;
});
+
+ details.page.pageNum = 1;
+ onLoad();
};
/** 零担补录提交 */
-const handleEditZeroSubmit = () => {};
+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,
+ });
+ }
+
+ console.log('_data :>> ', _data);
+};
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 883cdddd..4bddd073 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -131,6 +131,7 @@
-->
+
@@ -388,6 +393,7 @@
+
@@ -2586,6 +2593,16 @@ export default {
fixed: false,
sortable: true,
},
+ {
+ label: '装车时间',
+ prop: 'loadingTime',
+ type: 2,
+ values: '',
+ width: '130',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
// {
// label: '配送计划状态',
// prop: 'orderPackageDeliveryStatus',
@@ -2932,6 +2949,8 @@ export default {
this.windowHeight = window.innerHeight * 0.8;
console.log(`浏览器窗口的高度为：${this.windowHeight}px`);
+
+ this.setTableHeight();
},
created() {
// //查询字典
@@ -2956,6 +2975,13 @@ export default {
},
},
methods: {
+ async setTableHeight() {
+ await this.$nextTick();
+ const tableNode = document.querySelectorAll('.tableNode');
+
+ setNodeHeight(tableNode, '600px');
+ },
+
callFordelivery(formName) {
console.log(formName, 'formName');
this.$refs[formName].validate(valid => {
@@ -3762,4 +3788,11 @@ export default {
.el_foot {
overflow: scroll;
}
+
+// 标题
+:deep(.el-divider__text.is-center) {
+ font-size: 20px;
+ font-weight: bold;
+ color: var(--el-color-primary);
+}
diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index d7b1cea0..4250b20d 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -1340,13 +1340,22 @@ export default {
}
});
ids = ids.join(',');
+
this.$router.push({
- path: '/distribution/reservation/atlas',
+ path: '/distribution/turndelivery/deliveryMarket',
query: {
id: ids,
- type: '1',
+ name: '市配计划',
},
});
+
+ // this.$router.push({
+ // path: '/distribution/reservation/atlas',
+ // query: {
+ // id: ids,
+ // type: '1',
+ // },
+ // });
// console.log(">>>>>>>>>>",ids);
},
//批量转备货
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 1681fedb..1f9aa830 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -128,6 +128,7 @@
新 增
新 增
> ', _node);
_node.style.transition = 'all 0.3s';
setNodeHeight(_node, '500px');
+
+ this.setTableHeight();
});
},
checkOrder(row, index) {
@@ -2128,6 +2141,8 @@ export default {
const _node = document.querySelector('.stockListShow .maboxhi');
_node.style.transition = 'all 0.3s';
setNodeHeight(_node, '500px');
+
+ this.setTableHeight();
});
}
);
@@ -2571,7 +2586,7 @@ export default {
if (item.id === row.id) {
this.orderData.splice(index, 1);
}
- console.log(this.orderData,'当前存在的数据');
+ console.log(this.orderData, '当前存在的数据');
});
// 当两个列表没有数据时, 清空限制
if (this.inventoryData.length === 0 && this.orderData.length === 0) this.marketName = '';
@@ -2819,17 +2834,22 @@ export default {
// }
// return true;
// });
+ console.log('this.inventoryList :>> ', this.inventoryList);
+
const stockArr = [...this.inventoryData, ...this.inventoryList];
// 检测商场是否选择统一商场
const _isUnifyMarketName = stockArr.every(value => {
// 设置同一商场
- if (this.marketName === '') this.marketName = value.marketName;
+ if (this.marketName === '') this.marketName = removeZeroWidth(value.marketName);
if (this.marketName !== value.marketName) {
this.$message.warning('请选择统一商场!!!');
return false;
- } else if (value.reservationNum > value.applyNum) {
+ } else if (Number(value.reservationNum) > Number(value.applyNum)) {
+ console.log('value >>>>>>>>', value);
+ console.log('Number(value.reservationNum) :>> ', Number(value.reservationNum));
+ console.log('Number(value.applyNum) :>> ', Number(value.applyNum), value.applyNum);
this.$message.warning('该库存品数量输入有误!!!');
return false;
}
@@ -2840,7 +2860,6 @@ export default {
return;
}
- console.log('this.inventoryList :>> ', this.inventoryList);
this.inventoryData = stockArr;
this.stockListShow = false;
@@ -2852,10 +2871,10 @@ export default {
console.log('orderList-------------》', this.orderList);
if (this.orderList.length === 0) return this.$message.warning('最少选择一条数据!!!');
const list = [...this.orderData, ...this.orderList];
- let _name = list[0].customerName.trim();
- let _address = list[0].customerAddress.trim();
- let _phone = list[0].customerTelephone.trim();
- if (this.marketName === '') this.marketName = list[0].mallName.trim();
+ let _name = removeZeroWidth(list[0].customerName.trim());
+ let _address = removeZeroWidth(list[0].customerAddress.trim());
+ let _phone = removeZeroWidth(list[0].customerTelephone.trim());
+ if (this.marketName === '') this.marketName = removeZeroWidth(list[0].mallName.trim());
// 设置商场名称
if (this.marketName === '') this.marketName = this.marketName;
@@ -2867,10 +2886,20 @@ export default {
return false;
}
- if (
- item.customerName.trim() !== _name ||
- item.customerAddress.trim() !== _address ||
+ console.log(' item.customerName.trim() !== _name :>> ', item.customerName.trim() !== _name);
+ console.log(
+ ' item.customerName.trim() !== _name :>> ',
+ item.customerAddress.trim() !== _address
+ );
+ console.log(
+ ' item.customerName.trim() !== _name :>> ',
item.customerTelephone.trim() !== _phone
+ );
+
+ if (
+ removeZeroWidth(item.customerName.trim()) !== _name ||
+ removeZeroWidth(item.customerAddress.trim()) !== _address ||
+ removeZeroWidth(item.customerTelephone.trim()) !== _phone
) {
console.log('123');
this.$message.warning('请选择统一顾客订单!!!');
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 39ed1b27..37a1a08a 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -381,7 +381,6 @@
-
@@ -441,7 +440,14 @@
+
+
+
@@ -453,9 +459,7 @@
placeholder="请输入顾客地址"
/>
-
-
-
+