main
zouyanyan 11 hours ago
parent da1490e1b6
commit 42084bb341

@ -95,9 +95,9 @@ export default {
that.html5QrCode = new Html5Qrcode("reader"); that.html5QrCode = new Html5Qrcode("reader");
let windowInfo = uni.getWindowInfo(); let windowInfo = uni.getWindowInfo();
console.log(windowInfo); // console.log(windowInfo);
const width = windowInfo.windowWidth?windowInfo.windowWidth:375; const width = windowInfo&&windowInfo.windowWidth?windowInfo.windowWidth:375;
const height = windowInfo.windowHeight?windowInfo.windowHeight:720; const height = windowInfo&&windowInfo.windowHeight?windowInfo.windowHeight:720;
// //
const aspectRatio = width / height; const aspectRatio = width / height;
@ -134,6 +134,11 @@ export default {
facingMode: "environment", facingMode: "environment",
aspectRatio: width < 600 ? mobileAspectRatio : aspectRatio, aspectRatio: width < 600 ? mobileAspectRatio : aspectRatio,
}, },
autofocus:true, // 使
colorDark: '#0000ff', //
colorLight: '#ffffff',//
visualFeedback:true, //
halfSample:true,//
}, },
(decodedText, decodedResult) => { (decodedText, decodedResult) => {
// //
@ -182,6 +187,8 @@ export default {
top: 50%; top: 50%;
left: 0; left: 0;
transform: translateY(-50%); transform: translateY(-50%);
width: 100vw;
height: 100vh;
} }
.scan-tip-overlay { .scan-tip-overlay {

@ -221,146 +221,148 @@
<text class="item-tip">{{ item.groupDesc }} ({{ item.qty?parseFloat(item.qty).toFixed(2):'0.00'}})</text> <text class="item-tip">{{ item.groupDesc }} ({{ item.qty?parseFloat(item.qty).toFixed(2):'0.00'}})</text>
</view> </view>
<view class="item-header" @click="toggleDetail(index)"> <view v-for="(row, ii) in item.items">
<text class="item-title">{{ item.assemcode }} ({{ item.qty?parseFloat(item.qty).toFixed(2):'0.00' }})</text> <view class="item-header" @click="toggleDetail(ii)">
<!-- <text class="status-badge" :class="getStatusClass(item.status)">{{item.status}}</text> --> <text class="item-title">{{ row.assemcode }} ({{ row.qty?parseFloat(row.qty).toFixed(2):'0.00' }})</text>
<uni-icons :type="expandedIndex === index ? 'arrowup' : 'arrowdown'" size="16" color="#999"></uni-icons> <uni-icons :type="expandedIndex === ii ? 'arrowup' : 'arrowdown'" size="16" color="#999"></uni-icons>
</view> </view>
<view v-if="expandedIndex === index" class="item-content"> <view v-if="expandedIndex === ii" class="item-content">
<view class="detail-row"> <view class="detail-row">
<text class="label">工程编号:</text> <text class="label">工程编号:</text>
<text class="value">{{ item.project }}</text> <text class="value">{{ row.project }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">安装托盘表号:</text> <text class="label">安装托盘表号:</text>
<text class="value">{{ item.instno }}</text> <text class="value">{{ row.instno }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">制作图号:</text> <text class="label">制作图号:</text>
<text class="value">{{ item.dwgno }}</text> <text class="value">{{ row.dwgno }}</text>
</view> </view>
<!-- <view class="detail-row"> <!-- <view class="detail-row">
<text class="label">分段号:</text> <text class="label">分段号:</text>
<text class="value">{{ item.section }}</text> <text class="value">{{ row.section }}</text>
</view> --> </view> -->
<view class="detail-row"> <view class="detail-row">
<text class="label">规格:</text> <text class="label">规格:</text>
<text class="value">{{ item.spec }}</text> <text class="value">{{ row.spec }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">材质:</text> <text class="label">材质:</text>
<text class="value">{{ item.grd }}</text> <text class="value">{{ row.grd }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">数量:</text> <text class="label">数量:</text>
<text class="value">{{ item.qty }}</text> <text class="value">{{ row.qty }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">重量:</text> <text class="label">重量:</text>
<text class="value">{{ item.weight }}</text> <text class="value">{{ row.weight }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">表面处理:</text> <text class="label">表面处理:</text>
<text class="value">{{ item.treatment }}</text> <text class="value">{{ row.treatment }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">涂装代码:</text> <text class="label">涂装代码:</text>
<text class="value">{{ item.paintcode }}</text> <text class="value">{{ row.paintcode }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">修改类型:</text> <text class="label">修改类型:</text>
<text class="value">{{ item.modifyType }}</text> <text class="value">{{ row.modifyType }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">修改卡号:</text> <text class="label">修改卡号:</text>
<text class="value">{{ item.modifyKh }}</text> <text class="value">{{ row.modifyKh }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">修改通知单号:</text> <text class="label">修改通知单号:</text>
<text class="value">{{ item.modifyDwgno }}</text> <text class="value">{{ row.modifyDwgno }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">修改日期:</text> <text class="label">修改日期:</text>
<text class="value">{{ item.modifyDate }}</text> <text class="value">{{ row.modifyDate }}</text>
</view> </view>
<!-- <view class="detail-row"> <!-- <view class="detail-row">
<text class="label">生产状态:</text> <text class="label">生产状态:</text>
<text class="value">{{ item.status }}</text> <text class="value">{{ row.status }}</text>
</view> --> </view> -->
<!-- <view class="detail-row"> <!-- <view class="detail-row">
<text class="label">状态日期:</text> <text class="label">状态日期:</text>
<text class="value">{{ item.statusDate }}</text> <text class="value">{{ row.statusDate }}</text>
</view> --> </view> -->
<view class="detail-row"> <view class="detail-row">
<text class="label">制作单位:</text> <text class="label">制作单位:</text>
<text class="value">{{ item.manuDept }}</text> <text class="value">{{ row.manuDept }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">处理单位:</text> <text class="label">处理单位:</text>
<text class="value">{{ item.treatDept }}</text> <text class="value">{{ row.treatDept }}</text>
</view> </view>
<!-- <view class="detail-row"> <!-- <view class="detail-row">
<text class="label">配送单位:</text> <text class="label">配送单位:</text>
<text class="value">{{ item.deliverDept }}</text> <text class="value">{{ row.deliverDept }}</text>
</view> --> </view> -->
<view class="detail-row"> <view class="detail-row">
<text class="label">工装托盘编号:</text> <text class="label">工装托盘编号:</text>
<text class="value">{{ item.palletNo }}</text> <text class="value">{{ row.palletNo }}</text>
</view> </view>
<!-- <view class="detail-row"> <!-- <view class="detail-row">
<text class="label">工装托盘转运记录ID:</text> <text class="label">工装托盘转运记录ID:</text>
<text class="value">{{ item.deliveryId }}</text> <text class="value">{{ row.deliveryId }}</text>
</view> --> </view> -->
<!-- <view class="detail-row"> <!-- <view class="detail-row">
<text class="label">配送单号:</text> <text class="label">配送单号:</text>
<text class="value">{{ item.deliveryNo }}</text> <text class="value">{{ row.deliveryNo }}</text>
</view> --> </view> -->
<view class="detail-row"> <view class="detail-row">
<text class="label">配送车辆:</text> <text class="label">配送车辆:</text>
<text class="value">{{ item.deliveryCar }}</text> <text class="value">{{ row.deliveryCar }}</text>
</view> </view>
<!-- <view class="detail-row"> <!-- <view class="detail-row">
<text class="label">配送日期:</text> <text class="label">配送日期:</text>
<text class="value">{{ item.deliveryDate }}</text> <text class="value">{{ row.deliveryDate }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">配送备注:</text> <text class="label">配送备注:</text>
<text class="value">{{ item.deliveryRemark }}</text> <text class="value">{{ row.deliveryRemark }}</text>
</view> --> </view> -->
<view class="detail-row"> <view class="detail-row">
<text class="label">需求日期:</text> <text class="label">需求日期:</text>
<text class="value">{{ item.requireRate }}</text> <text class="value">{{ row.requireRate }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">需求单位:</text> <text class="label">需求单位:</text>
<text class="value">{{ retType(item.requireDepartCode,2) }}</text> <text class="value">{{ retType(row.requireDepartCode,2) }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">配送地址:</text> <text class="label">配送地址:</text>
<text class="value">{{ item.requireAddress }}</text> <text class="value">{{ row.requireAddress }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">接收人员:</text> <text class="label">接收人员:</text>
<text class="value">{{ item.requireName }}</text> <text class="value">{{ row.requireName }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">接收人员电话:</text> <text class="label">接收人员电话:</text>
<text class="value">{{ item.requirePhone }}</text> <text class="value">{{ row.requirePhone }}</text>
</view> </view>
<!-- <view class="detail-row"> <!-- <view class="detail-row">
<text class="label">实际接收日期:</text> <text class="label">实际接收日期:</text>
<text class="value">{{ item.receiveDate }}</text> <text class="value">{{ row.receiveDate }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">实际接收人员:</text> <text class="label">实际接收人员:</text>
<text class="value">{{ item.receiveName }}</text> <text class="value">{{ row.receiveName }}</text>
</view> </view>
<view class="detail-row"> <view class="detail-row">
<text class="label">实际接收备注:</text> <text class="label">实际接收备注:</text>
<text class="value">{{ item.receiveRemark }}</text> <text class="value">{{ row.receiveRemark }}</text>
</view> --> </view> -->
</view> </view>
</view> </view>
</view>
</view> </view>
</view> </view>
@ -451,44 +453,50 @@
palletNo: this.pallet.palletNo palletNo: this.pallet.palletNo
}); });
if(res.success){ if(res.success){
if(res.data) if(res.data&&res.data.length>0)
{ {
this.pallet["instdetailList"]=res.data; this.pallet["instdetailList"]=[];
// this.pallet["instdetailList"]=[{ res.data.forEach(cell=>{
// "id": "b0ce28eb-cf71-466f-952f-17b7663c29f2", var findx = -1;
// "project": "T300K-106", findx = this.pallet["instdetailList"].findIndex(item => item.groupDesc === cell.groupDesc);
// "instno": "9201FP12010MV", if(findx<0){
// "dwgno": "9201MP12MVM", var add = {
// "section": "9201", ...cell,
// "assemcode": "40-CW02-L3S-05", items:[cell],
// "spec": "21.3*2.11", };
// "grd": "A312 TP316", this.pallet["instdetailList"].push(add);
// "qty": "1.000000", this.$forceUpdate();
// "weight": "0.6500", }
// "treatment": "", else {
// "status": "", this.pallet["instdetailList"][findx].items.push(cell);
// "statusDate": "2026/01/07", this.$forceUpdate();
// "manuDept": "", }
// "treatDept": "", });
// "deliverDept": "",
// "palletNo": "", this.pallet["instdetailList"].forEach((cell,idx)=>{
// "deliveryCar": "284", cell["qty"]=this.getQty(cell.items);
// "deliveryDate": "2026/01/07", this.$forceUpdate();
// "deliveryRemark": " ( 2026/01/06)", });
// "requireDate": "2026/01/05",
// "requireDepartCode": "P30000", // this.pallet["instdetailList"]=res.data;
// "requireAddress": "",
// "requireName": "",
// "requirePhone": "13500795290",
// "groupDesc": "T300K-106 9201FP12010MV",
// "uniStr": "T300K-106 9201FP12010MV 40-CW02-L3S-05\n21.3*2.11 A312 TP316 1.000000"
// }]
this.$forceUpdate(); this.$forceUpdate();
} }
} }
} }
}, },
getQty(items){
var num=0
if (items&&items.length>0) {
items.forEach(cell=>{
num=num+1.0*(cell.qty?cell.qty:0);
});
return num.toFixed(2);
}
else{
return 0;
}
},
toggleDetail(index) { toggleDetail(index) {
if (this.expandedIndex === index) { if (this.expandedIndex === index) {
this.expandedIndex = null; this.expandedIndex = null;
@ -719,6 +727,7 @@
padding: 12rpx; padding: 12rpx;
border-radius: 10rpx; border-radius: 10rpx;
border: 1rpx solid #007aff; border: 1rpx solid #007aff;
background: #e2eefa;
} }
.item-title { .item-title {
display: flex; display: flex;

@ -310,15 +310,18 @@
if(res.data){ if(res.data){
this.ifsm = false; this.ifsm = false;
this.trayInfo=res.data; this.trayInfo=res.data;
if(this.trayInfo.loadId){
console.log(1) //
// this.openPalletDetail();
this.getYpDetail()
} // if(this.trayInfo.loadId){
else{ // //
// this.open() // // this.getYpDetail()
this.openPalletDetail(); // // }
} // else{
// // this.open() //
// this.openPalletDetail(); //
// }
} }
else{ else{
this.ifsm = true; this.ifsm = true;

@ -66,12 +66,13 @@
<uni-icons type="right" size="20" color="#999"></uni-icons> <uni-icons type="right" size="20" color="#999"></uni-icons>
</view> </view>
</u-form-item> </u-form-item>
<u-form-item label="接收人" label-width="100rpx" label-position="left" prop="receiveName"> <u-form-item label="接收人" label-width="140rpx" label-position="left" prop="receiveName">
<view class="selarr" @click="showry()"> <!-- <view class="selarr" @click="showry()">
<text class="txt" v-if="itemList.receiveName">{{itemList.receiveName}}</text> <text class="txt" v-if="itemList.receiveName">{{itemList.receiveName}}</text>
<text class="txt" v-else style="color:#999">请选择</text> <text class="txt" v-else style="color:#999">请选择</text>
<uni-icons type="right" size="20" color="#999"></uni-icons> <uni-icons type="right" size="20" color="#999"></uni-icons>
</view> </view> -->
<u-input :border="true" :height="60" placeholder="请输入" input-align="left" v-model="itemList.receiveName" maxlength="12"></u-input>
</u-form-item> </u-form-item>
<u-form-item label="接收电话" label-width="140rpx" label-position="left" prop="receivePhone"> <u-form-item label="接收电话" label-width="140rpx" label-position="left" prop="receivePhone">
<u-input :border="true" :height="60" placeholder="请输入" input-align="left" v-model="itemList.receivePhone" type="number" maxlength="12"></u-input> <u-input :border="true" :height="60" placeholder="请输入" input-align="left" v-model="itemList.receivePhone" type="number" maxlength="12"></u-input>

Loading…
Cancel
Save