From b4143cbaeab134dd7676d82352597385e701a685 Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Tue, 9 Jul 2024 18:39:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20HL-3897=EF=BC=8CHL-?= =?UTF-8?q?3908=EF=BC=8CHL-3966?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 5fa0fbd9a..9b5e713cb 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/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({ // 显示窗口宽度设置 From fb7aadc6817e4194f6c2c423348d3964fc15b584 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 9 Jul 2024 18:43:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?WMS+SCP=E7=94=B5=E8=84=91=E7=AB=AF=E5=85=A8?= =?UTF-8?q?=E5=B1=80UI=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/RouterSearch/index.vue | 2 +- src/layout/components/CategoryHeader.vue | 9 ++++++++- src/layout/components/Message/src/Message.vue | 2 +- src/layout/components/ToolHeader.vue | 16 ++++++++-------- src/layout/components/UserInfo/src/UserInfo.vue | 4 ++-- src/layout/components/useRenderLayout.tsx | 4 ++-- 6 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/components/RouterSearch/index.vue b/src/components/RouterSearch/index.vue index 0966638e6..b15f88066 100644 --- a/src/components/RouterSearch/index.vue +++ b/src/components/RouterSearch/index.vue @@ -18,7 +18,7 @@ -->
- + +
) } @@ -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; diff --git a/src/layout/components/Message/src/Message.vue b/src/layout/components/Message/src/Message.vue index 4ca667fbd..67ea37a33 100644 --- a/src/layout/components/Message/src/Message.vue +++ b/src/layout/components/Message/src/Message.vue @@ -62,7 +62,7 @@ onBeforeUnmount(() => { diff --git a/src/layout/components/ToolHeader.vue b/src/layout/components/ToolHeader.vue index 22d7a457c..ca7328fb9 100644 --- a/src/layout/components/ToolHeader.vue +++ b/src/layout/components/ToolHeader.vue @@ -54,28 +54,28 @@ export default defineComponent({ 'dark:bg-[var(--el-bg-color)]' ]} > - {layout.value !== 'top' ? ( + {/* {layout.value !== 'top' ? (
{hamburger.value && layout.value !== 'cutMenu' ? ( ) : undefined} {breadcrumb.value ? : undefined}
- ) : undefined} + ) : undefined} */}
{search.value ? () : undefined} - {screenfull.value ? ( + {/* {screenfull.value ? ( - ) : undefined} - {size.value ? ( + ) : undefined} */} + {/* {size.value ? ( - ) : undefined} - {locale.value ? ( + ) : undefined} */} + {/* {locale.value ? ( - ) : undefined} + ) : undefined} */} {message.value ? ( ) : undefined} diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue index 3c03ea7d2..3521bd443 100644 --- a/src/layout/components/UserInfo/src/UserInfo.vue +++ b/src/layout/components/UserInfo/src/UserInfo.vue @@ -54,7 +54,7 @@ const toDocument = () => {
- + {{ userName }}
@@ -62,7 +62,7 @@ const toDocument = () => { -
{{ t('common.profile') }}
+
{{ t('common.profile') }}
 -
+
\ No newline at end of file diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index 568bb3152..1bb24f9f6 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/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({