Merge remote-tracking branch 'origin/master'

config/index.js

@@ -66,7 +66,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:80",
-    // target: "http://localhost:8080",
+    //target: "http://localhost:8080",
     // target: "http://192.168.1.101:8080",
     ws: true,
     pathRewrite: {

src/components/main.vue

@@ -256,7 +256,7 @@
       :class="{ 'sl-container2': menuType === '2' }"
       id="mainContainer"
     >
-      <header class="sl-header">
+      <header class="sl-header" id="outerHeader">
         <div v-if="showIframe" class="sl-header-ul">
           <!-- <div class="sl-header-li-name">工业互联网平台 ICP-iCore 2.0</div> -->
           <!-- <div class="hnstLogo">
@@ -818,6 +818,7 @@ export default {
         ],
       },
       fullScreen: false,
+      oldMinHeight:0,
       minHeight: "width: 100%;height: 100%;border: 0px;min-height: 777px",
       menuTabIndex: 0,
       pageBreadcrumb: [
@@ -1036,6 +1037,17 @@ export default {
     selectedMenu: function(menuId){
       var currentMenu = this.getMenuIndexByMenuId(this.menuData,  null, menuId);
       currentMenu && window.top.localStorage.setItem("currentMenuIndex", currentMenu.menuIndex);
+    },
+    fullScreen: function(fullScreen){
+      if(!fullScreen){
+        // 退出全屏时做还原处理
+        $(".oa-header-user").show().next().show();
+        $("#outerHeader").show();
+        $("#mainContainer").css("paddingLeft","179px");
+        $("#menuTabId").css("padding","10px 0px 0px").children(":eq(0)").show();
+        $("#menuTabId").find("div[role=tabpanel]:visible").find("iframe").css("min-height",this.oldMinHeight);
+        $(".sl-content-main",top.document).css("height","100%");
+      }
     }
   },
   mounted() {
@@ -1334,6 +1346,17 @@ export default {
           document.msExitFullscreen();
         }
       } else {
+        // 开始全屏操作
+        var currentIfrm = $("#menuTabId").find("div[role=tabpanel]:visible").find("iframe");
+        $(".oa-header-user").hide().next().hide();
+        $("#outerHeader").hide();
+        $("#mainContainer").css("paddingLeft","0");
+        $("#menuTabId").css("padding",0).children(":eq(0)").hide();
+        $(".sl-content-main",top.document).css("height","initial");
+        // 先保留全屏前的iframe高度
+        this.oldMinHeight = currentIfrm.css("min-height");
+        // 将最小高度设置成当前分辨率的高度
+        currentIfrm.css("min-height",window.screen.height);
         if (main.requestFullscreen) {
           main.requestFullscreen();
         } else if (main.mozRequestFullScreen) {
@@ -2672,8 +2695,9 @@ export default {
 .sl-content-main {
   width: 100%;
   //   min-width: 1200px;
-  height: calc(100% - 60px);
+  //height: calc(100% - 60px);
   overflow: auto;
+  height:100%
 }
 
 .icore-menu-main {

src/config/routerBefore.js

@@ -16,7 +16,7 @@ import {
 } from '@/config/config.js';
 
 // 免登录白名单
-const whiteList = ['/', '/login', '/download', '/page404', '/dingtalkTaskMobileEnd', '/dingtalkWorkFlowMobileEnd', '/luckDraw'];
+const whiteList = ['/', '/login', '/download', '/page404', '/dingtalkTaskMobileEnd', '/dingtalkWorkFlowMobileEnd', '/luckDraw', '/printScan'];
 
 /**
  * 当前路由取标题
@@ -168,6 +168,10 @@ function DoneCookie(to, from, next, accessToken, flag) {
             path: '/default'
           });
           // 普通用户
+        } else if (userInfo.orgCode === 'zizhuyitiji') {
+          next({
+            path: '/printScan'
+          });
         } else {
           if (userInfo.hasOwnProperty('sysGroup') && userInfo.sysGroup !== '' && userInfo.sysGroup !== null && JSON.stringify(userInfo.sysGroup) !== '{}' && JSON.stringify(userInfo.sysGroup) !== '[]') {
             window.top.localStorage.setItem('sysGroup', JSON.stringify(userInfo.sysGroup));

src/views/index/app.js

@@ -18,6 +18,9 @@ import apollo from '@/config/apolloConfig.js'
 import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 
+import Print from 'vue-print-nb';
+Vue.use(Print);
+
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 

src/views/index/components/login.vue

@@ -109,6 +109,7 @@ export default {
           form.app_code = "web"; //终端code暂时写死
           this.shaObj.update(form.password);
           console.log(form.password);
+
           form.password = this.shaObj.getHash("HEX");
           console.log(form.password);
           this.store
@@ -145,6 +146,8 @@ export default {
                 // 判断用户集团公司情况跳转
                 let userInfo = res.data.user;
                 let sRedirect = this.$route.query.redirect;
+                console.log(userInfo)
+                console.log("userInfo")
                 // 超级管理员
                 if (userInfo.userCode === "admin") {
                   if (userInfo.sysCompanys) {
@@ -171,8 +174,10 @@ export default {
                     this.$router.push({ name: "default" }).catch(() => {});
                   }
                   // 普通用户
-                } else {
-                  // this.$router.push("printScan");
+                }
+                else if(userInfo.orgCode == 'zizhuyitiji'){
+                  this.$router.push("/printScan")
+                }else {
                   if (
                     userInfo.hasOwnProperty("sysGroup") &&
                     userInfo.sysGroup !== "" &&
@@ -204,6 +209,7 @@ export default {
                             .push({ name: "default" })
                             .catch(() => {});
                         }
+
                       }
                     } else {
                       this.$message.error(
@@ -215,6 +221,7 @@ export default {
                       "必须隶属一个集团！请先联系管理员添加集团信息!"
                     );
                   }
+
                 }
               } else {
                 //  登录失败
@@ -226,7 +233,7 @@ export default {
               }
               this.loginBtnLoading = false;
               setTimeout(() => {
-                this.$router.go(0);
+                // this.$router.go(0);
               }, 2000);
             })
             .catch(() => {

src/views/index/components/printReceipt.vue

@@ -0,0 +1,364 @@
+<template>
+  <div class="tableAllDate">
+    <div class="button-box">
+      <el-button
+        type="primary"
+        @click="print1()"
+        v-print="'#pdfDom1'"
+        style="width: 500px;height: 120px;font-size: 100px"
+      >
+        <!--class="el-icon-printer"-->
+        <!---->
+        打印
+      </el-button>
+    </div>
+    <div id="pdfDom1">
+      <div id="pdfDom" v-for="(item, index) in dataList" :key="index">
+        <div class="blank"></div>
+
+        <div class="title">
+          <h5 align="center">{{ shippername }} 物资送货单</h5>
+          <!--        <h5 align="center">物资送货单</h5>-->
+        </div>
+        <div>
+          <!-- tablePart0 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin: auto; font-size: 20px"
+            width="1000px"
+            class="tablePart0"
+          >
+            <tr>
+              <th style="width: 14.5%">销售订单号：</th>
+              <td style="width: 85.5%">{{ saleNo }}</td>
+            </tr>
+          </table>
+        </div>
+        <div class="tableBody">
+          <!-- tablePart1 -->
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin-top: 10px; text-align: center"
+            width="1000px"
+            class="tablePart1"
+          >
+            <tr>
+              <th style="width: 5%; text-align: center">序号</th>
+              <th style="width: 23.5%; text-align: center">物资名称</th>
+              <th style="width: 22.5%; text-align: center">规格型号</th>
+              <th style="width: 14%">件数</th>
+              <th style="width: 35%">重量</th>
+<!--              <th style="width: 21%">订单日期</th>-->
+            </tr>
+            <tr v-for="(item, index) in deliveryOrderMaterialList" :key="index">
+              <td>{{ index + 1 }}</td>
+              <td>{{ item.materialName }}</td>
+              <td>{{ item.materialSpe }}{{ item.materialModel }}</td>
+              <td>{{ item.materialNumber }}</td>
+              <td>{{ item.materialWeight }}</td>
+<!--              <td>{{ item.makeDate }}</td>-->
+            </tr>
+          </table>
+
+          <!-- tablePart2 -->
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="border-top: 0px"
+            width="1000px"
+            class="tablePart2"
+          >
+            <tr>
+              <th style="width: 28.5%">收货地点</th>
+              <td style="width: 71.5%">
+                {{ province }}{{ district }}{{ town }}{{ deliveryAddress }}
+              </td>
+            </tr>
+          </table>
+
+          <!-- tablePart3 -->
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="border-top: 0px"
+            width="1000px"
+            class="tablePart3"
+          >
+            <tr>
+              <th style="width: 28.5%">收货人</th>
+              <td style="width: 22.5%">{{ consignee }}</td>
+              <th style="width: 14%">电话</th>
+              <td style="width: 35%">{{ consigneeTel }}</td>
+            </tr>
+          </table>
+
+          <!-- tablePart4 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="border-top: 0px"
+            width="1000px"
+            class="tablePart4"
+          >
+            <tr>
+              <th style="width: 28.5%">承运商</th>
+              <td style="width: 36.5%">{{ carrierName }}</td>
+              <th style="width: 14%">车牌号</th>
+              <td style="width: 35%">{{ capacityNumber }}</td>
+            </tr>
+          </table>
+
+          <!-- tablePart9 -->
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="border-top: 0px"
+            width="1000px"
+            class="tablePart9"
+          >
+            <tr>
+              <th style="width: 28.5%">备注</th>
+              <td style="width: 71.5%">{{ note }}</td>
+            </tr>
+          </table>
+        </div>
+
+        <div>
+          <!-- tablePart6 margin-top: 10px-->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin: auto; font-size: 20px"
+            width="1000px"
+            class="tablePart6"
+          >
+            <tr>
+              <th style="width: 8.25%">发货单位：</th>
+              <td style="width: 30.5%">{{ shippername }}</td>
+              <th style="width: 8.25%">收货单位：</th>
+              <td style="width: 30.5%">{{ consigeeName }}</td>
+            </tr>
+          </table>
+        </div>
+
+        <!--          <div>
+        &lt;!&ndash; tablePart6 &ndash;&gt;
+        <table
+          border="0"
+          cellpadding="10"
+          cellspacing="0"
+          style="margin: auto; font-size: 20px; margin-top: 10px"
+          width="1000px"
+          class="tablePart6"
+        >
+          <tr>
+            <th style="width: 6.25%">收货单位：</th>
+            <td style="width: 53.5%">{{ consigeeName }}</td>
+          </tr>
+        </table>
+      </div>-->
+        <div>
+          <!-- tablePart6 margin-top: 10px-->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin: auto; font-size: 20px"
+            width="1000px"
+            class="tablePart6"
+          >
+            <tr>
+              <th style="width: 14.5%">签收人：</th>
+              <th style="width: 14.5%">签收时间：</th>
+            </tr>
+          </table>
+        </div>
+        <!--      <div>
+        &lt;!&ndash; tablePart6 &ndash;&gt;
+        <table
+          border="0"
+          cellpadding="10"
+          cellspacing="0"
+          style="margin: auto; font-size: 20px; margin-top: 10px"
+          width="1000px"
+          class="tablePart6"
+        >
+          <tr>
+            <th style="width: 14.5%">签收时间：</th>
+          </tr>
+        </table>
+      </div>-->
+        <!--设置中间的间隔以及虚线-->
+        <div style="height: 80px"></div>
+        <hr width=1500px style="border:1px dashed black;height:1px">
+      </div>
+    </div>
+    <!-- <el-button style="margin-left: 45%;" type="primary" @click="getPdf()">
+        <i class="el-icon-download"></i>导出(pdf)
+      </el-button> -->
+    <el-button type="primary" @click="backScan()">
+      <i class="el-icon-back"></i>返回
+    </el-button>
+  </div>
+</template>
+
+<script>
+import table from "@/components/DilCommonUI/packages/table/src/table.vue";
+export default {
+  components: { table },
+  name: "Login",
+  data() {
+    return {
+      orderNumber: "",
+      consignee: "",
+      town: "",
+      consigneeTel: "",
+      sendDate: "",
+      receiptDate: "",
+      consigeeName: "",
+      saleNo: "",
+      deliveryOrderMaterialList: [
+        {
+          materialName: "",
+          materialSpe: "",
+          materialModel: "",
+          materialNumber: 0,
+          materialWeight: 0,
+          makeDate: ""
+        }
+      ],
+      carrierName: "",
+      province: "",
+      deliveryAddress: "",
+      district: "",
+      capacityNumber: "",
+      shippername: "",
+      year: new Date().getFullYear(),
+      month: new Date().getMonth() + 1,
+      date: new Date().getDate(),
+      htmlTitle: "客户换票送货单",
+      note: "",
+      dataList: ["1", "2", "3"],
+      timer1:''
+    };
+  },
+  created() {
+    this.getDeliveryOrder();
+  },
+  mounted() {
+    /*this.timer1 = setTimeout(this.print,2000);*/
+    // 六十秒不操作，自动返回扫码页面
+    const timer = setInterval(() => {
+      this.backScan();
+    }, 30000);
+    this.$once("hook:beforeDestroy", () => {
+      clearInterval(timer);
+      /*clearTimeout(this.timer1)*/
+    });
+  },
+  methods: {
+    getDeliveryOrder() {
+      let orderNumber = this.$route.query.orderNumber;
+      this.axios
+        .post("/api/v1/tms/getDeliveryOrder?orderNumber=" + orderNumber)
+        .then(res => {
+          console.log(res);
+          this.orderNumber = res.data.orderNumber;
+          this.carrierName = res.data.carrierName;
+          this.capacityNumber = res.data.capacityNumber;
+          this.consigeeName = res.data.consigeeName;
+          this.consignee = res.data.consignee;
+          this.consigneeTel = res.data.consigneeTel;
+          this.sendDate = res.data.sendDate;
+          this.saleNo = res.data.saleNo;
+          console.log(this.saleNo);
+          this.shippername = res.data.shippername;
+          this.province = res.data.province;
+          this.district = res.data.district;
+          this.town = res.data.town;
+          this.deliveryAddress = res.data.deliveryAddress;
+          this.deliveryOrderMaterialList = res.data.deliveryOrderMaterialList;
+          this.note = res.data.note;
+        });
+    },
+   print(){
+     let newstr=document.getElementById("pdfDom1").innerHTML
+     let oldstr=document.body.innerHTML
+     document.body.innerHTML=newstr
+     window.print()
+     /*document.body.innerHTML=oldstr*/
+     let orderNumber = this.$route.query.orderNumber;
+     this.axios.post("/api/v1/tms/changeNumber?orderNumber=" + orderNumber)
+   },
+    print1(){
+      let orderNumber = this.$route.query.orderNumber;
+      this.axios.post("/api/v1/tms/changeNumber?orderNumber=" + orderNumber)
+      this.backScan();
+    },
+    backScan() {
+      this.$router.go(-1);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.title {
+  font-size: 25px;
+}
+.tableBody {
+  table,
+  th,
+  td {
+    border: 1px solid black;
+    font-size: 20px;
+    margin: auto;
+    text-align: center;
+  }
+  .tablePart1 th {
+    border-top: 1px solid black;
+    text-align: center;
+  }
+  .tablePart2 td,
+  th {
+    border-top: 0px;
+    text-align: center;
+  }
+  .tablePart3 td,
+  th {
+    border-top: 0px;
+    text-align: center;
+  }
+  .tablePart4 td,
+  th {
+    border-top: 0px;
+    text-align: center;
+  }
+  .tablePart9 td,
+  th {
+    border-top: 0px;
+    text-align: center;
+  }
+}
+.blank {
+  width: 100%;
+  height: 50px;
+}
+.button-box {
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>

src/views/index/components/printScan.vue

@@ -4,16 +4,25 @@
       <img :src="backgroundImgURL" width="100%" height="100%" />
     </div>
     <div class="orderNumberData">
+      <!--v-show="false" disabled="!isEdit"-->
       <el-input
         placeholder="请将二维码放置在扫描区"
         v-model="orderNumber"
         :focus="true"
         ref="inputs"
-        :disabled="!isEdit"
-        v-show="false"
       >
       </el-input>
       <!--style="display:block;width:120px"-->
+      <div  v-show="false">
+        手动输入开关：
+      </div>
+      <i class="el-icon-full-screen" @click="fullScreen"
+      v-show="edit1"></i>
+<!--      <el-switch
+        :disabled="!isEdit"
+        v-show="false"
+      >
+      </el-input>style="display:block;width:120px"-->
       <div v-show="false">
         手动输入开关：
       </div>
@@ -26,10 +35,8 @@
       </el-switch>-->
     </div>
     <div class="tip">
-      <h1>将手机二维码对准摄像头</h1>
-      <h1>扫描</h1>
-      <!-- 将手机二维码对准摄像头 扫描<br /> -->
-      <i class="el-icon-bottom" style="font-size: 100px"></i>
+      手机二维码对准下方摄像头<br>
+      <i class="el-icon-bottom" style="padding-left: 450px;font-size: 300px"></i>
     </div>
   </div>
 </template>
@@ -60,9 +67,27 @@ export default {
     fullScreen() {
       if (screenfull.isEnabled && !screenfull.isFullscreen) {
         screenfull.request();
-        this.edit1 = false;
+        this.edit1=false
       }
     },
+    /*async querynumber(){
+      console.log(this.orderNumber)
+      let orderNumber=this.orderNumber
+      let i=0
+      await this.axios.post("/api/v1/tms/queryNumber?orderNumber=" + orderNumber)
+        .then((res)=>{
+          console.log("查找出来的数据")
+          console.log(res.data)
+          console.log("-------------------------")
+          if (res.data.printnumber==1){
+            i=1
+          }
+        })
+      console.log(i)
+      return i
+        this.edit1 = false;
+      }
+    },*/
     async querynumber() {
       console.log(this.orderNumber);
       let orderNumber = this.orderNumber;
@@ -105,11 +130,11 @@ export default {
           this.orderNumber.startsWith("wysdd") == true
         ) {
           let promise = await this.querynumber(this.orderNumber);
-          console.log(promise);
-          if (promise == 1) {
-            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
@@ -145,14 +170,13 @@ export default {
     justify-content: center;
     align-items: center;
   }
-  .tip {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 1000px;
-    height: 300px;
-    font-size: 60px;
-    color: #e6e6e6;
+  .tip{
+    width: 1500px;
+    height: 500px;
+    font-size: 100px;
+    padding-left: 100px;
+    padding-top: 200px;
+    color: #4cc9e9;
   }
 }
 </style>

src/views/index/router/index.js

@@ -9,8 +9,12 @@ 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 printReceipt from "../components/printReceipt";
 // 网页登录不可访问
 import page404 from "@/views/index/components/page404.vue";
 
@@ -21,72 +25,78 @@ import printScan from "@/views/index/components/printScan.vue";
 
 Vue.use(Router);
 
-export const constantRouterMap = [
-  {
-    path: "/",
-    meta: {
-      title: "登录"
+export const constantRouterMap = [{
+        path: '/',
+        meta: {
+            'title': '登录'
+        },
+        component: login
+    },
+
+    {
+        path: '/download',
+        name: 'download',
+        meta: {
+            'title': '下载'
+        },
+        component: download
     },
-    component: login
-  },
   {
-    path: "/printScan",
-    name: "printScan",
+    path: '/printScan',
+    name: 'printScan',
     meta: {
-      title: "自助一体机"
+      'title': '下载'
     },
     component: printScan
   },
   {
-    path: "/download",
-    name: "download",
+    path: '/printReceipt',
+    name: 'printReceipt',
     meta: {
-      title: "下载"
+      'title': '下载'
     },
-    component: download
+    component: printReceipt
   },
-  {
-    path: "/login",
-    name: "login",
-    meta: {
-      title: "登录"
+    {
+        path: '/login',
+        name: 'login',
+        meta: {
+            'title': '登录'
+        },
+        component: login
     },
-    component: login
-  },
-  {
-    path: "/luckDraw",
-    name: "luckDraw",
-    meta: {
-      title: "抽奖结果"
+    {
+        path:'/luckDraw',
+        name:'luckDraw',
+        meta:{
+            'title':'抽奖结果'
+        },
+        component:luckDraw
     },
-    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"
+    {
+        path: '/default',
+        name: 'default',
+        component: main,
+        meta: {
+            'title': '首页'
+        }
     },
-    component: page404
-  }
-];
+    {
+        path: '/selectCompany',
+        name: 'selectCompany',
+        component: selectCompany,
+        meta: {
+            'title': '集团与公司用户跳转页'
+        }
+    },,
+    {
+        path: '/page404',
+        name: 'page404',
+        meta: {
+            'title': '404'
+        },
+        component: page404
+}];
 
 const router = new Router({
   // mode: 'history', // require service support

src/views/sale/components/saleSelfMachine/printReceipt.vue

@@ -3,8 +3,8 @@
     <div class="button-box">
       <el-button
         type="primary"
+        @click="print1()"
         v-print="'#pdfDom1'"
-        @click="backScan()"
         style="width: 500px;height: 120px;font-size: 100px"
       >
         <!--class="el-icon-printer"-->
@@ -247,19 +247,22 @@ export default {
       date: new Date().getDate(),
       htmlTitle: "客户换票送货单",
       note: "",
-      dataList: ["1", "2", "3"]
+      dataList: ["1", "2", "3"],
+      timer1:''
     };
   },
   created() {
     this.getDeliveryOrder();
   },
   mounted() {
+    /*this.timer1 = setTimeout(this.print,2000);*/
     // 六十秒不操作，自动返回扫码页面
     const timer = setInterval(() => {
       this.backScan();
-    }, 60000);
+    }, 30000);
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
+      /*clearTimeout(this.timer1)*/
     });
   },
   methods: {
@@ -287,9 +290,21 @@ export default {
           this.note = res.data.note;
         });
     },
-    backScan() {
+   print(){
+     let newstr=document.getElementById("pdfDom1").innerHTML
+     let oldstr=document.body.innerHTML
+     document.body.innerHTML=newstr
+     window.print()
+     /*document.body.innerHTML=oldstr*/
+     let orderNumber = this.$route.query.orderNumber;
+     this.axios.post("/api/v1/tms/changeNumber?orderNumber=" + orderNumber)
+   },
+    print1(){
       let orderNumber = this.$route.query.orderNumber;
       this.axios.post("/api/v1/tms/changeNumber?orderNumber=" + orderNumber)
+      this.backScan();
+    },
+    backScan() {
       this.$router.go(-1);
     }
   }

src/views/sale/components/saleSelfMachine/printScan.vue

@@ -4,13 +4,12 @@
       <img :src="backgroundImgURL" width="100%" height="100%" />
     </div>
     <div class="orderNumberData">
+      <!--v-show="false" disabled="!isEdit"-->
       <el-input
         placeholder="请将二维码放置在扫描区"
         v-model="orderNumber"
         :focus="true"
         ref="inputs"
-        :disabled="!isEdit"
-        v-show="false"
       >
       </el-input>
       <!--style="display:block;width:120px"-->
@@ -27,9 +26,8 @@
       </el-switch>-->
     </div>
     <div class="tip">
-      将手机二维码对准摄像头<br>
-      扫描<br>
-      <i class="el-icon-bottom" style="padding-left: 150px;font-size: 100px"></i>
+      手机二维码对准下方摄像头<br>
+      <i class="el-icon-bottom" style="padding-left: 450px;font-size: 300px"></i>
     </div>
   </div>
 </template>
@@ -145,10 +143,10 @@ export default {
     align-items: center;
   }
   .tip{
-    width: 1000px;
-    height: 300px;
-    font-size: 60px;
-    padding-left: 300px;
+    width: 1500px;
+    height: 500px;
+    font-size: 100px;
+    padding-left: 100px;
     padding-top: 200px;
     color: #e6e6e6;
   }

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

@@ -380,6 +380,13 @@
             >
           </template>
         </el-table-column>
+        <el-table-column prop="canwork" label="继续装">
+          <template slot-scope="scope">
+            <el-button  type="primary" size="small" @click="continue1(scope.row)">
+              继续装
+            </el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <div>
@@ -662,15 +669,30 @@ export default {
           )
           .then(res => {
             if (res.data.code == "200") {
-              this.$message.success("反关闭成功");
+              this.$message({
+                duration:600,
+                message:"反关闭成功",
+                type:"success"
+              })
+                //.success("反关闭成功");
               this.getSteelReport();
             } else {
-              this.$message.error("反关闭失败");
+              this.$message({
+                duration:600,
+                message:"反关闭失败",
+                type:"error"
+              })
+              //this.$message.error("反关闭失败");
               this.getSteelReport();
             }
           })
           .catch(() => {
-            this.$message.error("反关闭失败");
+            this.$message({
+              duration:600,
+              message:"反关闭失败",
+              type:"error"
+            })
+            //this.$message.error("反关闭失败");
             this.getSteelReport();
           });
       });
@@ -767,7 +789,12 @@ export default {
             if (res.data.code == "200") {
               this.carrierList = [];
               if (res.data.data.length == 0) {
-                this.$message.info("承运商不存在,请前往注册");
+                this.$message({
+                  duration:600,
+                  message:"承运商不存在,请前往注册",
+                  type:"info"
+                })
+                //this.$message.info("承运商不存在,请前往注册");
                 return;
               }
               var restaurants = res.data.data;
@@ -797,7 +824,12 @@ export default {
             this.capacityList = [];
             if (res.data.code == "200") {
               if (res.data.data.length == 0) {
-                this.$message.info("车牌号不存在,请前往注册");
+                this.$message({
+                  duration:600,
+                  message:"车牌号不存在,请前往注册",
+                  type:"info"
+                })
+                //this.$message.info("车牌号不存在,请前往注册");
                 return;
               }
               var restaurants = res.data.data;
@@ -830,11 +862,21 @@ export default {
     updateCapacity(row) {
       row.capacityId = row.newsCapacityId;
       if (row.newsCapacityId == null) {
-        this.$message.warning("请先注册车牌号或者选中弹出后再提交!");
+        this.$message({
+          duration:600,
+          message:"请先注册车牌号或者选中弹出后再提交!",
+          type:"warning"
+        })
+        //this.$message.warning("请先注册车牌号或者选中弹出后再提交!");
         return;
       }
       if (!isVehicleNumber(row.capacityNo)) {
-        this.$message.error("请输入正确格式的车牌号!");
+        this.$message({
+          duration:600,
+          message:"请输入正确格式的车牌号!",
+          type:"error"
+        })
+        //this.$message.error("请输入正确格式的车牌号!");
         return;
       }
       if (row.capacityIds != 0) {
@@ -848,23 +890,43 @@ export default {
           .post("/api/v1/ams/updateCapacityNumberInFactory", row)
           .then(res => {
             if (res.data.code == 200) {
-              this.$message.success("变更车牌号成功!");
+              this.$message({
+                duration:600,
+                message:"变更车牌号成功",
+                type:"success"
+              })
+              //this.$message.success("变更车牌号成功!");
               this.getSteelReport();
               loading.close();
             } else {
-              this.$message.success("变更失败，请联系管理员");
+              this.$message({
+                duration:600,
+                message:"变更失败，请联系管理员",
+                type:"error"
+              })
+              //this.$message.success("变更失败，请联系管理员");
               this.getSteelReport();
               loading.close();
             }
           })
           .catch(() => {
-            this.$message.success("变更失败，请联系管理员");
+            this.$message({
+              duration:600,
+              message:"变更失败，请联系管理员",
+              type:"error"
+            })
+            //this.$message.success("变更失败，请联系管理员");
             this.getSteelReport();
             loading.close();
           });
       } else {
         if (row.carrierIds == 0) {
-          this.$message.error("请先选择承运商！");
+          this.$message({
+            duration:600,
+            message:"请先选择承运商！",
+            type:"error"
+          })
+          //this.$message.error("请先选择承运商！");
           return;
         }
         let i = 0;
@@ -888,17 +950,32 @@ export default {
           .post("/api/v1/ams/dispatchSteelOrder", arr)
           .then(res => {
             if (res.data.code == "200") {
-              this.$message.success("派车成功!");
+              this.$message({
+                duration:600,
+                message:"派车成功!",
+                type:"success"
+              })
+              //this.$message.success("派车成功!");
               this.getSteelReport();
               loading.close();
             } else {
-              this.$message.error("派车失败,请联系管理员");
+              this.$message({
+                duration:600,
+                message:"派车失败,请联系管理员",
+                type:"error"
+              })
+              //this.$message.error("派车失败,请联系管理员");
               this.getSteelReport();
               loading.close();
             }
           })
           .catch(() => {
-            this.$message.error("派车失败,请联系管理员");
+            this.$message({
+              duration:600,
+              message:"派车失败,请联系管理员",
+              type:"error"
+            })
+            //this.$message.error("派车失败,请联系管理员");
             this.getSteelReport();
             loading.close();
           });
@@ -913,7 +990,12 @@ export default {
         background: "rgba(0, 0, 0, 0.7)"
       });
       if (row.capacityTel == null || row.capacityTel == "") {
-        this.$message.error("电话号码不能为空");
+        this.$message({
+          duration:100,
+          message:'电话号码不能为空',
+          type:'error'
+        })
+          //.error("电话号码不能为空");
         return;
       }
       this.axios
@@ -923,17 +1005,32 @@ export default {
         })
         .then(res => {
           if (res.data.code == "200") {
-            this.$message.success("修改成功");
+            this.$message({
+              duration:600,
+              message:"修改成功",
+              type:"success"
+            })
+            //this.$message.success("修改成功");
             this.getSteelReport();
             loading.close();
           } else {
-            this.$message.error("修改失败");
+            this.$message({
+              duration:600,
+              message:"修改失败",
+              type:"error"
+            })
+            //this.$message.error("修改失败");
             this.getSteelReport();
             loading.close();
           }
         })
         .catch(() => {
-          this.$message.error("修改失败");
+          this.$message({
+            duration:600,
+            message:"修改失败",
+            type:"error"
+          })
+          //this.$message.error("修改失败");
           this.getSteelReport();
           loading.close();
         });
@@ -947,7 +1044,14 @@ export default {
         background: "rgba(0, 0, 0, 0.7)"
       });
       if (row.consigneeTel == null || row.consigneeTel == "") {
-        this.$message.error("电话号码不能为空");
+        this.$message({
+          duration:600,
+          message:'电话号码不能为空',
+          type:"error"
+        })
+          //.error("电话号码不能为空");
+        this.getSteelReport();
+        loading.close();
         return;
       }
       this.axios
@@ -958,17 +1062,32 @@ export default {
         })
         .then(res => {
           if (res.data.code == "200") {
-            this.$message.success("修改成功");
+            this.$message({
+              duration:600,
+              message:"修改成功",
+              type:"success"
+            })
+            //this.$message.success("修改成功");
             this.getSteelReport();
             loading.close();
           } else {
-            this.$message.error("修改失败");
+            this.$message({
+              duration:600,
+              message:"修改失败",
+              type:"error"
+            })
+            //this.$message.error("修改失败");
             this.getSteelReport();
             loading.close();
           }
         })
         .catch(() => {
-          this.$message.error("修改失败");
+          this.$message({
+            duration:600,
+            message:"修改失败",
+            type:"error"
+          })
+          //this.$message.error("修改失败");
           this.getSteelReport();
           loading.close();
         });
@@ -994,29 +1113,54 @@ export default {
             .post("/api/v1/ams/updateCarAddress", map)
             .then(res => {
               if (res.data.code == "200") {
-                this.$message.success("关闭车辆成功");
+                this.$message({
+                  duration:600,
+                  message:"关闭车辆成功",
+                  type:"errsuccessor"
+                })
+                //this.$message.success("关闭车辆成功");
                 this.getSteelReport();
                 loading.close();
               } else {
-                this.$message.error("关闭车辆失败");
+                this.$message({
+                  duration:600,
+                  message:"关闭车辆失败",
+                  type:"error"
+                })
+                //this.$message.error("关闭车辆失败");
                 this.getSteelReport();
                 loading.close();
               }
             })
             .catch(() => {
-              this.$message.error("关闭车辆失败");
+              this.$message({
+                duration:600,
+                message:"关闭车辆失败",
+                type:"error"
+              })
+              //this.$message.error("关闭车辆失败");
               this.getSteelReport();
               loading.close();
             });
         })
         .catch(() => {
-          this.$message.info("取消关闭");
+          this.$message({
+            duration:600,
+            message:"取消关闭",
+            type:"info"
+          })
+          //this.$message.info("取消关闭");
         });
     },
     //修改承运商授权
     updateTruckCarrier(row) {
       if (row.newCarrierId == null) {
-        this.$message.warning("请注册承运商或者选中弹出层之后再提交!");
+        this.$message({
+          duration:600,
+          message:"注册承运商或者选中弹出层之后再提交!",
+          type:"warning"
+        })
+        //this.$message.warning("请注册承运商或者选中弹出层之后再提交!");
         this.getSteelReport();
         return;
       }
@@ -1031,17 +1175,32 @@ export default {
           .post("/api/v1/ams/updateTruckNoCarrier", row)
           .then(res => {
             if (res.data.code == "200") {
-              this.$message.success("修改承运商授权成功");
+              this.$message({
+                duration:600,
+                message:"修改承运商授权成功!",
+                type:"success"
+              })
+              //this.$message.success("修改承运商授权成功");
               this.getSteelReport();
               loading.close();
             } else {
-              this.$message.error("修改失败,请联系管理员!");
+              this.$message({
+                duration:600,
+                message:"修改失败,请联系管理员!",
+                type:"error"
+              })
+              //this.$message.error("修改失败,请联系管理员!");
               this.getSteelReport();
               loading.close();
             }
           })
           .catch(() => {
-            this.$message.error("修改失败,请联系管理员!");
+            this.$message({
+              duration:600,
+              message:"修改失败,请联系管理员!",
+              type:"error"
+            })
+            //this.$message.error("修改失败,请联系管理员!");
             this.getSteelReport();
             loading.close();
           });
@@ -1058,18 +1217,36 @@ export default {
         this.axios
           .post("/api/v1/ams/dispatchToCarrier", arr)
           .then(res => {
-            if (res.data.code == "0") {
-              this.$message.success("授权承运商成功");
-              this.getSteelReport();
-              loading.close();
-            } else {
-              this.$message.error("授权失败,请联系管理员");
-              this.getSteelReport();
-              loading.close();
+            if (res.data.code == "200") {
+              this.$message({
+                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();
+              }
             }
           })
           .catch(() => {
-            this.$message.error("授权失败,请联系管理员");
+            this.$message({
+              duration:1000,
+              message:"授权失败,请联系管理员",
+              type:"error"
+            })
+            //this.$message.error("授权失败,请联系管理员");
             this.getSteelReport();
             loading.close();
           });
@@ -1180,19 +1357,34 @@ export default {
         .post("/api/v1/ams/updateCarAddress", map)
         .then(res => {
           if (res.data.code == "200") {
-            this.$message.success("修改收货地址成功!");
+            this.$message({
+              duration:1000,
+              message:"修改收货地址成功!",
+              type:"success"
+            })
+            //this.$message.success("修改收货地址成功!");
             this.getSteelReport();
             this.drawer = false;
             loading.close();
           } else {
-            this.$message.error("修改失败,请联系管理员!");
+            this.$message({
+              duration:1000,
+              message:"修改失败,请联系管理员!",
+              type:"error"
+            })
+            //this.$message.error("修改失败,请联系管理员!");
             this.getSteelReport();
             this.drawer = false;
             loading.close();
           }
         })
         .catch(() => {
-          this.$message.error("修改失败,请联系管理员!");
+          this.$message({
+            duration:1000,
+            message:"修改失败,请联系管理员!",
+            type:"error"
+          })
+          //this.$message.error("修改失败,请联系管理员!");
           this.getSteelReport();
           this.drawer = false;
           loading.close();
@@ -1259,21 +1451,52 @@ export default {
         .post("/api/v1/oms/updateMaterialMes", updateMap)
         .then(res => {
           if (res.data.code == "200") {
-            this.$message.success("修改物资数量成功");
+            this.$message({
+              duration:1000,
+              message:"修改物资数量成功",
+              type:"success"
+            })
+            //this.$message.success("修改物资数量成功");
             this.getSteelReport();
             loading.close();
           } else {
-            this.$message.error("修改物资数量失败,请联系管理员");
+            this.$message({
+              duration:1000,
+              message:"修改物资数量失败,请联系管理员",
+              type:"error"
+            })
+            //this.$message.error("修改物资数量失败,请联系管理员");
             this.getSteelReport();
             loading.close();
           }
         })
         .catch(() => {
-          this.$message.error("修改物资数量失败,请联系管理员");
+          this.$message({
+            duration:1000,
+            message:"修改物资数量失败,请联系管理员",
+            type:"error"
+          })
+          //this.$message.error("修改物资数量失败,请联系管理员");
           this.getSteelReport();
           loading.close();
         });
     },
+    //继续装
+    continue1(row){
+      let map={
+        orderId:row.orderId
+      }
+      this.axios
+        .post("/api/v1/oms/updateContinueStaus", map)
+        .then((res)=>{
+          if (res.data.code=="200"){
+            this.$message.success("修改成功")
+          }else {
+            this.$message.error("修改失败")
+          }
+        })
+      this.getSteelReport();
+    },
     //关闭单条分录
     closeEasEntryId(row) {
       console.log(row);
@@ -1303,24 +1526,44 @@ export default {
               .post("/api/v1/ams/closeSteelMaterialId", map)
               .then(res => {
                 if (res.data.code == "200") {
-                  this.$message.success("关闭成功");
+                  this.$message({
+                    duration:1000,
+                    message:"关闭成功",
+                    type:"success"
+                  })
+                  //this.$message.success("关闭成功");
                   this.getSteelReport();
                   loading.close();
                 } else {
-                  this.$message.error("关闭失败,请联系管理员");
+                  this.$message({
+                    duration:1000,
+                    message:"关闭失败,请联系管理员",
+                    type:"error"
+                  })
+                  //this.$message.error("关闭失败,请联系管理员");
                   this.getSteelReport();
                   loading.close();
                 }
               })
               .catch(() => {
-                this.$message.error("关闭失败,请联系管理员");
+                this.$message({
+                  duration:1000,
+                  message:"关闭失败,请联系管理员",
+                  type:"error"
+                })
+                //this.$message.error("关闭失败,请联系管理员");
                 this.getSteelReport();
                 loading.close();
               });
           }
         })
         .catch(() => {
-          this.$message.info("取消输入");
+          this.$message({
+            duration:1000,
+            message:"取消输入",
+            type:"info"
+          })
+          //this.$message.info("取消输入");
         });
     },
     //查询，输入查询条件