diff --git a/README.md b/README.md
index caf9bdb..7349302 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
# 注意事项
-+ 铜箔二期
+ 原生APP云打包使用自有证书
+ 证书别名:testalias
+ 打包模块配置不勾选扫码和相机相册
diff --git a/pages/SecondPhase/production/ZjContainer.vue b/pages/SecondPhase/production/ZjContainer.vue
index 4f4baf4..32f8a22 100644
--- a/pages/SecondPhase/production/ZjContainer.vue
+++ b/pages/SecondPhase/production/ZjContainer.vue
@@ -20,9 +20,9 @@
| {{$t('grid.select')}} |
{{$t('grid.order-number')}} |
- {{$t('grid.customer-name')}} |
+ {{$t('grid.customer-name')}} |
{{$t('grid.sub-roll-number')}} |
- {{$t('grid.sub-roll-spec')}} |
+ {{$t('grid.sub-roll-spec')}} |
{{$t('grid.sub-roll-weight')}} |
{{$t('grid.subtube-weight')}} |
{{$t('filter.box-type')}} |
@@ -32,9 +32,9 @@
| − |
{{e.sale_order_name}} |
- {{e.customer_description}} |
+ {{e.customer_description}} |
{{e.container_name}} |
- {{e.paper_tube_description}} |
+ {{e.paper_tube_description}} |
{{e.paper_weight}} |
{{e.box_weight}} |
{{e.box_type}} |
@@ -65,7 +65,7 @@
| {{$t('grid.wooden-box-specs')}} |
- {{$t('grid.material-name')}} |
+ {{$t('grid.material-name')}} |
{{$t('grid.wooden-box-length')}} |
{{$t('grid.wooden-box-width')}} |
{{$t('grid.wooden-box-height')}} |
@@ -76,7 +76,7 @@
| {{e.material_code}} |
- {{e.material_name}} |
+ {{e.material_name}} |
{{e.box_length}} |
{{e.box_width}} |
{{e.box_high}} |
@@ -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 !== '') {
diff --git a/utils/mork2.js b/utils/mork2.js
index e3ba340..4cbcc09 100644
--- a/utils/mork2.js
+++ b/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",