6

dist/static/css/chunk-752cd159.dc2d4f50.css

@@ -1 +0,0 @@
-.choose2[data-v-0533bc29]{color:#03fcd3;position:relative}.bc[data-v-0533bc29]{height:100%}.tabBar[data-v-0533bc29]{width:100%;color:#a8a2a2}.footer[data-v-0533bc29]{position:absolute;bottom:0;width:100%;height:3.06rem;z-index:1;background-image:url(../../static/img/tabbarlist.0ccaf302.png)}.nav-link[data-v-0533bc29]{color:#abdfff}.h5[data-v-0533bc29]{margin-bottom:0;position:relative;top:.24rem}.nav[data-v-0533bc29]{--bs-nav-link-padding-x:0rem;--bs-nav-link-padding-y:0rem}.choose[data-v-0533bc29]{color:#03fcd3}.circle[data-v-0533bc29]{width:3rem;height:3rem;margin:0 auto;position:absolute}.choose_1[data-v-0533bc29],.choose_3[data-v-0533bc29]{border-radius:50%;background:#03fcd3;top:-.3rem;left:50%;transform:translate(-50%,-50%);line-height:2.3;z-index:2}[data-v-0533bc29] .ivu-modal{top:42%;width:8rem!important;left:50%;transform:translate(-50%,-50%);margin:0}[data-v-0533bc29] .ivu-modal-content{background-color:rgba(0,0,0,.6)!important}[data-v-0533bc29] .ivu-modal-body{padding:0}[data-v-0533bc29] .ivu-btn-primary{background-color:#0f4680}

dist/static/css/chunk-a6f1d61a.2d564744.css

@@ -0,0 +1 @@
+.choose2[data-v-424a4848]{color:#03fcd3;position:relative}.bc[data-v-424a4848]{height:100%}.tabBar[data-v-424a4848]{width:100%;color:#a8a2a2}.footer[data-v-424a4848]{position:absolute;bottom:0;width:100%;height:3.06rem;z-index:1;background-image:url(../../static/img/tabbarlist.0ccaf302.png)}.nav-link[data-v-424a4848]{color:#abdfff}.h5[data-v-424a4848]{margin-bottom:0;position:relative;top:.24rem}.nav[data-v-424a4848]{--bs-nav-link-padding-x:0rem;--bs-nav-link-padding-y:0rem}.choose[data-v-424a4848]{color:#03fcd3}.circle[data-v-424a4848]{width:3rem;height:3rem;margin:0 auto;position:absolute}.choose_1[data-v-424a4848],.choose_3[data-v-424a4848]{border-radius:50%;background:#03fcd3;top:-.3rem;left:50%;transform:translate(-50%,-50%);line-height:2.3;z-index:2}[data-v-424a4848] .ivu-modal{top:42%;width:8rem!important;left:50%;transform:translate(-50%,-50%);margin:0}[data-v-424a4848] .ivu-modal-content{background-color:rgba(0,0,0,.6)!important}[data-v-424a4848] .ivu-modal-body{padding:0}[data-v-424a4848] .ivu-btn-primary{background-color:#0f4680}

src/views/page/Package/detailed.vue

@@ -244,24 +244,28 @@ export default {
       // let team_name = '';
       // let employee_ids = '';
       // let employee_names = '';
+
       this.list.forEach((v, index) => {
-        box_orders_label_products.push(...(v.box_orders_label_product.filter(v => v.loss_num)))
+        box_orders_label_products.push(...(v.box_orders_label_product.filter(c => c.loss_num)))
         let box_orders_product = {
           "item_num": (index + 1),
           "product_no": v.material_code,
           "product_title": v.material_code_show,
+          "process_title_two": v.craft_type_two_code_show,
           "color_code": v.craft_type_code_show,
           "process_code_two": v.craft_type_two_code,
           "color_code_two": v.decor_two_code,
           "process_title": v.craft_type_code_show,
           "color": v.decor_code_show,
-          "process_title_two": v.craft_type_two_show,
+          // "process_title_two": v.craft_type_two_show,
           "color_two": v.decor_two_code_show,
           "product_size": v.specs,
           "product_unit": v.unit_code,
           "product_unit_title": v.unit_code_show,
           "order_no": v.exe_sale_order_b.no,
           "order_item_id": v.id,
+          "brand_code":v.prod_trademark_compare_c.brand_code,
+          "brand_code_show":v.prod_trademark_compare_c.brand_code_show,
           "order_item_no": v.item_no,
           "customer_no": v.exe_sale_order_b.customer_code,
           "customer_name": v.exe_sale_order_b.customer_code_show,
@@ -301,6 +305,7 @@ export default {
           "production_orders_dtl": box_orders_products,
         }
       }
+
       let data1 = {
         url: 'http://121.36.142.167:7774/jbl/api/module-data/box_orders/box_orders',
         post: data