Browse Source

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

hella_online_20240819
gaojs 3 months ago
parent
commit
56431c6ac3
  1. 15
      src/api/wms/mesRawMaterialConsumptionInfo/index.ts
  2. 5
      src/api/wms/purchasereturnRequestMain/index.ts
  3. 11
      src/api/wms/rawMaterialConsumptionInfo/index.ts
  4. 10
      src/api/wms/supplierinvoiceRecordMain/index.ts
  5. 6
      src/components/Search/src/Search.vue
  6. 16
      src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
  7. 20
      src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue
  8. 2
      src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
  9. 24
      src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue
  10. 3
      src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
  11. 3
      src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
  12. 3
      src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
  13. 5
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
  14. 5
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
  15. 3
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
  16. 3
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
  17. 5
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
  18. 3
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
  19. 5
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
  20. 10
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
  21. 7
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
  22. 12
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
  23. 7
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
  24. 10
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
  25. 7
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts

15
src/api/wms/mesRawMaterialConsumptionInfo/index.ts

@ -44,3 +44,18 @@ export const getMesRawMaterialConsumptionInfoPage = async (params) => {
}
export const exportAssemblyMaterialUsageMes = async (params) => {
if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/wms/productreceipt-detailb/getAssemblyMaterialUsageMesSeniorExport`, data })
}else{
return await request.download({ url: `/wms/productreceipt-detailb/assemblyMaterialUsageMesExport`, params })
}
}

5
src/api/wms/purchasereturnRequestMain/index.ts

@ -136,6 +136,11 @@ export const handlePurchasereturnRequestMain = async (id) => {
return await request.put({ url: `/wms/purchasereturn-request-main/handle?id=` + id })
}
// 处理采购退货申请主(新)
export const handlePurchasereturnRequestMainNew = async (id) => {
return await request.put({ url: `/wms/purchasereturn-request-main/handleNew?id=` + id })
}
// 生成标签
export const genLabel = async (data) => {
return await request.post({ url: `/wms/purchasereturn-request-main/genLabel`, data })

11
src/api/wms/rawMaterialConsumptionInfo/index.ts

@ -44,3 +44,14 @@ export const getRawMaterialConsumptionInfoPage = async (params) => {
}
export const exportAssemblyMaterialUsage = async (params) => {
if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/wms/backflush-record-detailb/getAssemblyMaterialUsageSeniorExport`, data })
}else{
return await request.download({ url: `/wms/backflush-record-detailb/assemblyMaterialUsageExport`, params })
}
}

10
src/api/wms/supplierinvoiceRecordMain/index.ts

@ -53,8 +53,14 @@ export const deleteSupplierinvoiceRecordMain = async (id: number) => {
}
// 导出供应商发票记录主 Excel
export const exportSupplierinvoiceRecordMain = async (data) => {
return await request.downloadPost({ url: `/wms/supplierinvoice-record-main/export-excel`, data })
export const exportSupplierinvoiceRecordMain = async (params) => {
console.log(params)
if (params.isSearch) {
const data = { ...params }
return await request.downloadPost({ url: `/wms/supplierinvoice-record-main/export-excel-senior`, data })
} else {
return await request.download({ url: `/wms/supplierinvoice-record-main/export-excel`, params })
}
}
// 下载用户导入模板

6
src/components/Search/src/Search.vue

@ -342,12 +342,12 @@ defineExpose({setFormValues,search}) // 提供 open 方法,用于打开弹窗
<style lang="scss" scoped>
.search ::v-deep(.el-form-item) {
margin-right: 1%;
width: 20%;
width: 24%;
}
.dateSearch ::v-deep(.el-form-item) {
margin-right: 1%;
min-width: 20%;
width: auto;
min-width: 320px;
width:30%;
}
.search ::v-deep(.el-form-item:nth-last-child(1)) {
margin-right: 0px;

16
src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts

@ -133,7 +133,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'InputNumber',
componentProps: {
min: 1,
min: 0,
precision: 6
}
}
@ -295,12 +295,22 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
}
}
]))
const validateQty = (rule: any, value: any, callback: any,a,b) => {
console.log('validateQty',rule, value,a,b)
if (!value) {
callback(new Error('包装数量必须大于0'));
} else {
callback();
}
}
// 表单校验
export const ItempackagingRules = reactive({
itemCode: [{ required: true, message: '物料代码不能为空', trigger: 'change' }],
uom: [{ required: true, message: '计量单位不能为空', trigger: 'change' }],
packUnit: [{ required: true, message: '包装单位不能为空', trigger: 'change' }],
packQty: [{ required: true, message: '包装数量不能为空', trigger: 'change' }],
packQty: [
{ required: true, message: '包装数量不能为空', trigger: 'change' },
{ validator: validateQty, trigger: 'change' }
],
available: [{ required: true, message: '是否可用不能为空', trigger: 'change' }]
})

20
src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue

@ -56,6 +56,8 @@ const routeName = ref()
routeName.value = route.name
const tableColumns = ref([...MesRawMaterialConsumptionInfo.allSchemas.tableColumns])
/** 列表导出按钮操作 */
const exportLoading = ref(false) //
const mesModelVisible = ref(false)
const { tableObject: tableObject, tableMethods: tableMethods } =useTable({
getListApi: MesRawMaterialConsumptionInfoApi.getMesRawMaterialConsumptionInfoPage
@ -70,7 +72,7 @@ const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
// defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-record-main:export'}), //
defaultButtons.defaultExportBtn(null), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
@ -79,7 +81,7 @@ const HeadButttondata = [
//
const buttonBaseClick = (val, item) => {
if (val == 'export') { //
// handleExport()
handleExport()
} else if (val == 'refresh') { //
if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
searchFormClick({
@ -95,6 +97,20 @@ const buttonBaseClick = (val, item) => {
}
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await MesRawMaterialConsumptionInfoApi.exportAssemblyMaterialUsageMes(tableObject.params)
download.excel(data, '装配完工原料信息.xlsx')
} catch {
} finally {
exportLoading.value = false
}
}
//
const searchFormClick = (searchData) => {
tableObject.params = {

2
src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts

@ -91,7 +91,6 @@ export const MesRawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[
label: '原料包装号',
field: 'packingNumber',
sort: 'custom',
isSearch: true,
table: {
width: 150
},
@ -103,7 +102,6 @@ export const MesRawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
isSearch: true,
},
{
label: '原料批次',

24
src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue

@ -51,11 +51,13 @@ defineOptions({ name: 'RawMaterialConsumptionInfo' })
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref([...RawMaterialConsumptionInfo.allSchemas.tableColumns])
/** 列表导出按钮操作 */
const exportLoading = ref(false) //
const mesModelVisible = ref(false)
const { tableObject: tableObject, tableMethods: tableMethods } =useTable({
getListApi: RawMaterialConsumptionInfoApi.getRawMaterialConsumptionInfoPage
@ -70,7 +72,7 @@ const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
// defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-record-main:export'}), //
defaultButtons.defaultExportBtn(null), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
@ -80,7 +82,7 @@ const HeadButttondata = [
//
const buttonBaseClick = (val, item) => {
if (val == 'export') { //
// handleExport()
handleExport()
} else if (val == 'refresh') { //
if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
searchFormClick({
@ -89,7 +91,7 @@ const buttonBaseClick = (val, item) => {
} else {
getList()
}
} else if (val == 'filtrate') { //
}else if (val == 'filtrate') { //
} else { //
console.log('其他按钮', item)
}
@ -104,6 +106,20 @@ const searchFormClick = (searchData) => {
getList() //
}
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await RawMaterialConsumptionInfoApi.exportAssemblyMaterialUsage(tableObject.params)
download.excel(data, '装配完工原料信息.xlsx')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(async () => {
getList()

3
src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue

@ -233,8 +233,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await InspectJobMainApi.exportInspectJobMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue

@ -179,8 +179,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await InspectRecordMainApi.exportInspectRecordMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@ -322,8 +322,9 @@
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await InspectRequestMainApi.exportInspectRequestMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

5
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

@ -303,12 +303,13 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
if(routeName.value.includes('SCP')){
const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else{
const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}
} catch {
} finally {

5
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue

@ -291,12 +291,13 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
if(routeName.value.includes('SCP')){
const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else{
const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordRefuseMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}
} catch {
} finally {

3
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

@ -762,8 +762,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue

@ -238,8 +238,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

5
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue

@ -169,12 +169,13 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
if(routeName.value.includes('SCP')){
const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else{
const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}
} catch {
} finally {

3
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@ -756,10 +756,11 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(
tableObject.params
)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

5
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue

@ -640,7 +640,7 @@ const handleHandle = async (id: number) => {
try {
await message.confirm(t('common.confirmHandle'))
tableObject.loading = true
await PurchasereturnRequestMainApi.handlePurchasereturnRequestMain(id)
await PurchasereturnRequestMainApi.handlePurchasereturnRequestMainNew(id)
message.success(t('common.handleSuccess'))
buttonBaseClick('refresh',null)
} catch {
@ -672,10 +672,11 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(
tableObject.params
)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

10
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue

@ -280,7 +280,12 @@ const searchList = (model)=>{
model.postingDate[1] = model.postingDate[1].replace('00:00:00','23:59:59')
}
selectionRows.value = []
setSearchParams(model)
let model1 = {
...model,
statuss: model.status.join(',')?model.status.join(','):''
}
delete model1.status
setSearchParams(model1)
}
const selectionRows = ref<any>([])
const tableRef = ref()
@ -303,6 +308,9 @@ const handleExport = async () => {
selectionRows.value.forEach(item=>{
rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
})
if (!tableObject.params.createTime || tableObject.params.createTime && tableObject.params. createTime.length == 0) {
delete tableObject.params.createTime
}
try {
//
await message.exportConfirm()

7
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@ -73,6 +73,13 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
search: {
componentProps: {
multiple: true,
collapseTags: true,
collapseTagsTooltip: true,
}
},
isSearch: true,
form: {
value: '1',

12
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@ -378,7 +378,12 @@ const searchTableParams = ref([
const formPurchasePassRef = ref()
const searchList = (model) => {
selectionRows.value = []
setSearchParams(model)
let model1 = {
...model,
statuss: model.status.join(',')?model.status.join(','):''
}
delete model1.status
setSearchParams(model1)
}
const selectionRows = ref<any>([])
const tableRef = ref()
@ -1159,6 +1164,7 @@ const genRecords = async (id: number) => {
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {
console.log(111)
let rows: any = []
selectionRows.value.forEach((item) => {
rows = [...rows, ...item.selectionRows.map((item1) => item1.number)]
@ -1174,7 +1180,9 @@ const handleExport = async () => {
} else {
paramsData = { ...paramsData, checkNums: rows }
}
console.log('批量导出', paramsData)
if (!paramsData.createTime || paramsData.createTime && paramsData.createTime.length == 0) {
delete paramsData.createTime
}
try {
//
await message.exportConfirm()

7
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@ -220,6 +220,13 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
},
sortTableDefault:9,
isSearch: true,
search: {
componentProps: {
multiple: true,
collapseTags: true,
collapseTagsTooltip: true,
}
},
form: {
value: '1',
componentProps: {

10
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue

@ -185,7 +185,12 @@ const searchList = (model)=>{
model.endDifferencePrice = endDifferencePrice.value
console.log('searchList',model)
selectionRows.value = []
setSearchParams(model)
let model1 = {
...model,
statuss: model.status.join(',')?model.status.join(','):''
}
delete model1.status
setSearchParams(model1)
}
const resetList = (model)=>{
staDifferencePrice.value = null
@ -324,6 +329,9 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
}else{
paramsData = {...paramsData,checkNums:rows}
}
if (!paramsData.createTime || paramsData.createTime && paramsData.createTime.length == 0) {
delete paramsData.createTime
}
console.log('批量导出',paramsData)
try {
//

7
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts

@ -212,6 +212,13 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
},
sortTableDefault:9,
isSearch: true,
search: {
componentProps: {
multiple: true,
collapseTags: true,
collapseTagsTooltip: true,
}
},
form: {
value: '1',
componentProps: {

Loading…
Cancel
Save