diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 7b0a6070..16a8f085 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -98,13 +98,13 @@ 新 增 - EXCEL导出 + > --> - + @@ -181,7 +181,7 @@ import { const $router = useRouter(); //跳转 const $useStore = useStore(); //权限 const $route = useRoute(); //获取地址栏参数 -const activeName = ref('1'); +const activeName = ref('2'); const dataCopy = ref([]); //拷贝数据 const dialogVisible = ref(false); const from = ref({ @@ -401,7 +401,7 @@ const onLoad = async () => { console.log(_res, '基础信息'); from.value.warehouse = data.warehouse; //已入库 from.value.unWarehouse = data.unWarehouse; //未入库 - details.data = data.warehouse; + details.data = data.unWarehouse; dataCopy.value = deepClone(from.value.warehouse); details.loadingObj.list = false; }; diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue index 0602bc89..b1478648 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue @@ -934,6 +934,9 @@ export default { methods: { // 未入库数量跳转 InformationViewing(row) { + if(!row.notReceived || Number(row.isZero)) { + return + } this.$router.push({ path: '/distribution/inventory/delivery/Unstoreddetails', query: {