lijuncheng 11 months ago
parent
commit
eb116548c8
  1. 5
      common/style/new_style.css
  2. 5
      mycomponents/balance/balance.vue
  3. 146
      mycomponents/balance/balanceDetailPopup.vue
  4. 31
      mycomponents/balance/toLocation.vue
  5. 1
      mycomponents/detail/comRequestDetailCard.vue
  6. 67
      mycomponents/detail/detailBalanceInfo.vue
  7. 6
      mycomponents/detail/detailCommonInfo.vue
  8. 6
      mycomponents/detail/detailItemInfo.vue
  9. 65
      mycomponents/detail/detailPackageInfo.vue
  10. 26
      mycomponents/detail/recordDetailCommonInfo.vue
  11. 90
      mycomponents/detail/recordDetailPopup.vue
  12. 58
      mycomponents/detail/requestDetailBasicInfo.vue
  13. 15
      mycomponents/detail/requestDetailCommonInfo.vue
  14. 9
      mycomponents/recommend/recommend.vue
  15. 11
      mycomponents/record/recordComDetailCard.vue
  16. 42
      pages/inspect/job/inspectDetail.vue
  17. 1
      pages/purchaseReceipt/coms/comReceiptDetailCard.vue
  18. 1
      pages/purchaseReceipt/job/receiptDetail.vue
  19. 93
      pages/purchaseReturn/coms/requestDetailInfoPopup.vue
  20. 29
      pages/purchaseReturn/record/returnRecord.vue
  21. 2
      pages/purchaseReturn/request/returnRequest.vue
  22. 6
      pages/purchaseReturn/request/returnRequestCreate.vue
  23. 10
      pages/purchaseReturn/request/returnRequestDetail.vue

5
common/style/new_style.css

@ -2104,6 +2104,11 @@ button::after {
padding: 5px; padding: 5px;
} }
.card_to_location {
color: #329362;
padding: 5px;
}
.card_location_content { .card_location_content {
font-size: 32rpx; font-size: 32rpx;
padding: 5px; padding: 5px;

5
mycomponents/balance/balance.vue

@ -5,7 +5,8 @@
<pack v-if="isShowPack && dataContent.packingNumber" :packingCode="dataContent.packingNumber"></pack> <pack v-if="isShowPack && dataContent.packingNumber" :packingCode="dataContent.packingNumber"></pack>
<batch v-if="isShowBatch && dataContent.batch" :batch="dataContent.batch"></batch> <batch v-if="isShowBatch && dataContent.batch" :batch="dataContent.batch"></batch>
<location title="来源库位" v-if="isShowFromLocation" :locationCode="dataContent.locationCode"></location> <location title="来源库位" v-if="isShowFromLocation" :locationCode="dataContent.locationCode"></location>
<location title="目标库位" v-if="isShowToLocation" :locationCode="dataContent.toLocationCode"></location> <to-location title="目标库位" v-if="isShowToLocation" :locationCode="dataContent.toLocationCode">
</to-location>
</view> </view>
<view> <view>
<!-- <qty v-if="dataContent.record==null ||dataContent.record==undefined " :dataContent="dataContent" <!-- <qty v-if="dataContent.record==null ||dataContent.record==undefined " :dataContent="dataContent"
@ -28,6 +29,7 @@
<script> <script>
import pack from '@/mycomponents/balance/pack.vue' import pack from '@/mycomponents/balance/pack.vue'
import location from '@/mycomponents/balance/location.vue' import location from '@/mycomponents/balance/location.vue'
import toLocation from '@/mycomponents/balance/toLocation.vue'
import batch from '@/mycomponents/balance/batch.vue' import batch from '@/mycomponents/balance/batch.vue'
import qty from '@/mycomponents/qty/qty.vue' import qty from '@/mycomponents/qty/qty.vue'
import recommendQty from '@/mycomponents/qty/recommendQty.vue' import recommendQty from '@/mycomponents/qty/recommendQty.vue'
@ -37,6 +39,7 @@
components: { components: {
pack, pack,
location, location,
toLocation,
batch, batch,
qty, qty,
recommendQty, recommendQty,

146
mycomponents/balance/balanceDetailPopup.vue

@ -1,7 +1,9 @@
<template> <template>
<uni-popup ref="popup"> <uni-popup ref="popup">
<view class="pop_detail" style="height:80%"> <view class="pop_detail" style="height:80%">
<com-item :dataContent="dataContent.package"></com-item>
<!-- <com-item :dataContent="dataContent.package"></com-item>
<u-line></u-line> <u-line></u-line>
<scroll-view style="height:320px "> <scroll-view style="height:320px ">
<view v-for="(item, index) in dataList" style="width: 100%;"> <view v-for="(item, index) in dataList" style="width: 100%;">
@ -12,7 +14,7 @@
<text v-else-if="item.type=='boolean'" class="text_wrap">{{boolean(item.content)}} </text> <text v-else-if="item.type=='boolean'" class="text_wrap">{{boolean(item.content)}} </text>
</view> </view>
</view> </view>
</scroll-view> </scroll-view> -->
<view class="uni-flex u-row-center "> <view class="uni-flex u-row-center ">
<view class="close_button" @click="closePopup"> <view class="close_button" @click="closePopup">
@ -24,13 +26,21 @@
</template> </template>
<script> <script>
import comItem from '@/mycomponents/item/item.vue' import detailItemInfo from '@/mycomponents/detail/detailItemInfo.vue'
import { dateFormat } from '@/common/basic.js'; import detailBalanceInfo from '@/mycomponents/detail/detailBalanceInfo.vue'
import detailPackageInfo from '@/mycomponents/detail/detailPackageInfo.vue'
import {
dateFormat
} from '@/common/basic.js';
export default { export default {
emits: ['onClose'], emits: ['onClose'],
components: { components: {
comItem detailItemInfo,
detailBalanceInfo,
detailPackageInfo
}, },
data() { data() {
return { return {
@ -50,127 +60,23 @@
methods: { methods: {
openPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.getDataList();
this.$refs.popup.open('bottom') this.$refs.popup.open('bottom')
}, },
avaliable(value) { // avaliable(value) {
return value == "TRUE" ? "可用" : "不可用" // return value == "TRUE" ? "" : ""
}, // },
boolean(value) { // boolean(value) {
return value == "TRUE" ? "是" : "否" // return value == "TRUE" ? "" : ""
}, // },
formatDate(val) { // formatDate(val) {
return dateFormat(val) // return dateFormat(val)
}, // },
closePopup(val) { closePopup(val) {
this.$refs.popup.close('bottom') this.$refs.popup.close('bottom')
// this.$emit('onClose') // this.$emit('onClose')
}, },
getDataList() {
// console.log(JSON.stringify(this.dataContent));
this.dataList.length = 0;
this.dataList.push(...[{
item_title: '包装号',
content: this.dataContent.packingNumber,
}, {
item_title: '器具代码',
content: this.dataContent.containerNumber,
}, {
item_title: '物料代码',
content: this.dataContent.itemCode,
}, {
item_title: '批次',
content: this.dataContent.batch,
}, {
item_title: '替代批次',
content: this.dataContent.altBatch,
}, {
item_title: '到货日期',
content: this.dataContent.arriveDate,
type:"dateTime"
}, {
item_title: '生产日期',
content: this.dataContent.produceDate,
type:"dateTime"
}, {
item_title: '失效日期',
content: this.dataContent.expireDate,
type:"dateTime"
}, {
item_title: '库存状态',
content: this.dataContent.inventoryStatus,
type:""
}, {
item_title: '库位代码',
content: this.dataContent.locationCode,
type:""
}, {
item_title: '库位组代码',
content: this.dataContent.locationGroupCode,
type:""
}, {
item_title: '库区代码',
content: this.dataContent.areaCode,
type:""
}, {
item_title: '仓库代码',
content: this.dataContent.warehouseCode,
}, {
item_title: 'ERP库位代码',
content: this.dataContent.erpLocationCode,
}, {
item_title: '货主代码',
content: this.dataContent.ownerCode,
}, {
item_title: '计量单位',
content: this.dataContent.uom,
type:"uom"
}, {
item_title: '数量',
content: this.dataContent.qty,
}, {
item_title: '锁定数量',
content: this.dataContent.lockedQty,
}, {
item_title: '可用数量',
content: this.dataContent.usableQty,
}, {
item_title: '单价',
content: this.dataContent.singlePrice,
}, {
item_title: '金额',
content: this.dataContent.amount,
}, {
item_title: '入库时间',
content: this.dataContent.putInTime,
type:"dateTime"
}, {
item_title: '是否冻结',
content: this.dataContent.frozen,
type:""
}, {
item_title: '冻结原因',
content: this.dataContent.frozenReason,
}, {
item_title: '最后事务号',
content: this.dataContent.lastTransNumber,
}, {
item_title: '重量',
content: this.dataContent.weight,
}, {
item_title: '面积',
content: this.dataContent.area,
}, {
item_title: '体积',
content: this.dataContent.volume,
}]);
// console.log(JSON.stringify(this.dataList));
},
} }
} }
</script> </script>

31
mycomponents/balance/toLocation.vue

@ -0,0 +1,31 @@
<template>
<view class="card_view ">
<text class="card_to_location card_content ">{{title}}</text>
<text class="card_content ">{{locationCode}}</text>
</view>
</template>
<script>
export default {
components: {
},
data() {
return {}
},
props: {
locationCode: {
type: String,
default: ''
},
title: {
type: String,
default: '库位'
},
},
}
</script>
<style>
</style>

1
mycomponents/detail/comRequestDetailCard.vue

@ -20,7 +20,6 @@
:isShowBatch="isShowBatch" :isShowFromLocation="isShowLocation"></recommend> :isShowBatch="isShowBatch" :isShowFromLocation="isShowLocation"></recommend>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
<u-line />
</view> </view>
</uni-collapse-item> </uni-collapse-item>
</uni-collapse> </uni-collapse>

67
mycomponents/detail/detailBalanceInfo.vue

@ -0,0 +1,67 @@
<template>
<view>
<!-- <view class="item_big_title">
[明细]
</view> -->
<view class="item">
<text class="item_title">箱码 : </text>
<text class="text_wrap">{{dataContent.packingNumber}}</text>
</view>
<view class="item">
<text class="item_title">批次 : </text>
<text class="text_wrap">{{dataContent.batch}}</text>
</view>
<view class="item">
<text class="item_title">数量 : </text>
<view class="text_wrap">
<text class="text_wrap">{{Number(dataContent.qty)}}</text>
<text class="text_wrap">{{getUnitInfo(dataContent.uom)}}</text>
</view>
</view>
<view class="item">
<text class="item_title">库存状态 : </text>
<text class="text_wrap">{{getInventoryStatusInfo(dataContent.inventoryStatus)}}</text>
</view>
<view class="item">
<text class="item_title">来源库位 : </text>
<text class="text_wrap">{{dataContent.fromLocationCode}}</text>
</view>
</view>
</template>
<script>
import {
getInventoryStatusName,
getStdPackUnitInfo,
getUnitInfo
} from '@/common/directory.js';
export default {
components: {},
data() {
return {
}
},
mounted() {},
props: {
dataContent: {
type: Object,
default: {}
}
},
methods: {
getInventoryStatusInfo(value) {
return getInventoryStatusName(value)
},
getUnitInfo(value){
return getUnitInfo(value).label
}
}
}
</script>
<style>
</style>

6
mycomponents/detail/detailCommonInfo.vue

@ -3,7 +3,7 @@
<com-item :dataContent="dataContent"></com-item> <com-item :dataContent="dataContent"></com-item>
<u-line></u-line> <u-line></u-line>
<scroll-view style="height:320px "> <scroll-view style="height:320px ">
<detail-basic-info :dataContent="dataContent"></detail-basic-info> <detail-item-info :dataContent="dataContent"></detail-item-info>
<u-line></u-line> <u-line></u-line>
<detail-recommend-info :dataContent="dataContent"></detail-recommend-info> <detail-recommend-info :dataContent="dataContent"></detail-recommend-info>
<u-line></u-line> <u-line></u-line>
@ -27,7 +27,7 @@
<script> <script>
import comItem from '@/mycomponents/item/item.vue' import comItem from '@/mycomponents/item/item.vue'
import detailBasicInfo from '@/mycomponents/detail/detailBasicInfo.vue' import detailItemInfo from '@/mycomponents/detail/detailItemInfo.vue'
import detailRecommendInfo from '@/mycomponents/detail/detailRecommendInfo.vue' import detailRecommendInfo from '@/mycomponents/detail/detailRecommendInfo.vue'
import detailHandleInfo from '@/mycomponents/detail/detailHandleInfo.vue' import detailHandleInfo from '@/mycomponents/detail/detailHandleInfo.vue'
@ -35,7 +35,7 @@
emits: ['onClose'], emits: ['onClose'],
components: { components: {
comItem, comItem,
detailBasicInfo, detailItemInfo,
detailRecommendInfo, detailRecommendInfo,
detailHandleInfo detailHandleInfo
}, },

6
mycomponents/detail/detailBasicInfo.vue → mycomponents/detail/detailItemInfo.vue

@ -10,11 +10,7 @@
</view> </view>
<view class="item"> <view class="item">
<text class="item_title">数量 : </text> <text class="item_title">数量 : </text>
<text class="text_wrap">{{dataContent.qty}} </text> <text class="text_wrap">{{dataContent.qty}}{{getUnitInfo(dataContent.uom)}} </text>
</view>
<view class="item">
<text class="item_title">计量单位 : </text>
<text class="text_wrap">{{getUnitInfo(dataContent.uom)}} </text>
</view> </view>
</view> </view>
</template> </template>

65
mycomponents/detail/detailPackageInfo.vue

@ -0,0 +1,65 @@
<template>
<view>
<view class="item">
<text class="item_title">供应商代码 : </text>
<text class="text_wrap">{{dataContent.supplierCode}}</text>
</view>
<view class="item">
<text class="item_title">采购订单 : </text>
<text class="text_wrap">{{dataContent.asnNumber}}</text>
</view>
<view class="item">
<text class="item_title">订单行 : </text>
<text class="text_wrap">{{dataContent.poNumber}}</text>
</view>
<view class="item">
<text class="item_title">订单行 : </text>
<view class="text_wrap">
<text class="text_wrap">{{dataContent.poLine}}</text>
</view>
</view>
<view class="item">
<text class="item_title">标包 : </text>
<view class="text_wrap">
<text class="text_wrap">{{dataContent.stdPackQty}}{{dataContent.stdPackUnit}}</text>
</view>
</view>
</view>
</template>
<script>
import {
getInventoryStatusName,
getStdPackUnitInfo,
getUnitInfo
} from '@/common/directory.js';
export default {
components: {},
data() {
return {
}
},
mounted() {},
props: {
dataContent: {
type: Object,
default: {}
}
},
methods: {
getInventoryStatusInfo(value) {
return getInventoryStatusName(value)
},
getUnitInfo(value){
return getUnitInfo(value).label
}
}
}
</script>
<style>
</style>

26
mycomponents/detail/recordDetailCommonInfo.vue

@ -1,13 +1,17 @@
<template> <template>
<view class="pop_detail" style="height:80%"> <view class="pop_detail" style="height:80%">
<com-item :dataContent="dataContent"></com-item>
<u-line></u-line> <u-line></u-line>
<scroll-view style="height:320px "> <scroll-view style="height:320px ">
<recordDetailBasicInfo :dataContent="dataContent"></recordDetailBasicInfo> <scroll-view style="height:320px ">
<u-line></u-line> <!-- 物品 -->
<slot> <detail-item-info :dataContent="dataContent"></detail-item-info>
<!-- 每个任务的详情 --> <!-- <request-detail-basic-info :dataContent="dataContent"></request-detail-basic-info> -->
</slot> <u-line></u-line>
<!-- 库存余额 -->
<detail-balance-info :dataContent="dataContent"></detail-balance-info>
<!-- 包装 -->
<!-- <detail-package-info :dataContent="dataContent"></detail-package-info> -->
</scroll-view>
</scroll-view> </scroll-view>
<view class="uni-flex u-row-center "> <view class="uni-flex u-row-center ">
@ -19,14 +23,16 @@
</template> </template>
<script> <script>
import comItem from '@/mycomponents/item/item.vue' import detailItemInfo from '@/mycomponents/detail/detailItemInfo.vue'
import recordDetailBasicInfo from '@/mycomponents/detail/recordDetailBasicInfo.vue' import detailPackageInfo from '@/mycomponents/detail/detailPackageInfo.vue'
import detailBalanceInfo from '@/mycomponents/detail/detailBalanceInfo.vue'
export default { export default {
emits: ['onClose'], emits: ['onClose'],
components: { components: {
comItem, detailItemInfo,
recordDetailBasicInfo, detailPackageInfo,
detailBalanceInfo
}, },
data() { data() {
return {} return {}

90
mycomponents/detail/recordDetailPopup.vue

@ -1,77 +1,69 @@
<template> <template>
<view class=""> <uni-popup ref="popup">
<uni-popup ref="popup"> <view class="pop_detail" style="height:80%">
<recordDetailCommonInfo :dataContent='dataContent'></recordDetailCommonInfo> <com-item :dataContent="dataContent"></com-item>
</uni-popup> <u-line></u-line>
</view> <scroll-view style="height:320px ">
<!-- 物品 -->
<detail-item-info :dataContent="dataContent"></detail-item-info>
<u-line></u-line>
<!-- 库存余额 -->
<detail-balance-info :dataContent="dataContent"></detail-balance-info>
<u-line></u-line>
<!-- 包装 -->
<detail-package-info :dataContent="dataContent.package"></detail-package-info>
</scroll-view>
<view class="uni-flex u-row-center ">
<view class="close_button" @click="closePopup">
关闭</view>
<!-- button 滚动不好使 -->
</view>
</view>
</uni-popup>
</template> </template>
<script> <script>
import { import comItem from '@/mycomponents/item/item.vue'
getInventoryStatusName, import detailItemInfo from '@/mycomponents/detail/detailItemInfo.vue'
getStdPackUnitInfo import detailPackageInfo from '@/mycomponents/detail/detailPackageInfo.vue'
} from '@/common/directory.js'; import detailBalanceInfo from '@/mycomponents/detail/detailBalanceInfo.vue'
import recordDetailCommonInfo from '@/mycomponents/detail/recordDetailCommonInfo.vue'
export default { export default {
emits: ['onClose'],
components: { components: {
recordDetailCommonInfo comItem,
detailItemInfo,
detailPackageInfo,
detailBalanceInfo
}, },
data() { data() {
return { return {
dataContent: {} dataContent: {
type: Object,
default: {}
}
} }
}, },
mounted() {},
props: { props: {
title: {
type: String,
default: ""
},
}, },
methods: { methods: {
openScanPopup(val) { openPopup(val) {
this.dataContent = val; this.dataContent = val;
this.$refs.popup.open('bottom') this.$refs.popup.open('bottom')
}, },
closeScanPopup() { closePopup() {
this.$refs.popup.close() this.$refs.popup.close()
}, },
getInventoryStatusInfo(value) {
return getInventoryStatusName(value).label
},
getStdPackUnit(uom) {
let item = getStdPackUnitInfo(uom);
if (item == '') {
return uom;
} else {
return item.label
}
}
} }
} }
</script> </script>
<style> <style>
.popup_box {
width: 500rpx;
height: 500rpx;
}
.item_big_title {
color: #2196F3;
font-size: 35rpx;
margin-top: 15rpx;
margin-bottom: 15rpx;
}
.item {
padding-top: 5rpx;
padding-bottom: 5rpx;
}
.item_title {
color: #000000;
font-size: 32rpx;
}
</style> </style>

58
mycomponents/detail/requestDetailBasicInfo.vue

@ -1,16 +1,17 @@
<template> <template>
<view class=""> <view class="">
<comListItem :dataList="dataList"></comListItem> <detail-item-info :dataContent="dataContent"></detail-item-info>
<!-- <comListItem :dataList="dataList"></comListItem> -->
</view> </view>
</template> </template>
<script> <script>
import comListItem from '@/mycomponents/common/comListItem.vue';
import detailItemInfo from '@/mycomponents/detail/detailItemInfo.vue'
export default { export default {
components: { components: {
comListItem detailItemInfo
}, },
data() { data() {
return { return {
@ -18,46 +19,7 @@
} }
}, },
watch: { watch: {
dataContent: {
handler(newName, oldName) {
this.dataList = [ {
title: '物品描述1',
content: this.dataContent.itemDesc1,
}, {
title: '物品描述2',
content: this.dataContent.itemDesc2,
}, {
title: '数量',
content: this.dataContent.qty,
}, {
title: '计量单位',
content: this.dataContent.uom,
type:"uom"
},
{
title: '项目代码',
content: this.dataContent.projectCode,
},{
title: '最后更新时间',
content: this.dataContent.updateTime,
type:"dateTime"
},
{
title: '最后更新者Id',
content: this.dataContent.lastModifierId,
},
{
title: '最后更新者用户名',
content: this.dataContent.lastModiferName,
},
{
title: '并发乐观锁',
content: this.dataContent.concurrencyStamp,
}];
},
immediate: true,
deep: true
}
}, },
mounted() {}, mounted() {},
@ -68,7 +30,11 @@
} }
}, },
methods: {} methods: {
getUnitInfo(value){
return getUnitInfo(value).label
}
}
} }
</script> </script>

15
mycomponents/detail/requestDetailCommonInfo.vue

@ -3,10 +3,14 @@
<com-item :dataContent="dataContent"></com-item> <com-item :dataContent="dataContent"></com-item>
<u-line></u-line> <u-line></u-line>
<scroll-view style="height:320px "> <scroll-view style="height:320px ">
<requestDetailBasicInfo :dataContent="dataContent"></requestDetailBasicInfo> <!-- 物品 -->
<detail-item-info :dataContent="dataContent"></detail-item-info>
<!-- <request-detail-basic-info :dataContent="dataContent"></request-detail-basic-info> -->
<u-line></u-line> <u-line></u-line>
<!-- <detail-recommend-info :dataContent="dataContent"></detail-recommend-info> <!-- 包装 -->
<u-line></u-line> -->
<!-- 库存余额 -->
<detail-balance-info :dataContent="dataContent"></detail-balance-info>
<slot> <slot>
<!-- 每个任务的详情 --> <!-- 每个任务的详情 -->
</slot> </slot>
@ -24,13 +28,16 @@
import comItem from '@/mycomponents/item/item.vue' import comItem from '@/mycomponents/item/item.vue'
import requestDetailBasicInfo from '@/mycomponents/detail/requestDetailBasicInfo.vue' import requestDetailBasicInfo from '@/mycomponents/detail/requestDetailBasicInfo.vue'
import detailRecommendInfo from '@/mycomponents/detail/detailRecommendInfo.vue' import detailRecommendInfo from '@/mycomponents/detail/detailRecommendInfo.vue'
import detailItemInfo from '@/mycomponents/detail/detailItemInfo.vue'
import detailBalanceInfo from '@/mycomponents/detail/detailBalanceInfo.vue'
export default { export default {
emits: ['onClose'], emits: ['onClose'],
components: { components: {
comItem, comItem,
requestDetailBasicInfo, requestDetailBasicInfo,
detailRecommendInfo, detailRecommendInfo,
detailItemInfo,
detailBalanceInfo
}, },
data() { data() {
return {} return {}

9
mycomponents/recommend/recommend.vue

@ -1,14 +1,15 @@
<template> <template>
<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff; border-bottom: 1upx solid #EEEEEE;"> <view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff; border-bottom: 1upx solid #EEEEEE;">
<view class="uni-flex uni-row space-between" style="align-items: center"> <view class="uni-flex uni-row space-between" style="align-items: center">
<!-- uni-inline-item 暂时拿掉--> <!-- uni-inline-item 暂时拿掉-->
<view> <view>
<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack> <pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
<batch v-if="isShowBatch" :batch="detail.batch"></batch> <batch v-if="isShowBatch" :batch="detail.batch"></batch>
<location v-if="isShowFromLocation" title="来源库位" :locationCode="detail.fromLocationCode"> <location v-if="isShowFromLocation" title="来源库位" :locationCode="detail.fromLocationCode">
</location> </location>
<location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode"> <!-- <to-location></to-location> -->
</location> <to-location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode">
</to-location>
</view> </view>
<view> <view>
<!-- ||detail.handleQty==0 可能会有扫描到0的情况--> <!-- ||detail.handleQty==0 可能会有扫描到0的情况-->
@ -30,6 +31,7 @@
<script> <script>
import pack from '@/mycomponents/balance/pack.vue' import pack from '@/mycomponents/balance/pack.vue'
import location from '@/mycomponents/balance/location.vue' import location from '@/mycomponents/balance/location.vue'
import toLocation from '@/mycomponents/balance/toLocation.vue'
import batch from '@/mycomponents/balance/batch.vue' import batch from '@/mycomponents/balance/batch.vue'
import recommendQty from '@/mycomponents/qty/recommendQty.vue' import recommendQty from '@/mycomponents/qty/recommendQty.vue'
import compareQty from '@/mycomponents/qty/compareQty.vue' import compareQty from '@/mycomponents/qty/compareQty.vue'
@ -38,6 +40,7 @@
components: { components: {
pack, pack,
location, location,
toLocation,
batch, batch,
recommendQty, recommendQty,
compareQty compareQty

11
mycomponents/record/recordComDetailCard.vue

@ -25,8 +25,8 @@
</uni-collapse-item> </uni-collapse-item>
</uni-collapse> </uni-collapse>
<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm"></balance-qty-edit> <balance-qty-edit ref="balanceQtyEdit" @confirm="confirm"></balance-qty-edit>
<!-- <job-detail-popup ref="winHint" :dataContent="showItem"></job-detail-popup> --> <record-detail-popup ref="recordDetailPopup"></record-detail-popup>
<balance-detail-popup ref="balanceDetailPopup"></balance-detail-popup> <!-- <balance-detail-popup ref="balanceDetailPopup"></balance-detail-popup> -->
<com-message ref="comMessage"></com-message> <com-message ref="comMessage"></com-message>
</view> </view>
</template> </template>
@ -41,6 +41,7 @@
import purchaseLabel from '@/mycomponents/balance/purchaseLabel.vue' import purchaseLabel from '@/mycomponents/balance/purchaseLabel.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import location from '@/mycomponents/balance/location.vue' import location from '@/mycomponents/balance/location.vue'
import recordDetailPopup from '@/mycomponents/detail/recordDetailPopup.vue'
import { import {
getDetailOption, getDetailOption,
@ -56,7 +57,8 @@
balanceDetailPopup, balanceDetailPopup,
purchaseLabel, purchaseLabel,
comMessage, comMessage,
location location,
recordDetailPopup
// winListHint // winListHint
}, },
props: { props: {
@ -153,8 +155,7 @@
detail(item) { detail(item) {
this.showItem = item; this.showItem = item;
this.$refs.balanceDetailPopup.openPopup(item); this.$refs.recordDetailPopup.openPopup(item);
// console.log(JSON.stringify(item));
}, },
remove(item, index) { remove(item, index) {

42
pages/inspect/job/inspectDetail.vue

@ -105,7 +105,7 @@
this.failedQty = option.failedQty; this.failedQty = option.failedQty;
this.crackQty = option.crackQty; this.crackQty = option.crackQty;
if (this.id != undefined ) { if (this.id != undefined) {
// // // //
this.getDetail(); this.getDetail();
} }
@ -136,7 +136,7 @@
} }
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.getDetail(); this.getDetail();
@ -147,29 +147,29 @@
}, },
methods: { methods: {
deleteFileById(id){ deleteFileById(id) {
deleteFileById(id).then(res=>{ deleteFileById(id).then(res => {
}) })
}, },
getFileList(id){ getFileList(id) {
getFileList("jobInspectDetail", id).then(res => { getFileList("jobInspectDetail", id).then(res => {
if(res.data){ if (res.data) {
res.data.forEach(res=>{ res.data.forEach(res => {
this.deleteFileById(res.id) this.deleteFileById(res.id)
}) })
} }
}) })
}, },
clearPicList(subList){ clearPicList(subList) {
subList.forEach(item=>{ subList.forEach(item => {
this.getFileList(item.id) this.getFileList(item.id)
}) })
}, },
// //
receive(callback) { receive(callback) {
uni.showLoading({ uni.showLoading({
@ -309,8 +309,9 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
if(this.jobContent.allowModifyInventoryStatus=="TRUE"){ if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
itemStatus +
']不一致,是否继续检验?', res => { ']不一致,是否继续检验?', res => {
if (res) { if (res) {
itemDetail.scaned = true; itemDetail.scaned = true;
@ -321,13 +322,14 @@
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} }
}); });
}else { } else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
itemStatus +
']不一致,不允许转移!', res => { ']不一致,不允许转移!', res => {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
}); });
} }
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.balance = result.balance; itemDetail.balance = result.balance;

1
pages/purchaseReceipt/coms/comReceiptDetailCard.vue

@ -13,7 +13,6 @@
<recommend :detail="item" :isShowLocation="false" :isShowFromLocation="false" :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend> <recommend :detail="item" :isShowLocation="false" :isShowFromLocation="false" :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
<u-line color="#D8D8D8"></u-line>
</view> </view>
</uni-collapse-item> </uni-collapse-item>
</uni-collapse> </uni-collapse>

1
pages/purchaseReceipt/job/receiptDetail.vue

@ -17,7 +17,6 @@
@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'> @remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
</com-receipt-detail-card> </com-receipt-detail-card>
</view> </view>
<u-line />
</view> </view>
</scroll-view> </scroll-view>
</view> </view>

93
pages/purchaseReturn/coms/requestDetailInfoPopup.vue

@ -1,11 +1,21 @@
<template> <template>
<view class=""> <view class="">
<uni-popup ref="popup"> <uni-popup ref="popup">
<requestDetailCommonInfo :dataContent="dataContent" @onClose="closePopup"> <request-detail-common-info :dataContent="dataContent" @onClose="closePopup">
<view class=""> <view class="">
<comListItem :dataList="dataList"></comListItem> <u-line></u-line>
<view class="uni-flex uni-column">
<view class="item">
<text class="item_title">订单号 : </text>
<text class="text_wrap">{{dataContent.poNumber}} </text>
</view>
<view class="item">
<text class="item_title">订单行 : </text>
<text class="text_wrap">{{dataContent.poLine}} </text>
</view>
</view>
</view> </view>
</requestDetailCommonInfo> </request-detail-common-info>
</uni-popup> </uni-popup>
</view> </view>
</template> </template>
@ -14,7 +24,7 @@
import requestDetailCommonInfo from '@/mycomponents/detail/requestDetailCommonInfo.vue' import requestDetailCommonInfo from '@/mycomponents/detail/requestDetailCommonInfo.vue'
import comListItem from '@/mycomponents/common/comListItem.vue'; import comListItem from '@/mycomponents/common/comListItem.vue';
export default { export default {
components: { components: {
requestDetailCommonInfo, requestDetailCommonInfo,
comListItem comListItem
@ -25,48 +35,47 @@
type: Object, type: Object,
default: {} default: {}
}, },
dataList:[] dataList: []
} }
}, },
watch:{ watch: {
dataContent: { dataContent: {
handler(newName, oldName) { handler(newName, oldName) {
this.dataList=[{ this.dataList = [{
title: '包装号', title: '包装号',
content: this.dataContent.packingNumber content: this.dataContent.packingNumber
}, { }, {
title: '器具号', title: '器具号',
content: this.dataContent.containerNumber content: this.dataContent.containerNumber
},{ }, {
title: '批次', title: '批次',
content: this.dataContent.batch content: this.dataContent.batch
},{ }, {
title: '替代批次', title: '替代批次',
content: this.dataContent.altBatch, content: this.dataContent.altBatch,
},{ }, {
title: '到库位代码', title: '到库位代码',
content: this.dataContent.toLocationCode content: this.dataContent.toLocationCode
},{ }, {
title: '库存状态', title: '库存状态',
content: this.dataContent.inventoryStatus, content: this.dataContent.inventoryStatus,
type:"inventoryStatus" type: "inventoryStatus"
},{ }, {
title: '订单号', title: '订单号',
content: this.dataContent.poNumber content: this.dataContent.poNumber
},{ }, {
title: '订单行', title: '订单行',
content: this.dataContent.poLine content: this.dataContent.poLine
},{ }, {
title: '原因', title: '原因',
content: this.dataContent.reason content: this.dataContent.reason
},{ }, {
title: '从货主代码', title: '从货主代码',
content: this.dataContent.fromOwnerCode, content: this.dataContent.fromOwnerCode,
},{ }, {
title: '到货主代码', title: '到货主代码',
content: this.dataContent.toOwnerCode, content: this.dataContent.toOwnerCode,
} }];
];
}, },
immediate: true, immediate: true,
deep: true deep: true

29
pages/purchaseReturn/record/returnRecord.vue

@ -4,13 +4,22 @@
<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view> <com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
</view> </view>
<view class="page-wraper" v-if="detailSource.length>0"> <view class="page-wraper" v-if="detailSource.length>0">
<u-line></u-line> <view class="page-header">
<view class="header_item">
供应商代码{{supplierCode}}
</view>
<view class="header_item">
采购订单{{poNumber}}
</view>
<u-line color="#D8D8D8"></u-line>
</view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<record-com-detail-card :dataContent="item" @removeItem="removeItem(index,item)" <record-com-detail-card :dataContent="item" @removeItem="removeItem(index,item)"
@updateData="updateData" @removePack="removePack"> @updateData="updateData" @removePack="removePack" :isShowToLocation="false">
</record-com-detail-card> </record-com-detail-card>
</view> </view>
</view> </view>
@ -87,6 +96,7 @@
fromlocationTypeList: [], fromlocationTypeList: [],
tolocationTypeList: [], tolocationTypeList: [],
businessType: {}, // businessType: {}, //
supplierCode: '', //
poNumber: '', poNumber: '',
fromType: "", fromType: "",
dataContent: {} dataContent: {}
@ -143,11 +153,20 @@
}, },
getScanResult(result) { getScanResult(result) {
if (this.supplierCode == '') {
this.supplierCode = result.label.supplierCode;
} else {
if (this.supplierCode != result.label.supplierCode) {
this.showErrorMessage('扫描的供应商代码[' + result.label.supplierCode + ']与默认供应商代码[' + this.poNumber + ']不一致')
return;
}
}
if (this.poNumber == '') { if (this.poNumber == '') {
this.poNumber = result.label.order; this.poNumber = result.label.poNumber;
} else { } else {
if (this.poNumber != result.label.order) { if (this.poNumber != result.label.poNumber) {
this.showErrorMessage('扫描的采购订单号[' + result.label.order + ']与默认采购订单号[' + this.poNumber + ']不一致') this.showErrorMessage('扫描的采购订单号[' + result.label.poNumber + ']与默认采购订单号[' + this.poNumber + ']不一致')
return; return;
} }
} }

2
pages/purchaseReturn/request/returnRequest.vue

@ -268,7 +268,7 @@
getPurchaseReturnRequestList(params).then(res => { getPurchaseReturnRequestList(params).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res.data.list.length == 0) { if (res.data.list.length == 0) {
that.showMessage('未查找到' + '【' + code + '】的货任务'); that.showMessage('未查找到' + '【' + code + '】的退货任务');
} else if (res.data.list.length == 1) { } else if (res.data.list.length == 1) {
that.openRequestDetail(res.data.list[0]); that.openRequestDetail(res.data.list[0]);
} }

6
pages/purchaseReturn/request/returnRequestCreate.vue

@ -137,10 +137,10 @@
getScanResult(result) { getScanResult(result) {
if (this.poNumber == '') { if (this.poNumber == '') {
this.poNumber = result.label.order; this.poNumber = result.label.poNumber;
} else { } else {
if (this.poNumber != result.label.order) { if (this.poNumber != result.label.poNumber) {
this.showErrorMessage('扫描的采购订单号[' + result.label.order + ']与默认采购订单号[' + this.poNumber + ']不一致') this.showErrorMessage('扫描的采购订单号[' + result.label.poNumber + ']与默认采购订单号[' + this.poNumber + ']不一致')
return; return;
} }
} }

10
pages/purchaseReturn/request/returnRequestDetail.vue

@ -4,15 +4,14 @@
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<comRequestDetailCard :dataContent="item" <com-request-detail-card :dataContent="item"
@openDetail="openDetail"> @openDetail="openDetail">
</comRequestDetailCard> </com-request-detail-card>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<request-detail-info-popup ref="jobDetailPopup"></request-detail-info-popup>
<requestDetailInfoPopup ref="jobDetailPopup"></requestDetailInfoPopup>
<com-message ref="comMessage"></com-message> <com-message ref="comMessage"></com-message>
</view> </view>
</template> </template>
@ -86,7 +85,8 @@
that.requestContent = res.data; that.requestContent = res.data;
that.subList = res.data.subList; that.subList = res.data.subList;
that.subList.forEach(res=>{ that.subList.forEach(res=>{
res.fromLocationCode = res.toLocationCode // res.fromLocationCode = res.toLocationCode
res.locationCode = res.fromLocationCode
}) })
that.detailSource = getDataSource(that.subList); that.detailSource = getDataSource(that.subList);
} else { } else {

Loading…
Cancel
Save