From 0d37bbe276032742252bd5a96a0bbad93dd148ec Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 18 十月 2024 14:57:13 +0800
Subject: [PATCH] @#
---
pages/pakin/repairPakin.vue | 116 ++++++++++++++++++++++++++++++++------
pages/pakin/confirmPakin.vue | 14 ++--
2 files changed, 105 insertions(+), 25 deletions(-)
diff --git a/pages/pakin/confirmPakin.vue b/pages/pakin/confirmPakin.vue
index 22e4c65..68214bf 100644
--- a/pages/pakin/confirmPakin.vue
+++ b/pages/pakin/confirmPakin.vue
@@ -6,10 +6,11 @@
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
@input="barcodeInput()">
</view>
- <view class="item">
+ <view class="item" style="padding: 8rpx;">
<view class="code-decs">鐮佸灈浣�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="bomCode" :focus="bomCodeFocus"
- @confirm="bomInput()">
+ <uni-combox style="height:30rpx;" emptyTips="鏆傛棤鏁版嵁" :candidates="stas" v-model="sta" placeholder="绔欏彴鍙�"></uni-combox>
+ <!-- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="bomCode" :focus="bomCodeFocus"
+ @confirm="bomInput()"> -->
</view>
<view class="item">
<view class="code-decs">鐗╂枡鐮�:</view>
@@ -37,7 +38,7 @@
<scroll-view>
<view class="list" v-for="(item,i) in dataList" :key="i">
<view class="list-left">
- <view style="display: flex; flex-wrap: wrap;color: #3a3a3a;">
+ <view style="display: flex;flex-direction: column;color: #3a3a3a;">
<view style="margin-right: 20rpx;">
<text style="font-weight: 600;">鍖呰缁勫彿:</text>
<text>{{item.packageGroupNo}}</text>
@@ -190,7 +191,8 @@
bomCode: '',
bomCodeFocus: false,
maxAn: 0,
-
+ stas: [3092,3102,3095],
+ sta: ''
}
},
onLoad() {
@@ -723,7 +725,7 @@
uni.request({
url: that.baseUrl + '/mobile/pdtz/auth',
data: JSON.stringify({
- palletizingNo: that.bomCode,
+ palletizingNo: that.sta,
barcode: that.barcode,
matList: that.dataList
}),
diff --git a/pages/pakin/repairPakin.vue b/pages/pakin/repairPakin.vue
index 1f1dc45..a4accc1 100644
--- a/pages/pakin/repairPakin.vue
+++ b/pages/pakin/repairPakin.vue
@@ -23,19 +23,64 @@
<scroll-view>
<view class="list" v-for="(item,i) in dataList" :key="i">
<view class="list-left">
- <!-- <view class="list-left-item">
- <view class="desc">No锛�</view>
- <view class="left-item">{{i + 1}}</view>
- </view> -->
- <view class="list-left-item">
- <view class="left-item">鍖呰缁勫彿锛�</view>
+ <view style="display: flex;align-items: center;">
+ <text style="font-weight: 600;">鍖呰缁勫彿:</text>
+ <text>{{item.packageGroupNo}}</text>
</view>
- <view class="list-left-item">
- <view class="left-item">
- {{item.packageGroupNo}}
+ <view style="display: flex;align-items: center;">
+ <text style="font-weight: 600;">鏈ㄧ绫诲瀷:</text>
+ <text>{{item.boxType}}</text>
+ </view>
+ <view style="display: flex;align-items: center;">
+ <text style="font-weight: 600;">绠¤姱绫诲瀷:</text>
+ <text>{{item.rollType}}</text>
+ </view>
+ <view style="display: flex;align-items: center;">
+ <text style="font-weight: 600;">瀹藉箙:</text>
+ <text>{{item.wideInWidth}}</text>
+ </view>
+ <view style="display: flex;align-items: center;">
+ <text style="font-weight: 600;">鐢熺當鍘氬害:</text>
+ <text>{{item.thickness}}</text>
+ </view>
+ <view v-for="(roll,i) in item.rolls" style="font-size: 14px;padding: 8px;">
+ <view style="display: flex;align-items: center;">
+ <text style="font-weight: 600;">搴忓彿:</text>
+ <text>{{i + 1}}</text>
</view>
- </view>
-
+ <view style="display: flex;align-items: center;">
+ <text style="font-weight: 600;">鍗峰彿:</text>
+ <text>{{roll.rollNo}}</text>
+ </view>
+ <view style="display: flex;align-items: center;">
+ <text style="font-weight: 600;">绠卞彿:</text>
+ <text>{{roll.boxNo}}</text>
+ </view>
+ <view style="display: flex;align-items: center;">
+ <text style="font-weight: 600;">瑙勬牸:</text>
+ <text>{{roll.specs}}</text>
+ </view>
+ <view style="display: flex;align-items: center;">
+ <text style="font-weight: 600;">闀垮害:</text>
+ <text>{{roll.length}}</text>
+ </view>
+ <view style="display: flex;align-items: center;">
+ <text style="font-weight: 600;">鎺ュご:</text>
+ <text>{{roll.splices}}</text>
+ </view>
+ <view style="display: flex;align-items: center;">
+ <text style="font-weight: 600;">鍑�閲�:</text>
+ <text>{{roll.netWeight}}</text>
+ </view>
+ <view style="display: flex;align-items: center;">
+ <text style="font-weight: 600;">姣涢噸:</text>
+ <text>{{roll.grossWeight}}</text>
+ </view>
+ <view style="display: flex;align-items: center;">
+ <text style="font-weight: 600;">鍒嗗垏涓嬫枡鏃堕棿:</text>
+ <text>{{roll.fqTime}}</text>
+ </view>
+ </view>
</view>
<view class="list-right">
<picker mode="selector" :range="list" @change="onChange($event, i)">
@@ -250,16 +295,48 @@
const result = parseData(data);
// console.log(result);
- // this.secAnalysis(result)
- if (this.dataList.length > 0) this.checkAdd(result)
- else this.dataList.push(result);
- this.focuss()
+ this.secAnalysis(result)
+ // if (this.dataList.length > 0) this.checkAdd(result)
+ // else this.dataList.push(result);
+ // this.focuss()
+ },
+ oo() {
+ let pp = {
+ palletizingNo: 3050,
+ barcode: 80009991,
+ boxList: {
+ boxPos: '宸�',
+ packageGroupNo: data.packageGroupNo,
+ rollType: data.rollType,
+ boxType: data.boxType,
+ thickness: data.thickness,
+ wideInWidth: data.wideInWidth,
+ totalGrossWeight: data.totalGrossWeight,
+ totalNetWeight: data.totalNetWeight,
+ rolls: [
+ {
+ rollNo: '',
+ boxNo: '',
+ specs: '',
+ length: '',
+ splices: '',
+ netWeight: '',
+ grossWeight: '',
+ fqTime: '',
+ },
+ {}
+ ],
+ }
+ }
+
+
},
// 浜屾瑙ｆ瀽
secAnalysis(data) {
let rolls = data.rolls
let nedata = {
+ boxPos: '宸�',
packageGroupNo: data.packageGroupNo,
rollType: data.rollType,
boxType: data.boxType,
@@ -267,6 +344,7 @@
wideInWidth: data.wideInWidth,
totalGrossWeight: data.totalGrossWeight,
totalNetWeight: data.totalNetWeight,
+ rolls: [],
}
@@ -291,11 +369,10 @@
else if (key.startsWith('鎺ュご')) roll.splices = item[key];
else if (key.startsWith('鍒嗗垏鏃堕棿')) roll.fqTime = item[key];
})
- let newObj = {...nedata,...roll}
- if (this.dataList.length > 0) this.checkAdd(newObj)
- else this.dataList.push(newObj);
-
+ nedata.rolls.push(roll)
}
+ if (this.dataList.length > 0) this.checkAdd(nedata)
+ else this.dataList.push(nedata);
this.focuss()
},
// 纭娣诲姞
@@ -315,6 +392,7 @@
}
}
if (add) {
+ if (this.dataList.length == 2) return
this.dataList.unshift(newMat)
}
if (this.dataList.length == 2) {
--
Gitblit v1.9.1