diff --git a/fe/PC/src/components/currenForm/index.vue b/fe/PC/src/components/currenForm/index.vue index f608af1a0..e59e0278b 100644 --- a/fe/PC/src/components/currenForm/index.vue +++ b/fe/PC/src/components/currenForm/index.vue @@ -49,6 +49,7 @@ @@ -67,7 +67,7 @@ @@ -81,14 +81,13 @@
{{item[inventoryColumn[6].prop]}}
@@ -200,9 +199,9 @@ export default { { label: _Names.itemCode, prop: "itemCode"}, { label: _Names.itemName, prop: "itemName" }, { label: _Names.itemDesc1, prop: "itemDesc1" }, - { label: _Names.itemDesc2, prop: "itemDesc2" }, - { label: "请求数量", prop: 'requestQty' }, - { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' }, + // { label: _Names.itemDesc2, prop: "itemDesc2" }, + // { label: "请求数量", prop: 'requestQty' }, + // { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' }, { label: "推荐来源数量", prop: 'recommendFromQty' }, { label: "推荐目标数量", prop: 'recommendToQty' }, { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' }, @@ -215,22 +214,22 @@ export default { { label: "推荐目标批次", prop: 'recommendToLot' }, { label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, { label: "推荐目标过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, - { label: "实际来源数量", prop: 'handledFromQty' }, - { label: "实际目标数量", prop: 'handledToQty' }, - { label: "实际来源箱标签", prop: 'handledFromPackingCode' }, - { label: "实际目标箱标签", prop: 'handledToPackingCode' }, - { label: "实际来源库位", prop: 'handledFromLocationCode' }, - { label: "实际目标库位", prop: 'handledToLocationCode' }, - { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' }, - { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' }, - { label: "实际来源批次", prop: 'handledFromLot' }, - { label: "实际目标批次", prop: 'handledToLot' }, - { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, - { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" }, + // { label: "实际来源数量", prop: 'handledFromQty' }, + // { label: "实际目标数量", prop: 'handledToQty' }, + // { label: "实际来源箱标签", prop: 'handledFromPackingCode' }, + // { label: "实际目标箱标签", prop: 'handledToPackingCode' }, + // { label: "实际来源库位", prop: 'handledFromLocationCode' }, + // { label: "实际目标库位", prop: 'handledToLocationCode' }, + // { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' }, + // { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' }, + // { label: "实际来源批次", prop: 'handledFromLot' }, + // { label: "实际目标批次", prop: 'handledToLot' }, + // { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, + // { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" }, { label: "位置码", prop: 'positionCode' }, { label: "生产线", prop: 'prodLine' }, { label: "任务状态", prop: "jobStatus",type: "filter", filters: "jobStatus" }, - { label: "推荐类型", prop: 'recommendType' }, + // { label: "推荐类型", prop: 'recommendType' }, ], listRowButton:[ { @@ -256,7 +255,7 @@ export default { toLocationCode:"", }, compeletForm: [ - { type: "input", label: "箱码", prop: 'packingCode', colSpan: 12, }, + { type: "input", id:'compeletFormPackingCode', label: "箱码", prop: 'packingCode', colSpan: 12, }, { type: "input", disabled:true, label: "来源库位", prop: 'fromLocationCode', colSpan: 12, }, { type: "input", disabled:true, label: "目标库位", prop: 'toLocationCode', colSpan: 12, }, // filterSelect示例: @@ -265,7 +264,7 @@ export default { // }, ], compeletRule: { - packingCode: [{ required: true, trigger: "blur", message: "不可为空" }], + packingCode: [{ required: true, trigger: ["blur","change"], message: "不可为空" }], fromLocationCode: [{ required: true, trigger: "blur", message: "不可为空" }], toLocationCode: [{ required: true, trigger: "blur", message: "不可为空" }], }, @@ -284,7 +283,7 @@ export default { { label: '数量', prop: "qty" }, { label: "箱码", prop: 'packingCode' }, { label: "批次", prop: 'lot' }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, { label: "标包数量", prop: "stdPackQty" }, { label: "库位", prop: 'locationCode' }, { label: _Names.locationErpCode, prop: "locationErpCode" }, @@ -292,10 +291,10 @@ export default { { label: "标准成本单价", prop: "stdCostPrice" }, { label: "标准成本金额", prop: "stdCost" }, { label: "备注", prop: 'remark' }, - { label: "序号", prop: 'serialNumber' }, - { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, + // { label: "序号", prop: 'serialNumber' }, + // { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, { label: "库区", prop: 'locationArea' }, - { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" }, + // { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" }, { label: "入库时间", prop: 'putInTime', type:"dateTime" }, { label: "生产时间", prop: "produceDate", type: "dateTime" }, { label: "到货时间", prop: "arriveDate", type: "dateTime" }, @@ -401,6 +400,9 @@ export default { if(item.name == "compelet"){ this.currentRowData = row this.compeletHandleVisible = true + this.$nextTick(()=>{ + document.getElementById("compeletFormPackingCode").focus() + }) } }, headerSearchHandle(){ @@ -479,6 +481,9 @@ export default { ::v-deep .el-dialog{ margin-bottom:0 !important } + ::v-deep .el-empty__image{ + width:100px !important + } ::v-deep .el-dialog__body{ padding:0 15px !important; }