From 03476120e1f507c225bdf4847bafbea510b69a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Thu, 9 May 2024 17:33:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev=E3=80=91=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/utils/detailsTableColumns/index.js | 2 +- fe/PC/src/utils/tableColumns/index.js | 6 +- fe/PC/src/utils/tabsDesTions/index.js | 6 +- .../basicData/ItemsManage/PositionCode.vue | 14 +- fe/PC/src/views/login/index.vue | 5 + fe/PC/src/views/padManage/padKittingPack.vue | 156 ++++++++++++++++++ 6 files changed, 175 insertions(+), 14 deletions(-) create mode 100644 fe/PC/src/views/padManage/padKittingPack.vue diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index e3127a4eb..ea560f173 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -4975,7 +4975,7 @@ export const KittingIssueRequest = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" }, + { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, { label: "单位", prop: "uom" }, { label: "数量", prop: "qty" }, { label: "申请数量", prop: 'issuedQty' }, diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 60d831184..fa50ee2fd 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -4173,9 +4173,9 @@ export const PositionCode = [ { label: _Names.itemDesc1, prop: "partDesc" }, // { label: _Names.itemDesc2, prop: "desc2" }, { label: _Names.basicUom, prop: "basicUom" }, - { label: _Names.stdPackQty, prop: "stdPackQty",isNumber:true }, - { label: "叫料库位代码", prop: "locationCode" }, - { label: "叫料库位名称", prop: "locationName" }, + { label: "箱数/数量", prop: "stdPackQty",isNumber:true }, + { label: "目标库位代码", prop: "locationCode" }, + { label: "目标库位名称", prop: "locationName" }, { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, { label: _Public.remark, prop: "remark" }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 73e391b96..eb699526d 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -3016,9 +3016,9 @@ export const PositionCode = [ { label: _Names.itemDesc1, prop: "partDesc" }, // { label: _Names.itemDesc2, prop: "desc2" }, { label: _Names.basicUom, prop: "basicUom" }, - { label: _Names.stdPackQty, prop: "stdPackQty" }, - { label: "叫料库位代码", prop: "locationCode" }, - { label: "叫料库位名称", prop: "locationName" }, + { label: "箱数/数量", prop: "stdPackQty" }, + { label: "目标库位代码", prop: "locationCode" }, + { label: "目标库位名称", prop: "locationName" }, { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, { label: _Public.remark, prop: "remark" }, diff --git a/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue b/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue index 1dca957a7..9a6f9386f 100644 --- a/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue +++ b/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue @@ -161,7 +161,7 @@ export default { CreateForm: [ { type: "select", label: "类型", prop: "type", colSpan: 12 ,options:'positionCodeType' }, { type: "prefixInput", label: "位置码",validType:'numberLetter', prop: "codeSuffix",prefixProp:"codeType",prefixWidth:'50px',prefixDisabled:true, colSpan: 12 }, - { type: "inputNumber", label: "标包数量", prop: "stdPackQty", colSpan: 12, min:1 }, + { type: "inputNumber", label: "箱数/数量", prop: "stdPackQty", colSpan: 12, min:1 }, { type: "filterSelect", label: "物品代码", prop: "partCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, @@ -170,18 +170,18 @@ export default { { type: "input", disabled:true, label: "物品名称", prop: "partName",colSpan: 12 }, { type: "input", disabled:true, label: "物品描述", prop: "partDesc",colSpan: 12 }, { type: "input", disabled:true, label: "单位", prop: "basicUom",colSpan: 12 }, - { type: "filterSelect", label: "叫料库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", + { type: "filterSelect", label: "目标库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, colSpan: 12 }, - { type: "input", disabled:true, label: "叫料库位名称", prop: "locationName",colSpan: 12 }, + { type: "input", disabled:true, label: "目标库位名称", prop: "locationName",colSpan: 12 }, { type: "input", label: "备注", prop: "remark",colSpan: 12 }, ], editForm: [ { type: "select",disabled:true, label: "类型", prop: "type", colSpan: 12 ,options:'positionCodeType' }, { disabled:true,type: "prefixInput", label: "位置码", prop: "codeSuffix",prefixProp:"codeType",prefixWidth:'50px',prefixDisabled:true, colSpan: 12 }, - { type: "inputNumber", label: "标包数量", prop: "stdPackQty", colSpan: 12, min:1 }, + { type: "inputNumber", label: "箱数/数量", prop: "stdPackQty", colSpan: 12, min:1 }, { type: "filterSelect", label: "物品代码", prop: "partCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.editFormData) }, @@ -190,12 +190,12 @@ export default { { type: "input", disabled:true, label: "物品名称", prop: "partName",colSpan: 12 }, { type: "input", disabled:true, label: "物品描述", prop: "partDesc",colSpan: 12 }, { type: "input", disabled:true, label: "单位", prop: "basicUom",colSpan: 12 }, - { type: "filterSelect", label: "叫料库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", + { type: "filterSelect", label: "目标库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 }, - { type: "input", disabled:true, label: "叫料库位名称", prop: "locationName",colSpan: 12 }, + { type: "input", disabled:true, label: "目标库位名称", prop: "locationName",colSpan: 12 }, { type: "input", label: "备注", prop: "remark",colSpan: 12 }, ], editRules: { @@ -295,7 +295,7 @@ export default { this.editFormData.codeType = 'Z' break; case 4: - this.CreateFormData.codeType = 'K' + this.editFormData.codeType = 'K' break; default: this.editFormData.codeType = '' diff --git a/fe/PC/src/views/login/index.vue b/fe/PC/src/views/login/index.vue index 4532be8d3..9a79767cb 100644 --- a/fe/PC/src/views/login/index.vue +++ b/fe/PC/src/views/login/index.vue @@ -137,6 +137,7 @@ export default { }); }, mounted () { + window.showInfoFromJava = this.showInfoFromJava(111) if (this.loginForm.username === '') { this.$refs.username.focus() } else if (this.loginForm.password === '') { @@ -147,6 +148,10 @@ export default { // window.removeEventListener('storage', this.afterQRScan) }, methods: { + showInfoFromJava(msg){ + console.log("showInfoFromJava") + alert(msg) + }, checkCapslock (e) { const { key } = e this.capsTooltip = key && key.length === 1 && (key >= 'A' && key <= 'Z') diff --git a/fe/PC/src/views/padManage/padKittingPack.vue b/fe/PC/src/views/padManage/padKittingPack.vue new file mode 100644 index 000000000..fb6859f12 --- /dev/null +++ b/fe/PC/src/views/padManage/padKittingPack.vue @@ -0,0 +1,156 @@ + + + \ No newline at end of file