Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

master_hella
赵雪冰 1 week ago
parent
commit
c48c63e155
  1. 10
      src/api/wms/inventorymoveRecordDetail/index.ts
  2. 11
      src/api/wms/inventorymoveRecordMain/index.ts
  3. 5
      src/api/wms/settlementReport/index.ts
  4. 10
      src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
  5. 24
      src/views/wms/issueManage/onlinesettlement/settlementReport/index.vue
  6. 6
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
  7. 3
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
  8. 9
      src/views/wms/moveManage/inventorymove/inventorymoveRecordMainSettlement/index.vue
  9. 21
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts

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

@ -45,6 +45,16 @@ export const getInventorymoveRecordDetailPage = async (params) => {
}
}
// 查询库存转移记录子列表
export const getInventorymoveRecordDetailSettlePage = async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.post({ url: '/wms/inventorymove-record-detail/seniorSettle', data })
} else {
return await request.get({ url: `/wms/inventorymove-record-detail/pageSettle`, params })
}
}
// 查询库存转移记录子列表(备件专用)
export const getInventorymoveRecordDetailPageSparePart = async (params) => {

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

@ -70,6 +70,17 @@ export const exportInventorymoveRecordMain = async (params) => {
}
}
// 导出库存转移记录主 Excel
export const exportInventorymoveRecordMainSettle = async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.downloadPost({ url: '/wms/inventorymove-record-main/export-excel-senior-settle', data })
} else {
return await request.download({ url: `/wms/inventorymove-record-main/export-excel-settle`, params })
}
}
// 导出库存转移记录主 Excel
export const exportInventorymoveRecordMainSparePart = async (params) => {

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

@ -38,6 +38,11 @@ export const exportSettlementInfoReportScpPage = async (params) => {
return await request.download({ url: `/wms/onlinesettlement-info/export-excel-scp`, params })
}
// 导出发料申请主 Excel
export const exportOnlinesettlementInfoReportExcel = async (params) => {
return await request.download({ url: `/wms/onlinesettlement-info/export-excel-report`, params })
}
// 查询上线结算配置列表
export const getSettlementReportBalance = async (params) => {
// if (params.isSearch) {

10
src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts

@ -872,11 +872,11 @@ export const SaleDetailAndMain = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '批次',
field: 'batch',
sort: 'custom',
},
// {
// label: '批次',
// field: 'batch',
// sort: 'custom',
// },
{
label: '客户库位',
field: 'fromLocationCode',

24
src/views/wms/issueManage/onlinesettlement/settlementReport/index.vue

@ -80,7 +80,9 @@ import * as WarehouseApi from '@/api/wms/warehouse'
import * as LocationApi from '@/api/wms/location'
import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
import { tableFormBlurVer, FormBlur, getListByBottonInput } from '@/api/wms/business/inputBlur'
import { formatDate } from '@/utils/formatTime'
import { usePageLoading } from '@/hooks/web/usePageLoading'
const { loadStart, loadDone } = usePageLoading()
// 线
defineOptions({ name: 'SettlementReport' })
@ -108,6 +110,7 @@ const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultExportBtn({hasPermi:'wms:onlinesettlement-info:export'}), //
// {
// label: '',
// name: 'zdy',
@ -123,7 +126,9 @@ const buttonBaseClick = (val, item) => {
if (val == 'refresh') { //
getList()
} else if (val == 'filtrate') { //
} else { //
} else if (val == 'export') { //
handleExport()
}else { //
console.log('其他按钮', item)
}
}
@ -283,4 +288,19 @@ onMounted(async () => {
// importTemplateData.templateUrl = await SettlementConfigurationApi.importTemplate()
})
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
loadStart()
const excelTitle = ref(route.meta.title)
const data = await SettlementtReportApi.exportOnlinesettlementInfoReportExcel(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
loadDone()
}
}
</script>

6
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@ -1421,7 +1421,8 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
searchCondition:[{
key: 'itemCode',
value: 'itemCode',
isMainValue: true
isTableRowValue: true,
isMainValue:false
}]
}
},
@ -1444,7 +1445,8 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
key: 'itemCode',
value: 'itemCode',
message: '请填写物料代码!',
isMainValue: true
isTableRowValue: true,
isMainValue:false
}]
}
},

3
src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts

@ -757,7 +757,8 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
key:'itemCode',
value:'itemCode',
message: '请填写物料代码!',
isMainValue: true
isTableRowValue: true,
isMainValue:false
},{
key: 'available',
value: 'TRUE',

9
src/views/wms/moveManage/inventorymove/inventorymoveRecordMainSettlement/index.vue

@ -72,7 +72,7 @@
:allSchemas="InventorymoveRecordMainNew.allSchemas"
:detailAllSchemas="InventorymoveRecordDetailNew.allSchemas"
:detailAllSchemasRules="InventorymoveRecordDetailNewRules"
:apiPage="InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage"
:apiPage="InventorymoveRecordDetailApi.getInventorymoveRecordDetailSettlePage"
/>
<!-- 标签打印 -->
<SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccessLabel" />
@ -122,9 +122,8 @@ const updataTableColumns = (val) => {
}
const { tableObject, tableMethods } = useTable({
getListApi: InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage //
getListApi: InventorymoveRecordDetailApi.getInventorymoveRecordDetailSettlePage //
})
tableObject.params.businessType = 'onlineSettleMove'
//
console.log(146 , fromInventoryStatus.value)
@ -137,7 +136,7 @@ const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
//defaultButtons.defaultAddBtn(null), //
defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), //
defaultButtons.defaultExportBtn({hasPermi:`wms:onlinesettlement-info:export`}), //
// defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import`}), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
@ -296,7 +295,7 @@ const handleExport = async () => {
//
loadStart()
const excelTitle = ref(route.meta.title)
const data = await InventorymoveRecordMainApi.exportInventorymoveRecordMain(tableObject.params)
const data = await InventorymoveRecordMainApi.exportInventorymoveRecordMainSettle(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {

21
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts

@ -405,15 +405,16 @@ export const PurchasereturnRecordMain = useCrudSchemas(
table: {
width: 180
},
isTable: true,
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
},
isTable: false,
isForm: false,
// form: {
// component: 'DatePicker',
// componentProps: {
// type: 'datetime',
// dateFormat: 'YYYY-MM-DD HH:mm:ss',
// valueFormat: 'x'
// }
// },
isSearch: true,
search: {
component: 'DatePicker',
@ -431,7 +432,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(
table: {
width: 150
},
isTable: true
isTable: false
},
{
label: '操作',

Loading…
Cancel
Save