Merge branch 'cjh' of 121.41.102.225:Nidong/jiufang

src/views/OrderMannage/BusinessOrderlist/printlist.vue

@@ -10,11 +10,11 @@
                     <td colspan="23" style="border: 0;">
                         <div class="table-header">
                             <img class="left-img" :src="$store.state.ip + showTable.logo" alt="" v-show="showTable.logo?true:false">
-                            <h1 class="table-title">{{showTable.title}}</h1><div style="display:flex;position: relative;top: -83px;left: 621px;"><img v-for="(item,index) in showTable.product_img" :key="index"  class="right-img1" :src='$store.state.ip + item' alt="" v-show="showTable.product_img.length!=0?true:false">
+                            <h1 class="table-title">{{showTable.title}}</h1><div style="display:flex;position: relative;top: -100px;left: 621px;"><img v-for="(item,index) in showTable.product_img" :key="index"  class="right-img1" :src='$store.state.ip + item' alt="" v-show="showTable.product_img.length!=0?true:false">
                             
                             </div>
                         </div>
-                         <div style="float:right;margin:5pt">{{showTable.box_title}}</div>
+                       
                     </td>
                 </tr>
                 <tr>
@@ -29,7 +29,7 @@
                         <p>序号</p>
                     </td>
                     <td rowspan="2">
-                        <p style="width:80px ;">位置</p>
+                        <p style="width:60px ;">位置</p>
                     </td>
                     <td rowspan="2">
                         <p style="width:80px ;">材质</p>
@@ -176,6 +176,7 @@
                     <td colspan="16" class="order_info" style="padding-left: 20px;">
                         <!-- 客户备注：<span
                             class="customer_remark">{{showTable.foot.customer_remark}}</span> -->
+                            包装：<span class="crt_time">{{showTable.box_title}}</span>
                             订货日期：<span class="crt_time">{{showTable.foot.crt_time}}</span>交货日期：<span
                             class="end_time">{{showTable.foot.end_time}}</span>业务经理：<span class="saleman">{{showTable.foot.saleman}}</span>制单人：<span
                             class="crt_id">{{showTable.foot.crt_id}}</span>审核：<span class="oa">{{showTable.foot.oa}}</span>客户确认：<span class="is_confirm">{{showTable.foot.is_confirm}}</span></td>
@@ -395,6 +396,13 @@ export default {
         }).then(res=>{
             console.log(res)
             this.showTableContentStr = res.msg.list
+            this.showTableContentStr.forEach(el=>{
+                let arr = el.price.split('.')
+                if(arr[1] == '00'){
+                    el.price = arr[0]
+                }
+            })
+            console.log(this.showTableContentStr);
             this.showTable = res.msg
             this.newArr = this.chunk(this.showTableContentStr,15)
         });
@@ -476,6 +484,7 @@ export default {
     .right-img1 {
         /* position: absolute; */
         /* right: 0; */
+        margin-top: -40px;
         margin-left:10px;
         vertical-align: middle;
         width: auto;