sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改记录的详情

wms3.0_pda
niexiting 10 months ago
parent
7747fd7dc7
commit
dd52c0dd2e
8 changed files with 139 additions and 226 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 146
      mycomponents/balance/balanceDetailPopup.vue
  2. 6
      mycomponents/detail/detailItemInfo.vue
  3. 30
      mycomponents/detail/detailPackageInfo.vue
  4. 26
      mycomponents/detail/recordDetailCommonInfo.vue
  5. 90
      mycomponents/detail/recordDetailPopup.vue
  6. 11
      mycomponents/record/recordComDetailCard.vue
  7. 42
      pages/inspect/job/inspectDetail.vue
  8. 14
      pages/purchaseReturn/record/returnRecord.vue

146
mycomponents/balance/balanceDetailPopup.vue
View File

@ -1,7 +1,9 @@
<template>
<uni-popup ref="popup">
<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>
<scroll-view style="height:320px ">
<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>
</view>
</view>
</scroll-view>
</scroll-view> -->
<view class="uni-flex u-row-center ">
<view class="close_button" @click="closePopup">
@ -24,13 +26,21 @@
</template>
<script>
import comItem from '@/mycomponents/item/item.vue'
import { dateFormat } from '@/common/basic.js';
import detailItemInfo from '@/mycomponents/detail/detailItemInfo.vue'
import detailBalanceInfo from '@/mycomponents/detail/detailBalanceInfo.vue'
import detailPackageInfo from '@/mycomponents/detail/detailPackageInfo.vue'
import {
dateFormat
} from '@/common/basic.js';
export default {
emits: ['onClose'],
components: {
comItem
detailItemInfo,
detailBalanceInfo,
detailPackageInfo
},
data() {
return {
@ -50,127 +60,23 @@
methods: {
openPopup(val) {
this.dataContent = val;
this.getDataList();
this.$refs.popup.open('bottom')
},
avaliable(value) {
return value == "TRUE" ? "可用" : "不可用"
},
boolean(value) {
return value == "TRUE" ? "是" : "否"
},
formatDate(val) {
return dateFormat(val)
},
// avaliable(value) {
// return value == "TRUE" ? "可用" : "不可用"
// },
// boolean(value) {
// return value == "TRUE" ? "是" : "否"
// },
// formatDate(val) {
// return dateFormat(val)
// },
closePopup(val) {
this.$refs.popup.close('bottom')
// 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>

6
mycomponents/detail/detailItemInfo.vue
View File

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

30
mycomponents/detail/detailPackageInfo.vue
View File

@ -1,30 +1,28 @@
<template>
<view>
<!-- <view class="item_big_title">
[明细]
</view> -->
<view class="item">
<text class="item_title">箱码 : </text>
<text class="text_wrap">{{dataContent.packingNumber}}</text>
<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.batch}}</text>
<text class="item_title">采购订单 : </text>
<text class="text_wrap">{{dataContent.asnNumber}}</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>
<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">{{getInventoryStatusInfo(dataContent.inventoryStatus)}}</text>
<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>
<text class="text_wrap">{{dataContent.fromLocationCode}}</text>
<text class="item_title">标包 : </text>
<view class="text_wrap">
<text class="text_wrap">{{dataContent.stdPackQty}}{{dataContent.stdPackUnit}}</text>
</view>
</view>
</view>
</template>

26
mycomponents/detail/recordDetailCommonInfo.vue
View File

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

90
mycomponents/detail/recordDetailPopup.vue
View File

@ -1,77 +1,69 @@
<template>
<view class="">
<uni-popup ref="popup">
<recordDetailCommonInfo :dataContent='dataContent'></recordDetailCommonInfo>
</uni-popup>
</view>
<uni-popup ref="popup">
<view class="pop_detail" style="height:80%">
<com-item :dataContent="dataContent"></com-item>
<u-line></u-line>
<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>
<script>
import {
getInventoryStatusName,
getStdPackUnitInfo
} from '@/common/directory.js';
import recordDetailCommonInfo from '@/mycomponents/detail/recordDetailCommonInfo.vue'
import comItem from '@/mycomponents/item/item.vue'
import detailItemInfo from '@/mycomponents/detail/detailItemInfo.vue'
import detailPackageInfo from '@/mycomponents/detail/detailPackageInfo.vue'
import detailBalanceInfo from '@/mycomponents/detail/detailBalanceInfo.vue'
export default {
emits: ['onClose'],
components: {
recordDetailCommonInfo
comItem,
detailItemInfo,
detailPackageInfo,
detailBalanceInfo
},
data() {
return {
dataContent: {}
dataContent: {
type: Object,
default: {}
}
}
},
mounted() {},
props: {
title: {
type: String,
default: ""
},
},
methods: {
openScanPopup(val) {
openPopup(val) {
this.dataContent = val;
this.$refs.popup.open('bottom')
},
closeScanPopup() {
closePopup() {
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>
<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>

11
mycomponents/record/recordComDetailCard.vue
View File

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

42
pages/inspect/job/inspectDetail.vue
View File

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

14
pages/purchaseReturn/record/returnRecord.vue
View File

@ -5,6 +5,9 @@
</view>
<view class="page-wraper" v-if="detailSource.length>0">
<view class="page-header">
<view class="header_item">
供应商代码：{{supplierCode}}
</view>
<view class="header_item">
采购订单：{{poNumber}}
</view>
@ -93,6 +96,7 @@
fromlocationTypeList: [],
tolocationTypeList: [],
businessType: {}, //业务类型
supplierCode: '', //供应商代码
poNumber: '',
fromType: "",
dataContent: {}
@ -149,7 +153,15 @@
},
getScanResult(result) {
debugger;
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 == '') {
this.poNumber = result.label.poNumber;
} else {

Write Preview
Loading…
Cancel
Save