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 @@
-
-
+
+
-
-
+
+
-
- 任务号
- {{ dataContent.jobNumber }}
+
+ 仓库
+ {{dataContent.warehouseCode}}
-
- 业务类型
- {{ businessTypeDesc(dataContent.businessType) }}
+
+
+ 任务号
+ {{dataContent.jobNumber}}
+
+
+
+ 业务类型
+ {{dataContent.businessType}}
+ {{businessTypeDesc(dataContent.businessType)}}
-
+
+
+
+
+ 事务类型
+ {{dataContent.transactionType}}
+
+
+ 库存动作
+ {{inventoryActionName(dataContent.inventoryAction)}}
+
+
+
+ 业务记录号
+ {{dataContent.recordNumber}}
+
+
+
+ 事务号
+ {{dataContent.number}}
+
+
+
+ 操作人
+ {{dataContent.worker}}
+
+
+ 创建时间
+ {{dateFormat(dataContent.createTime)}}
@@ -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 @@
-
-
- 物料代码
-
+
+
+
-
+
-
+
-
- 任务号
- {{ dataContent.jobNumber }}
+
+ 任务号
+ {{dataContent.jobNumber}}
-
- 业务类型
- {{ businessTypeDesc(dataContent.businessType) }}
+
+ 业务类型
+ {{dataContent.businessType}}
+ {{businessTypeDesc(dataContent.businessType)}}
-
+
-
+
+
+
+
+ 事务类型
+ {{dataContent.transactionType}}
+
+
+ 库存动作
+ {{inventoryActionName(dataContent.inventoryAction)}}
+
+
+
+ 业务记录号
+ {{dataContent.recordNumber}}
+
+
+
+ 事务号
+ {{dataContent.number}}
+
+
+
+ 操作人
+ {{dataContent.worker}}
+
+
+ 创建时间
+ {{dateFormat(dataContent.createTime)}}
@@ -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 @@
- 物料