From 445dff443ad3f20a6a81f88aed800d3a71172d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com> Date: Mon, 4 Nov 2024 09:14:58 +0800 Subject: [PATCH] =?UTF-8?q?page/query/coms=20=E6=96=87=E4=BB=B6=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=208/8-10/25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/query/coms/comItemDetailCard.vue | 105 +++++++++++++++--- .../query/coms/comLocationDetailCard.vue | 100 ++++++++++++++--- src/pages/query/coms/comPackDetailCard.vue | 1 - 3 files changed, 176 insertions(+), 30 deletions(-) diff --git a/src/pages/query/coms/comItemDetailCard.vue b/src/pages/query/coms/comItemDetailCard.vue index 254f1f04..d92a3f57 100644 --- a/src/pages/query/coms/comItemDetailCard.vue +++ b/src/pages/query/coms/comItemDetailCard.vue @@ -1,25 +1,61 @@ @@ -34,7 +70,7 @@ import qty from '@/mycomponents/qty/qty.vue' import status from '@/mycomponents/status/status.vue' import location from '@/mycomponents/balance/location.vue' import { getBusinessTypeName } from '@/common/directory.js' - +import { dateFormat } from '@/common/basic.js'; const props = defineProps({ dataContent: { type: Object, @@ -55,11 +91,54 @@ const props = defineProps({ isShowStdPack: { type: Boolean, default: true - } + }, + isShowWarehouseCode: { + type: Boolean, + default: false + }, + isShowJobNumber: { + type: Boolean, + default: false + }, + isShowBusinessType: { + type: Boolean, + default: false + }, + isShowTransactionType: { + type: Boolean, + default: false + }, + isShowRecordNumber: { + type: Boolean, + default: false + }, + isShowNumber: { + type: Boolean, + default: false + }, + isShowWorker: { + type: Boolean, + default: false + }, + isShowInventoryAction: { + type: Boolean, + default: false + }, }) const businessTypeDesc = (type) => { return getBusinessTypeName(type) } +const dateFormat = (times)=> { + return dateFormat(times) +} +const hasChinese = (str)=> { + let reg = /[\u4e00-\u9fa5]/g; + return reg.test(str); +} + +const inventoryActionName = (value)=> { + return value == "IN" ? "入库" : "出库" +} diff --git a/src/pages/query/coms/comLocationDetailCard.vue b/src/pages/query/coms/comLocationDetailCard.vue index da3c23e0..def9c2ab 100644 --- a/src/pages/query/coms/comLocationDetailCard.vue +++ b/src/pages/query/coms/comLocationDetailCard.vue @@ -1,29 +1,58 @@ @@ -36,7 +65,7 @@ import batch from '@/mycomponents/balance/batch.vue' import qty from '@/mycomponents/qty/qty.vue' import status from '@/mycomponents/status/status.vue' import { getBusinessTypeName } from '@/common/directory.js' - +import { dateFormat } from '@/common/basic.js'; const props = defineProps({ dataContent: { type: Object, @@ -57,11 +86,50 @@ const props = defineProps({ isShowStdPack: { type: Boolean, default: true - } + }, + isShowJobNumber: { + type: Boolean, + default: false + }, + isShowBusinessType: { + type: Boolean, + default: false + }, + isShowTransactionType: { + type: Boolean, + default: false + }, + isShowRecordNumber: { + type: Boolean, + default: false + }, + isShowNumber: { + type: Boolean, + default: false + }, + isShowWorker: { + type: Boolean, + default: false + }, + isShowInventoryAction: { + type: Boolean, + default: false + }, }) const businessTypeDesc = (type) => { return getBusinessTypeName(type) } +const dateFormat = (times)=> { + return dateFormat(times) +} +const hasChinese = (str)=> { + let reg = /[\u4e00-\u9fa5]/g; + return reg.test(str); +} + +const inventoryActionName = (value)=> { + return value == "IN" ? "入库" : "出库" +} diff --git a/src/pages/query/coms/comPackDetailCard.vue b/src/pages/query/coms/comPackDetailCard.vue index d7bdaf16..1e13e869 100644 --- a/src/pages/query/coms/comPackDetailCard.vue +++ b/src/pages/query/coms/comPackDetailCard.vue @@ -3,7 +3,6 @@ - 物料