diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js index c15c6aae3..356b44a77 100644 --- a/fe/PC/src/filters/status.js +++ b/fe/PC/src/filters/status.js @@ -2478,7 +2478,7 @@ export function positionCodeType(index, prop) { }, 2: { value: 2, - label: "器具" + label: "半成品" }, 3: { value: 3, diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js index 0c8bb4d20..8c3d0e9fe 100644 --- a/fe/PC/src/router/index.js +++ b/fe/PC/src/router/index.js @@ -190,54 +190,7 @@ export const constantRoutes = [ } }] }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'completDumpNoteZS', - component: () => import('@/views/finishedProductManage/completDump/completDumpNoteZS.vue'), - name: 'completDumpNoteZS', - meta: { - keepAlive : true, - title: '完工转储记录(注塑)', - icon: '完工转储申请', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'completDumpNotePT', - component: () => import('@/views/finishedProductManage/completDump/completDumpNotePT.vue'), - name: 'completDumpNotePT', - meta: { - keepAlive : true, - title: '完工转储记录(喷涂)', - icon: '完工转储申请', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'completDumpNoteZP', - component: () => import('@/views/finishedProductManage/completDump/completDumpNoteZP.vue'), - name: 'completDumpNoteZP', - meta: { - keepAlive : true, - title: '完工转储记录(装配)', - icon: '完工转储申请', - } - }] - }, + { path: '/', component: Layout, @@ -478,86 +431,6 @@ export const constantRoutes = [ } }] }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'ItemContainer', - component: () => import('@/views/basicData/ItemsManage/ItemContainer.vue'), - name: 'ItemContainer', - meta: { - keepAlive : true, - title: '收容数标包', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'ThirdLocationRequest', - component: () => import('@/views/ThirdLocationManage/ThirdLocationRequest.vue'), - name: 'ThirdLocationRequest', - meta: { - keepAlive : true, - title: '三方库申请', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'ThirdLocationJob', - component: () => import('@/views/ThirdLocationManage/ThirdLocationJob.vue'), - name: 'ThirdLocationJob', - meta: { - keepAlive : true, - title: '三方库任务', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'ThirdLocationNote', - component: () => import('@/views/ThirdLocationManage/ThirdLocationNote.vue'), - name: 'ThirdLocationNote', - meta: { - keepAlive : true, - title: '三方库记录', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'customerReturnNote', - component: () => import('@/views/finishedProductManage/customerReturn/customerReturnNote.vue'), - name: 'customerReturnNote', - meta: { - keepAlive : true, - title: '客户退货', - icon: '成品发运任务', - } - }] - }, ] diff --git a/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue b/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue index 295675c0c..d1ca90f22 100644 --- a/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue +++ b/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue @@ -286,7 +286,7 @@ export default { this.CreateFormData.codeType = 'W' break; case 2: - this.CreateFormData.codeType = 'Q' + this.CreateFormData.codeType = 'B' break; case 3: this.CreateFormData.codeType = 'K' @@ -301,7 +301,7 @@ export default { this.editFormData.codeType = 'W' break; case 2: - this.editFormData.codeType = 'Q' + this.editFormData.codeType = 'B' break; case 3: this.editFormData.codeType = 'K' @@ -343,8 +343,8 @@ export default { // todo:编辑-拆分类型前缀和code码 this.initCodeType(this.editFormData.type) console.log([1,2,3].indexOf(this.editFormData.type)) - // this.editFormData.type = (this.editFormData.type == 'W' || this.editFormData.type == 'Q' || this.editFormData.type == 'K') ? this.editFormData.type : (this.editFormData.code && this.editFormData.code.length > 0 ? this.editFormData.code.slice(0,1) : null) - // this.editFormData.type = (this.editFormData.type == 'W' || this.editFormData.type == 'Q' || this.editFormData.type == 'K') ? this.editFormData.type : null + // this.editFormData.type = (this.editFormData.type == 'W' || this.editFormData.type == 'B' || this.editFormData.type == 'K') ? this.editFormData.type : (this.editFormData.code && this.editFormData.code.length > 0 ? this.editFormData.code.slice(0,1) : null) + // this.editFormData.type = (this.editFormData.type == 'W' || this.editFormData.type == 'B' || this.editFormData.type == 'K') ? this.editFormData.type : null this.editFormData.codeSuffix = [1,2,3].indexOf(this.editFormData.type) >= 0 ? (this.editFormData.code && this.editFormData.code.length > 0 ? this.editFormData.code.slice(1) : null) : this.editFormData.code }else{ this.drawerbutton(val) diff --git a/fe/PC/src/views/finishedProductManage/customerReturn/customerReturnNote.vue b/fe/PC/src/views/finishedProductManage/customerReturn/customerReturnNote.vue index 92a1a4af1..f26b34d06 100644 --- a/fe/PC/src/views/finishedProductManage/customerReturn/customerReturnNote.vue +++ b/fe/PC/src/views/finishedProductManage/customerReturn/customerReturnNote.vue @@ -71,7 +71,7 @@ export default { data () { let _this = this; return { - URL: 'wms/store/production-return-note', + URL: 'wms/store/customer-production-return-note', tableLoading: false, handleMultipleSelection: [], //常用按钮数据