Merge remote-tracking branch 'origin/master'

build/utils.js

@@ -21,6 +21,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "WMS", "inward"];
 // let devModules = ["index", "inward", "WMS", "queue"];
 // let devModules = ["index", "appoint", "statisticalReport", "sale"];
+// let devModules = ["index", "appoint", "statisticalReport", "WMS", "sale"];
 let devModules = ["all"];
 //let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS",'statisticalReport',"inward"];
 

src/views/index/components/login.vue

@@ -172,6 +172,7 @@ export default {
                   }
                   // 普通用户
                 } else {
+                  // this.$router.push("printScan");
                   if (
                     userInfo.hasOwnProperty("sysGroup") &&
                     userInfo.sysGroup !== "" &&

src/views/index/components/printScan.vue

@@ -0,0 +1,158 @@
+<template xmlns="http://www.w3.org/1999/html">
+  <div class="saleSelfMachine">
+    <div class="background">
+      <img :src="backgroundImgURL" width="100%" height="100%" />
+    </div>
+    <div class="orderNumberData">
+      <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
+        v-model="isEdit"
+        active-color="#66ccff"
+        inactive-color="#ffffff"
+      >
+      </el-switch>-->
+    </div>
+    <div class="tip">
+      <h1>将手机二维码对准摄像头</h1>
+      <h1>扫描</h1>
+      <!-- 将手机二维码对准摄像头 扫描<br /> -->
+      <i class="el-icon-bottom" style="font-size: 100px"></i>
+    </div>
+  </div>
+</template>
+<script>
+import screenfull from "screenfull";
+export default {
+  data() {
+    return {
+      orderNumber: null,
+      isEdit: true,
+      edit1: true,
+      backgroundImgURL: require("@/assets/saleSelfMachine/backgroundImg.jpg")
+    };
+  },
+  created() {
+    this.changfouce();
+  },
+  // watch:{
+  //    data:"toSaleSelfMachine"
+  // },
+  methods: {
+    //输入框自动聚焦
+    changfouce() {
+      this.$nextTick(x => {
+        this.$refs.inputs.focus();
+      });
+    },
+    fullScreen() {
+      if (screenfull.isEnabled && !screenfull.isFullscreen) {
+        screenfull.request();
+        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;
+    }
+    //失去焦点后自动执行获得焦点事件
+    // onInputBlur(){
+    //     console.log("获取焦点")
+    //     this.changfouce();
+    // }
+    // toSaleSelfMachine(){
+    //      this.$router.push({
+    //         path:'/saleSelfMachine',
+    //     })
+    // }
+  },
+  mounted() {
+    console.log(screenfull.isFullscreen);
+    // this.changfouce();
+    const timer = setInterval(async () => {
+      // if(this.$refs.inputs.focus==false){
+      //     console.log("false")
+      this.changfouce();
+      //}
+      if (this.orderNumber != null && this.orderNumber.length == 21) {
+        if (
+          this.orderNumber.startsWith("WYSDD") == true ||
+          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;
+          }
+          this.$router.push({
+            path: "/printReceipt?orderNumber=" + this.orderNumber
+          });
+        }
+      } else if (this.orderNumber.length > 21) {
+        //清空输入框，免得一次多个重复订单还无法删除
+        this.orderNumber = null;
+      }
+    }, 3000);
+    this.$once("hook:beforeDestroy", () => {
+      clearInterval(timer);
+    });
+  }
+};
+</script>
+<style lang="scss">
+.saleSelfMachine {
+  width: 100vh;
+  height: 100vh;
+  .background {
+    width: 100%;
+    height: 100%;
+    z-index: -1;
+    position: absolute;
+    overflow: hidden;
+  }
+  .orderNumberData {
+    width: 100%;
+    color: #fff;
+    position: absolute;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .tip {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 1000px;
+    height: 300px;
+    font-size: 60px;
+    color: #e6e6e6;
+  }
+}
+</style>

src/views/index/router/index.js

@@ -1,81 +1,92 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-import routerBefore from '@/config/routerBefore.js'
+import Vue from "vue";
+import Router from "vue-router";
+import routerBefore from "@/config/routerBefore.js";
 
 // 主页
-import main from '@/components/main.vue'
+import main from "@/components/main.vue";
 
 // 登录
-import login from '@/views/index/components/login.vue'// 登录
-import download from '@/views/index/components/download.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 page404 from '@/views/index/components/page404.vue'
+import page404 from "@/views/index/components/page404.vue";
 
 // 集团公司选择过渡页
-import selectCompany from '@/views/index/components/selectCompany.vue'
+import selectCompany from "@/views/index/components/selectCompany.vue";
+
+import printScan from "@/views/index/components/printScan.vue";
 
-Vue.use(Router)
+Vue.use(Router);
 
-export const constantRouterMap = [{
-        path: '/',
-        meta: {
-            'title': '登录'
-        },
-        component: login
+export const constantRouterMap = [
+  {
+    path: "/",
+    meta: {
+      title: "登录"
+    },
+    component: login
+  },
+  {
+    path: "/printScan",
+    name: "printScan",
+    meta: {
+      title: "自助一体机"
     },
-    
-    {
-        path: '/download',
-        name: 'download',
-        meta: {
-            'title': '下载'
-        },
-        component: download
+    component: printScan
+  },
+  {
+    path: "/download",
+    name: "download",
+    meta: {
+      title: "下载"
     },
-    {
-        path: '/login',
-        name: 'login',
-        meta: {
-            'title': '登录'
-        },
-        component: login
+    component: download
+  },
+  {
+    path: "/login",
+    name: "login",
+    meta: {
+      title: "登录"
     },
-    {
-        path:'/luckDraw',
-        name:'luckDraw',
-        meta:{
-            'title':'抽奖结果'
-        },
-        component:luckDraw
+    component: login
+  },
+  {
+    path: "/luckDraw",
+    name: "luckDraw",
+    meta: {
+      title: "抽奖结果"
     },
-    {
-        path: '/default',
-        name: 'default',
-        component: main,
-        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"
     },
-    {
-        path: '/selectCompany',
-        name: 'selectCompany',
-        component: selectCompany,
-        meta: {
-            'title': '集团与公司用户跳转页'
-        }
-    },,
-    {
-        path: '/page404',
-        name: 'page404',
-        meta: {
-            'title': '404'
-        },
-        component: page404
-}];
+    component: page404
+  }
+];
 
 const router = new Router({
   // mode: 'history', // require service support

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

@@ -159,7 +159,12 @@
           width="150px"
         >
         </el-table-column>
-        <el-table-column prop="materialSpe" label="物资规格" align="center" sortable>
+        <el-table-column
+          prop="materialSpe"
+          label="物资规格"
+          align="center"
+          sortable
+        >
         </el-table-column>
         <el-table-column
           prop="materialNum"
@@ -309,7 +314,7 @@
               @click="updateconsigneeTel(scope.row)"
               type="primary"
               v-if="scope.row.isconsigneeTelShow == 1"
-            >提交</el-button
+              >提交</el-button
             >
           </template>
         </el-table-column>
@@ -947,9 +952,9 @@ export default {
       }
       this.axios
         .post("/api/v1/ams/updateConsigneeTel", {
-          saleOrderNo:row.saleOrderNo,
-          saleMaterialId:row.saleMaterialId,
-          consigneeTel:row.consigneeTel
+          saleOrderNo: row.saleOrderNo,
+          saleOrderMaterialId: row.saleOrderMaterialId,
+          consigneeTel: row.consigneeTel
         })
         .then(res => {
           if (res.data.code == "200") {
@@ -1053,7 +1058,7 @@ export default {
         this.axios
           .post("/api/v1/ams/dispatchToCarrier", arr)
           .then(res => {
-            if (res.data.code == "200") {
+            if (res.data.code == "0") {
               this.$message.success("授权承运商成功");
               this.getSteelReport();
               loading.close();