From 663f3a788369469880be7091afc22bd3e0879f87 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Sat, 11 May 2024 11:36:46 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=97=B6=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/edittablehead/index.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/components/edittablehead/index.vue b/src/components/edittablehead/index.vue
index 72c2f0fc..4b7be45d 100644
--- a/src/components/edittablehead/index.vue
+++ b/src/components/edittablehead/index.vue
@@ -49,6 +49,7 @@ import { useRoute } from 'vue-router';
const functions = inject('functions') as any;
import Sortable from 'sortablejs';
+import { handleClearTableQuery } from '@/utils/util';
interface TableColumnType {
/** 表格列的key */
prop: string;
@@ -131,6 +132,7 @@ const _arr = functions.getStorage($route.fullPath + props.columnListName);
if (_arr) {
columnRef.value = [..._arr];
+ handleClearTableQuery(_arr);
emit('update:modelValue', _arr);
}
From 153c6519bc5e5a3dc93fa511b165b5ee7b01e8d5 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Sat, 11 May 2024 13:49:09 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E5=B9=B2=E7=BA=BFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../distribution/artery/AddVehicleStowage.vue | 95 ++++++++++++-------
src/views/waybill/TemporaryStorageList.vue | 2 +-
2 files changed, 61 insertions(+), 36 deletions(-)
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index 1b7ff261..91b9cbf2 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -355,7 +355,7 @@
搜 索
- 重置
+ 重 置
@@ -425,8 +425,7 @@
:model="details.newQuery"
class="el-fr-d"
>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 搜 索
+
+
+ 重 置
+
+
@@ -619,6 +637,7 @@ import {
isNumber,
deepClone,
debounce,
+ handleClearTableQuery,
} from '@/utils/util';
import {
columnList,
@@ -1048,7 +1067,7 @@ const onLoad = async () => {
if (!value) delete this.timeQuery[prop];
- this.itemFilterData();
+ // this.itemFilterData();
},
/** 筛选数据 */
itemFilterData() {
@@ -1086,6 +1105,13 @@ const onLoad = async () => {
this.renderData = _filterArr;
},
+ /** 清空搜索的值 */
+ itemClearQuery() {
+ this.query = {};
+ this.timeQuery = {};
+ handleClearTableQuery(this.newColumnList);
+ this.itemFilterData();
+ },
MappingData: [],
};
@@ -1171,10 +1197,8 @@ const searchChange = () => {
const searchReset = () => {
details.query = {};
details.page.pageNum = 1;
- for (let i = 0; i < details.columnList.length; i++) {
- const value = details.columnList[i];
- value.values = '';
- }
+
+ handleClearTableQuery(details.columnList);
initOriginWarehouseOrder();
};
@@ -1392,7 +1416,7 @@ const handleAddNode = async (index: number) => {
if (!value) delete this.timeQuery[prop];
- this.itemFilterData();
+ // this.itemFilterData();
},
/** 筛选数据 */
itemFilterData() {
@@ -1430,6 +1454,13 @@ const handleAddNode = async (index: number) => {
this.renderData = _filterArr;
},
+ /** 清空搜索的值 */
+ itemClearQuery() {
+ this.query = {};
+ this.timeQuery = {};
+ handleClearTableQuery(this.newColumnList);
+ this.itemFilterData();
+ },
MappingData: [],
});
@@ -1882,12 +1913,6 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index 91b9cbf2..cfefff1e 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -74,6 +74,10 @@
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index bbcc13b9..8770c7cf 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -257,13 +257,22 @@ export default {
columnList: [
{
prop: '',
- label: '序号',
+ label: '复选框',
type: 0,
values: '',
width: 55,
checkarr: [],
fixed: true,
},
+ {
+ prop: '',
+ label: '序号',
+ type: 12,
+ values: '',
+ width: 55,
+ checkarr: [],
+ fixed: true,
+ },
{
prop: 'pickupBatch',
label: '提货批次',
From c1ab31299bf85d64377cfbdfa00c3fd02eee391e Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Sat, 11 May 2024 18:16:54 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B9=B2=E7=BA=BF?=
=?UTF-8?q?=E6=8F=90=E8=B4=A7=E6=93=8D=E4=BD=9CLoading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../arteryDistrilbutionBillLadingList.vue | 26 ++++++++++++-------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
index da47020b..322d9ee8 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
@@ -663,23 +663,29 @@ export default {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'success',
- })
- .then(() => {
- return postUpdateBillladingStatus({
+ }).then(async () => {
+ try {
+ this.loadingObj.pageLoading = true;
+
+ const res = await postUpdateBillladingStatus({
id: this.selectionList[0].id,
type,
});
- })
- .then(() => {
+
+ const { code, msg } = res.data;
+
+ if (code !== 200) return;
+ this.$message.success(msg);
// 清空复选框
this.selectionClear();
// 刷新表格
this.onLoad(this.page);
- this.$message({
- type: 'success',
- message: '操作成功!',
- });
- });
+ } catch (error) {
+ console.log('error :>> ', error);
+ } finally {
+ this.loadingObj.pageLoading = false;
+ }
+ });
},
/** 开启添加提货数据弹窗 */
handleAddDistrilbution() {