+
搜索
@@ -2036,52 +2036,6 @@ const SearchFu = () => {
}
return;
- if (multifunctional.value) {
- document.getElementById(multifunctional.value).scrollIntoView();
- }
- return;
- console.log(soInpuState.value, '当前搜索状态');
- if (!multifunctional.value && !dataInfoTemp.value.length) {
- soInpuState.value = false; //重置搜索状态
- ElMessage({
- showClose: true,
- message: '请输入搜索内容',
- type: 'warning',
- });
- return;
- }
- if (!multifunctional.value && dataInfoTemp.value.length) {
- //这里是回复初始内容
- soInpuState.value = false; //重置搜索状态
- dataInfo.value = JSON.parse(JSON.stringify(dataInfoTemp.value));
- dataInfoTemp.value = [];
- }
- if (soInpuState.value) {
- ElMessage({
- showClose: true,
- message: '请先重置数据',
- type: 'warning',
- });
- return;
- } else {
- //当前状态默认为假，如果是假可以搜索
- console.log('多功能搜索功能');
- console.log(dataInfo.value, '当前订单');
- dataInfoTemp.value = dataInfo.value; //先存储一个完整的值
- let temp = dataInfo.value.filter(item => {
- return Object.values(item).some(val => {
- if (typeof val === 'string') {
- return val.includes(multifunctional.value);
- }
- return false;
- });
- });
-
- console.log(temp, '搜索结果');
- console.log(dataInfoTemp.value, '临时存储的值');
- dataInfo.value = temp; //如果搜索到了值才赋值
- soInpuState.value = false; //表示当前已经搜索过了
- }
// console.log(dataInfo.value, '搜索结果');
};
@@ -2265,66 +2219,6 @@ const ViewEvent = val => {
// 编辑信息弹窗状态
PackageFn();
return;
- if (RouteId.value) {
- console.log(wrapLoading.value, '当前为编辑状态');
- $_getPackageListByDeliveryIdAndOrderId({
- waybillNumber: '', //运单号
- orderPackageCode: '', //包条码
- current: 1,
- size: 100,
- deliveryId: RouteId.value,
- id: val.id,
- }).then(res => {
- console.log(res, '订单包件信息');
- if (res.data.code == 200) {
- wrapData.value = res.data.data.data.packageList;
- 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; //关闭弹窗
- console.log(wrapData.value, '包件表格信息');
- console.log(res);
- });
- } else {
- // 运单号
- // 包条码
- $_getPackageListByStockArticleId({
- waybillNumber: '', //运单号
- orderPackageCode: '', //包条码
- id: val.id,
- current: 1,
- size: 100,
- }).then(res => {
- wrapData.value = res.data.data.records;
- console.log(res, '订单包件');
- if (kind.value) {
- toggleSelection({ index: 0 }); //自主配送下面包件全选
- } else {
- 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; //关闭加载效果
};
// 输入框值切换
@@ -2970,9 +2864,10 @@ const SubmitCommercial = async () => {
.el-Cart-button-left,
.el-Cart-button-right {
display: flex;
- margin: 0 0px;
justify-content: space-between;
+ margin: 0 0px;
}
+
.el-Cart-button-left {
width: 100%;
:deep(button) {
diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index 099b36f3..7d55c87f 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/src/views/warehouse/parcelList/distributionParcelList.vue
@@ -84,7 +84,9 @@
-