From 8ad90f9a7c2a26acd9642bbdb159633beec2821a Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 6 Sep 2024 09:15:53 +0800 Subject: [PATCH 01/66] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=A6=81=E8=B4=A7?= =?UTF-8?q?=E9=A2=84=E6=B5=8B=E5=88=86=E9=A1=B5=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=EF=BC=8C=E5=A4=B4=E9=83=A8=E6=8E=A5=E5=8F=A3=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/demandforecastingMain/index.vue | 5 ++++- .../supplierdeliver/demandforecastingSupplierMain/index.vue | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue index 9db63afdf..d36758d0f 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue @@ -122,7 +122,10 @@ const { tableObject, tableMethods } = useTable({ // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods - +watch(()=>tableObject.currentPage,async ()=>{ + tableObjectHead.currentPage = tableObject.currentPage + updateDateTableColumns() +}) // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultExportBtn({hasPermi:'wms:demandforecasting-main:export'}), // 导出 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue index e2a1bf390..49eb20d07 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue @@ -130,7 +130,10 @@ const { tableObject, tableMethods } = useTable({ // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods - +watch(()=>tableObject.currentPage,async ()=>{ + tableObjectHead.currentPage = tableObject.currentPage + updateDateTableColumns() +}) // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultExportBtn({hasPermi:'wms:demandforecasting-main:export'}), // 导出 From 6b49371d22bcbe52fcd5f168dada9478e26f7df3 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 6 Sep 2024 10:10:20 +0800 Subject: [PATCH 02/66] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7--=E6=96=B0=E5=8A=A0=E4=B8=89?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5hella=E4=BB=A3=E7=A0=81=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain/index.vue | 12 +++++ .../supplierinvoiceRecordMain.data.ts | 9 ++++ .../supplierinvoiceRequestMain/index.vue | 19 +++++++- .../supplierinvoiceRequestMain.data.ts | 47 ++++++++++++++++++- .../index.vue | 12 +++++ ...pplierinvoiceRequestMainDifference.data.ts | 9 ++++ 6 files changed, 104 insertions(+), 4 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index d60e64faf..ff49c7c11 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -138,6 +138,18 @@ :apiPage="SupplierinvoiceRecordDetailApi.getSupplierinvoiceRecordDeatilPage" @buttonBaseClick="detailButtonBaseClick" > + + + + + + diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 3183fa5b7..459b0be99 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -1218,6 +1218,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive + + + + + + diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 060b95ccd..becf3987b 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -434,7 +434,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( // } // }, { - label: '折扣金额', + label: '返利未税金额', field: 'discountAmount1', formatter: accountantFormart, table: { @@ -470,6 +470,40 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( }, isTableForm:false, }, + { + label: '返利税额', + field: 'rebateTax', + formatter: accountantFormart, + table: { + width: 150 + }, + sortTableDefault:4, + form: { + component: 'InputNumber', + componentProps: { + precision: 2, + disabled: true, + } + }, + isTableForm:false, + }, + { + label: '返利价税合计', + field: 'rebateTotal', + formatter: accountantFormart, + table: { + width: 150 + }, + sortTableDefault:4, + form: { + component: 'InputNumber', + componentProps: { + precision: 2, + disabled: true, + } + }, + isTableForm:false, + }, { label: '发票税额', field: 'totalTaxAmount', @@ -579,7 +613,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( precision: 2, disabled: true, } - }, + } }, // { @@ -1473,6 +1507,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive + + + + + + diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts index 5bdc5ec06..93482a5c1 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts @@ -1489,6 +1489,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive Date: Fri, 6 Sep 2024 10:39:48 +0800 Subject: [PATCH 03/66] =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8E=BB=E6=8E=89=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.development b/.env.development index bed5e9cb9..8db04bcf0 100644 --- a/.env.development +++ b/.env.development @@ -43,4 +43,4 @@ VITE_TENANT='["长春1379","成都1397","长春2379"]' VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' # 是否需要验证码 -VITE_NEED_CODE = true +VITE_NEED_CODE = false From 13f6f85a9e89ea551b04ba57b2da63b761998220 Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Fri, 6 Sep 2024 11:02:46 +0800 Subject: [PATCH 04/66] =?UTF-8?q?1=E3=80=81=E5=AF=86=E7=A0=81=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E4=BC=98=E5=8C=96(=E4=BB=8E=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E8=A1=A8=E8=BF=81=E7=A7=BB=E5=88=B0=E7=8B=AC=E7=AB=8B=E8=A1=A8?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/password/index.ts | 25 ++++ src/views/system/passwordRule/index.vue | 153 ++++++++++++++++++++++++ 2 files changed, 178 insertions(+) create mode 100644 src/api/system/password/index.ts create mode 100644 src/views/system/passwordRule/index.vue diff --git a/src/api/system/password/index.ts b/src/api/system/password/index.ts new file mode 100644 index 000000000..cc2495169 --- /dev/null +++ b/src/api/system/password/index.ts @@ -0,0 +1,25 @@ +import request from '@/config/axios' + +export interface PassWordConfigVO { + id: number + status: boolean + ruleLevel: string + ruleDesc: string + tryCount: number + lockMinutes: number + updatePeriod: number +} +// 获取密码策略 +export const getConfig = () => { + return request.get({ url: '/system/password/getConfig' }) +} + +// 设置密码策略 +export const setConfig = (data: PassWordConfigVO) => { + return request.post({ url: '/system/password/setConfig', data }) +} + +// 获取密码复杂度 +export const getRuleList = () => { + return request.get({ url: '/system/password/getRuleList'}) +} diff --git a/src/views/system/passwordRule/index.vue b/src/views/system/passwordRule/index.vue new file mode 100644 index 000000000..d5f964e88 --- /dev/null +++ b/src/views/system/passwordRule/index.vue @@ -0,0 +1,153 @@ + + + From db7ec25557a05899983df29be1fd5700ee483023 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Fri, 6 Sep 2024 11:04:53 +0800 Subject: [PATCH 05/66] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E6=9A=82=E5=AD=98=E5=90=8E=E5=86=8D=E5=8F=91=E5=B8=83?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=94=99=E8=AF=AF=20=20=20HL-5848?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/index.vue | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue index 7be97e488..0cecf6f33 100644 --- a/src/views/qms/inspectionJob/index.vue +++ b/src/views/qms/inspectionJob/index.vue @@ -238,15 +238,6 @@ const isShowMainButton3 = (row) => { } } -// 根据状态返回该按钮是否显示 -const isShowMainButton2 = (row, val) => { - if (val.indexOf(row.isStaging) > -1) { - return false - } else { - return true - } -} - // 根据状态返回该按钮是否显示 const isShowMainButton1 = (row, val) => { if (val.indexOf(row.status) > -1) { @@ -278,10 +269,6 @@ const butttondata = (row) => { hide: isShowMainButton(row, ['1', '2']), hasPermi: 'qms:inspection-job-main:execute' }), // 执行 - defaultButtons.mainListOrderPubBtn({ - hide: isShowMainButton2(row, ['TRUE']), - hasPermi: 'qms:inspection-job-main:execute' - }), // 发布 defaultButtons.mainListPackageBtn(null), // 包装 defaultButtons.mainListPlanCheckQualityReportBtn({ hide: isShowMainButton3(row) From 316686aea324387beffc1d1d347f4297ebbbf47a Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Fri, 6 Sep 2024 11:19:47 +0800 Subject: [PATCH 06/66] =?UTF-8?q?WMS=20bug=EF=BC=9AHL-5847=20=E7=89=A9?= =?UTF-8?q?=E6=96=99=E9=9A=94=E7=A6=BB=E7=9B=B8=E5=85=B3=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E7=9A=84=E9=80=89=E6=8B=A9=E5=92=8C=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryManage/balance/balance.data.ts | 9 +++++++++ .../inventorymoveRequestMain.data.ts | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts index 9e954f518..a41edccf0 100644 --- a/src/views/wms/inventoryManage/balance/balance.data.ts +++ b/src/views/wms/inventoryManage/balance/balance.data.ts @@ -44,6 +44,15 @@ export const Balance = useCrudSchemas( }, isSearch: true }, + { + label: '供应商批次', + field: 'altBatch', + sort: 'custom', + table: { + width: 150 + }, + isSearch: false + }, { label: '包装号', field: 'packingNumber', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts index 56874d08b..6ac9dab6d 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts @@ -606,6 +606,24 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( } } }, + { + label: '供应商批次', + field: 'altBatch', + sort: 'custom', + isForm:false, + isSearch: true, + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + disabled: true + } + }, { label: '到批次', field: 'toBatch', From 84609509edac0ba80d05467ddbc1091015c47f59 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 6 Sep 2024 13:07:36 +0800 Subject: [PATCH 07/66] =?UTF-8?q?=E6=B6=88=E8=80=97QAD=E5=9B=9E=E4=BC=A0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backflushDetailbQad.data.ts | 53 +++++++++++++++---- .../agvManage/backflushDetailbQad/index.vue | 7 ++- 2 files changed, 47 insertions(+), 13 deletions(-) diff --git a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts index 8cf4a2e33..01ee0aa4e 100644 --- a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts +++ b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts @@ -39,7 +39,6 @@ export const BackflushDetailbQad = useCrudSchemas(reactive([ field: 'createTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, search: { component: 'DatePicker', componentProps: { @@ -50,20 +49,52 @@ export const BackflushDetailbQad = useCrudSchemas(reactive([ }, isForm: false, }, + // { + // label: '创建者Id', + // field: 'creator', + // sort: 'custom', + // isForm: false, + // }, { - label: '创建者Id', - field: 'creator', - sort: 'custom', - isForm: false, - }, - { - label: '执行状态0未执行1成功2失败', + label: '执行状态', field: 'status', sort: 'custom', isSearch: true, - form: { - component: 'SelectV2' - }, + search: { + component: 'Select', + componentProps: { + options: [{ + value: 0, + label: '未执行' + }, + { + value: 1, + label: '成功' + }, + { + value: 2, + label: '失败' + }] + }, + }, + form: { + component: 'Select', + componentProps: { + options: [{ + value: 0, + label: '未执行' + }, + { + value: 1, + label: '成功' + }, + { + value: 2, + label: '失败' + }] + }, + }, + }, { label: '操作', diff --git a/src/views/wms/agvManage/backflushDetailbQad/index.vue b/src/views/wms/agvManage/backflushDetailbQad/index.vue index 38c711b8d..748ff3607 100644 --- a/src/views/wms/agvManage/backflushDetailbQad/index.vue +++ b/src/views/wms/agvManage/backflushDetailbQad/index.vue @@ -27,6 +27,9 @@ v-model:currentPage="tableObject.currentPage" v-model:sort="tableObject.sort" > + @@ -82,13 +84,13 @@ import { ElLoading } from 'element-plus' import LoginFormTitle from './LoginFormTitle.vue' import type { RouteLocationNormalizedLoaded } from 'vue-router' - import { Verify } from '@/components/Verifition' import { useIcon } from '@/hooks/web/useIcon' import * as authUtil from '@/utils/auth' import { usePermissionStore } from '@/store/modules/permission' import * as LoginApi from '@/api/login' + import * as PassWordApi from '@/api/system/password' import { LoginStateEnum, useFormValid, useLoginState } from './useLogin' import { getCodeImg } from "@/api/login"; import router from "@/router"; @@ -96,6 +98,7 @@ import * as DeptApi from '@/api/system/dept' import { getTenant } from '@/utils/systemParam' import { getSystermUpdateAlert,getSystermUpdateUrl,getNeedCode } from '@/utils/systemParam' + import {validateResetTime} from "@/api/system/password"; const needCode = ref(getNeedCode()==true||getNeedCode()=='true') defineOptions({ name: 'LoginForm' }) @@ -112,7 +115,8 @@ const permissionStore = usePermissionStore() const redirect = ref('') const loginLoading = ref(false) - const VerifySlide = ref() + const verify = ref() + const captchaType = ref('blockPuzzle') // blockPuzzle 滑块 clickWord 点击文字 const getShow = computed(() => unref(getLoginState) === LoginStateEnum.LOGIN) @@ -183,14 +187,13 @@ if(!needCode.value){ return } - VerifySlide.value.refresh() - // getCodeImg().then(res => { - // captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled; - // if (captchaEnabled.value) { - // codeUrl.value = "data:image/gif;base64," + res.img; - // loginData.loginForm.uuid = res.uuid; - // } - // }); + getCodeImg().then(res => { + captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled; + if (captchaEnabled.value) { + codeUrl.value = "data:image/gif;base64," + res.img; + loginData.loginForm.uuid = res.uuid; + } + }); } //获取租户ID const getTenantId = async () => { @@ -219,20 +222,9 @@ }) }; - // 滑块校验成功 - const capctchaCheckSuccess = ({captchaVerification})=>{ - console.log('capctchaCheckSuccess',captchaVerification) - loginData.loginForm.code = captchaVerification - handleLogin() - } - // 滑块校验失败 - const capctchaCheckError = ()=>{ - VerifySlide.value.refresh() - } - const loading = ref() // ElLoading.service 返回的实例 // 登录 - const handleLogin = async () => { + const handleLogin = async (params) => { console.log('登录-185') if(getSystermUpdateAlert()=='true'||getSystermUpdateAlert()===true){ await ElMessageBox.alert( @@ -257,6 +249,19 @@ }else{ res = await LoginApi.login(loginData.loginForm) } + try{ + await PassWordApi.validateResetTime(res.userId) + }catch (e) { + if (e.code === 1002000010) { + await ElMessageBox.alert( + '密码长时间未修改，存在安全隐患,请及时修改', + '重要提示', + { + dangerouslyUseHTMLString: true, + } + ) + } + } if (!res) { console.log('登录-195') getCode() @@ -286,20 +291,13 @@ // 存储 部门信息 const { wsCache } = useCache() wsCache.set(CACHE_KEY.DEPT, await DeptApi.getSimpleDeptList()) - }catch (e) { - if(e.code === 1002000010){ - setTimeout(function (){ - router.push({path:"/updatePasswordNewTips",query:{username:loginData.loginForm.username}}) - },3000) - } - } finally { + }finally { console.log('登录-224') getCode() loginLoading.value = false loading?.value?.close() } } - // 社交登录 const doSocialLogin = async (type : number) => { if (type === 0) { From 2c776567964c1c9c4f772a8cb1cc89afc769fa3a Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Sat, 7 Sep 2024 13:37:46 +0800 Subject: [PATCH 29/66] =?UTF-8?q?WMS=20bug=EF=BC=9AHL-5893=20=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=E8=BD=AC=E5=90=88=E6=A0=BC=E3=80=81=E7=89=A9=E6=96=99?= =?UTF-8?q?=E9=9A=94=E7=A6=BB=EF=BC=8C=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5=EF=BC=8C=E5=BA=94=E5=BC=B9?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84excel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/inventorymoveRequestMain/index.ts | 4 +++- .../inventorymove/inventorymoveRequestMain/index.vue | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/api/wms/inventorymoveRequestMain/index.ts b/src/api/wms/inventorymoveRequestMain/index.ts index 72e91ea6c..f7bfa0704 100644 --- a/src/api/wms/inventorymoveRequestMain/index.ts +++ b/src/api/wms/inventorymoveRequestMain/index.ts @@ -130,10 +130,12 @@ export const exportScrapToHoldRequestMain = async (params) => { // 下载用户导入模板 // 下载用户导入模板（除库存移动外） - export const importTemplate = () => { return request.download({ url: '/wms/inventorymove-request-main/get-import-template' }) } +export const importTemplateHoldOk = () => { + return request.download({ url: '/wms/inventorymove-request-main/get-import-template-hold-ok' }) +} export const importTemplateExceptMove = () => { return request.download({ url: '/wms/inventorymove-request-main/get-import-template-exceptMove' }) } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 20689e6b7..db8d9d37d 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -90,6 +90,7 @@ import * as InventorymoveRequestDetailApi from '@/api/wms/inventorymoveRequestDe import * as defaultButtons from '@/utils/disposition/defaultButtons' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' +import {importTemplateHoldOk} from "@/api/wms/inventorymoveRequestMain"; const { loadStart, loadDone } = usePageLoading() // 库存转移申请 defineOptions({ name: 'InventorymoveRequestMain' }) @@ -818,9 +819,16 @@ const searchList = (model)=>{ /** 初始化 **/ onMounted(async () => { getList() + //库存移动 if(routeName.value == "InventorymoveRequestMain"){ importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplate() - }else { + } + //隔离转合格 + else if(routeName.value == "HoldtookRequestMain"){ + console.log("sssssssssssssssss"); + importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplateHoldOk() + } + else { importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplateExceptMove() } }) From e66f7726937b40524a726a4d2efdd026897a2b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Mon, 9 Sep 2024 09:17:35 +0800 Subject: [PATCH 30/66] =?UTF-8?q?HL-5833=20=E8=A3=85=E9=85=8D=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5bom=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/rawMaterialConsumptionInfo/index.ts | 4 ++++ .../rawMaterialConsumptionInfo/index.vue | 24 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/src/api/wms/rawMaterialConsumptionInfo/index.ts b/src/api/wms/rawMaterialConsumptionInfo/index.ts index 477158e1f..6acc4feef 100644 --- a/src/api/wms/rawMaterialConsumptionInfo/index.ts +++ b/src/api/wms/rawMaterialConsumptionInfo/index.ts @@ -54,4 +54,8 @@ export const exportAssemblyMaterialUsage = async (params) => { } +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/backflush-record-detailb/get-import-template-error' }) +} diff --git a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue index 7839573f2..1a98248be 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue @@ -33,6 +33,10 @@ + + + From c8639ed2e197187d2b05621cbd6fe97d9758d285 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 9 Sep 2024 09:42:13 +0800 Subject: [PATCH 31/66] HL-5269 --- src/views/login/components/LoginForm.vue | 57 ++++++++++++++++-------- 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index a6f47e85c..1cfff0c24 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -34,6 +34,11 @@ + + + + + @@ -69,14 +74,8 @@ + - @@ -99,6 +98,8 @@ import { getTenant } from '@/utils/systemParam' import { getSystermUpdateAlert,getSystermUpdateUrl,getNeedCode } from '@/utils/systemParam' import {validateResetTime} from "@/api/system/password"; + import { Verify } from '@/components/Verifition' + const needCode = ref(getNeedCode()==true||getNeedCode()=='true') defineOptions({ name: 'LoginForm' }) @@ -115,8 +116,7 @@ const permissionStore = usePermissionStore() const redirect = ref('') const loginLoading = ref(false) - const verify = ref() - const captchaType = ref('blockPuzzle') // blockPuzzle 滑块 clickWord 点击文字 + const VerifySlide = ref() const getShow = computed(() => unref(getLoginState) === LoginStateEnum.LOGIN) @@ -184,16 +184,18 @@ } } function getCode() { + console.log('getCode') if(!needCode.value){ return } - getCodeImg().then(res => { - captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled; - if (captchaEnabled.value) { - codeUrl.value = "data:image/gif;base64," + res.img; - loginData.loginForm.uuid = res.uuid; - } - }); + VerifySlide.value.refresh() + // getCodeImg().then(res => { + // captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled; + // if (captchaEnabled.value) { + // codeUrl.value = "data:image/gif;base64," + res.img; + // loginData.loginForm.uuid = res.uuid; + // } + // }); } //获取租户ID const getTenantId = async () => { @@ -221,10 +223,23 @@ name: 'ForgetPassword', }) }; + // 滑块校验成功 + const capctchaCheckSuccess = async ({captchaVerification})=>{ + console.log('capctchaCheckSuccess',captchaVerification) + if(captchaVerification){ + loginData.loginForm.code = captchaVerification + await handleLogin() + } + } + // 滑块校验失败 + const capctchaCheckError = ()=>{ + VerifySlide.value.refresh() + } + const loading = ref() // ElLoading.service 返回的实例 // 登录 - const handleLogin = async (params) => { + const handleLogin = async () => { console.log('登录-185') if(getSystermUpdateAlert()=='true'||getSystermUpdateAlert()===true){ await ElMessageBox.alert( @@ -237,8 +252,10 @@ ) } loginLoading.value = true + try { await getTenantId() + const data = await validForm() if (!data) { return @@ -249,6 +266,8 @@ }else{ res = await LoginApi.login(loginData.loginForm) } + + console.log('登陆res',res) try{ await PassWordApi.validateResetTime(res.userId) }catch (e) { @@ -293,9 +312,9 @@ wsCache.set(CACHE_KEY.DEPT, await DeptApi.getSimpleDeptList()) }finally { console.log('登录-224') - getCode() loginLoading.value = false loading?.value?.close() + getCode() } } // 社交登录 From 6352401bbf1e7e0abb27872dde3f21476d8506a9 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 9 Sep 2024 09:53:36 +0800 Subject: [PATCH 32/66] =?UTF-8?q?HL-5241=E5=9C=A8=E9=95=BF=E6=98=A5?= =?UTF-8?q?=E5=92=8C=E6=88=90=E9=83=BD=E7=9A=84=E7=99=BB=E5=BD=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=90=84=E6=94=BE=E4=B8=80=E4=B8=AAPDA=E7=AB=AFAPK?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=B8=8B=E8=BD=BD=E7=9A=84=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.prod | 4 ++++ .env.test | 4 ++++ .env.test-scp | 3 +++ src/utils/systemParam.ts | 10 ++++++++++ src/views/login/components/QRCodePDA.vue | 6 +++++- 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/.env.prod b/.env.prod index be6b9a31d..06f2aa7cc 100644 --- a/.env.prod +++ b/.env.prod @@ -48,3 +48,7 @@ VITE_SYSTERM_UPDATE_URL = 'https://scptest.faway-hella.com/' # 是否需要验证码 VITE_NEED_CODE = true + + +# 是否需要下载PDA链接 +VITE_PDA_URL = false diff --git a/.env.test b/.env.test index c58a58c21..cb687a764 100644 --- a/.env.test +++ b/.env.test @@ -44,3 +44,7 @@ VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' # 是否需要验证码 VITE_NEED_CODE = true + + +# 是否需要下载PDA链接 +VITE_PDA_URL = true \ No newline at end of file diff --git a/.env.test-scp b/.env.test-scp index 8bb0eb982..218728c32 100644 --- a/.env.test-scp +++ b/.env.test-scp @@ -45,3 +45,6 @@ VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' # 是否需要验证码 VITE_NEED_CODE = false + +# 是否需要下载PDA链接 +VITE_PDA_URL = false diff --git a/src/utils/systemParam.ts b/src/utils/systemParam.ts index 3341cd539..9cb51bf51 100644 --- a/src/utils/systemParam.ts +++ b/src/utils/systemParam.ts @@ -7,6 +7,7 @@ const tenant = ref(import.meta.env.VITE_TENANT) const systermUpdateAlert = ref(import.meta.env.VITE_SYSTERM_UPDATE_ALERT) const systermUpdateUrl = ref(import.meta.env.VITE_SYSTERM_UPDATE_URL) const needCode = ref(import.meta.env.VITE_NEED_CODE) +const pdaUrl = ref(import.meta.env.VITE_PDA_URL) const mode = ref(import.meta.env.MODE) // 获取baseUrl @@ -85,4 +86,13 @@ export const getNeedCode = () => { } } +//是否需要PDA下载链接 +export const getPDAUrl = () => { + if(mode.value === 'prod') { + return systemConfig.pdaUrl + } else { + return pdaUrl.value + } +} + diff --git a/src/views/login/components/QRCodePDA.vue b/src/views/login/components/QRCodePDA.vue index 2b28194b0..d8d3b05fc 100644 --- a/src/views/login/components/QRCodePDA.vue +++ b/src/views/login/components/QRCodePDA.vue @@ -5,14 +5,18 @@ - PDA安装程序下载链接 + PDA安装程序下载链接 diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index 1cfff0c24..d599aec05 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -233,7 +233,7 @@ } // 滑块校验失败 const capctchaCheckError = ()=>{ - VerifySlide.value.refresh() + console.log('capctchaCheckError') } From 43f88c0d22f82a5a5afcc229d81fa1b3ae9e5b85 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 9 Sep 2024 11:14:36 +0800 Subject: [PATCH 36/66] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92-?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=87=8C=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=9C=89?= =?UTF-8?q?=E9=80=81=E8=BE=BE=E6=97=A5=E6=9C=9F=E7=9A=84=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain.data.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 75f9df6c4..321782718 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -8,12 +8,13 @@ import { PurchasePlanDetail, PurchasePlanMain } from '../purchasePlanMain/purcha import { validateHanset, validateEmail } from '@/utils/validator' import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' import * as ItemPackageApi from '@/api/wms/itempackage/index' +import { cloneDeep } from 'lodash-es' import {validateInteger} from '@/utils/validator' const { t } = useI18n() // 国际化 -const PurchasePlanDetailSchemas = {...PurchasePlanDetail.allSchemas} +let PurchasePlanDetailSchemas = cloneDeep(PurchasePlanDetail.allSchemas) if(PurchasePlanDetailSchemas?.tableColumns){ PurchasePlanDetailSchemas.tableColumns.splice(2, 0, { label: '送达日期', From 66c80fcd85abe44c1ea6172e4a011df44a0a71b3 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 9 Sep 2024 11:50:47 +0800 Subject: [PATCH 37/66] =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=9AHL-5787?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrapRequestMain/scrapRequestMain.data.ts | 62 ++++++++++++++----- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 28840c4ea..cd52fff6c 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -153,6 +153,8 @@ export const ScrapRequestMain = useCrudSchemas( table: { width: 150 }, + isForm:false, + isTable:false, form: { componentProps: { disabled: true @@ -281,6 +283,8 @@ export const ScrapRequestMain = useCrudSchemas( label: '工作中心', field: 'workCenter', sort: 'custom', + isTable:false, + isForm:false, table: { width: 150 }, @@ -289,9 +293,32 @@ export const ScrapRequestMain = useCrudSchemas( label: '订单号', field: 'orderNumber', sort: 'custom', + isTable:false, + isForm:false, + table: { + width: 150 + }, + }, + { + label: '出库原因', + field: 'outboundReason', + dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON, + dictClass: 'string', + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return cellValue + }, table: { width: 150 }, + form: { + componentProps: { + filterable: true + } + }, + tableForm: { + type: 'Select', + filterable: true + } }, { label: 'Q1通知单号', @@ -480,6 +507,9 @@ export const ScrapRequestMain = useCrudSchemas( table: { width: 180 }, + isTable:false, + isForm:false, + isTableForm:false, form: { component: 'DatePicker', componentProps: { @@ -620,6 +650,8 @@ export const ScrapRequestMain = useCrudSchemas( label: '通知单描述', field: 'noticeRemark', sort: 'custom', + isForm:false, + isTable:false, table: { width: 150 } @@ -630,7 +662,10 @@ export const ScrapRequestMain = useCrudSchemas( sort: 'custom', table: { width: 150 - } + }, + isTable:false, + isForm:false, + isTableForm:false }, { label: '自动提交', @@ -1023,13 +1058,13 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + precision: 2 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + precision: 2 } }, { @@ -1124,28 +1159,17 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ { label: '原因', field: 'reason', - dictType: DICT_TYPE.SCRAP_REASON, - dictClass: 'string', - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - return cellValue - }, table: { width: 150 }, - form: { - componentProps: { - filterable: true - } - }, - tableForm: { - type: 'Select', - filterable: true - } }, { label: '项目订单号', field: 'projectOrderNumber', sort: 'custom', + isTable:false, + isForm:false, + isTableForm:false, table: { width: 150 }, @@ -1159,6 +1183,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ }, isTableForm: false, isForm: false, + isTable:false, }, { label: '项目代码', @@ -1174,6 +1199,9 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ label: '明细备注', field: 'remark', sort: 'custom', + isTable:false, + isForm:false, + isTableForm:false, table: { width: 150 }, From 122150dc5dec4eaca8e60fd9df0703feacbb6ef6 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 9 Sep 2024 12:00:54 +0800 Subject: [PATCH 38/66] =?UTF-8?q?HL-5891@=E7=8E=8B=E5=AE=87=E9=A3=9E=20?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA=E6=97=B6=20loading=20?= =?UTF-8?q?=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierManage/supplieritem/index.vue | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue index b15b79a46..5b6bdb027 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue @@ -196,22 +196,25 @@ const formsSuccess = async (formType,data) => { if(data.activeTime==0)data.activeTime = null; if(data.expireTime==0)data.expireTime = null; basicFormRef.value.formLoading = true - if (formType === 'create') { - if(routeName.value.includes('SCP')){ - await SupplieritemApi.createSupplieritemSCP(data) - }else{ - await SupplieritemApi.createSupplieritem(data) - } - message.success(t('common.createSuccess')) - } else { - if(routeName.value.includes('SCP')){ - await SupplieritemApi.updateSupplieritemSCP(data) - }else{ - await SupplieritemApi.updateSupplieritem(data) + try { + if (formType === 'create') { + if(routeName.value.includes('SCP')){ + await SupplieritemApi.createSupplieritemSCP(data) + }else{ + await SupplieritemApi.createSupplieritem(data) + } + message.success(t('common.createSuccess')) + } else { + if(routeName.value.includes('SCP')){ + await SupplieritemApi.updateSupplieritemSCP(data) + }else{ + await SupplieritemApi.updateSupplieritem(data) + } + message.success(t('common.updateSuccess')) } - message.success(t('common.updateSuccess')) + } finally { + basicFormRef.value.formLoading = false } - basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false if (formType === 'create') { getList() From ee5b2516e8ed3930c2d3b81d7c7202f8bf3124a0 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 9 Sep 2024 13:02:08 +0800 Subject: [PATCH 39/66] =?UTF-8?q?=E5=96=9C=E5=A9=B7=E6=8F=90=EF=BC=9A@?= =?UTF-8?q?=E7=8E=8B=E5=AE=87=E9=A3=9E=E6=AD=A4=E8=AE=A2=E5=8D=95=E3=80=90?= =?UTF-8?q?xxx=E3=80=91=E6=9A=82=E6=97=A0=E6=BB=A1=E8=B6=B3=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=94=B6=E8=B4=A7=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRequestOrderMTypeMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue index 9837f1fa4..b54a8b191 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue @@ -536,7 +536,7 @@ const getSearchTableData = async (number,isEnter=false)=>{ }) tableData.value = [] if(tableObject.tableList.length==0){ - message.error(`此订单${number}已存在M类型申请的数据`) + message.error(`此订单【${number}】暂无满足条件的收货明细`) return } updateTableData(tableObject.tableList) From b084a084676e911077180bcf996d197bf0b6031c Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 9 Sep 2024 13:17:23 +0800 Subject: [PATCH 40/66] =?UTF-8?q?HL-5880SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E8=BE=93=E5=85=A5=E7=9A=84=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E5=8F=B7=E9=99=90=E5=88=B6=E4=B8=BA20=E4=BD=8D?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain.data.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 6a06c0bd7..e77af73be 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1611,6 +1611,16 @@ function validateTaxRate(rule, value, callback) { } } +const validateGoldenTaxInvoiceNumber = (rule, value, callback) => { + const reg = /^[1-9][0-9]*$/ + if (reg.test(value)) { + callback() + }else{ + callback(new Error('只能是数字')) + } +} + + //表单校验 export const SupplierinvoiceRequestMainRules = reactive({ taxRate: [ @@ -1624,7 +1634,8 @@ export const SupplierinvoiceRequestMainRules = reactive({ { required: false, message: '请选择发票日期', trigger: 'blur' } ], goldenTaxInvoiceNumber:[ - { required: false, message: '请输入金税票号', trigger: 'blur' } + { required: false, message: '请输入金税票号', trigger: 'blur' }, + { validator:validateGoldenTaxInvoiceNumber, message: '金税票号只能是数字', trigger: 'blur'} ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } From a4635b3787b316f07a6d8f2221de7ace4039c6c0 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 9 Sep 2024 13:25:06 +0800 Subject: [PATCH 41/66] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5787?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrap/scrapJobMain/scrapJobMain.data.ts | 18 ++++++++++++++++++ .../scrapRecordMain/scrapRecordMain.data.ts | 18 ++++++++++++++++++ .../scrapRequestMain/scrapRequestMain.data.ts | 3 --- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts index d5d6db4d1..ec2b54976 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts @@ -177,6 +177,24 @@ export const ScrapJobMain = useCrudSchemas( width: 150 }, }, + { + label: '出库原因', + field: 'outboundReason', + dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON, + dictClass: 'string', + table: { + width: 150 + }, + form: { + componentProps: { + filterable: true + } + }, + tableForm: { + type: 'Select', + filterable: true + } + }, { label: 'Q1通知单号', field: 'q1Number', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index dd6322a27..753c0fa35 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -138,6 +138,24 @@ export const ScrapRecordMain = useCrudSchemas( } } }, + { + label: '出库原因', + field: 'outboundReason', + dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON, + dictClass: 'string', + table: { + width: 150 + }, + form: { + componentProps: { + filterable: true + } + }, + tableForm: { + type: 'Select', + filterable: true + } + }, { label: '项目代码', field: 'projectCode', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index cd52fff6c..db21a5adb 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -304,9 +304,6 @@ export const ScrapRequestMain = useCrudSchemas( field: 'outboundReason', dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON, dictClass: 'string', - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - return cellValue - }, table: { width: 150 }, From 1a9530904d2943c2754d31f70f8a00e3b6139304 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 9 Sep 2024 13:29:45 +0800 Subject: [PATCH 42/66] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=8F=90=E7=A4=BA=E7=9A=84=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/components/LoginForm.vue | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index d599aec05..578cd990c 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -241,16 +241,6 @@ // 登录 const handleLogin = async () => { console.log('登录-185') - if(getSystermUpdateAlert()=='true'||getSystermUpdateAlert()===true){ - await ElMessageBox.alert( - '系统迁移，请移步至' + - `${getSystermUpdateUrl()}`, - '重要提示', - { - dangerouslyUseHTMLString: true, - } - ) - } loginLoading.value = true try { @@ -297,6 +287,16 @@ authUtil.removeLoginForm() } authUtil.setToken(res) + if(getSystermUpdateAlert()=='true'||getSystermUpdateAlert()===true){ + await ElMessageBox.alert( + '系统迁移，请移步至' + + `${getSystermUpdateUrl()}`, + '重要提示', + { + dangerouslyUseHTMLString: true, + } + ) + } if (!redirect.value) { redirect.value = '/' } From 081e9b887f0e4b503fbe5f6d596c278e67508fbe Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 9 Sep 2024 13:42:23 +0800 Subject: [PATCH 43/66] =?UTF-8?q?HL-5833=E8=B0=83=E6=95=B4=E7=BA=BF?= =?UTF-8?q?=E8=BE=B9=E5=8E=9F=E6=96=99=E6=B6=88=E8=80=97=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E5=AE=8C=E5=B7=A5=E6=94=B6=E8=B4=A7=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E5=8E=9F=E6=96=99?= =?UTF-8?q?=E6=B6=88=E8=80=97=E5=8D=95=E6=8D=AE=E5=92=8C=E6=B6=88=E8=80=97?= =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E5=8E=9F=E6=96=99=E5=BA=93=E5=AD=98=EF=BC=88?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=BC=80=E5=85=B3=E6=8E=A7=E5=88=B6=EF=BC=89?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=80=9A=E8=BF=87=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BB=8EQAD=E6=8E=A5=E6=94=B6=E7=BA=BF=E8=BE=B9?= =?UTF-8?q?=E5=8E=9F=E6=96=99=E6=B6=88=E8=80=97=E6=95=B0=E9=87=8F=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=8C=89=E7=85=A7FIFO=E5=8E=9F=E5=88=99=E6=89=A3?= =?UTF-8?q?=E5=87=8F=E7=BA=BF=E8=BE=B9=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/agvManage/backflushDetailbQad/index.vue | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/views/wms/agvManage/backflushDetailbQad/index.vue b/src/views/wms/agvManage/backflushDetailbQad/index.vue index eb4b971fd..e1bda5667 100644 --- a/src/views/wms/agvManage/backflushDetailbQad/index.vue +++ b/src/views/wms/agvManage/backflushDetailbQad/index.vue @@ -152,6 +152,19 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { + if(type=='update'){ + //编辑 + BackflushDetailbQad.allSchemas.formSchema.forEach(item=>{ + if(item.field != 'status'){ + item.componentProps.disabled = true + } + }) + }else{ + BackflushDetailbQad.allSchemas.formSchema.forEach(item=>{ + item.componentProps.disabled = false + + }) + } basicFormRef.value.open(type, row) } From 43978bc62ce003303c466790801a842c5469cebb Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 9 Sep 2024 14:22:26 +0800 Subject: [PATCH 44/66] =?UTF-8?q?HL-5886=E6=89=80=E6=9C=89=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E7=9A=84=E9=BB=98=E8=AE=A4=E8=A7=84=E5=88=99=E4=B8=8D?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=88=A0=E9=99=A4=EF=BC=8C=E4=B8=8D=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E5=85=B3=E9=97=AD=EF=BC=88=E7=8A=B6=E6=80=81=E5=BF=85?= =?UTF-8?q?=E9=A1=BB=E6=98=AF=E5=BC=80=E5=90=AF=EF=BC=89=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9=E4=BC=98=E5=85=88=E7=BA=A7?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9=E8=A7=84?= =?UTF-8?q?=E5=88=99=E6=9D=A1=E4=BB=B6=EF=BC=8C=E4=BD=86=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=84=E5=88=99=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arrivalInspectionStrategy/AddForm.vue | 6 ++++- .../strategy/batchStrategy/AddForm.vue | 12 +++++++++- .../strategy/downShelfStrategy/AddForm.vue | 22 +++++++++++++++++-- .../strategy/inspectStrategy/AddForm.vue | 8 ++++++- .../purchaseReceiptStrategy/AddForm.vue | 6 ++++- .../storageCapacityStrategy/AddForm.vue | 12 +++++++++- .../supplieDeliveryStrategy/AddForm.vue | 8 ++++++- .../strategy/upShelfStrategy/AddForm.vue | 22 +++++++++++++++++-- .../utensilCapacityStrategy/AddForm.vue | 11 +++++++++- .../warehouseStorageStrategy/AddForm.vue | 5 ++++- 10 files changed, 100 insertions(+), 12 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue index e234111d0..300bd0569 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue @@ -35,7 +35,7 @@ - + @@ -60,6 +60,7 @@ v-model="item.Operator" placeholder="请选择范围" style="width: 110px; margin-right: 10px" + :disabled="formData.name=='默认规则'&&formType=='update'" > - + @@ -58,6 +58,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeSupplierCustomer" + :disabled="formData.name=='默认规则'&&formType=='update'" > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index 05dda56b9..a536f57b2 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -36,7 +36,7 @@ - + @@ -60,6 +60,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeSupplierCustomer" + :disabled="formData.name=='默认规则'&&formType=='update'" > @@ -202,6 +212,7 @@ placeholder="" @change="changeCalculation" style="width: 110px; margin-right: 10px" + :disabled="formData.name=='默认规则'&&formType=='update'" > @@ -237,6 +250,7 @@ v-model="item.Operator" placeholder="请选择范围" style="width: 110px; margin-right: 10px" + :disabled="formData.name=='默认规则'&&formType=='update'" > --> diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue index 4aa292de6..b5ac08e0c 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue @@ -36,7 +36,7 @@ - + @@ -57,6 +57,7 @@ v-model="item.Operator" placeholder="请选择范围" style="width: 110px; margin-right: 10px" + :disabled="formData.name=='默认规则'&&formType=='update'" > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue index 53ba2e1e5..715b5cff3 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue @@ -36,7 +36,7 @@ - + @@ -61,6 +61,7 @@ v-model="item.Operator" placeholder="请选择范围" style="width: 110px; margin-right: 10px" + :disabled="formData.name=='默认规则'&&formType=='update'" > - + @@ -58,6 +58,7 @@ placeholder="" @change="changeItemsType" style="width: 110px; margin-right: 10px" + :disabled="formData.name=='默认规则'&&formType=='update'" > @@ -139,6 +146,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeWarehouse" + :disabled="formData.name=='默认规则'&&formType=='update'" > - + @@ -61,6 +61,7 @@ v-model="item.Operator" :placeholder="t('ts.请选择范围').replace('ts.','')" style="width: 110px; margin-right: 10px" + :disabled="formData.name=='默认规则'&&formType=='update'" > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index f05604bbd..baf6aadca 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -35,7 +35,7 @@ - + @@ -58,6 +58,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeSupplierCustomer" + :disabled="formData.name=='默认规则'&&formType=='update'" > @@ -184,6 +194,7 @@ placeholder="" @change="changeCalculation" style="width: 110px; margin-right: 10px" + :disabled="formData.name=='默认规则'&&formType=='update'" > @@ -219,6 +232,7 @@ v-model="item.Operator" placeholder="请选择范围" style="width: 110px; margin-right: 10px" + :disabled="formData.name=='默认规则'&&formType=='update'" > --> diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue index 9daeab9a7..01ab5f540 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue @@ -35,7 +35,7 @@ - + @@ -67,6 +67,7 @@ v-model="item.Operator" placeholder="请选择范围" style="width: 110px; margin-right: 10px" + :disabled="formData.name=='默认规则'&&formType=='update'" > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue index 6ccb3627a..595dd95e9 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue @@ -35,7 +35,7 @@ - + @@ -59,6 +59,7 @@ placeholder="" style="width: 120px; margin-right: 10px" @change="changeWarehouse" + :disabled="formData.name=='默认规则'&&formType=='update'" > Date: Mon, 9 Sep 2024 15:04:10 +0800 Subject: [PATCH 45/66] =?UTF-8?q?HL-5855=E7=8A=B6=E6=80=81=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E4=BD=BF=E7=94=A8=E4=B8=8D=E5=90=8C=E7=9A=84=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E9=A2=9C=E8=89=B2=EF=BC=8C=E4=BB=A5=E4=BE=BF=E4=BA=8E?= =?UTF-8?q?=E5=BF=AB=E9=80=9F=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DictTag/src/DictTag.vue | 2 +- src/views/wms/basicDataManage/itemManage/bom/index.vue | 1 + src/views/wms/basicDataManage/itemManage/itembasic/index.vue | 1 + src/views/wms/basicDataManage/itemManage/packageunit/index.vue | 1 + .../itemManage/productionitemcodeSpareitemcode/index.vue | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/DictTag/src/DictTag.vue b/src/components/DictTag/src/DictTag.vue index 947f5037f..101e30df3 100644 --- a/src/components/DictTag/src/DictTag.vue +++ b/src/components/DictTag/src/DictTag.vue @@ -47,7 +47,7 @@ export default defineComponent({ if (dictDataList.length == 0) { if(dictData.value?.label !== '' && dictData.value?.label !== undefined){ return ( Date: Mon, 9 Sep 2024 15:28:12 +0800 Subject: [PATCH 46/66] =?UTF-8?q?HL-5931=E8=AE=A1=E5=88=92=E5=A4=96?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E3=80=81=E5=85=A5=E5=BA=93=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E5=A4=87=E6=B3=A8=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedissueRequestMain/unplannedissueRequestMain.data.ts | 1 + .../unplannedreceiptRequestMain.data.ts | 1 + .../purchasereceiptRequestOrderMTypeMain/index.vue | 1 + 3 files changed, 3 insertions(+) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index a9bbc743b..0748c8b80 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -651,6 +651,7 @@ export const UnplannedissueRequestMainRules = reactive({ { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' } ], remarkMain: [ + { required: true, message: '请输入单据备注', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], usageDescription:[ diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index fc2f9eefd..05419185b 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -669,6 +669,7 @@ export const UnplannedreceiptRequestMainRules = reactive({ { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' } ], remarkMain: [ + { required: true, message: '请输入单据备注', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], usageDescription:[ diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue index b54a8b191..6cbcc8d51 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue @@ -171,6 +171,7 @@ import { getReportUrl } from '@/utils/systemParam' import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() // 采购收货申请-M类型收货 +// M类型采购收货 defineOptions({ name: 'PurchasereceiptRequestOrderMTypeMain' }) const message = useMessage() // 消息弹窗 From ee4d2c7ef5ceb46ed8e2eb2fe4af0cb785f012f8 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 9 Sep 2024 15:36:13 +0800 Subject: [PATCH 47/66] =?UTF-8?q?HL-5905SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E8=AE=B0=E5=BD=95=EF=BC=8C=E4=BB=B7?= =?UTF-8?q?=E5=B7=AE=E6=95=B0=E6=8D=AE=E6=9F=A5=E7=9C=8B=E3=80=82=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E9=99=84=E4=BB=B6=E4=B8=8E=E5=90=88=E5=90=8C=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoice/supplierinvoiceRecordMain/index.vue | 2 ++ .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 2 ++ .../supplierinvoiceRequestMainDifference/index.vue | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index ff49c7c11..b39d50357 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -66,6 +66,7 @@ prop: 'Annex', tableName:'contract', showDownload:true, + showPreview: true, hiddenDelete:true, hiddenUpload:true, queryParams:[{ @@ -77,6 +78,7 @@ prop: 'Annex', tableName:'invoice', showDownload:true, + showPreview: true, hiddenDelete:true, hiddenUpload:true, queryParams:[{ diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index a6f4d02d6..a164fab26 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -882,6 +882,7 @@ const detailAnnexTable = ref([ prop: 'Annex', tableName: 'contract', hiddenDelete: false, + showPreview: true, hiddenUpload: false, fileSize: 20 }, @@ -891,6 +892,7 @@ const detailAnnexTable = ref([ tableName: 'invoice', hiddenDelete: false, hiddenUpload: false, + showPreview: true, fileSize: 20, fileType:['pdf'] }, diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue index 80dc5acd5..7b6006bbd 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue @@ -293,6 +293,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea tableName:'contract', hiddenDelete:true, hiddenUpload:true, + showPreview: true, fileSize:20 },{ label: t('ts.发票附件'), @@ -300,6 +301,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea tableName:'invoice', hiddenDelete:true, hiddenUpload:true, + showPreview: true, fileSize:20 },{ From 5641b9b14c177ee566c3af959379ae42f1b7b84d Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 9 Sep 2024 15:36:51 +0800 Subject: [PATCH 48/66] =?UTF-8?q?HL-5930SCP=20=E8=A6=81=E8=B4=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=9A=84=E7=AD=9B=E9=80=89=E4=B8=AD=EF=BC=8C=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=8F=B7=E3=80=81=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E9=87=8D=E5=A4=8D=EF=BC=8C=E4=BB=96=E4=BF=A9=E6=98=AF?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=EF=BC=8C=E5=BA=94=E8=AF=A5=E5=8F=AA=E5=8F=96?= =?UTF-8?q?=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasePlanMain/purchasePlanMain.data.ts | 120 +++++++++--------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 2bac465f9..f44468c43 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -568,66 +568,66 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ } } }, - { - label: '订单号', - field: 'poNumber', - sort: 'custom', - table: { - width: 180 - }, - hiddenInMain:true, - isTableForm:false, - tableForm: { - disabled: true, - isInpuFocusShow: false, - searchListPlaceholder: '请选择订单号', - searchField: 'number', - searchTitle: '采购订单信息', - searchAllSchemas: PurchaseMain.allSchemas, - searchPage: PurchaseMainApi.getPurchaseMainPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }, { - key: 'supplierCode', - value: 'supplierCode', - message: '请填写供应商代码！', - isMainValue: true - }, { - key: 'status', - value: 2, - isMainValue: false - } - ] - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - disabled: true, - isSearchList: false, - searchListPlaceholder: '请选择订单号', - searchField: 'number', - searchTitle: '采购订单信息', - searchAllSchemas: PurchaseMain.allSchemas, - searchPage: PurchaseMainApi.getPurchaseMainPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - },{ - key: 'supplierCode', - value: 'supplierCode', - message: '请填写供应商代码！', - isMainValue: true - },{ - key: 'status', - value: 2, - isMainValue: false - }] - } - } - }, + // { + // label: '订单号', + // field: 'poNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // hiddenInMain:true, + // isTableForm:false, + // tableForm: { + // disabled: true, + // isInpuFocusShow: false, + // searchListPlaceholder: '请选择订单号', + // searchField: 'number', + // searchTitle: '采购订单信息', + // searchAllSchemas: PurchaseMain.allSchemas, + // searchPage: PurchaseMainApi.getPurchaseMainPage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }, { + // key: 'supplierCode', + // value: 'supplierCode', + // message: '请填写供应商代码！', + // isMainValue: true + // }, { + // key: 'status', + // value: 2, + // isMainValue: false + // } + // ] + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // disabled: true, + // isSearchList: false, + // searchListPlaceholder: '请选择订单号', + // searchField: 'number', + // searchTitle: '采购订单信息', + // searchAllSchemas: PurchaseMain.allSchemas, + // searchPage: PurchaseMainApi.getPurchaseMainPage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // },{ + // key: 'supplierCode', + // value: 'supplierCode', + // message: '请填写供应商代码！', + // isMainValue: true + // },{ + // key: 'status', + // value: 2, + // isMainValue: false + // }] + // } + // } + // }, { label: '计划数量', field: 'planQty', From f058dc6eaf80da1fc92c0fa02a821a468e28dd90 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 9 Sep 2024 15:44:09 +0800 Subject: [PATCH 49/66] =?UTF-8?q?HL-5853=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=E5=A2=9E=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=B1=A5=E5=8E=86=E8=A1=A8=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E9=9D=9E=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/index.vue | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 83576b36d..0abaf2495 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -100,7 +100,19 @@ Date: Mon, 9 Sep 2024 15:51:29 +0800 Subject: [PATCH 50/66] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E6=9C=AA=E7=A8=8E?= =?UTF-8?q?=E5=B0=BE=E5=B7=AE=E3=80=81=E7=A8=8E=E9=A2=9D=E5=B0=BE=E5=B7=AE?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoice/supplierinvoiceRecordMain/index.vue | 4 ++-- .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 4 ++-- .../supplierinvoiceRequestMainDifference/index.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index b39d50357..49634b251 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -146,11 +146,11 @@