Browse Source

修复了未设置二维码表单显示字段时请求异常bug

lwx_v17
liwenxuan 10 months ago
parent
commit
e70628b88c
  1. 28
      src/components/DesignForm/app/index.vue
  2. 30
      src/components/DesignForm/tableListPage/index.vue

28
src/components/DesignForm/app/index.vue

@ -472,11 +472,17 @@ const setUpClick = (val: string, id: string) => {
//, //,
let idArray = state.selectionChecked.map(item => item.id); let idArray = state.selectionChecked.map(item => item.id);
if(idArray.length>0){ if(idArray.length>0){
const loadingInstance1 = ElLoading.service({ /* const loadingInstance1 = ElLoading.service({
fullscreen: true, fullscreen: true,
text: '正在生成二维码,请稍候...' // text: '正在生成二维码,请稍候...' //
}); }); */
//console.log(props.formBasicConfig) console.log(props.formBasicConfig)
if(props.formBasicConfig.qrCodeFlag==true){
if(props.formBasicConfig.qrCodeInside==true){
if(props.formBasicConfig.qrCodePrintStyle&&props.formBasicConfig.qrCodePrintStyle=="2"&&props.formBasicConfig.qrCodeShowFields.length==0){
alert("未选择表格展示字段")
return
}
// //
let getDetailQrCodesData: any = {} let getDetailQrCodesData: any = {}
let currentFieldsMapArrObj: any = {} let currentFieldsMapArrObj: any = {}
@ -630,7 +636,7 @@ const setUpClick = (val: string, id: string) => {
setTimeout(()=>{ setTimeout(()=>{
loadingInstance1.close() //loadingInstance1.close()
qrCodesPrintDialogFlag.value = true qrCodesPrintDialogFlag.value = true
},820) },820)
@ -638,13 +644,17 @@ const setUpClick = (val: string, id: string) => {
//fieldsMap = null //fieldsMap = null
tablesData.value = getDetailQrCodesData tablesData.value = getDetailQrCodesData
qrCodesPrintDialogFlag.value = true qrCodesPrintDialogFlag.value = true
loadingInstance1.close() //loadingInstance1.close()
}
})
}else{
alert("内部二维码功能未启用")
}
}else{
alert("请先为本表单开启二维码功能")
} }
})/* .finally(()=>{
loadingInstance1.close()
qrCodesPrintDialogFlag.value = true
}) */
}else{ }else{
alert("未选中任何一条,请先选择") alert("未选中任何一条,请先选择")

30
src/components/DesignForm/tableListPage/index.vue

@ -462,11 +462,19 @@ const setUpClick = (val: string, id: string) => {
//, //,
let idArray = state.selectionChecked.map(item => item.id); let idArray = state.selectionChecked.map(item => item.id);
if(idArray.length>0){ if(idArray.length>0){
const loadingInstance1 = ElLoading.service({ /* const loadingInstance1 = ElLoading.service({
fullscreen: true, fullscreen: true,
text: '正在生成二维码,请稍候...' // text: '正在生成二维码,请稍候...' //
}); }); */
//console.log(props.formBasicConfig) console.log(props.formBasicConfig)
if(props.formBasicConfig.qrCodeFlag==true){
if(props.formBasicConfig.qrCodeInside==true){
if(props.formBasicConfig.qrCodePrintStyle&&props.formBasicConfig.qrCodePrintStyle=="2"&&props.formBasicConfig.qrCodeShowFields.length==0){
alert("未选择表格展示字段")
return
}
// //
let getDetailQrCodesData: any = {} let getDetailQrCodesData: any = {}
let currentFieldsMapArrObj: any = {} let currentFieldsMapArrObj: any = {}
@ -620,7 +628,7 @@ const setUpClick = (val: string, id: string) => {
setTimeout(()=>{ setTimeout(()=>{
loadingInstance1.close() //loadingInstance1.close()
qrCodesPrintDialogFlag.value = true qrCodesPrintDialogFlag.value = true
},820) },820)
@ -628,13 +636,17 @@ const setUpClick = (val: string, id: string) => {
//fieldsMap = null //fieldsMap = null
tablesData.value = getDetailQrCodesData tablesData.value = getDetailQrCodesData
qrCodesPrintDialogFlag.value = true qrCodesPrintDialogFlag.value = true
loadingInstance1.close() //loadingInstance1.close()
} }
})/* .finally(()=>{ })
loadingInstance1.close()
qrCodesPrintDialogFlag.value = true }else{
}) */ alert("内部二维码功能未启用")
}
}else{
alert("请先为本表单开启二维码功能")
}
}else{ }else{
alert("未选中任何一条,请先选择") alert("未选中任何一条,请先选择")

Loading…
Cancel
Save