From c61d4941e61ef2879472223e0cc19c2785793f04 Mon Sep 17 00:00:00 2001 From: zhangdi <15053473693@163.com> Date: Fri, 6 Feb 2026 17:25:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/login/authorization.vue | 4 +++- src/router/axios.js | 14 ++++---------- src/views/secondOrder/components/outDialog.vue | 16 +++++++++++++--- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/page/login/authorization.vue b/src/page/login/authorization.vue index fa4dd6e..7a65b34 100644 --- a/src/page/login/authorization.vue +++ b/src/page/login/authorization.vue @@ -20,7 +20,8 @@ export default { methods: { getUserinfo() { let data = this.$route.query.data; - // let data1 = { + // let res = { + // data:{ // success: true, // message: "操作成功!", // code: 200, @@ -242,6 +243,7 @@ export default { // mainErDepartmentName: "实业公司", // }, // timestamp: 1768984070128, + // } // }; getUserinfo(this.$route.query.data).then((res) => { this.$store.dispatch("user/setUserInfo", res); diff --git a/src/router/axios.js b/src/router/axios.js index 82b9285..f829520 100644 --- a/src/router/axios.js +++ b/src/router/axios.js @@ -46,15 +46,9 @@ axios.interceptors.request.use(config => { // 初始化错误提示状态 isErrorShown = false; //地址为已经配置状态则不添加前缀 - // if (!isURL(config.url) && !config.url.startsWith(baseUrl)) { - // if(config.url.indexOf('smartpark')>0){ - // config.url = config.url; - // }else{ - // config.url = baseUrl + config.url; - // } - // } - - // console.log(99999,window.BASE_URL) + // 本地测试 时使用 + // config.url = config.url; + // 发版打开下面注释 if(config.url.indexOf('/smartpark') != -1){ if(config.url.indexOf('/AES/decryptAndGetUser') != -1){ config.url = config.url.replace('/smartparkAPP','http://atcflight.com:10094/6583e0b6-a422-4c74-aa40-df48e059b4de/lowDurableTest') @@ -62,7 +56,7 @@ axios.interceptors.request.use(config => { config.url = config.url.replace('/smartpark','http://atcflight.com:10094/6583e0b6-a422-4c74-aa40-df48e059b4de/lowDurableWebTestFront/smartpark') } }else{ - config.url = "http://10.90.100.231:8333" + config.url + config.url = "http://10.90.100.231:8333" + config.url } //安全请求header diff --git a/src/views/secondOrder/components/outDialog.vue b/src/views/secondOrder/components/outDialog.vue index 0689e79..b2ede06 100644 --- a/src/views/secondOrder/components/outDialog.vue +++ b/src/views/secondOrder/components/outDialog.vue @@ -168,9 +168,7 @@ :min="0" :max="getMaxQuantity(scope.row)" style="width: 100%" - :disabled=" - outDialogType != 'add' || scope.row.type === 'NY' - " + disabled @change=" (newValue) => handleQuantityChange(newValue, scope.$index) @@ -546,6 +544,18 @@ export default { if (this.sizeForm.ldTwoOutStorage.groupName != null) { getGroupMaterial(this.sizeForm.ldTwoOutStorage).then((res) => { this.groupTableData = res.data.result; + this.groupTableData.forEach((group) => { + // 初始化每个分组的选中项为当前已选的明细项 + if (group.twoInventoryVOList.length > 0) { + group.twoInventoryVOList.forEach((element) => { + if(element.type === "NY"){ + element.num = 1; + } else { + element.num = group.applyNum; + } + }); + } + }); }); } },