Browse Source

修复PC端bug

master_hella_20240701
yufei0306 6 months ago
parent
commit
6e0a0af10e
  1. 1
      README.md
  2. 5
      src/components/BasicForm/src/BasicForm.vue
  3. 12
      src/components/Form/src/Form.vue
  4. 11
      src/components/SearchTable/src/SearchTable.vue
  5. 1
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
  6. 1
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
  7. 1
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

1
README.md

@ -8,6 +8,7 @@ form: {
searchField: 'itemCode', // 查询弹窗赋值字段 searchField: 'itemCode', // 查询弹窗赋值字段
searchTitle: '生产线物料关系信息', // 查询弹窗标题 searchTitle: '生产线物料关系信息', // 查询弹窗标题
hiddenFilterButton:true,//是否隐藏筛选按钮 hiddenFilterButton:true,//是否隐藏筛选按钮
dialogWidth:'100px',//搜索出来弹窗的宽度
searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
searchCondition: [{ searchCondition: [{

5
src/components/BasicForm/src/BasicForm.vue

@ -16,6 +16,7 @@
:is-col="true" :is-col="true"
@opensearchTable="opensearchTable" @opensearchTable="opensearchTable"
@hiddenFilterButton="hiddenSearchTableFilterButton" @hiddenFilterButton="hiddenSearchTableFilterButton"
@changeDialogWidth="changeDialogWidth"
@clearSearchInput="clearSearchInput" @clearSearchInput="clearSearchInput"
@onChange="onChange" @onChange="onChange"
@onBlur="onBlur" @onBlur="onBlur"
@ -429,6 +430,10 @@ const opensearchTable = (
searchDetailSchemas searchDetailSchemas
) )
} }
// searchTable
const changeDialogWidth = (width)=>{
searchTableRef.value.changeDialogWidth(width)
}
const hiddenSearchTableFilterButton = ()=>{ const hiddenSearchTableFilterButton = ()=>{
searchTableRef.value.hiddenFilterButton() searchTableRef.value.hiddenFilterButton()
} }

12
src/components/Form/src/Form.vue

@ -55,7 +55,7 @@ export default defineComponent({
vLoading: propTypes.bool.def(false), vLoading: propTypes.bool.def(false),
labelPosition: propTypes.string.def('left'), labelPosition: propTypes.string.def('left'),
}, },
emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter','hiddenFilterButton'], emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter','hiddenFilterButton','changeDialogWidth'],
setup(props, { slots, expose, emit }) { setup(props, { slots, expose, emit }) {
// element form // element form
const elFormRef = ref<ComponentRef<typeof ElForm>>() const elFormRef = ref<ComponentRef<typeof ElForm>>()
@ -306,6 +306,11 @@ export default defineComponent({
emit('hiddenFilterButton') emit('hiddenFilterButton')
} }
//
if(item?.componentProps?.dialogWidth){
emit('changeDialogWidth',item?.componentProps?.dialogWidth)
}
}}/> }}/>
</> </>
) )
@ -349,6 +354,11 @@ export default defineComponent({
if(item?.componentProps?.hiddenFilterButton){ if(item?.componentProps?.hiddenFilterButton){
emit('hiddenFilterButton') emit('hiddenFilterButton')
} }
//
if(item?.componentProps?.dialogWidth){
emit('changeDialogWidth',item?.componentProps?.dialogWidth)
}
}}/> }}/>
</> </>
) )

11
src/components/SearchTable/src/SearchTable.vue

@ -1,5 +1,5 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="searchDialogVisible" :width="'80%'"> <Dialog :title="dialogTitle" v-model="searchDialogVisible" :width="dialogWidth" >
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<!-- <Search :schema="searchSchema" @search="setSearchParamsRef" @reset="setSearchParamsRef" /> --> <!-- <Search :schema="searchSchema" @search="setSearchParamsRef" @reset="setSearchParamsRef" /> -->
@ -72,6 +72,7 @@ const multipleBol = ref(false)
const searchConditionRef = ref() const searchConditionRef = ref()
const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any) => { const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any) => {
dialogWidth.value = '80%'
HeadButttondata.value = [ HeadButttondata.value = [
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
] ]
@ -84,6 +85,7 @@ const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any
tableColumns.value = allSchemas.tableColumns tableColumns.value = allSchemas.tableColumns
} }
const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any,isConcatDetailSchemas=false,detailSchemas: any) => { const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any,isConcatDetailSchemas=false,detailSchemas: any) => {
dialogWidth.value = '80%'
HeadButttondata.value = [ HeadButttondata.value = [
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
] ]
@ -121,7 +123,10 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
getListRef.value = getList getListRef.value = getList
getList() getList()
} }
const dialogWidth = ref('80%')
const changeDialogWidth = (width: any) => {
dialogWidth.value = width
}
const hiddenFilterButton = ()=>{ const hiddenFilterButton = ()=>{
HeadButttondata.value = [] HeadButttondata.value = []
} }
@ -167,7 +172,7 @@ const searchFormClick = (searchData) => {
getListRef.value() // getListRef.value() //
} }
defineExpose({ open,openData,hiddenFilterButton }) // open defineExpose({ open,openData,hiddenFilterButton ,changeDialogWidth}) // open
// Table ref // Table ref
const searchTableRef = ref() const searchTableRef = ref()

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

@ -59,6 +59,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
// labelMessage: '信息提示说明!!!', // labelMessage: '信息提示说明!!!',
componentProps: { componentProps: {
dialogWidth:'1085px',//搜索出来弹窗的宽度
isSearchList: true, isSearchList: true,
searchListPlaceholder: '请选择采购订单', searchListPlaceholder: '请选择采购订单',
searchField: 'number', searchField: 'number',

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

@ -89,6 +89,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
form: { form: {
// labelMessage: '信息提示说明!!!', // labelMessage: '信息提示说明!!!',
componentProps: { componentProps: {
dialogWidth:'1055px',//搜索出来弹窗的宽度
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本 searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段 searchField: 'number', // 查询弹窗赋值字段

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

@ -519,6 +519,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
componentProps: { componentProps: {
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
hiddenFilterButton:true,//是否隐藏筛选按钮 hiddenFilterButton:true,//是否隐藏筛选按钮
dialogWidth:'665px',//搜索出来弹窗的宽度
searchListPlaceholder: '请选择采购员', // 输入框占位文本 searchListPlaceholder: '请选择采购员', // 输入框占位文本
searchField: 'id', // 查询弹窗赋值字段 searchField: 'id', // 查询弹窗赋值字段
searchTitle: '采购员信息', // 查询弹窗标题 searchTitle: '采购员信息', // 查询弹窗标题

Loading…
Cancel
Save