Browse Source

Merge remote-tracking branch 'remotes/origin/intex_online20250509' into intex

# Conflicts:
#	src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
intex_online20250522
songguoqiang 4 weeks ago
parent
commit
370f8f3f5e
  1. 26
      src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
  2. 2
      src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
  3. 2
      src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts
  4. 2
      src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts
  5. 4
      src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
  6. 2
      src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
  7. 38
      src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue
  8. 4
      src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts
  9. 4
      src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
  10. 4
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
  11. 12
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
  12. 2
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
  13. 11
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

26
src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts

@ -603,14 +603,14 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '父包装号',
field: 'parentPackingNumber',
sort: 'custom',
table: {
width: 150
},
},
// {
// label: '父包装号',
// field: 'parentPackingNumber',
// sort: 'custom',
// table: {
// width: 150
// },
// },
{
label: '包装规格',
field: 'packUnit',
@ -841,10 +841,18 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
type: 'datetimerange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
},
},
// search: {
// component: 'DatePicker',
// componentProps: {
// valueFormat: 'YYYY-MM-DD HH:mm:ss',
// type: 'daterange',
// defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
// },
// },
},
{
label: '最后更新者',

2
src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue

@ -120,7 +120,7 @@ const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), //
defaultButtons.defaultExportBtn(null), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //

2
src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts

@ -548,7 +548,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
type: 'datetimerange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
},
},

2
src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts

@ -598,7 +598,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
type: 'datetimerange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
},
},

4
src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts

@ -533,11 +533,11 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
}
},
isSearch: true,
search: {
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
type: 'datetimerange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
},
},

2
src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts

@ -949,7 +949,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
type: 'datetimerange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
},
},

38
src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue

@ -64,7 +64,18 @@
:detailButtonIsShowEdit="false"
:detailButtonIsShowDelete="false"
:buttondataTable="buttondataTable"
:otherHeadButttonData = "[]"
:otherHeadButttonData = "[
{
label: t('ts.导出明细'),
name: 'export-detail',
hide: false,
type: 'primary',
// icon: 'ep:operation',
color: '',
float: 'left',
hasPermi: ''
}
]"
@buttonBaseClick="detailButtonBaseClick"
@tableFormButton="tableFormButton"
@ -260,7 +271,7 @@ const buttonBaseClick = (val, item) => {
}
}
const clicKRowId = ref()
//
const tableFormButton = async (val , row) => {
if (val == 'close') { //
@ -281,6 +292,7 @@ const buttonBaseClick = (val, item) => {
value: row.number
}]
detailRef.value.openDetail(row, titleName, titleValue, 'basicCustomerStatementMain')
clicKRowId.value = row.id;
}
@ -369,8 +381,30 @@ const importSuccess = () => {
if (val == 'export') {
//
handleExportDetail(detailTableObject)
} else if (val === 'export-detail') {
console.log('导出明细:', clicKRowId.value)
handleDetailExport(clicKRowId.value)
}
}
/** 导出明细按钮操作 */
const exportLoadingDetail = ref(false) //
const handleDetailExport = async (masterId) => {
try {
//
await message.exportConfirm()
//
exportLoadingDetail.value = true
let params = {
masterId: masterId
}
const excelTitle = ref(route.meta.title)
const data = await SuppliperMoldCostDetailApi.exportSupplierMoldCostDetail(params)
download.excel(data, `${excelTitle.value}明细】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoadingDetail.value = false
}
}
/** 导出按钮操作 */
const exportLoading = ref(false) //
//

4
src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts

@ -273,9 +273,9 @@ export const FinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
type: 'datetimerange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
},
isForm: false,
hiddenInMain:true

4
src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts

@ -267,9 +267,9 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
type: 'datetimerange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
},
isForm: false,
hiddenInMain:true

4
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@ -74,7 +74,8 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable:false
isTable:true,
sortTableDefault:5,
},
{
label: '供应商代码',
@ -975,6 +976,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
valueFormat: 'x',
}
},
sortTableDefault:19,
},
{

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

@ -1052,6 +1052,18 @@ export const PurchasePlanDetail = useCrudSchemas(
isTable: true,
},
{
label: '已收库存数量',
field: 'inventoryedQty',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
isTable: true,
},
// {需求作废
// label: '受入地',

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

@ -1770,7 +1770,7 @@ onMounted(async () => {
sort: '',
by: 'ASC'
})
item.componentProps.options = procurementCreators.list
item.componentProps.options = procurementCreators.list.filter(item => item.id != 1)
}
})
getList()

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

@ -16,7 +16,6 @@ const queryParams = {
pageNo: 1,
code: 'PurchaseInvoiceRequest'
}
console.log(34343)
const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
const requestsettingData = data?.list[0] || {}
@ -29,7 +28,8 @@ const requestsettingData = data?.list[0] || {}
userDept.id = userDept.id.toString()
const userDeptArray:any = [userDept]
const procurementCreators = await SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ roleCode: 'purchase',pageSize: 1000,pageNo: 1,sort: '',by: 'ASC' })
const procurementCreators = await SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ roleCode: 'purchase', pageSize: 1000, pageNo: 1, sort: '', by: 'ASC' })
const purchasingPriceApprover = procurementCreators.list.filter(item => item.id != 1)
/**
* @returns {Array}
*/
@ -929,7 +929,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
isSearch:true,
form: {
component: 'Select',
api: () => procurementCreators.list,
api: () => purchasingPriceApprover,
componentProps: {
options:[],
optionsAlias: {
@ -956,7 +956,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
},
search: {
component: 'Select',
api: () => procurementCreators.list,
api: () => purchasingPriceApprover,
componentProps: {
options:[],
optionsAlias: {
@ -978,7 +978,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
isDetail:false,
form: {
component: 'Select',
api: () => procurementCreators.list,
api: () => purchasingPriceApprover,
componentProps: {
optionsAlias: {
labelField: 'nickname',
@ -1964,7 +1964,6 @@ function validateTaxRate(rule, value, callback) {
}
const validateGoldenTaxInvoiceNumber = (rule, value, callback) => {
console.log('金税票号',value)
const reg = /^[0-9]*$/
if (value==null||value==''||reg.test(value)) {
callback()

Loading…
Cancel
Save