From 8177c6b1f6708288eec90f6cf9ee57ae7ebab435 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Mon, 1 Apr 2024 20:16:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E9=85=8D=E6=96=B0=E5=A2=9E=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/views/index.js | 5 ++++-
.../deliverylist/distributionDeliveryList.vue | 1 +
.../deliverylist/distributionDeliveryListdis.vue | 2 ++
src/views/distribution/turndelivery/deliveryDiscuss.vue | 8 ++++++--
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/router/views/index.js b/src/router/views/index.js
index cba64c83..84bf6535 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -815,13 +815,16 @@ export default [
// ],
// },
{
- path: '/distribution/turndelivery/deliveryDiscuss',
+ path: '/distribution/turndelivery',
component: Layout,
redirect: '/distribution/turndelivery/deliveryDiscuss',
children: [
{
path: '/distribution/turndelivery/deliveryDiscuss',
name: '商配计划',
+ meta: {
+ keepAlive: true,
+ },
component: () => import('@/views/distribution/turndelivery/deliveryDiscuss.vue'),
},
],
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index def9cb5a..04a42bfb 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -1021,6 +1021,7 @@ export default {
this.box = true;
},
handleEdit(scope) {
+ this.$store.commit('DEL_ONCE_TAG', 'deliveryDiscuss');
const { row } = scope;
this.$router.push({
path: '/distribution/turndelivery/deliveryDiscuss',
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index 8e7554b7..2c03e293 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -1111,6 +1111,7 @@ export default {
},
handleEdit(scope) {
const { row } = scope;
+ this.$store.commit('DEL_ONCE_TAG', 'deliveryDiscuss');
this.$router.push({
path: '/distribution/turndelivery/deliveryDiscuss',
query: {
@@ -1200,6 +1201,7 @@ export default {
* 新增按钮，跳转至配送计划
*/
toDeliveryPlan() {
+ this.$store.commit('DEL_ONCE_TAG', 'deliveryDiscuss');
this.$router.push({
path: '/distribution/turndelivery/deliveryDiscuss',
});
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 8be97719..cb8d6893 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -642,6 +642,12 @@
</div>
</template>
+<script lang="ts">
+export default {
+ name: '/distribution/turndelivery/deliveryDiscuss',
+};
+</script>
+
<script setup lang="ts">
import { ref, reactive, onMounted, computed, watch, nextTick } from 'vue';
import { useRoute, useRouter } from 'vue-router';
@@ -2344,14 +2350,12 @@ const SubmitLoad = () => {
// message: item.firsts + item.reservationNum + ':最大值:不能超过（可用数量）',
// type: 'warning',
// });
-
// return;
// }
// }
// }
// console.log(dataInfo.value[dataId.value], '当前零担信息');
} else {
-
// 操作数量最小值校验 冻结数量+出库数量
// for (const item of isZeroTable.value) {
// if (item.number < item.deliveryQuantity + item.outboundQuantity) {