子卷装箱修改

README.md

@@ -1,5 +1,4 @@
 # 注意事项
-+ 铜箔二期
 + 原生APP云打包使用自有证书
 + 证书别名：testalias
 + 打包模块配置不勾选扫码和相机相册

pages/SecondPhase/production/ZjContainer.vue

@@ -20,9 +20,9 @@
 							<tr>
 								<th>{{$t('grid.select')}}</th>
 								<th class="th_2">{{$t('grid.order-number')}}</th>
-								<th>{{$t('grid.customer-name')}}</th>
+								<th><view style="width: 240rpx;">{{$t('grid.customer-name')}}</view></th>
 								<th>{{$t('grid.sub-roll-number')}}</th>
-								<th>{{$t('grid.sub-roll-spec')}}</th>
+								<th><view style="width: 240rpx;">{{$t('grid.sub-roll-spec')}}</view></th>
 								<th>{{$t('grid.sub-roll-weight')}}</th>
 								<th>{{$t('grid.subtube-weight')}}</th>
 								<th>{{$t('filter.box-type')}}</th>
@@ -32,9 +32,9 @@
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td><span class="iconfont icon_minus-filled" @click="toCheck(e, i)">&minus;</span></td>
 								<td class="td_2">{{e.sale_order_name}}</td>
-								<td>{{e.customer_description}}</td>
+								<td class="wrap">{{e.customer_description}}</td>
 								<td>{{e.container_name}}</td>
-								<td>{{e.paper_tube_description}}</td>
+								<td class="wrap">{{e.paper_tube_description}}</td>
 								<td>{{e.paper_weight}}</td>
 								<td>{{e.box_weight}}</td>
 								<td>{{e.box_type}}</td>
@@ -65,7 +65,7 @@
 							<thead>
 								<tr>
 									<th>{{$t('grid.wooden-box-specs')}}</th>
-									<th>{{$t('grid.material-name')}}</th>
+									<th><view style="width: 240rpx;">{{$t('grid.material-name')}}</view></th>
 									<th>{{$t('grid.wooden-box-length')}}</th>
 									<th>{{$t('grid.wooden-box-width')}}</th>
 									<th>{{$t('grid.wooden-box-height')}}</th>
@@ -76,7 +76,7 @@
 							<tbody>
 								<tr v-for="(e, i) in popData" :key="'pop' + i" @click="popCheck(e)" :class="{'checked': e.material_code === pkId}">
 									<td>{{e.material_code}}</td>
-									<td>{{e.material_name}}</td>
+									<td class="wrap">{{e.material_name}}</td>
 									<td>{{e.box_length}}</td>
 									<td>{{e.box_width}}</td>
 									<td>{{e.box_high}}</td>
@@ -230,6 +230,8 @@
 				if (!this.dataList.length) {
 					return
 				}
+				this.pkId = ''
+				this.pkObj = {}
 				let code = ''
 				for (let i = 0; i < this.dataList.length; i++) {
 					if (this.dataList[i].box_type !== '') {

utils/mork2.js

@@ -139,7 +139,24 @@ export const queryContainerNameBySaleOrder = () => {
 				"customer_description": "惠州市禾腾能源科技有限公司",
 				"container_name": "A1522210281605B1",
 				"status": "99",
-				"box_type": "",
+				"box_type": "11",
+				"sap_pcsn": "AA20000251",
+				"box_group": "0",
+				"paper_tube_description": " 璃纤维及其制品|FRP管|6英寸|25|1300",
+				"paper_weight": "22",
+				"weight": "2"
+			},
+			{
+				"workorder_id": "2",
+				"package_box_sn": null,
+				"quanlity_in_box": null,
+				"box_weight": 210.000000,
+				"sale_order_name": "100000011-100",
+				"customer_name": "10000252",
+				"customer_description": "惠州市禾腾能源科技有限公司",
+				"container_name": "A1522210281605B1",
+				"status": "99",
+				"box_type": "12",
 				"sap_pcsn": "AA20000251",
 				"box_group": "0",
 				"paper_tube_description": " 璃纤维及其制品|FRP管|6英寸|25|1300",