陈薪名 10 months ago
parent
commit
98836d91e2
  1. 10
      src/api/wms/itembasic/index.ts
  2. 22
      src/api/wms/purchaseDetail/index.ts
  3. 9
      src/api/wms/supplierdeliverRecordMain/index.ts
  4. 15
      src/components/Detail/src/Detail.vue
  5. 14
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
  6. 24
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
  7. 16
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
  8. 21
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
  9. 10
      src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
  10. 5
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
  11. 21
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  12. 5
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

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

@ -78,3 +78,13 @@ export const importTemplate = () => {
} }
// 导入地址 // 导入地址
export const importUrl = '/wms/itembasic/import' export const importUrl = '/wms/itembasic/import'
// 查询物品基本信息列表
export const selectItembasicPageToFgAndSemibasicPage = async (params) => {
if (params.isSearch) {
const data = {...params}
return request.post({ url: '/wms/itembasic/itembasicPageToFgAndSemiSenior', data })
} else {
return await request.get({ url: `/wms/itembasic/ItembasicPageToFgAndSemi`, params })
}
}

22
src/api/wms/purchaseDetail/index.ts

@ -30,6 +30,8 @@ export interface PurchaseDetailVO {
available: string available: string
} }
const message = useMessage() // 消息弹窗
// 查询采购订单子列表 // 查询采购订单子列表
export const getPurchaseDetailPage = async (params) => { export const getPurchaseDetailPage = async (params) => {
if (params.isSearch) { if (params.isSearch) {
@ -41,6 +43,24 @@ export const getPurchaseDetailPage = async (params) => {
} }
} }
// 查询采购订单子列表
export const getPurchaseDetailPagePoNumber = async (params) => {
if (params.isSearch) {
if(params.number == ''){
return;
}
delete params.isSearch
const data = {...params}
return await request.post({ url: '/wms/purchase-detail/senior', data })
} else {
if(params.number == ''){
return;
}
return await request.get({ url: `/wms/purchase-detail/page`, params })
}
}
// 查询采购订单子详情 // 查询采购订单子详情
export const getPurchaseDetail = async (id: number) => { export const getPurchaseDetail = async (id: number) => {
return await request.get({ url: `/wms/purchase-detail/get?id=` + id }) return await request.get({ url: `/wms/purchase-detail/get?id=` + id })
@ -69,4 +89,4 @@ export const exportPurchaseDetail = async (params) => {
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/purchase-detail/get-import-template' }) return request.download({ url: '/wms/purchase-detail/get-import-template' })
} }

9
src/api/wms/supplierdeliverRecordMain/index.ts

@ -66,8 +66,13 @@ export const deleteSupplierdeliverRecordMain = async (id: number) => {
// 导出供应商发货记录主 Excel // 导出供应商发货记录主 Excel
export const exportSupplierdeliverRecordMain = async (params) => { export const exportSupplierdeliverRecordMain = async (params) => {
return await request.download({ url: `/wms/supplierdeliver-record-main/export-excel`, params }) if (params.isSearch) {
} const data = {...params}
return await request.downloadPost({ url: `/wms/supplierdeliver-record-main/export-excel-senior`, data })
} else {
return await request.download({ url: `/wms/supplierdeliver-record-main/export-excel`, params })
}
}
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {

15
src/components/Detail/src/Detail.vue

@ -434,6 +434,12 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
defaultButtons.defaultFilterBtn(null) // defaultButtons.defaultFilterBtn(null) //
] ]
} }
//
if (props.fromeWhere == 'DeliverRequestMain') {
HeadButttondata.value = [
defaultButtons.defaultFilterBtn(null) //
]
}
} }
// //
@ -448,6 +454,15 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
...props.buttondataTable ...props.buttondataTable
] ]
} }
//
if (props.fromeWhere == 'DeliverRequestMain') {
buttondata.value = [...[
defaultButtons.mainListEditBtn({
hide: isShowMainButton(row, ["1"])
})], //
...props.buttondataTable
]
}
} finally { } finally {
detailLoading.value = false detailLoading.value = false
} }

14
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@ -645,12 +645,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchField: 'code', searchField: 'code',
searchTitle: '物品基础信息', searchTitle: '物品基础信息',
searchAllSchemas: Itembasic.allSchemas, searchAllSchemas: Itembasic.allSchemas,
searchPage: ItembasicApi.getItembasicPage, searchPage: ItembasicApi.selectItembasicPageToFgAndSemibasicPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}, },
form: { form: {
// labelMessage: '信息提示说明!!!', // labelMessage: '信息提示说明!!!',
@ -660,12 +655,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchField: 'code', searchField: 'code',
searchTitle: '物品基础信息', searchTitle: '物品基础信息',
searchAllSchemas: Itembasic.allSchemas, searchAllSchemas: Itembasic.allSchemas,
searchPage: ItembasicApi.getItembasicPage, searchPage: ItembasicApi.selectItembasicPageToFgAndSemibasicPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
} }
} }
}, },

24
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@ -51,11 +51,13 @@
:apiUpdate="DeliverRequestMainApi.updateDeliverRequestMain" :apiUpdate="DeliverRequestMainApi.updateDeliverRequestMain"
:apiCreate="DeliverRequestMainApi.createDeliverRequestMain" :apiCreate="DeliverRequestMainApi.createDeliverRequestMain"
:isBusiness="true" :isBusiness="true"
fromeWhere="DeliverRequestMain"
@handleAddTable="handleAddTable" @handleAddTable="handleAddTable"
@handleDeleteTable="handleDeleteTable" @handleDeleteTable="handleDeleteTable"
@searchTableSuccess="searchTableSuccess" @searchTableSuccess="searchTableSuccess"
@submitForm="submitForm" @submitForm="submitForm"
:isShowButton = isShowButton :isShowButton = isShowButton
:isShowReduceButton = isShowButton
/> />
<!-- 详情 --> <!-- 详情 -->
@ -70,8 +72,9 @@
:apiPage="DeliverRequestDetailApi.getDeliverRequestDetailPage" :apiPage="DeliverRequestDetailApi.getDeliverRequestDetailPage"
:apiDelete="DeliverRequestDetailApi.deleteDeliverRequestDetail" :apiDelete="DeliverRequestDetailApi.deleteDeliverRequestDetail"
:Echo="Echo" :Echo="Echo"
fromeWhere="DeliverRequestMain"
@searchTableSuccessDetail="searchTableSuccessDetail" @searchTableSuccessDetail="searchTableSuccessDetail"
:detailButtonIsShow = trueFalse
/> />
<!-- 导入 --> <!-- 导入 -->
@ -99,8 +102,9 @@ routeName.value = route.name
const tableColumns = ref(DeliverRequestMain.allSchemas.tableColumns) const tableColumns = ref(DeliverRequestMain.allSchemas.tableColumns)
const isShowButton = ref(true) const isShowButton = ref(true)
// // // //
const trueFalse = ref(true) const trueFalse = ref(false)
// //
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -318,9 +322,9 @@ const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => { const openDetail = (row: any, titleName: any, titleValue: any) => {
console.log(999,row.deliverPlanNumber); console.log(999,row.deliverPlanNumber);
if(row.deliverPlanNumber != null){ if(row.deliverPlanNumber != null){
trueFalse.value = false trueFalse.value = true
}else { }else {
trueFalse.value = true trueFalse.value = false
} }
detailRef.value.openDetail(row, titleName, titleValue,'requestDeliverMain') detailRef.value.openDetail(row, titleName, titleValue,'requestDeliverMain')
} }
@ -377,12 +381,6 @@ const flag = ref(false)
// //
const submitForm = async (formType, data) => { const submitForm = async (formType, data) => {
if(tableData.value.length <= 0){
message.warning(`子表明细不能为空!`)
flag.value = true
formRef.value.formLoading = false
return;
}
data.subList = tableData.value // data.subList = tableData.value //
data.subList.forEach(obj => { data.subList.forEach(obj => {
if(obj.qty == 0){ if(obj.qty == 0){
@ -397,6 +395,12 @@ const submitForm = async (formType, data) => {
} }
try { try {
if (formType === 'create') { if (formType === 'create') {
if(tableData.value.length <= 0){
message.warning(`子表明细不能为空!`)
flag.value = true
formRef.value.formLoading = false
return;
}
await DeliverRequestMainApi.createDeliverRequestMain(data) await DeliverRequestMainApi.createDeliverRequestMain(data)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
} else { } else {

16
src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@ -257,6 +257,22 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
} }
} else { } else {
const setV = {} const setV = {}
if (formField == 'fromWarehouseCode') {
if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.push({
key: 'warehouseCode',
value: val[0]["code"],
isMainValue: false
})
} else {
InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => {
if (item.key == 'warehouseCode') {
item.value = val[0]["code"]
}
})
}
// console.log(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')));
}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
formRef.setValues(setV) formRef.setValues(setV)
} }

21
src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts

@ -140,15 +140,6 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
}, },
{
label: '从仓库代码',
field: 'fromWarehouseCode',
sort: 'custom',
table: {
width: 150
},
isForm: false,
},
{ {
label: '从库位类型范围', label: '从库位类型范围',
field: 'fromLocationTypes', field: 'fromLocationTypes',
@ -542,7 +533,12 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
searchTitle: '库存余额信息', searchTitle: '库存余额信息',
searchAllSchemas: Balance.allSchemas, searchAllSchemas: Balance.allSchemas,
searchPage: BalanceApi.selectLocationTypeToBalance, searchPage: BalanceApi.selectLocationTypeToBalance,
searchCondition: [{ searchCondition: [
{
key: 'warehouseCode',
value: 'fromWarehouseCode',
isMainValue: true
},{
key: 'locationCode', key: 'locationCode',
value: 'businessType', value: 'businessType',
isMainValue: true isMainValue: true
@ -558,6 +554,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
searchAllSchemas: Balance.allSchemas, searchAllSchemas: Balance.allSchemas,
searchPage: BalanceApi.selectLocationTypeToBalance, searchPage: BalanceApi.selectLocationTypeToBalance,
searchCondition: [{ searchCondition: [{
key: 'warehouseCode',
value: 'fromWarehouseCode',
isMainValue: true
},
{
key: 'locationCode', key: 'locationCode',
value: 'businessType', value: 'businessType',
isMainValue: true isMainValue: true

10
src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts

@ -387,12 +387,16 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchField: 'itemCode', searchField: 'itemCode',
searchTitle: '供应商物品信息', searchTitle: '供应商物品信息',
searchAllSchemas: Supplieritem.allSchemas, searchAllSchemas: Supplieritem.allSchemas,
searchPage: SupplieritemApi.getSupplieritemPage, searchPage: SupplieritemApi.selectItembasicTypeToSupplieritem,
searchCondition: [{ searchCondition: [{
key:'supplierCode', key:'supplierCode',
value:'supplierCode', value:'supplierCode',
isMainValue: true isMainValue: true
}] },{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}, },
form: { form: {
// labelMessage: '信息提示说明!!!', // labelMessage: '信息提示说明!!!',
@ -402,7 +406,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchField: 'itemCode', searchField: 'itemCode',
searchTitle: '供应商物品信息', searchTitle: '供应商物品信息',
searchAllSchemas: Supplieritem.allSchemas, searchAllSchemas: Supplieritem.allSchemas,
searchPage: SupplieritemApi.getSupplieritemPage, searchPage: SupplieritemApi.selectItembasicTypeToSupplieritem,
searchCondition: [{ searchCondition: [{
key:'supplierCode', key:'supplierCode',
value:'supplierCode', value:'supplierCode',

5
src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@ -5,6 +5,7 @@ import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/su
import * as PurchaseMainApi from '@/api/wms/purchaseMain' import * as PurchaseMainApi from '@/api/wms/purchaseMain'
import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data' import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
import {getPurchaseDetailPagePoNumber} from "@/api/wms/purchaseDetail";
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
/** /**
@ -316,7 +317,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchField: 'lineNumber', searchField: 'lineNumber',
searchTitle: '采购订单信息', searchTitle: '采购订单信息',
searchAllSchemas: PurchaseDetail.allSchemas, searchAllSchemas: PurchaseDetail.allSchemas,
searchPage: PurchaseDetailApi.getPurchaseDetailPage, searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
searchCondition: [{ searchCondition: [{
key: 'number', key: 'number',
value: 'poNumber', value: 'poNumber',
@ -334,7 +335,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchField: 'lineNumber', searchField: 'lineNumber',
searchTitle: '采购订单信息', searchTitle: '采购订单信息',
searchAllSchemas: PurchaseDetail.allSchemas, searchAllSchemas: PurchaseDetail.allSchemas,
searchPage: PurchaseDetailApi.getPurchaseDetailPage, searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
searchCondition: [{ searchCondition: [{
key: 'number', key: 'number',
value: 'poNumber', value: 'poNumber',

21
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@ -316,6 +316,27 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
/// ///
const formRef = ref() const formRef = ref()
const openForm = async (type: string, row?: number) => { const openForm = async (type: string, row?: number) => {
if(type == "update"){
SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
if(item.field == 'supplierCode'){
item.componentProps.isSearchList = false
item.componentProps.disabled = true
}
if(item.field == 'ppNumber'){
item.componentProps.isSearchList = false
item.componentProps.disabled = true
}
if(item.field == 'asnNumber'){
item.componentProps.disabled = true
}
if(item.field == 'planArriveTime'){
item.componentProps.disabled = true
}
})
}else {
item.componentProps.isSearchList = true
item.componentProps.disabled = true
}
tableData.value = [] // tableData.value = [] //
formRef.value.open(type, row) formRef.value.open(type, row)
} }

5
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@ -100,6 +100,11 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
key: 'status', key: 'status',
value: 4, value: 4,
isMainValue: false isMainValue: false
},
{
key: 'available',
value: "TRUE",
isMainValue: false
}] }]
} }
} }

Loading…
Cancel
Save