Browse Source

Merge remote-tracking branch 'origin/master_hella' into master_hella

hella_online_20240829
gaojs 5 months ago
parent
commit
9603841ccd
  1. 2
      src/components/BasicForm/src/BasicForm.vue
  2. 2
      src/components/Form/src/Form.vue
  3. 7
      src/components/RouterSearch/index.vue
  4. 9
      src/layout/components/CategoryHeader.vue
  5. 2
      src/layout/components/Message/src/Message.vue
  6. 16
      src/layout/components/ToolHeader.vue
  7. 4
      src/layout/components/UserInfo/src/UserInfo.vue
  8. 4
      src/layout/components/useRenderLayout.tsx
  9. 17
      src/views/wms/issueManage/issue/issueRequestMain/index.vue

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

@ -135,7 +135,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import ButtonBase from '@/components/XButton/src/ButtonBase.vue' import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
import TableForm from '@/components/TableForm/src/TableForm.vue' import TableForm from '@/components/TableForm/src/TableForm.vue'
import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue' import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue'
import {DICT_TYPE, getStrDictOptions} from '@/utils/dict'
import { tableFormBlurVer,FormBlur,getListByBottonInput } from '@/api/wms/business/business' import { tableFormBlurVer,FormBlur,getListByBottonInput } from '@/api/wms/business/business'
const props = defineProps({ const props = defineProps({
// //

2
src/components/Form/src/Form.vue

@ -272,6 +272,7 @@ export default defineComponent({
}} }}
onBlur={(e)=>{onBlur(item.field, e)}} onBlur={(e)=>{onBlur(item.field, e)}}
onChange={(e)=>{onChange(item.field, e)}}
v-slots={{ v-slots={{
suffix: () => ( suffix: () => (
<ElButton type="text" icon={CircleClose} style="color:var(--el-button-text-color)" onClick={()=>{ <ElButton type="text" icon={CircleClose} style="color:var(--el-button-text-color)" onClick={()=>{
@ -324,6 +325,7 @@ export default defineComponent({
}} }}
onBlur={(e)=>{onBlur(item.field,formModel.value[item.field])}} onBlur={(e)=>{onBlur(item.field,formModel.value[item.field])}}
onChange={(e)=>{onChange(item.field,formModel.value[item.field])}}
disabled={item?.componentProps?.enterSearch?false:true} v-slots={{ disabled={item?.componentProps?.enterSearch?false:true} v-slots={{
suffix: () => ( suffix: () => (
<ElButton type="text" icon={CircleClose} style="color:var(--el-button-text-color)" onClick={()=>{ <ElButton type="text" icon={CircleClose} style="color:var(--el-button-text-color)" onClick={()=>{

7
src/components/RouterSearch/index.vue

@ -17,8 +17,8 @@
/> />
</el-select> --> </el-select> -->
</ElDialog> </ElDialog>
<div v-else class="custom-hover" @click.stop="showTopSearch = !showTopSearch"> <div v-else class="custom-hover1" @click.stop="showTopSearch = !showTopSearch">
<Icon icon="ep:search" /> <Icon icon="ep:search" color="#ffffff"/>
<el-select <el-select
filterable filterable
:reserve-keyword="false" :reserve-keyword="false"
@ -170,4 +170,7 @@ defineExpose({
.w-220px { .w-220px {
width: 220px !important; width: 220px !important;
} }
.custom-hover1{
background-color: transparent;
}
</style> </style>

9
src/layout/components/CategoryHeader.vue

@ -9,6 +9,8 @@ import { ElMenu, ElMenuItem } from 'element-plus'
import { usePermissionStore } from '@/store/modules/permission' import { usePermissionStore } from '@/store/modules/permission'
import { hasOneShowingChild } from '@/layout/components/Menu/src/helper' import { hasOneShowingChild } from '@/layout/components/Menu/src/helper'
import { useRenderMenuTitle } from '@/layout/components/Menu/src/components/useRenderMenuTitle' import { useRenderMenuTitle } from '@/layout/components/Menu/src/components/useRenderMenuTitle'
import ToolHeader from './ToolHeader.vue'
// //
import { useDesign } from '@/hooks/web/useDesign' import { useDesign } from '@/hooks/web/useDesign'
const { getPrefixCls, variables } = useDesign() const { getPrefixCls, variables } = useDesign()
@ -101,6 +103,7 @@ export default defineComponent({
} }
}} }}
</ElMenu> </ElMenu>
<ToolHeader class="tool-header"></ToolHeader>
</div> </div>
) )
} }
@ -127,7 +130,11 @@ $prefix-cls: #{$namespace}-tool-header;
left:0; left:0;
z-index: 999; z-index: 999;
} }
.tool-header{
position: absolute;
right: 0px;
top: 0px;
}
} }
.categoryheader{ .categoryheader{
padding-left: 20px; padding-left: 20px;

2
src/layout/components/Message/src/Message.vue

@ -62,7 +62,7 @@ onBeforeUnmount(() => {
<ElPopover :width="400" placement="bottom" trigger="click"> <ElPopover :width="400" placement="bottom" trigger="click">
<template #reference> <template #reference>
<ElBadge :is-dot="unreadCount > 0" class="item"> <ElBadge :is-dot="unreadCount > 0" class="item">
<Icon :size="18" class="cursor-pointer" icon="ep:bell" @click="getList" /> <Icon :size="18" class="cursor-pointer" color="#ffffff" icon="ep:bell" @click="getList" />
</ElBadge> </ElBadge>
</template> </template>
<ElTabs v-model="activeName"> <ElTabs v-model="activeName">

16
src/layout/components/ToolHeader.vue

@ -54,28 +54,28 @@ export default defineComponent({
'dark:bg-[var(--el-bg-color)]' 'dark:bg-[var(--el-bg-color)]'
]} ]}
> >
{layout.value !== 'top' ? ( {/* {layout.value !== 'top' ? (
<div class="h-full flex items-center"> <div class="h-full flex items-center">
{hamburger.value && layout.value !== 'cutMenu' ? ( {hamburger.value && layout.value !== 'cutMenu' ? (
<Collapse class="custom-hover" color="var(--top-header-text-color)"></Collapse> <Collapse class="custom-hover" color="var(--top-header-text-color)"></Collapse>
) : undefined} ) : undefined}
{breadcrumb.value ? <Breadcrumb class="lt-md:hidden"></Breadcrumb> : undefined} {breadcrumb.value ? <Breadcrumb class="lt-md:hidden"></Breadcrumb> : undefined}
</div> </div>
) : undefined} ) : undefined} */}
<div class="h-full flex items-center"> <div class="h-full flex items-center">
{search.value ? (<RouterSearch isModal={false} />) : undefined} {search.value ? (<RouterSearch isModal={false} />) : undefined}
{screenfull.value ? ( {/* {screenfull.value ? (
<Screenfull class="custom-hover" color="var(--top-header-text-color)"></Screenfull> <Screenfull class="custom-hover" color="var(--top-header-text-color)"></Screenfull>
) : undefined} ) : undefined} */}
{size.value ? ( {/* {size.value ? (
<SizeDropdown class="custom-hover" color="var(--top-header-text-color)"></SizeDropdown> <SizeDropdown class="custom-hover" color="var(--top-header-text-color)"></SizeDropdown>
) : undefined} ) : undefined} */}
{locale.value ? ( {/* {locale.value ? (
<LocaleDropdown <LocaleDropdown
class="custom-hover" class="custom-hover"
color="var(--top-header-text-color)" color="var(--top-header-text-color)"
></LocaleDropdown> ></LocaleDropdown>
) : undefined} ) : undefined} */}
{message.value ? ( {message.value ? (
<Message class="custom-hover" color="var(--top-header-text-color)"></Message> <Message class="custom-hover" color="var(--top-header-text-color)"></Message>
) : undefined} ) : undefined}

4
src/layout/components/UserInfo/src/UserInfo.vue

@ -54,7 +54,7 @@ const toDocument = () => {
<ElDropdown class="custom-hover" :class="prefixCls" trigger="click"> <ElDropdown class="custom-hover" :class="prefixCls" trigger="click">
<div class="flex items-center"> <div class="flex items-center">
<ElAvatar :src="avatar" alt="" class="w-[calc(var(--logo-height)-25px)] rounded-[50%]" /> <ElAvatar :src="avatar" alt="" class="w-[calc(var(--logo-height)-25px)] rounded-[50%]" />
<span class="pl-[5px] text-14px text-[var(--top-header-text-color)] <lg:hidden"> <span class="pl-[5px] text-14px text-[var(--top-header-text-color)] <lg:hidden" style="color:#ffffff">
{{ userName }} {{ userName }}
</span> </span>
</div> </div>
@ -62,7 +62,7 @@ const toDocument = () => {
<ElDropdownMenu> <ElDropdownMenu>
<ElDropdownItem> <ElDropdownItem>
<Icon icon="ep:tools" /> <Icon icon="ep:tools" />
<div @click="toProfile">{{ t('common.profile') }}</div> <div @click="toProfile" >{{ t('common.profile') }}</div>
</ElDropdownItem> </ElDropdownItem>
<!-- <ElDropdownItem> <!-- <ElDropdownItem>
<Icon icon="ep:menu" /> <Icon icon="ep:menu" />

4
src/layout/components/useRenderLayout.tsx

@ -114,14 +114,14 @@ export const useRenderLayout = () => {
style="transition: all var(--transition-time-02);width:100%;" style="transition: all var(--transition-time-02);width:100%;"
> >
<ToolHeader {/* <ToolHeader
class={[ class={[
'bg-[var(--top-header-bg-color)]', 'bg-[var(--top-header-bg-color)]',
{ {
'layout-border__bottom': !tagsView.value 'layout-border__bottom': !tagsView.value
} }
]} ]}
></ToolHeader> ></ToolHeader> */}
{tagsView.value ? ( {tagsView.value ? (
<TagsView class="layout-border__bottom layout-border__top"></TagsView> <TagsView class="layout-border__bottom layout-border__top"></TagsView>

17
src/views/wms/issueManage/issue/issueRequestMain/index.vue

@ -60,6 +60,7 @@
@searchTableSuccess="searchTableSuccess" @searchTableSuccess="searchTableSuccess"
@submitForm="submitForm" @submitForm="submitForm"
@onEnter="onEnter" @onEnter="onEnter"
@onChange="onChange"
/> />
<!-- 详情 --> <!-- 详情 -->
@ -108,7 +109,16 @@ const tableColumns = ref([...IssueRequestMain.allSchemas.tableColumns,...IssueRe
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
tableColumns.value = val tableColumns.value = val
} }
const onChange = async (field,value) => {
console.log('onChange',field,value)
if (field == 'workshopCode') {
//
const setV = {}
setV['productionLineCode'] = ''
setV['workStationCode'] = ''
formRef.value.formRef.setValues(setV)
}
}
const onEnter = async (field,value) => { const onEnter = async (field,value) => {
if (field == 'productionLineCode') { if (field == 'productionLineCode') {
//线 //线
@ -168,6 +178,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
setV['fromWarehouseCode'] = val[0]['code'] setV['fromWarehouseCode'] = val[0]['code']
setV['toWarehouseCode'] = val[0]['code'] setV['toWarehouseCode'] = val[0]['code']
} }
if (formField == 'workshopCode') {
//
setV['productionLineCode'] = ''
setV['workStationCode'] = ''
}
if (formField == 'productionLineCode') { if (formField == 'productionLineCode') {
//线 //线
let res = await WorkstationApi.getWorkstationPage({ let res = await WorkstationApi.getWorkstationPage({

Loading…
Cancel
Save