提交代码

src/views/index/components/login.vue

@@ -174,9 +174,8 @@ export default {
                     this.$router.push({ name: "default" }).catch(() => {});
                   }
                   // 普通用户
-                } else {
-                  // this.$router.push("printScan");
-                }else if(userInfo.orgCode == 'zizhuyitiji'){
+                }
+                else if(userInfo.orgCode == 'zizhuyitiji'){
                   this.$router.push("/printScan")
                 }else {
                   if (

src/views/index/components/printScan.vue

@@ -22,8 +22,7 @@
         :disabled="!isEdit"
         v-show="false"
       >
-      </el-input>
-      <!--style="display:block;width:120px"-->
+      </el-input>style="display:block;width:120px"-->
       <div v-show="false">
         手动输入开关：
       </div>
@@ -38,15 +37,10 @@
     <div class="tip">
       手机二维码对准下方摄像头<br>
       <i class="el-icon-bottom" style="padding-left: 450px;font-size: 300px"></i>
-      <h1>将手机二维码对准摄像头</h1>
-      <h1>扫描</h1>
-      <!-- 将手机二维码对准摄像头 扫描<br /> -->
-      <i class="el-icon-bottom" style="font-size: 100px"></i>
     </div>
   </div>
 </template>
 <script>
-import screenfull from "screenfull"
 import screenfull from "screenfull";
 export default {
   data() {
@@ -76,7 +70,7 @@ export default {
         this.edit1=false
       }
     },
-    async querynumber(){
+    /*async querynumber(){
       console.log(this.orderNumber)
       let orderNumber=this.orderNumber
       let i=0
@@ -93,7 +87,7 @@ export default {
       return i
         this.edit1 = false;
       }
-    },
+    },*/
     async querynumber() {
       console.log(this.orderNumber);
       let orderNumber = this.orderNumber;
@@ -141,11 +135,6 @@ export default {
             this.$message.error("你已经打印过了")
             this.orderNumber=null
             return
-          console.log(promise);
-          if (promise == 1) {
-            this.$message.error("你已经打印过了");
-            this.orderNumber = null;
-            return;
           }
           this.$router.push({
             path: "/printReceipt?orderNumber=" + this.orderNumber
@@ -187,14 +176,7 @@ export default {
     font-size: 100px;
     padding-left: 100px;
     padding-top: 200px;
-  .tip {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 1000px;
-    height: 300px;
-    font-size: 60px;
-    color: #e6e6e6;
+    color: #4cc9e9;
   }
 }
 </style>

src/views/index/router/index.js

@@ -9,11 +9,11 @@ import main from "@/components/main.vue";
 import login from "@/views/index/components/login.vue"; // 登录
 import download from "@/views/index/components/download.vue";
 // 抽奖结果
-import luckDraw from "@/views/index/components/luckDraw.vue";
+//import luckDraw from "@/views/index/components/luckDraw.vue";
 
 import luckDraw from '@/views/index/components/luckDraw.vue'
 
-import printScan from "../components/printScan";
+
 import printReceipt from "../components/printReceipt";
 // 网页登录不可访问
 import page404 from "@/views/index/components/page404.vue";
@@ -25,72 +25,6 @@ import printScan from "@/views/index/components/printScan.vue";
 
 Vue.use(Router);
 
-export const constantRouterMap = [
-  {
-    path: "/",
-    meta: {
-      title: "登录"
-    },
-    component: login
-  },
-  {
-    path: "/printScan",
-    name: "printScan",
-    meta: {
-      title: "自助一体机"
-    },
-    component: printScan
-  },
-  {
-    path: "/download",
-    name: "download",
-    meta: {
-      title: "下载"
-    },
-    component: download
-  },
-  {
-    path: "/login",
-    name: "login",
-    meta: {
-      title: "登录"
-    },
-    component: login
-  },
-  {
-    path: "/luckDraw",
-    name: "luckDraw",
-    meta: {
-      title: "抽奖结果"
-    },
-    component: luckDraw
-  },
-  {
-    path: "/default",
-    name: "default",
-    component: main,
-    meta: {
-      title: "首页"
-    }
-  },
-  {
-    path: "/selectCompany",
-    name: "selectCompany",
-    component: selectCompany,
-    meta: {
-      title: "集团与公司用户跳转页"
-    }
-  },
-  ,
-  {
-    path: "/page404",
-    name: "page404",
-    meta: {
-      title: "404"
-    },
-    component: page404
-  }
-];
 export const constantRouterMap = [{
         path: '/',
         meta: {

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelAllReport.vue

@@ -1219,24 +1219,25 @@ export default {
           .then(res => {
             if (res.data.code == "200") {
               this.$message({
-                duration:1000,
-                message:"授权承运商成功",
-                type:"success"
+                duration: 1000,
+                message: "授权承运商成功",
+                type: "success"
               })
               //this.$message.success("授权承运商成功");
-            if (res.data.code == "0") {
-              this.$message.success("授权承运商成功");
-              this.getSteelReport();
-              loading.close();
-            } else {
-              this.$message({
-                duration:1000,
-                message:"授权失败,请联系管理员",
-                type:"error"
-              })
-              //this.$message.error("授权失败,请联系管理员");
-              this.getSteelReport();
-              loading.close();
+              if (res.data.code == "0") {
+                this.$message.success("授权承运商成功");
+                this.getSteelReport();
+                loading.close();
+              } else {
+                this.$message({
+                  duration: 1000,
+                  message: "授权失败,请联系管理员",
+                  type: "error"
+                })
+                //this.$message.error("授权失败,请联系管理员");
+                this.getSteelReport();
+                loading.close();
+              }
             }
           })
           .catch(() => {