sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

YT-1435pc和pda端所有点击都需要增加loading

intex_20241211
张立 2 months ago
parent
d65863b6bf
commit
5d94261b1e
5 changed files with 205 additions and 176 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 47
      src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
  2. 8
      src/views/wms/inventoryManage/balance/index.vue
  3. 233
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
  4. 55
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
  5. 38
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

47
src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
View File

@ -319,29 +319,34 @@ const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAcces
// } // }
const labelType = ref('') // 标签类别 采购还是制造等 const labelType = ref('') // 标签类别 采购还是制造等
const handlePoint = async (row) => { const handlePoint = async (row) => {
console.log(row.packingNumber,445555555555555); console.log(row.packingNumber, 445555555555555);
PackageApi.getBalanceToPackage(row.relateNumber).then(res => { tableObject.loading = true
console.log(777,res); try {
if (res.productionLineCode != null) { await PackageApi.getBalanceToPackage(row.relateNumber).then( async res => {
labelType.value = 'zz' console.log(777,res);
} else { if (res.productionLineCode != null) {
labelType.value = 'cg' labelType.value = 'zz'
}
PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
console.log(159,resLable )
// 判断是采购还是制造
if (labelType.value == 'cg') {
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
console.log(159,resLable )
window.open(src.value+'&asn_number='+resLable)
} else { } else {
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) labelType.value = 'cg'
window.open(src.value+'&asn_number='+resLable) }
} await PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
console.log(159,resLable )
// 判断是采购还是制造
if (labelType.value == 'cg') {
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
console.log(159,resLable )
window.open(src.value+'&asn_number='+resLable)
} else {
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
window.open(src.value+'&asn_number='+resLable)
}
})
}).catch(err => {
console.log(err)
}) })
}).catch(err => { } finally {
console.log(err) tableObject.loading = false
}) }
} }
// form表单提交 // form表单提交

8
src/views/wms/inventoryManage/balance/index.vue
View File

@ -381,7 +381,8 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
// item.width = item.table?.width || 150 // item.width = item.table?.width || 150
// }) // })
// detatableData1.value = tableObjectPrint.tableList // detatableData1.value = tableObjectPrint.tableList
tableObject.loading = true
try {
await ItembasicApi.getItembasicPage({ await ItembasicApi.getItembasicPage({
pageSize: 10, pageSize: 10,
pageNo: 1, pageNo: 1,
@ -455,7 +456,10 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
}) })
console.log(1111) console.log(1111)
labelPointFormRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题 labelPointFormRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
} finally {
tableObject.loading = false
}
} }
// 批量打印--预生产收货 // 批量打印--预生产收货

233
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
View File

@ -551,83 +551,90 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'cjbq') { } else if (val == 'cjbq') {
// 创建标签 // 创建标签
// 判断 是否已创建标签 // 判断 是否已创建标签
let isCreateLabel = false tableObject.loading = true
await PackageApi.getPackagePage({ try {
requestNumber: row.number let isCreateLabel = false
}).then((res) => { await PackageApi.getPackagePage({
if (res) { requestNumber: row.number
if (res.list.length > 0) isCreateLabel = true }).then((res) => {
if (res) {
if (res.list.length > 0) isCreateLabel = true
}
})
if (isCreateLabel) {
message.warning('已创建过标签！！！')
tableObject.loading = false
return
} }
}) console.log('列表-操作按钮事件-创建标签')
if (isCreateLabel) { detatableData.params = {
message.warning('已创建过标签！！！') masterId: row.masterId
return }
} await getDetailList()
console.log('列表-操作按钮事件-创建标签') // 判断 是否已创建标签
detatableData.params = { if (detatableData.tableList[0].packingNumber) {
masterId: row.masterId message.warning('已创建过标签！！！')
} return
await getDetailList() }
// 判断 是否已创建标签 // 打开创建标签页面
if (detatableData.tableList[0].packingNumber) { // dialogVisible.value = true
message.warning('已创建过标签！！！') tableObject.loading = false
return formLabelRef.value.open('create', row)
} console.log(detailListTableColumns.tableFormColumns)
// 打开创建标签页面 detatableData.tableList.map((item) => {
// dialogVisible.value = true if (item.itemType == '可采购') {
formLabelRef.value.open('create', row) item.disabled_productionLineCode = true
item.disabled_supplierCode = false
console.log(detailListTableColumns.tableFormColumns) // 修改 tableform 属性
detatableData.tableList.map((item) => { SupplieritemApi.getSupplieritemPage({
if (item.itemType == '可采购') { pageSize: 10,
item.disabled_productionLineCode = true pageNo: 1,
item.disabled_supplierCode = false itemCode: item.itemCode,
// 修改 tableform 属性 sort: '',
SupplieritemApi.getSupplieritemPage({ by: 'ASC'
pageSize: 10, }).then((response) => {
pageNo: 1, detailListTableColumns.tableFormColumns.map((itemColumns) => {
itemCode: item.itemCode, if (itemColumns.field == 'supplierCode') {
sort: '', item.supplierCode = response?.list[0]?.supplierCode
by: 'ASC' }
}).then((response) => { })
detailListTableColumns.tableFormColumns.map((itemColumns) => {
if (itemColumns.field == 'supplierCode') {
item.supplierCode = response?.list[0]?.supplierCode
}
}) })
}) } else if (item.itemType == '可制造') {
} else if (item.itemType == '可制造') { item.disabled_supplierCode = true
item.disabled_supplierCode = true item.disabled_productionLineCode = false
item.disabled_productionLineCode = false ProductionlineitemApi.getProductionlineitemPage({
ProductionlineitemApi.getProductionlineitemPage({ pageNo: 1,
pageNo: 1, itemCode: item.itemCode,
itemCode: item.itemCode, sort: '',
sort: '', by: 'ASC'
by: 'ASC' }).then((response) => {
}).then((response) => { detailListTableColumns.tableFormColumns.map((itemColumns) => {
detailListTableColumns.tableFormColumns.map((itemColumns) => { if (itemColumns.field == 'productionLineCode') {
if (itemColumns.field == 'productionLineCode') { item.productionLineCode = response?.list[0]?.productionLineCode
item.productionLineCode = response?.list[0]?.productionLineCode }
})
})
}
ruleApi
.getManagementPrecision({
itemCodes: [item['itemCode']],
locationCode: item['toLocationCode']
})
.then((res) => {
fromManagementPrecision.value = res[0].ManagementPrecision
if (fromManagementPrecision.value == 'BY_QUANTITY') {
item.batch = formatDate(new Date(), 'YYYYMMDD')
item['disabled_batch'] = false
} else {
item['disabled_batch'] = true
} }
}) })
}) })
} }finally {
ruleApi tableObject.loading = false
.getManagementPrecision({ }
itemCodes: [item['itemCode']],
locationCode: item['toLocationCode']
})
.then((res) => {
fromManagementPrecision.value = res[0].ManagementPrecision
if (fromManagementPrecision.value == 'BY_QUANTITY') {
item.batch = formatDate(new Date(), 'YYYYMMDD')
item['disabled_batch'] = false
} else {
item['disabled_batch'] = true
}
})
})
} }
} }
/** 关闭按钮操作 */ /** 关闭按钮操作 */
@ -945,21 +952,25 @@ const searchFormClick = (searchData) => {
// 创建标签 // 创建标签
const submitFormLabel = async (formType, data) => { const submitFormLabel = async (formType, data) => {
try { try {
formLabelRef.value.formLoading = true
detatableData.tableList.forEach(async (item) => { detatableData.tableList.forEach(async (item) => {
await PackageApi.createPackageLabel(item) await PackageApi.createPackageLabel(item)
.then((res) => { .then((res) => {
isCreateLabel.value = true isCreateLabel.value = true
message.success('创建标签成功') message.success('创建标签成功')
formLabelRef.value.formLoading = false
formLabelRef.value.dialogVisible = false
}) })
.catch((err) => { .catch((err) => {
isCreateLabel.value = false isCreateLabel.value = false
formLabelRef.value.formLoading = false
console.log(err) console.log(err)
message.error('创建标签失败') message.error('创建标签失败')
}) })
}) })
} finally { } finally {
formLabelRef.value.formLoading = false // formLabelRef.value.formLoading = false
formLabelRef.value.dialogVisible = false // formLabelRef.value.dialogVisible = false
} }
} }
@ -1032,58 +1043,52 @@ const BASE_URL = getJmreportBaseUrl()
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
const labelPrint = async (row) => { const labelPrint = async (row) => {
// 查询是否已创建过标签 // 查询是否已创建过标签
await PackageApi.getPackagePage({ tableObject.loading = true
requestNumber: row.number try {
}) await PackageApi.getPackagePage({
.then((res) => { requestNumber: row.number
}).then((res) => {
if (res.list.length > 0) { if (res.list.length > 0) {
isCreateLabel.value = true isCreateLabel.value = true
} else { } else {
isCreateLabel.value = false isCreateLabel.value = false
} }
}) }).catch((err) => {
.catch((err) => {
isCreateLabel.value = false isCreateLabel.value = false
console.log(err) console.log(err)
}) })
// 判断是采购还是制造 // 判断是采购还是制造
if (isCreateLabel.value) { if (isCreateLabel.value) {
// labelPrint(row) // labelPrint(row)
await UnplannedreceiptRequestDetailApi.getDetailList(row.masterId).then((res) => { await UnplannedreceiptRequestDetailApi.getDetailList(row.masterId).then(async (res) => {
if (res.length > 0) { if (res.length > 0) {
const itemType = res.some((item) => item.itemType == '可采购') const itemType = res.some((item) => item.itemType == '可采购')
const itemType1 = res.some((item) => item.itemType == '可制造') const itemType1 = res.some((item) => item.itemType == '可制造')
if (itemType) { if (itemType) {
window.open( window.open( BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken() + '&request_number=' + row.number )
BASE_URL + }
'/jmreport/view/1016234988731322368?token=' + if (itemType1) {
getAccessToken() + // window.open(src.value + '&request_number=' + row.number)
'&request_number=' + await PackageApi.batchPrintingLableForYT(row.number).then((res) => {
row.number console.log(res)
) const src = ref(
} BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()
if (itemType1) { )
// window.open(src.value + '&request_number=' + row.number) window.open(src.value + '&asn_number=' + res)
PackageApi.batchPrintingLableForYT(row.number) })
.then((res) => { .catch((err) => {
console.log(res) console.log(err)
const src = ref( message.error('创建标签失败')
BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken() })
) }
window.open(src.value + '&asn_number=' + res)
})
.catch((err) => {
console.log(err)
message.error('创建标签失败')
})
} }
} })
})
} else { } else {
message.warning('请先创建标签') message.warning('请先创建标签')
} }
} finally {
tableObject.loading = false
}
// window.open(src.value + '&request_number=' + row.number) // window.open(src.value + '&request_number=' + row.number)
} }

55
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
View File

@ -534,6 +534,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'cjbq') { // 创建标签 } else if (val == 'cjbq') { // 创建标签
// 判断 是否已创建标签 // 判断 是否已创建标签
let isCreateLabel = false let isCreateLabel = false
tableObject.loading = true
await PackageApi.getPackagePage({ await PackageApi.getPackagePage({
requestNumber: row.number requestNumber: row.number
}).then(res => { }).then(res => {
@ -543,6 +544,7 @@ const buttonTableClick = async (val, row) => {
}) })
if (isCreateLabel) { if (isCreateLabel) {
message.warning('已创建过标签！！！') message.warning('已创建过标签！！！')
tableObject.loading = false
return return
} }
detatableData.params = { detatableData.params = {
@ -613,6 +615,7 @@ const buttonTableClick = async (val, row) => {
return return
} }
tableObject.loading = false
formLabelRef.value.open('create', row) formLabelRef.value.open('create', row)
}) })
}) })
@ -701,6 +704,8 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
message.warning("请先选择要打印的数据!") message.warning("请先选择要打印的数据!")
return return
} }
tableObject.loading = true
try {
// window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(',')) // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
let array = []//存储可采购数据 let array = []//存储可采购数据
let array1 = []//存储可制造数据 let array1 = []//存储可制造数据
@ -746,7 +751,10 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
// }).catch(err => { // }).catch(err => {
// console.log(err) // console.log(err)
// message.error('创建标签失败') // message.error('创建标签失败')
// }) // })
} finally {
tableObject.loading = false
}
} }
// 获取部门 用于详情 部门回显 // 获取部门 用于详情 部门回显
@ -901,31 +909,36 @@ const BASE_URL = getJmreportBaseUrl()
// 标签打印 // 标签打印
const handlePoint = async (row) => { const handlePoint = async (row) => {
// 查询是否已创建过标签 // 查询是否已创建过标签
await PackageApi.getPackagePage({ tableObject.loading = true
requestNumber: row.number try {
}).then((res) => { await PackageApi.getPackagePage({
if(res.list.length > 0) { requestNumber: row.number
isCreateLabel.value = true }).then((res) => {
if (res.list[0].supplierCode != null) { if(res.list.length > 0) {
labelType.value = 'cg' isCreateLabel.value = true
} else if(res.list[0].productionLineCode != null){ if (res.list[0].supplierCode != null) {
labelType.value = 'zz' labelType.value = 'cg'
} else if(res.list[0].productionLineCode != null){
labelType.value = 'zz'
} else {
isCreateLabel.value = false
message.warning('不是采购类型也不是制造类型物料不能打印标签！')
}
} else { } else {
isCreateLabel.value = false isCreateLabel.value = false
message.warning('不是采购类型也不是制造类型物料不能打印标签！')
} }
} else { }).catch(err => {
isCreateLabel.value = false isCreateLabel.value = false
console.log(err)
})
// 判断是采购还是制造
if (isCreateLabel.value) {
labelPrint(row)
} else {
message.warning('请先创建标签')
} }
}).catch(err => { } finally {
isCreateLabel.value = false tableObject.loading = false
console.log(err)
})
// 判断是采购还是制造
if (isCreateLabel.value) {
labelPrint(row)
} else {
message.warning('请先创建标签')
} }
} }

38
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
View File

@ -559,6 +559,8 @@ const buttonTableClick = async (val, row) => {
// 创建标签 // 创建标签
// 判断 是否已创建标签 // 判断 是否已创建标签
tableObject.loading = true
try {
let isCreateLabel = false let isCreateLabel = false
await PackageApi.getPackagePage({ await PackageApi.getPackagePage({
requestNumber: row.number requestNumber: row.number
@ -569,6 +571,7 @@ const buttonTableClick = async (val, row) => {
}) })
if (isCreateLabel) { if (isCreateLabel) {
message.warning('已创建过标签！！！') message.warning('已创建过标签！！！')
tableObject.loading = false
return return
} }
detatableData.params = { detatableData.params = {
@ -578,6 +581,7 @@ const buttonTableClick = async (val, row) => {
// 打开创建标签页面 // 打开创建标签页面
// dialogVisible.value = true // dialogVisible.value = true
formLabelRef.value.open('create', row) formLabelRef.value.open('create', row)
tableObject.loading = false
detatableData.tableList.map((item) => { detatableData.tableList.map((item) => {
// 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线
ItembasicApi.getItembasicPage({ ItembasicApi.getItembasicPage({
@ -638,6 +642,9 @@ const buttonTableClick = async (val, row) => {
row['disabled_batch'] = true row['disabled_batch'] = true
} }
}) })
}finally {
tableObject.loading = false
}
} else if (val == 'mainHandle') { } else if (val == 'mainHandle') {
// 处理 // 处理
// 判断 是否已创建标签 // 判断 是否已创建标签
@ -859,25 +866,20 @@ const submitFormLabel = async (formType, submitData) => {
if (data.masterId) { if (data.masterId) {
data.id = data.masterId data.id = data.masterId
} }
try { formLabelRef.value.formLoading = true
console.log('aaaaa', data) data.subList = detatableData.tableList
data.subList = detatableData.tableList // 创建标签 要物料库区配置表中 入库包装规格
console.log('bbbbb', data) await ProductreceiptRequestMainApi.productCreateLabel(data).then((res) => {
// 创建标签 要物料库区配置表中 入库包装规格 isCreateLabel.value = true
await ProductreceiptRequestMainApi.productCreateLabel(data) message.success('创建标签成功')
.then((res) => {
isCreateLabel.value = true
message.success('创建标签成功')
})
.catch((err) => {
isCreateLabel.value = false
console.log(err)
message.error('创建标签失败')
})
} finally {
formLabelRef.value.formLoading = false formLabelRef.value.formLoading = false
formLabelRef.value.dialogVisible = false formLabelRef.value.dialogVisible = false
} }).catch((err) => {
isCreateLabel.value = false
console.log(err)
message.error('创建标签失败')
formLabelRef.value.formLoading = false
})
} }
// 查看 Bom 按钮回调事件 // 查看 Bom 按钮回调事件
@ -957,7 +959,7 @@ const labelPrint = async (row) => {
// 获得表格的各种操作 // 获得表格的各种操作
const { getList: getListPrint } = tableMethods const { getList: getListPrint } = tableMethods
getListPrint() await getListPrint()
tableObject.loading = false tableObject.loading = false
const tableColumns = SupplierdeliverRequestPackage2.allSchemas.tableFormColumns const tableColumns = SupplierdeliverRequestPackage2.allSchemas.tableFormColumns
tableColumns.forEach((item) => { tableColumns.forEach((item) => {

Write Preview
Loading…
Cancel
Save