问题修改

master
zhangdi 2 months ago
parent 04fdb803db
commit c61d4941e6
  1. 4
      src/page/login/authorization.vue
  2. 14
      src/router/axios.js
  3. 16
      src/views/secondOrder/components/outDialog.vue

@ -20,7 +20,8 @@ export default {
methods: { methods: {
getUserinfo() { getUserinfo() {
let data = this.$route.query.data; let data = this.$route.query.data;
// let data1 = { // let res = {
// data:{
// success: true, // success: true,
// message: "", // message: "",
// code: 200, // code: 200,
@ -242,6 +243,7 @@ export default {
// mainErDepartmentName: "", // mainErDepartmentName: "",
// }, // },
// timestamp: 1768984070128, // timestamp: 1768984070128,
// }
// }; // };
getUserinfo(this.$route.query.data).then((res) => { getUserinfo(this.$route.query.data).then((res) => {
this.$store.dispatch("user/setUserInfo", res); this.$store.dispatch("user/setUserInfo", res);

@ -46,15 +46,9 @@ axios.interceptors.request.use(config => {
// 初始化错误提示状态 // 初始化错误提示状态
isErrorShown = false; isErrorShown = false;
//地址为已经配置状态则不添加前缀 //地址为已经配置状态则不添加前缀
// if (!isURL(config.url) && !config.url.startsWith(baseUrl)) { // 本地测试 时使用
// if(config.url.indexOf('smartpark')>0){ // config.url = config.url;
// config.url = config.url; // 发版打开下面注释
// }else{
// config.url = baseUrl + config.url;
// }
// }
// console.log(99999,window.BASE_URL)
if(config.url.indexOf('/smartpark') != -1){ if(config.url.indexOf('/smartpark') != -1){
if(config.url.indexOf('/AES/decryptAndGetUser') != -1){ if(config.url.indexOf('/AES/decryptAndGetUser') != -1){
config.url = config.url.replace('/smartparkAPP','http://atcflight.com:10094/6583e0b6-a422-4c74-aa40-df48e059b4de/lowDurableTest') 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') config.url = config.url.replace('/smartpark','http://atcflight.com:10094/6583e0b6-a422-4c74-aa40-df48e059b4de/lowDurableWebTestFront/smartpark')
} }
}else{ }else{
config.url = "http://10.90.100.231:8333" + config.url config.url = "http://10.90.100.231:8333" + config.url
} }
//安全请求header //安全请求header

@ -168,9 +168,7 @@
:min="0" :min="0"
:max="getMaxQuantity(scope.row)" :max="getMaxQuantity(scope.row)"
style="width: 100%" style="width: 100%"
:disabled=" disabled
outDialogType != 'add' || scope.row.type === 'NY'
"
@change=" @change="
(newValue) => (newValue) =>
handleQuantityChange(newValue, scope.$index) handleQuantityChange(newValue, scope.$index)
@ -546,6 +544,18 @@ export default {
if (this.sizeForm.ldTwoOutStorage.groupName != null) { if (this.sizeForm.ldTwoOutStorage.groupName != null) {
getGroupMaterial(this.sizeForm.ldTwoOutStorage).then((res) => { getGroupMaterial(this.sizeForm.ldTwoOutStorage).then((res) => {
this.groupTableData = res.data.result; 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;
}
});
}
});
}); });
} }
}, },

Loading…
Cancel
Save