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

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 TableForm from '@/components/TableForm/src/TableForm.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'
 const props = defineProps({
   // 显示窗口宽度设置

src/components/Form/src/Form.vue

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

src/components/RouterSearch/index.vue

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

src/layout/components/CategoryHeader.vue

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

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

@@ -62,7 +62,7 @@ onBeforeUnmount(() => {
     <ElPopover :width="400" placement="bottom" trigger="click">
       <template #reference>
         <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>
       </template>
       <ElTabs v-model="activeName">

src/layout/components/ToolHeader.vue

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

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

@@ -54,7 +54,7 @@ const toDocument = () => {
   <ElDropdown class="custom-hover" :class="prefixCls" trigger="click">
     <div class="flex items-center">
       <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 }}
       </span>
     </div>
@@ -62,7 +62,7 @@ const toDocument = () => {
       <ElDropdownMenu>
         <ElDropdownItem>
           <Icon icon="ep:tools" />
-          <div @click="toProfile">{{ t('common.profile') }}</div>
+          <div @click="toProfile" >{{ t('common.profile') }}</div>
         </ElDropdownItem>
         <!-- <ElDropdownItem>
           <Icon icon="ep:menu" />

src/layout/components/useRenderLayout.tsx

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

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

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