Browse Source

Merge remote-tracking branch 'origin/master_hella' into master_hella

hella_online_20240829
滕晓飞 6 months ago
parent
commit
9bc20f67fb
  1. 8
      src/api/qms/inspectionJob/inspectionJobMain/index.ts
  2. 9
      src/api/qms/inspectionQ1/index.ts
  3. 7
      src/api/qms/inspectionQ2/index.ts
  4. 7
      src/api/qms/inspectionQ3/index.ts
  5. 9
      src/api/qms/inspectionRecord/inspectionRecordMain/index.ts
  6. 7
      src/api/qms/inspectionRequest/index.ts
  7. 7
      src/api/qms/inspectionScheme/index.ts
  8. 7
      src/api/qms/inspectionTemplate/index.ts
  9. 1
      src/views/qms/inspectionJob/index.vue
  10. 4
      src/views/qms/inspectionRecord/index.vue
  11. 5
      src/views/qms/inspectionRecordFirst/index.vue
  12. 2
      src/views/qms/inspectionRequest/index.vue
  13. 19
      src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

8
src/api/qms/inspectionJob/inspectionJobMain/index.ts

@ -57,11 +57,15 @@ export const releaseInspectionJobMain = async (id) => {
} }
// 导出检验申请 Excel // 导出检验申请 Excel
export const exportInspectionJobMain = async (params) => { export const exportInspectionJobMain = async (params) => {
return await request.download({ url: `/qms/inspection-job-main/export-excel`, params }) if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/qms/inspection-job-main/export-excel-senior`, data })
}else{
return await request.download({ url: `/qms/inspection-job-main/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/qms/inspection-job-main/get-import-template' }) return request.download({ url: '/qms/inspection-job-main/get-import-template' })
} }

9
src/api/qms/inspectionQ1/index.ts

@ -58,7 +58,12 @@ export const deleteQ1 = async (id: number) => {
// 导出Q1通知单 Excel // 导出Q1通知单 Excel
export const exportQ1 = async (params) => { export const exportQ1 = async (params) => {
return await request.download({ url: `/qms/inspectionQ1/export-excel`, params }) if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/qms/inspectionQ1/export-excel-senior`, data })
}else{
return await request.download({ url: `/qms/inspectionQ1/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
@ -69,4 +74,4 @@ export const importTemplate = () => {
// 完成 // 完成
export const finishQ1 = async (id: number) => { export const finishQ1 = async (id: number) => {
return await request.get({ url: `/qms/inspectionQ1/finish?id=` + id }) return await request.get({ url: `/qms/inspectionQ1/finish?id=` + id })
} }

7
src/api/qms/inspectionQ2/index.ts

@ -59,7 +59,12 @@ export const deleteQ2 = async (id: number) => {
// 导出Q2通知单 Excel // 导出Q2通知单 Excel
export const exportQ2 = async (params) => { export const exportQ2 = async (params) => {
return await request.download({ url: `/qms/inspectionQ2/export-excel`, params }) if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/qms/inspectionQ2/export-excel-senior`, data })
}else{
return await request.download({ url: `/qms/inspectionQ2/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板

7
src/api/qms/inspectionQ3/index.ts

@ -59,7 +59,12 @@ export const deleteQ3 = async (id: number) => {
// 导出Q3通知单 Excel // 导出Q3通知单 Excel
export const exportQ3 = async (params) => { export const exportQ3 = async (params) => {
return await request.download({ url: `/qms/inspectionQ3/export-excel`, params }) if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/qms/inspectionQ3/export-excel-senior`, data })
}else{
return await request.download({ url: `/qms/inspectionQ3/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板

9
src/api/qms/inspectionRecord/inspectionRecordMain/index.ts

@ -68,6 +68,15 @@ export const exportInspectionRecordMain = async (params) => {
} }
} }
export const exportFirstInspectionRecordMain = async (params) => {
if (params.isSearch) {
const data = { ...params }
return await request.downloadPost({ url: `/qms/inspection-record-main/export-excel-first-senior`, data })
} else {
return await request.download({ url: `/qms/inspection-record-main/export-excel-first`, params })
}
}
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/qms/inspection-record-main/get-import-template' }) return request.download({ url: '/qms/inspection-record-main/get-import-template' })

7
src/api/qms/inspectionRequest/index.ts

@ -50,7 +50,12 @@ export const deleteInspectionMain = async (id: number) => {
// 导出检验申请 Excel // 导出检验申请 Excel
export const exportInspectionMain = async (params) => { export const exportInspectionMain = async (params) => {
return await request.download({ url: `/qms/inspection-request-main/export-excel`, params }) if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/qms/inspection-request-main/export-excel-senior`, data })
}else{
return await request.download({ url: `/qms/inspection-request-main/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板

7
src/api/qms/inspectionScheme/index.ts

@ -33,7 +33,12 @@ export const disableInspectionScheme = async (id: number) => {
// 导出检验阶段 Excel // 导出检验阶段 Excel
export const exportInspectionScheme = async (params) => { export const exportInspectionScheme = async (params) => {
return await request.download({ url: `/qms/inspection-scheme/export-excel`, params }) if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/qms/inspection-scheme/export-excel-senior`, data })
}else{
return await request.download({ url: `/qms/inspection-scheme/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板

7
src/api/qms/inspectionTemplate/index.ts

@ -38,7 +38,12 @@ export const disableInspectionTemplate = async (id: number) => {
// 导出检验模版 Excel // 导出检验模版 Excel
export const exportInspectionTemplate = async (params) => { export const exportInspectionTemplate = async (params) => {
return await request.download({ url: `/qms/programme-template/export-excel`, params }) if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/qms/programme-template/export-excel-senior`, data })
}else{
return await request.download({ url: `/qms/programme-template/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板

1
src/views/qms/inspectionJob/index.vue

@ -180,6 +180,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultExportBtn(null),
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null) // defaultButtons.defaultSetBtn(null) //

4
src/views/qms/inspectionRecord/index.vue

@ -163,7 +163,7 @@ const { getList, setSearchParams } = tableMethods
// //
let HeadButttondata = [ let HeadButttondata = [
// defaultButtons.defaultExportBtn(null), // defaultButtons.defaultExportBtn(null), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null) // defaultButtons.defaultSetBtn(null) //
@ -343,7 +343,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params) const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params)
download.excel(data, '备件申领记录主.xlsx') download.excel(data, '检验记录.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

5
src/views/qms/inspectionRecordFirst/index.vue

@ -67,6 +67,7 @@ import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeat
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import {exportFirstInspectionRecordMain} from "@/api/qms/inspectionRecord/inspectionRecordMain";
// //
defineOptions({ name: 'InspectionRecordMain' }) defineOptions({ name: 'InspectionRecordMain' })
@ -207,7 +208,7 @@ const handleMainExport = async (row: any) => {
// //
exportLoading.value = true exportLoading.value = true
tableObject.params.number = row.number tableObject.params.number = row.number
const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params) const data = await InspectionRecordMainApi.exportFirstInspectionRecordMain(tableObject.params)
download.excel(data, '首件检验记录.xlsx') download.excel(data, '首件检验记录.xlsx')
} catch { } catch {
} finally { } finally {
@ -223,7 +224,7 @@ const handleMainExport = async (row: any) => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params) const data = await InspectionRecordMainApi.exportFirstInspectionRecordMain(tableObject.params)
download.excel(data, '首件检验记录.xlsx') download.excel(data, '首件检验记录.xlsx')
} catch { } catch {
} finally { } finally {

2
src/views/qms/inspectionRequest/index.vue

@ -148,7 +148,7 @@ const { getList, setSearchParams } = tableMethods
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({ hasPermi: 'qms:inspection-request-main:create' }), // defaultButtons.defaultAddBtn({ hasPermi: 'qms:inspection-request-main:create' }), //
// defaultButtons.defaultImportBtn({ hasPermi: 'wms:inspectionMain:import' }), // // defaultButtons.defaultImportBtn({ hasPermi: 'wms:inspectionMain:import' }), //
// defaultButtons.defaultExportBtn({ hasPermi: 'wms:inspectionMain:export' }), // defaultButtons.defaultExportBtn(null), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null) // defaultButtons.defaultSetBtn(null) //

19
src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@ -160,6 +160,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
newRow['itemCode'] = item['itemCode'] newRow['itemCode'] = item['itemCode']
newRow['locationCode'] = item['locationCode'] newRow['locationCode'] = item['locationCode']
newRow['uom'] = item['uom'] newRow['uom'] = item['uom']
newRow['originFrozen'] = newRow['frozen']=='TRUE'?true:false //
tableData.value.push(newRow) tableData.value.push(newRow)
}) })
} else { } else {
@ -445,11 +446,25 @@ const submitForm = async (formType, submitData) => {
if(data.masterId){ if(data.masterId){
data.id = data.masterId data.id = data.masterId
} }
let findInventoryStatus = tableData.value.find(item=>item.fromInventoryStatus&&item.toInventoryStatus&&item.fromInventoryStatus==item.toInventoryStatus) if(tableData.value.find(item=>!item.toInventoryStatus)){
message.warning('请选择到库存状态')
return
}
if(tableData.value.find(item=>!item.toQty||item.toQty==0)){
message.warning('请填写到数量')
return
}
if(tableData.value.find(item=>!item.toExpireDate)){
message.warning('请选择到过期日期')
return
}
let findInventoryStatus = tableData.value.find(item=>item.fromInventoryStatus&&item.toInventoryStatus&&item.fromInventoryStatus==item.toInventoryStatus&&item.fromQty&&item.toQty&&item.fromQty==item.toQty&&item.fromExpireDate&&item.toExpireDate&&item.fromExpireDate==item.toExpireDate&&item.originFrozen==item.frozen)
if(findInventoryStatus){ if(findInventoryStatus){
message.warning('从库存状态和到库存状态不能相同') message.warning('您未修改数据')
return return
} }
data.subList = tableData.value // data.subList = tableData.value //
const duplicateItems = tableData.value.filter((item, index) => { const duplicateItems = tableData.value.filter((item, index) => {
return tableData.value.findIndex((el) => el.itemCode === item.itemCode) !== index; return tableData.value.findIndex((el) => el.itemCode === item.itemCode) !== index;

Loading…
Cancel
Save