diff --git a/src/api/wms/supplierinvoiceRecordMain/index.ts b/src/api/wms/supplierinvoiceRecordMain/index.ts index adf1adcd1..7442e6f7f 100644 --- a/src/api/wms/supplierinvoiceRecordMain/index.ts +++ b/src/api/wms/supplierinvoiceRecordMain/index.ts @@ -31,6 +31,16 @@ export const getSupplierinvoiceRecordMainPage = async (params) => { return await request.get({ url: `/wms/supplierinvoice-record-main/page`, params }) } } +// 查询供应商发票记录主列表 +export const getSupplierinvoiceRecordMainPageDiscrete = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/supplierinvoice-record-main/seniorDiscrete', data }) + } else { + return await request.get({ url: `/wms/supplierinvoice-record-main/pageDiscrete`, params }) + } +} // 查询供应商发票记录主详情 export const getSupplierinvoiceRecordMain = async (id: number) => { diff --git a/src/views/login/updatePassword.vue b/src/views/login/updatePassword.vue index 29150d64b..c3b0a71b6 100644 --- a/src/views/login/updatePassword.vue +++ b/src/views/login/updatePassword.vue @@ -45,6 +45,7 @@ const iconHouse = useIcon({ icon: 'ep:house' }) const iconCellphone = useIcon({ icon: 'ep:cellphone' }) const iconCircleCheck = useIcon({ icon: 'ep:circle-check' }) + const { push, replace } = useRouter() const route = useRoute() //路由信息 const rules = { password: [required], @@ -69,7 +70,8 @@ await UserApi.updateUserPassword(data) // 发送操作成功的事件 message.success(t('common.updateSuccess')) -  router.go(-1) + await replace('/login?redirect=/index') + //  router.go(-1) } } finally { // formLoading.value = false diff --git a/src/views/login/updatePasswordNewTips.vue b/src/views/login/updatePasswordNewTips.vue index 3ec16c854..14a055432 100644 --- a/src/views/login/updatePasswordNewTips.vue +++ b/src/views/login/updatePasswordNewTips.vue @@ -23,7 +23,7 @@ - + diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts index 6d2baa6b6..f27b29eb0 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts @@ -484,6 +484,19 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ label: '到数量', field: 'toQty', sort: 'custom', + form: { + component: 'InputNumber', + componentProps: { + disabled: true, + min: 0, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 6 + } }, { label: '计量单位', @@ -545,7 +558,8 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ width: 130 }, isForm: false, - isTable: true + isTable: true, + isTableForm: false }, { label: '地点ID', diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue index d005e11a3..e3ea5e8cb 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue @@ -144,11 +144,10 @@ const updataTableColumns = (val) => { // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods - // 列表头部按钮 const HeadButttondata = [ // defaultButtons.defaultAddBtn({hasPermi:`wms:{routeName.value}:create`}), // 新增 - defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts index c8ba04eef..3c4453b19 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts @@ -446,6 +446,19 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ label: '到数量', field: 'toQty', sort: 'custom', + form: { + component: 'InputNumber', + componentProps: { + disabled: true, + min: 0, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 6 + } }, { label: '计量单位', @@ -512,7 +525,8 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ width: 130 }, isForm: false, - isTable: true + isTable: true, + isTableForm: false }, { label: '地点ID', diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts index ca3856e27..14e32f9a2 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts @@ -485,6 +485,19 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ label: '到数量', field: 'toQty', sort: 'custom', + form: { + component: 'InputNumber', + componentProps: { + disabled: true, + min: 0, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 6 + } }, { label: '计量单位', diff --git a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue index a3c980593..23e035f6c 100644 --- a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue +++ b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue @@ -191,7 +191,7 @@ } const { tableObject, tableMethods } = useTable({ - getListApi: SupplierinvoiceRecordMainApi.getSupplierinvoiceRecordMainPage // 分页接口 + getListApi: SupplierinvoiceRecordMainApi.getSupplierinvoiceRecordMainPageDiscrete // 分页接口 }) tableObject.params.isLS = 1 diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts index df57fc158..0641ff6ef 100644 --- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts +++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts @@ -101,31 +101,31 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: false, }, - { - label: '生成时间', - field: 'ttGenerateTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: true, - 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')] - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, - }, + // { + // label: '生成时间', + // field: 'ttGenerateTime', + // sort: 'custom', + // formatter: dateFormatter, + // isSearch: true, + // 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')] + // } + // }, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // type: 'datetime', + // valueFormat: 'x' + // } + // }, + // }, { label: '应付挂账金额', field: 'ttAccountAp', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index dbd13c731..3f551943e 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -455,6 +455,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ } }, }, + //子表数据，仅是查询条件 { label: '货运单号', @@ -709,6 +710,26 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '财务驳回原因', + field: 'reasonFinancialRejection', + sort: 'custom', + isSearch: false, + isForm: true, + isDetail:false, + sortTableDefault:11, + table: { + width: 150 + }, + form: { + componentProps: { + style: { 'padding-bottom': '20px'}, + type:"textarea", + maxlength:50, + showWordLimit:true + } + } + }, { label: '回转凭证号', field: 'transferNumber', @@ -1825,6 +1846,23 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive