diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue index 304975676..99960ac65 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue @@ -339,11 +339,12 @@ const searchFormClick = (searchData) => { // tabs 切换事件 const changeTabs = (item) => { - if(item.prop == 'SupplierItems'){ - // tabsExtend.value = true - // apiPage.value = SupplieritemApi.getSupplieritemPage - // detailAllSchemas.value = Supplieritem.allSchemas - } else if(item.prop == 'CustomerItems'){ + // if(item.prop == 'SupplierItems'){ + // tabsExtend.value = true + // apiPage.value = SupplieritemApi.getSupplieritemPage + // detailAllSchemas.value = Supplieritem.allSchemas + // } else + if(item.prop == 'CustomerItems'){ tabsExtend.value = true apiPage.value = CustomeritemApi.getCustomeritemPage detailAllSchemas.value = Customeritem.allSchemas diff --git a/src/views/wms/basicDataManage/supplierManage/supplierDeliDetails/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierDeliDetails/index.vue index 2b503e561..bd8b0d409 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplierDeliDetails/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplierDeliDetails/index.vue @@ -48,6 +48,7 @@ :apiCreate="SupplierDeliDetailsApi.createSupplierDeliDetails" @searchTableSuccess="searchTableSuccess" :isBusiness="false" + @clearSearchInput="clearSearchInput" /> @@ -81,9 +82,19 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { const setV = {} setV[formField] = val[0][searchField] + if(formField == 'supplierCode'){ + setV['supplierName'] = val[0]['name'] + } formRef.setValues(setV) }) } +const clearSearchInput = (formField) => { + if (formField == 'supplierCode') { + basicFormRef.value.formRef.setValues({ + supplierName: '', + }) + } + } // 字段设置 更新主列表字段 const updataTableColumns = (val) => { @@ -99,8 +110,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'basic:supplier-deli-details:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'basic:supplier-deli-details:import'}), // 导入 + // defaultButtons.defaultAddBtn({hasPermi:'basic:supplier-deli-details:create'}), // 新增 + // defaultButtons.defaultImportBtn({hasPermi:'basic:supplier-deli-details:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'basic:supplier-deli-details:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 @@ -133,8 +144,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:supplierDeliDetails:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierDeliDetails:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:basic:supplier-deli-details:update'}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierDeliDetails:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/wms/basicDataManage/supplierManage/supplierDeliDetails/supplierDeliDetails.data.ts b/src/views/wms/basicDataManage/supplierManage/supplierDeliDetails/supplierDeliDetails.data.ts index e98f8e3bd..b209f2587 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplierDeliDetails/supplierDeliDetails.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplierDeliDetails/supplierDeliDetails.data.ts @@ -1,50 +1,99 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import * as SupplierApi from '@/api/wms/supplier' +import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' +import { dateFormatter,dateFormatterYM } from '@/utils/formatTime' // 表单校验 export const SupplierDeliDetailsRules = reactive({ supplierCode: [required], shiftDeliDate: [required], shift: [required], - receivedNumber: [required], + // receivedNumber: [required], deli: [required], }) export const SupplierDeliDetails = useCrudSchemas(reactive([ { - label: '供应商编码', - field: 'supplierCode', - sort: 'custom', - isSearch: true, - }, - { - label: '供应商名称', - field: 'supplierName', - sort: 'custom', - isSearch: true, - }, + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + isSearch: true, + table: { + width: 150, + fixed: 'left' + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '供应商信息', // 查询弹窗标题 + searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 + searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ], + verificationParams: [ + { + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + } + ] // 失去焦点校验参数 + } + } + }, + { + label: '供应商名称', + field: 'supplierName', + isForm: true, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 250 + } + }, + { label: '日期', field: 'shiftDeliDate', - 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')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, - }, + sort: 'custom', + formatter: dateFormatterYM, + table: { + width: 180 + }, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'date', + valueFormat: 'x', + dateFormat:'YYYY-MM-DD' + } + }, + detail: { + dateFormat:'YYYY-MM-DD' + } + }, { label: '班次', field: 'shift', diff --git a/src/views/wms/basicDataManage/supplierManage/supplierShiftDeli/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierShiftDeli/index.vue index 519fdbd0a..bccfaf940 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplierShiftDeli/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplierShiftDeli/index.vue @@ -48,6 +48,7 @@ :apiCreate="SupplierShiftDeliApi.createSupplierShiftDeli" @searchTableSuccess="searchTableSuccess" :isBusiness="false" + @clearSearchInput="clearSearchInput" /> @@ -88,6 +89,13 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { }) } +const clearSearchInput = (formField) => { + if (formField == 'supplierCode') { + basicFormRef.value.formRef.setValues({ + supplierName: '', + }) + } + } // 字段设置 更新主列表字段 const updataTableColumns = (val) => { tableColumns.value = val @@ -136,8 +144,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:supplierShiftDeli:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierShiftDeli:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'basic:supplier-shift-deli:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'basic:supplier-shift-deli:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/wms/basicDataManage/supplierManage/supplierShiftDeli/supplierShiftDeli.data.ts b/src/views/wms/basicDataManage/supplierManage/supplierShiftDeli/supplierShiftDeli.data.ts index 6e32ba765..5902d6bf6 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplierShiftDeli/supplierShiftDeli.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplierShiftDeli/supplierShiftDeli.data.ts @@ -62,7 +62,7 @@ export const SupplierShiftDeli = useCrudSchemas( } }, table: { - width: 180 + width: 250 } }, { @@ -70,24 +70,27 @@ export const SupplierShiftDeli = useCrudSchemas( field: 'shiftDeliDate', sort: 'custom', formatter: dateFormatterYM, - isSearch: true, + table: { + width: 180 + }, search: { component: 'DatePicker', componentProps: { - valueFormat: 'YYYY-MM', - type: 'monthrange', + valueFormat: 'YYYY-MM-DD', + type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - detail: { - dateFormat: 'YYYY-MM' - }, form: { component: 'DatePicker', componentProps: { - type: 'monthrange', - valueFormat: 'YYYY-MM' + type: 'date', + valueFormat: 'x', + dateFormat:'YYYY-MM-DD' } + }, + detail: { + dateFormat:'YYYY-MM-DD' } }, {