mushencc 3 years ago
parent
commit
d8d4a22430

+ 17 - 2
src/views/OrderMannage/BusinessOrderlist/edit.vue

@@ -1241,7 +1241,8 @@
       <div label="线条:" style="margin-left:20px;width:95%">
         <div style="font-size:20px">
           <span>线条:</span>
-          <span v-if="wood_title_count.length < 1">无</span>
+          <span>{{print_line_data}}</span>
+          <!-- <span v-if="wood_title_count.length < 1">无</span>
           <span
             v-else
             v-for="(item, index) in wood_title_count"
@@ -1252,7 +1253,7 @@
               <span v-show="_index < item.measure_str.length - 1">;</span>
             </span>
             <span v-show="index < wood_title_count.length - 1">;</span>
-          </span>
+          </span> -->
         </div>
       </div>
       <div label="合计:" style="margin-left:20px;width:95%">
@@ -2411,6 +2412,7 @@ export default {
       timeout: null,
       copiedLinePart: {},
       mentoubanList: [],
+      print_line_data:'',
     };
   },
   computed: {
@@ -2518,12 +2520,25 @@ export default {
       this.initData(this.order_no);
     }
     this.getProducts();
+    this.print_line();
     addEventListener("resize", (e) => {
       this.tableWidth = e.target.innerWidth - 300;
       this.$forceUpdate();
     });
   },
   methods: {
+    print_line(){
+          this.axios({
+            method:'get',
+            url:'/api/printe_order_detail',
+            params:{
+                order_no:this.$route.query.order_no,
+                box_id:'',
+            }
+        }).then(res=>{
+            this.print_line_data = res.msg.foot.amount_detail
+        })
+    },
     handleFaxPriceChange(e) {
       this.info.fax_price = e.target.value;
       this.info.order_price = (

+ 4 - 2
src/views/OrderMannage/BusinessOrderlist/list.vue

@@ -1186,8 +1186,10 @@ export default {
             this.prints.push(printContent)
         });
          });
-
-         this.showPrint = true;
+         setTimeout(()=>{
+            this.showPrint = true;
+         },1000)
+     
     },
     printOk(){
      this.$print(this.$refs.print) 

+ 2 - 2
vue.config.js

@@ -1,8 +1,8 @@
 const axios_default_ip =
   process.env.NODE_ENV == "dev"
-    ? "http://121.41.102.225:82"
+    ? "http://124.71.176.88:882"
     : process.env.NODE_ENV == "test-prd"
-    ? "http://124.71.176.88:882" //测试服
+    ? "http://121.41.102.225:82" //测试服
     : process.env.NODE_ENV == "prd_other"
     ? "http://121.37.173.82:82" //贝斯特
     : "http://124.71.176.88:882";