From 965bf5f02393dc02b1129527e49dac1d8d4e2ebd Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 16 Apr 2024 11:24:02 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index 4ed0011c4..fdfc9d74e 100644 --- a/.env.development +++ b/.env.development @@ -4,10 +4,10 @@ NODE_ENV=development VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://dev.ccwin-in.com:25300/api' +VITE_BASE_URL='http://localhost:12080' # 上传路径 -VITE_UPLOAD_URL='http://dev.ccwin-in.com:25300/api/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://localhost:12080/api/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH=/dev-api From a0976f9bc1d17eab726c889224415990a7f31634 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 16 Apr 2024 11:29:13 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0aa=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.ts | 1 + src/router/modules/remaining.ts | 9 +++++++++ src/views/login/aa.vue | 10 ++++++++++ 3 files changed, 20 insertions(+) create mode 100644 src/views/login/aa.vue diff --git a/src/permission.ts b/src/permission.ts index 0698dc880..24ce89277 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -15,6 +15,7 @@ const { loadStart, loadDone } = usePageLoading() // 路由不重定向白名单 const whiteList = [ '/login', + '/aa', '/social-login', '/auth-redirect', '/bind', diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index ef71f7952..57c118c66 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -184,6 +184,15 @@ const remainingRouter: AppRouteRecordRaw[] = [ title: t('router.login'), noTagsView: true } + },{ + path: '/aa', + component: () => import('@/views/login/aa.vue'), + name: 'Aa', + meta: { + hidden: true, + title: t('router.login'), + noTagsView: true + } }, { path: '/sso', diff --git a/src/views/login/aa.vue b/src/views/login/aa.vue new file mode 100644 index 000000000..96fb0164d --- /dev/null +++ b/src/views/login/aa.vue @@ -0,0 +1,10 @@ + + + + From 957d7d81af226e23d34164ea4ba3bf6f702ef857 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Tue, 16 Apr 2024 11:45:50 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/inspectionRecord/detail.vue | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/src/views/qms/inspection/inspectionRecord/detail.vue b/src/views/qms/inspection/inspectionRecord/detail.vue index cdb6ffa27..7f32fa946 100644 --- a/src/views/qms/inspection/inspectionRecord/detail.vue +++ b/src/views/qms/inspection/inspectionRecord/detail.vue @@ -46,32 +46,14 @@ - - - - - - + - - - - - - + From b509f98bbb6071d09b6ec02e292da4189d753a57 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 16 Apr 2024 13:05:47 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/interfaceInfo/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/api/wms/interfaceInfo/index.ts b/src/api/wms/interfaceInfo/index.ts index 370b7f1c2..9af0ea39d 100644 --- a/src/api/wms/interfaceInfo/index.ts +++ b/src/api/wms/interfaceInfo/index.ts @@ -1,6 +1,7 @@ import request from '@/config/axios' export interface InterfaceInfoVO { + number:string id: number interfaceType: string interfaceName: string From 5055dc3a9445dee1a85f3a74754e4bb29d73094b Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 16 Apr 2024 13:10:39 +0800 Subject: [PATCH 5/6] =?UTF-8?q?excel:=E5=85=B3=E4=BA=8E=E8=A6=81=E8=B4=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 6 ++++++ .../purchasePlanMain/purchasePlanMain.data.ts | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 9e86245c7..b34d082ac 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -75,6 +75,7 @@ import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { PurchaseDetail } from '../purchaseMain/purchaseMain.data' + import dayjs from 'dayjs' // 要货计划 defineOptions({ name: 'PurchasePlanMain' }) @@ -313,6 +314,11 @@ const getSearchTableData = async (number,formField,searchField)=>{ const openForm = async (type : string, row ?: number) => { tableData.value = [] // 重置明细数据 formRef.value.open(type, row) + if('create'==type){ + nextTick(async () => { + formRef.value.formRef.setValues({deliveryDate:dayjs().format('YYYY-MM-DD')}) + }) + } } // 获取部门 用于详情 部门回显 const { wsCache } = useCache() diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 9a4167f45..1e10f60a9 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -412,7 +412,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ width: 180 }, tableForm: { - isInpuFocusShow: true, + disabled: true, + isInpuFocusShow: false, searchListPlaceholder: '请选择订单号', searchField: 'number', searchTitle: '采购订单信息', @@ -490,7 +491,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ }, tableForm: { multiple:true, - isInpuFocusShow: true, + disabled: true, + isInpuFocusShow: false, searchListPlaceholder: '请选择订单行', searchField: 'lineNumber', searchTitle: '采购订单信息', From 0a082de5deb82f93cd238732d90b22b01d4623fc Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 16 Apr 2024 13:30:43 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=92=8C=E8=A1=A5=E6=96=99=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E6=98=BE=E7=A4=BA=E7=89=A9=E6=96=99=E5=8F=B7=E3=80=81?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=BA=93=E4=BD=8D=E3=80=81=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E3=80=81=E6=95=B0=E9=87=8F=E3=80=81=E5=8D=95?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repleinshJobMain/repleinshJobMain.data.ts | 43 +++++++++++++++++++ .../putawayJobMain/putawayJobMain.data.ts | 43 +++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts index eddd68caa..81d9c430d 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts @@ -457,6 +457,49 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ } }, }, + { + label: '物料号', + field: 'code', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '来源库位', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '目标库位', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '单位', + field: 'unit', + sort: 'custom', + dictType: DICT_TYPE.PACK_UNIT, + dictClass: 'string', + isSearch: false, + table: { + width: 150 + }, + }, { label: '创建者', field: 'creator', diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts index 3bb41dcd2..3b98cefbc 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts @@ -487,6 +487,49 @@ export const PutawayJobMain = useCrudSchemas(reactive([ } } }, + { + label: '物料号', + field: 'code', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '来源库位', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '目标库位', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '单位', + field: 'unit', + sort: 'custom', + dictType: DICT_TYPE.PACK_UNIT, + dictClass: 'string', + isSearch: false, + table: { + width: 150 + }, + }, { label: '操作', field: 'action',