傅豪杰 3 days ago
parent
commit
6ec6895d14
4 changed files with 24 additions and 23 deletions
  1. 1 1
      config/prod.env.js
  2. 20 20
      src/pages/goodsChange/transferGoods.vue
  3. 2 1
      src/pages/mailInfo.vue
  4. 1 1
      src/store/store.js

+ 1 - 1
config/prod.env.js

@@ -1,4 +1,4 @@
 'use strict'
 module.exports = {
-  NODE_ENV: '"production"'
+  NODE_ENV: '"production"',
 }

+ 20 - 20
src/pages/goodsChange/transferGoods.vue

@@ -659,26 +659,26 @@ export default {
                 return;
             }
 
-            // const getPrinters = await getListOfPrinters({});
-
-            // if (getPrinters.code == 0) {
-            //     if (getPrinters.data.length == []) {
-            //         this.shipServe();
-            //         Toast("没有打印机");
-            //     } else {
-            //         this.getPrintersList = getPrinters.data.map(item => {
-            //             return { printerName: item.printerName, id: item.id };
-            //         });
-
-            //         if (this.getPrintersList.length === 1) {
-            //             this.shipServe(this.getPrintersList[0].id);
-            //         } else {
-            //             this.printerShow = true;
-            //         }
-            //     }
-            // } else {
-            //     Toast("系统异常");
-            // }
+            const getPrinters = await getListOfPrinters({});
+
+            if (getPrinters.code == 0) {
+                if (getPrinters.data.length == []) {
+                    this.shipServe();
+                    Toast("没有打印机");
+                } else {
+                    this.getPrintersList = getPrinters.data.map(item => {
+                        return { printerName: item.printerName, id: item.id };
+                    });
+
+                    if (this.getPrintersList.length === 1) {
+                        this.shipServe(this.getPrintersList[0].id);
+                    } else {
+                        this.printerShow = true;
+                    }
+                }
+            } else {
+                Toast("系统异常");
+            }
 
             return;
         },

+ 2 - 1
src/pages/mailInfo.vue

@@ -9,7 +9,7 @@
               <span class="iconfont icon-dizhibao iconStyle"></span>
 
               <div v-if="mailDetail.type == 1">
-                <p>快递单号:{{ ObjectVlaue.withoutOrder }}</p>
+                <p>快递单号:{{ ObjectVlaue.waybillNo }}</p>
                 <p>收件人:{{ ObjectVlaue.addresseeName }}</p>
                 <p>手机号:{{ ObjectVlaue.addresseePhone }}</p>
 
@@ -33,6 +33,7 @@
       <!-- 外部 -->
       <div class="info" v-if="mailDetail.type == 1">
         <img style="margin: 0 auto;display: block;" id="barcode" />
+        <p>物流公司:{{ ObjectVlaue.expressCompany }}</p>
         <p>寄件人姓名:{{ ObjectVlaue.sendName }}</p>
         <p>寄件人手机号:{{ ObjectVlaue.sendPhone }}</p>
         <p>收件人姓名:{{ ObjectVlaue.addresseeName }}</p>

+ 1 - 1
src/store/store.js

@@ -8,7 +8,7 @@ const store = new Vuex.Store({
 		openId: localStorage.getItem("openid"),
 		//服务器用
 		//host: "http://www.kzmos.com/tianzong",
-		host: "http://47.101.145.23/tianzong",
+		host: "/tianzong",
 		//本地用
 		//host:"http://localhost:8080/tianzong",
 		regEmail: "^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$",