diff --git a/src/config/axios/config.ts b/src/config/axios/config.ts index 811650873..9bf0a928a 100644 --- a/src/config/axios/config.ts +++ b/src/config/axios/config.ts @@ -16,7 +16,7 @@ const config: { /** * 接口请求超时时间 */ - request_timeout: 30000, + request_timeout: 300000, /** * 默认接口请求类型 diff --git a/src/views/wms/basicDataManage/orderManage/team/team.data.ts b/src/views/wms/basicDataManage/orderManage/team/team.data.ts index f2e67fdcc..c3b374686 100644 --- a/src/views/wms/basicDataManage/orderManage/team/team.data.ts +++ b/src/views/wms/basicDataManage/orderManage/team/team.data.ts @@ -76,8 +76,8 @@ export const Team = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, - isSearch: true, + isTable: false, + isSearch: false, sort: 'custom', form: { component: 'Switch', diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index bc9a950bc..c546435e2 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -173,8 +173,14 @@ const handleSelectionPoint = async ()=>{ rows = [...rows,...item.selectionRows.map(item1=>item1.packingNumber)] }) console.log('批量打印',rows.join(',')) + let getLoading = ElLoading.service({ + lock: true, + text: 'loading...', + background: 'rgba(0, 0, 0, 0.7)' + }) PackageApi.getBalanceToPackageSelection(rows).then(res => { console.log('res',res); + getLoading?.close() if(res.zzLabel){ //制造标签 const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) @@ -188,6 +194,7 @@ const handleSelectionPoint = async ()=>{ }).catch(err => { console.log(err) + getLoading?.close() }) // window.open(srcPoint.value+'&relateNumber='+rows.join(',')) }