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
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
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 @@
+
+ 11
+
+
+
+
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 @@
-
-
-
-
-
-
+
-
-
-
-
-
-
+
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',
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: '采购订单信息',