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 @@
<template>
- <view class="" style="width: 100%; background-color: #fff; border-radius: 10rpx">
- <view class="uni-flex uni-row space-between" style="align-items: center">
+ <view class="" style="width: 100%; background-color: #fff; border-radius: 10rpx;">
+ <view class="uni-flex uni-row space-between" style="align-items: center;">
<view>
<pack v-if="dataContent.parentNumber" title="父包装" :packingCode="dataContent.parentNumber"></pack>
- <pack v-if="dataContent.packingNumber" :packingCode="dataContent.packingNumber"></pack>
- <batch v-if="isShowBatch && dataContent.batch" :batch="dataContent.batch"></batch>
+ <pack v-if="isShowPack" :packingCode="dataContent.packingNumber"></pack>
+ <batch :batch="dataContent.batch"></batch>
<location :locationCode="dataContent.locationCode"></location>
- <view class="" v-if="dataContent.jobNumber" style="font-size: 30rpx; padding-left: 10rpx; padding-bottom: 10rpx">
- <text style="color: coral">任务号</text>
- {{ dataContent.jobNumber }}
+ <view class="" v-if="isShowWarehouseCode"
+ style=" margin-left: 5rpx ;margin-top: 5rpx; ">
+ <text style="padding: 5px;font-size: 30rpx; color:#1DA4CF">仓库</text>
+ <text style="font-size: 35rpx; font-weight: bold;">{{dataContent.warehouseCode}}</text>
</view>
- <view class="" v-if="dataContent.businessType" style="font-size: 30rpx; padding-left: 10rpx; padding-bottom: 10rpx">
- <text style="color: green">业务类型</text>
- {{ businessTypeDesc(dataContent.businessType) }}
+
+ <view class="" v-if="isShowJobNumber" style="margin-left: 5rpx; margin-top: 5rpx;">
+ <text style="color: coral;padding: 5px;font-size: 30rpx;">任务号 </text>
+ <text style="font-size: 35rpx; font-weight: bold;">{{dataContent.jobNumber}}</text>
+ </view>
+
+ <view class="" v-if="isShowBusinessType" style="margin-left: 5rpx;margin-top: 5rpx;">
+ <text style="color: green;padding: 5px;font-size: 30rpx;">业务类型 </text>
+ <text style="font-size: 35rpx; font-weight: bold;" v-if="dataContent.businessType&&hasChinese(dataContent.businessType)">{{dataContent.businessType}}</text>
+ <text style="font-size: 35rpx; font-weight: bold;" v-if="dataContent.businessType&&!hasChinese(dataContent.businessType)"> {{businessTypeDesc(dataContent.businessType)}}</text>
</view>
</view>
- <view class="uni-flex" style="flex-direction: column">
+ <view class="uni-flex" style="flex-direction: column;">
<view class="uni-flex uni-row center">
<qty :dataContent="dataContent" :isShowStdPack="isShowStdPack" :isShowStatus="true"></qty>
</view>
</view>
+
+ </view>
+ <view class="" v-if="isShowTransactionType" style="margin-left: 5rpx;margin-top: 5rpx; ">
+ <text style="padding: 5px;font-size: 30rpx;color: #5383B3; ">事务类型 </text>
+ <text style="font-size: 35rpx; font-weight: bold;">{{dataContent.transactionType}}</text>
+ </view>
+ <view class="" v-if="isShowInventoryAction" style="margin-left: 5rpx;margin-top: 5rpx; ">
+ <text style="padding: 5px;font-size: 30rpx; color: #B69863">库存动作 </text>
+ <text style="font-size: 35rpx; font-weight: bold;">{{inventoryActionName(dataContent.inventoryAction)}}</text>
+ </view>
+
+ <view class="" v-if="isShowRecordNumber" style="margin-left: 5rpx; margin-top: 5rpx;">
+ <text style="padding: 5px;font-size: 30rpx;color: #B73681;">业务记录号 </text>
+ <text style="font-size: 35rpx; font-weight: bold;">{{dataContent.recordNumber}}</text>
+ </view>
+
+ <view class="" v-if="isShowNumber" style="margin-left: 5rpx; margin-top: 5rpx;">
+ <text style="padding: 5px;font-size: 30rpx; color: #5B61C1;">事务号 </text>
+ <text style="font-size: 35rpx; font-weight: bold;">{{dataContent.number}}</text>
+ </view>
+
+ <view class="" v-if="isShowWorker" style="margin-left: 5rpx; margin-top: 5rpx;">
+ <text style="padding: 5px;font-size: 30rpx;color: #ED77D9;">操作人 </text>
+ <text style="font-size: 35rpx; font-weight: bold;">{{dataContent.worker}}</text>
+ </view>
+ <view class="" style="margin-left: 5rpx; margin-top: 5rpx;">
+ <text style="padding: 5px;font-size: 30rpx;color:#569FE6">创建时间 </text>
+ <text v-if="dataContent.createTime" style="font-size: 35rpx; font-weight: bold;">{{dateFormat(dataContent.createTime)}}</text>
</view>
</view>
</template>
@@ -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" ? "入库" : "出库"
+}
</script>
<style></style>
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 @@
<template>
- <view class="" style="width: 100%; background-color: #fff; border-radius: 10rpx">
- <view class="uni-flex uni-row" style="align-items: center">
- <text style="font-size: 35rpx; padding-left: 10rpx">物料代码</text>
- <item :dataContent="dataContent" style="padding-top: 10rpx; margin-left: 10rpx"></item>
+ <view class="" style="width: 100%; background-color: #fff; border-radius: 10rpx;">
+ <view class="uni-flex uni-row" style="align-items: center;" >
+ <item :dataContent="dataContent" style="padding-top: 10rpx; margin-left: 10rpx;"></item>
</view>
- <view class="uni-flex uni-row space-between" style="align-items: center">
+ <view class="uni-flex uni-row space-between" style="align-items: center;">
<view>
<pack v-if="dataContent.parentNumber" title="父包装" :packingCode="dataContent.parentNumber"></pack>
- <pack v-if="dataContent.packingNumber" :packingCode="dataContent.packingNumber"></pack>
+ <pack v-if="isShowPack" :packingCode="dataContent.packingNumber"></pack>
<batch v-if="isShowBatch && dataContent.batch" :batch="dataContent.batch"></batch>
- <view class="" v-if="dataContent.jobNumber" style="font-size: 30rpx; padding-left: 10rpx; padding-bottom: 10rpx">
- <text style="color: coral">任务号</text>
- {{ dataContent.jobNumber }}
+ <view class="" v-if="isShowJobNumber" style="margin-left: 5rpx; margin-top: 5rpx;">
+ <text style="color: coral;padding: 5px;font-size: 30rpx;">任务号 </text>
+ <text style="font-size: 35rpx; font-weight: bold;">{{dataContent.jobNumber}}</text>
</view>
- <view class="" v-if="dataContent.businessType" style="font-size: 30rpx; padding-left: 10rpx; padding-bottom: 10rpx">
- <text style="color: green">业务类型</text>
- {{ businessTypeDesc(dataContent.businessType) }}
+ <view class="" v-if="isShowBusinessType" style="margin-left: 5rpx;margin-top: 5rpx;">
+ <text style="color: green;padding: 5px;font-size: 30rpx;">业务类型 </text>
+ <text style="font-size: 35rpx; font-weight: bold;" v-if="dataContent.businessType&&hasChinese(dataContent.businessType)">{{dataContent.businessType}}</text>
+ <text style="font-size: 35rpx; font-weight: bold;" v-if="dataContent.businessType&&!hasChinese(dataContent.businessType)"> {{businessTypeDesc(dataContent.businessType)}}</text>
</view>
</view>
- <view class="uni-flex" style="flex-direction: column">
+ <view class="uni-flex" style="flex-direction: column;">
<view class="uni-flex uni-row center">
- <qty :dataContent="dataContent" :isShowStdPack="isShowStdPack" :isShowStatus="true"></qty>
+ <qty :dataContent="dataContent"
+ :isShowStdPack="isShowStdPack" :isShowStatus="true"></qty>
</view>
</view>
+
+ </view>
+ <view class="" v-if="isShowTransactionType" style="margin-left: 5rpx;margin-top: 5rpx; ">
+ <text style="padding: 5px;font-size: 30rpx;color: #5383B3; ">事务类型 </text>
+ <text style="font-size: 35rpx; font-weight: bold;">{{dataContent.transactionType}}</text>
+ </view>
+ <view class="" v-if="isShowInventoryAction" style="margin-left: 5rpx;margin-top: 5rpx; ">
+ <text style="padding: 5px;font-size: 30rpx; color: #B69863">库存动作 </text>
+ <text style="font-size: 35rpx; font-weight: bold;">{{inventoryActionName(dataContent.inventoryAction)}}</text>
+ </view>
+
+ <view class="" v-if="isShowRecordNumber" style="margin-left: 5rpx; margin-top: 5rpx;">
+ <text style="padding: 5px;font-size: 30rpx;color: #B73681;">业务记录号 </text>
+ <text style="font-size: 35rpx; font-weight: bold;">{{dataContent.recordNumber}}</text>
+ </view>
+
+ <view class="" v-if="isShowNumber" style="margin-left: 5rpx; margin-top: 5rpx;">
+ <text style="padding: 5px;font-size: 30rpx; color: #5B61C1;">事务号 </text>
+ <text style="font-size: 35rpx; font-weight: bold;">{{dataContent.number}}</text>
+ </view>
+
+ <view class="" v-if="isShowWorker" style="margin-left: 5rpx; margin-top: 5rpx;">
+ <text style="padding: 5px;font-size: 30rpx;color: #ED77D9;">操作人 </text>
+ <text style="font-size: 35rpx; font-weight: bold;">{{dataContent.worker}}</text>
+ </view>
+ <view class="" style="margin-left: 5rpx; margin-top: 5rpx;">
+ <text style="padding: 5px;font-size: 30rpx;color:#569FE6">创建时间 </text>
+ <text v-if="dataContent.createTime" style="font-size: 35rpx; font-weight: bold;">{{dateFormat(dataContent.createTime)}}</text>
</view>
</view>
</template>
@@ -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" ? "入库" : "出库"
+}
</script>
<style></style>
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 @@
<view class="uni-flex uni-row space-between" style="align-items: center">
<view>
<view class="uni-flex uni-row" style="align-items: center">
- <text style="font-size: 30rpx; margin-left: 15rpx">物料</text>
<item :dataContent="dataContent" style="padding-top: 10rpx; margin-left: 20rpx"></item>
</view>