Browse Source

弹出框bug,鼠标悬停

master
张立 1 year ago
parent
commit
5bb8002816
  1. 2
      src/components/BasicForm/src/BasicForm.vue
  2. 28
      src/components/Form/src/Form.vue
  3. 4
      src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
  4. 4
      src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

2
src/components/BasicForm/src/BasicForm.vue

@ -1,5 +1,5 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" :width="isBusiness ? '60%' : '40%'"> <Dialog :title="dialogTitle" v-model="dialogVisible" :width="isBusiness ? '60%' : '40%'" :close-on-click-modal="false">
<Form <Form
ref="formRef" ref="formRef"
v-loading="formLoading" v-loading="formLoading"

28
src/components/Form/src/Form.vue

@ -223,12 +223,14 @@ export default defineComponent({
// isSearchList: true 使 // isSearchList: true 使
const formItemSlotsSearchList: Recordable = setFormItemSlots(slots, item.field) const formItemSlotsSearchList: Recordable = setFormItemSlots(slots, item.field)
if (item?.componentProps?.isSearchList) { if (item?.componentProps?.isSearchList) {
if(item?.componentProps?.multiple){
formItemSlotsSearchList[item.field] = () => { formItemSlotsSearchList[item.field] = () => {
return ( return (
<> <>
<ElTooltip placement="top" content={formModel.value[item.field]} visible={formModel.value[item.field]}>
<ElTooltip placement="top" content={formModel.value[item.field]}> <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={item?.componentProps?.searchListPlaceholder} disabled={true} />
<ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={item?.componentProps?.searchListPlaceholder} disabled={true} /></ElTooltip> </ElTooltip>
<ElButton icon={Search} onClick={()=>{ <ElButton icon={Search} onClick={()=>{
opensearchTable( opensearchTable(
item.field, item?.componentProps?.searchField, item.field, item?.componentProps?.searchField,
@ -241,6 +243,24 @@ export default defineComponent({
</> </>
) )
} }
}else{
formItemSlotsSearchList[item.field] = () => {
return (
<>
<ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={item?.componentProps?.searchListPlaceholder} disabled={true} />
<ElButton icon={Search} onClick={()=>{
opensearchTable(
item.field, item?.componentProps?.searchField,
item?.componentProps?.searchTitle,
item?.componentProps?.searchAllSchemas,
item?.componentProps?.searchPage,
item?.componentProps?.searchCondition,
item?.componentProps?.multiple,
)}}/>
</>
)
}
}
} }
return ( return (
<ElFormItem {...(item.formItemProps || {})} prop={item.field} label={item.label || ''}> <ElFormItem {...(item.formItemProps || {})} prop={item.field} label={item.label || ''}>
@ -333,7 +353,7 @@ export default defineComponent({
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.myInput{ .myInput {
width: calc(100% - 46px); width: calc(100% - 46px);
} }
.#{$elNamespace}-form.#{$namespace}-form .#{$elNamespace}-row { .#{$elNamespace}-form.#{$namespace}-form .#{$elNamespace}-row {

4
src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@ -141,8 +141,8 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:inspect-request-main:create'}), // // defaultButtons.defaultAddBtn({hasPermi:'wms:inspect-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:inspect-request-main:import'}), // // defaultButtons.defaultImportBtn({hasPermi:'wms:inspect-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:inspect-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:inspect-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //

4
src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@ -141,8 +141,8 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:putaway-request-main:create'}), // // defaultButtons.defaultAddBtn({hasPermi:'wms:putaway-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:putaway-request-main:import'}), // // defaultButtons.defaultImportBtn({hasPermi:'wms:putaway-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //

Loading…
Cancel
Save