Browse Source

提交代码

zyf 2 years ago
parent
commit
c503c7fc9e

+ 1 - 1
build/utils.js

@@ -15,7 +15,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // ['index','appoint','configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-//let devModules = ["index", "statisticalReport", "appoint", "sale"];
+//let devModules = ["index", "statisticalReport", "appoint", "sale","TMS","AMS"];
 let devModules = ['all']
 
 if (pathSrc.indexOf('node_modules') > -1) {

+ 3 - 1
src/config/routerBefore.js

@@ -16,8 +16,10 @@ const whiteList = [
   '/luckDraw',
   '/printScan',
   '/printScan1',
+  '/printScan2',
   '/printReceipt',
-  '/printReceipt1'
+  '/printReceipt1',
+  '/printReceipt2'
 ]
 
 /**

+ 14 - 22
src/views/index/components/printReceipt1.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="tableAllDate">
     <div class="button-box">
+      <!--v-print="'#pdfDom1'"-->
       <el-button
         type="primary"
         @click="print1()"
-        v-print="'#pdfDom'"
         style="width: 500px;height: 120px;font-size: 100px"
         id="printReceipt"
         v-show="false"
@@ -14,12 +14,13 @@
         打印
       </el-button>
     </div>
-    <div id="pdfDom">
+    <div id="pdfDom1">
+      <div id="pdfDom" v-for="(item, index) in dataList" :key="index">
         <div class="blank"></div>
-
         <div class="title" style="margin: auto">
-          <h5 align="center">{{ shippername }} 物资送货单</h5>
-          <!--        <h5 align="center">物资送货单</h5>-->
+          <h5 align="center">{{ shippername }}</h5>
+          <div style="height: 10px"></div>
+          <span style="margin-left: 480px">物资送货单</span>
         </div>
         <div style="height: 20px"></div>
         <div>
@@ -139,7 +140,7 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin-left: 190px; font-size: 20px;height: 45px"
+            style="margin: auto; font-size: 20px;height: 45px"
             width="1000px"
             class="tablePart6"
           >
@@ -198,10 +199,8 @@
           </tr>
         </table>
       </div>-->
-        <!--设置中间的间隔以及虚线-->
-        <div style="height: 50px" v-show="index < 2"></div>
-        <hr width="1500px" style="border:1px dashed black" v-show="index < 2"/>
-        <div style="page-break-after:always" v-show="index ==1 && page"></div>
+        <!--设置分页符-->
+        <div style="page-break-after:always"></div>
       </div>
     </div>
     <!-- <el-button style="margin-left: 45%;" type="primary" @click="getPdf()">
@@ -210,6 +209,7 @@
 <!--    <el-button type="primary" @click="backScan()">
       <i class="el-icon-back"></i>返回
     </el-button>-->
+  </div>
 </template>
 
 <script>
@@ -301,18 +301,8 @@ export default {
             this.deliveryOrderMaterialList.push(deliver)
             console.log(this.deliveryOrderMaterialList)
           }
-          /*var beforePrint = function (e) {
-            console.log("正在打印中")
-          };
-
-          var afterPrint = function (e) {
-            //打印后的业务代码
-            console.log("打印结束")
-          };*/
-          /*window.onbeforeprint = beforePrint;
-          window.onafterprint = afterPrint;*/
-          document.getElementById('printReceipt').click()
         })
+      document.getElementById('printReceipt').click()
     },
     // print() {
     //   console.log('调用了吗')
@@ -327,7 +317,9 @@ export default {
     print1() {
       let orderNumber = this.$route.query.orderNumber
       this.axios.post('/api/v1/tms/changeNumber?orderNumber=' + orderNumber)
-      this.backScan()
+      window.print()
+      this.$router.push({name:'printScan1',params:{index:'1'}})
+      //this.backScan()
     },
     backScan() {
       this.$router.go(-1)

+ 386 - 0
src/views/index/components/printReceipt2.vue

@@ -0,0 +1,386 @@
+<template>
+  <div class="tableAllDate">
+    <div class="button-box">
+      <!--v-print="'#pdfDom1'"-->
+      <el-button
+        type="primary"
+        @click="print1()"
+        v-print="'#pdfDom1'"
+        style="width: 500px;height: 120px;font-size: 100px"
+        id="printReceipt"
+        v-show="false"
+      >
+        <!--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" style="margin: auto">
+          <h5 align="center">{{ shippername }}</h5>
+          <div style="height: 10px"></div>
+          <span style="margin-left: 480px">物资送货单</span>
+        </div>
+        <div style="height: 20px"></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 style="height: 35px">
+              <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 style="height: 35px" 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;height: 40px"
+            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;height: 40px"
+            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;height: 40px"
+            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;height: 45px"
+            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;height: 45px"
+            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-left: 690px; font-size: 20px;height: 40px"
+            width="1000px"
+            class="tablePart6"
+          >
+            <tr>
+              <th style="width: 14.5%;text-align: left">签收人及签收时间:</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="page-break-after:always"></div>
+      </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: '',
+      //分页数据
+      page: '',
+    }
+  },
+  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: {
+    async getDeliveryOrder() {
+      let orderNumber = this.$route.query.orderNumber
+      //空对象设置为null值
+      var deliver={};
+      await this.axios
+        .post('/api/v1/tms/getDeliveryOrder?orderNumber=' + orderNumber)
+        .then(res => {
+          console.log("查询出来的数据")
+          console.log(res.data)
+          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
+          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
+          console.log("数据的长度"+res.data.deliveryOrderMaterialList.length)
+          if (res.data.deliveryOrderMaterialList.length > 2){
+            this.page=true
+          }else if (res.data.deliveryOrderMaterialList.length ==1){
+            this.deliveryOrderMaterialList.push(deliver)
+            console.log(this.deliveryOrderMaterialList)
+          }
+        })
+      document.getElementById('printReceipt').click()
+    },
+    // print() {
+    //   console.log('调用了吗')
+    //   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)
+      //window.print()
+      //this.$router.push({name:'printScan1',params:{index:'1'}})
+      this.backScan()
+    },
+    backScan() {
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+#id {
+  width: 1500px;
+  height: 700px;
+}
+.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>

+ 6 - 2
src/views/index/components/printScan.vue

@@ -153,9 +153,9 @@ export default {
   mounted() {
     document.getElementById('full').click()
     console.log(screenfull.isFullscreen)
-    const timer1 = setInterval(async ()=>{
+    /*const timer1 = setInterval(async ()=>{
       this.backgroundImgURL=this.backgroundImgURLList[0]
-    },3000)
+    },3000)*/
     const timer = setInterval(async () => {
       // if(this.$refs.inputs.focus==false){
       //     console.log("false")
@@ -175,6 +175,10 @@ export default {
           if (promise == 1) {
             this.backgroundImgURL=this.backgroundImgURLList[1]
             this.orderNumber = null
+            setTimeout(()=>{
+              this.backgroundImgURL=this.backgroundImgURLList[0]
+              console.log("进入该方法了")
+            },3000)
             return
           }
           this.$router.push({

+ 24 - 2
src/views/index/components/printScan1.vue

@@ -71,6 +71,20 @@ export default {
   //    data:"toSaleSelfMachine"
   // },
   methods: {
+    //打印函数
+    printing(){
+      console.log("进入了打印方法")
+      this.backgroundImgURL=this.backgroundImgURLList[2];
+      setTimeout(()=>{
+        console.log("进入了第一层定时器")
+        this.backgroundImgURL=this.backgroundImgURLList[3]
+        setTimeout(()=>{
+          console.log("进入了第二层定时器")
+          this.backgroundImgURL=this.backgroundImgURLList[0]
+          this.$route.params.index=0
+        },2000)
+      },30000);
+    },
     //全屏函数
     fullScreen() {
       // screenfull.request()
@@ -153,9 +167,13 @@ export default {
   mounted() {
     document.getElementById('full').click()
     console.log(screenfull.isFullscreen)
-    const timer1 = setInterval(async ()=>{
+    console.log(this.$route.params.index)
+    if (this.$route.params.index==1){
+      this.printing();
+    }
+    /*const timer1 = setInterval(async ()=>{
       this.backgroundImgURL=this.backgroundImgURLList[0]
-    },3000)
+    },3000)*/
     const timer = setInterval(async () => {
       // if(this.$refs.inputs.focus==false){
       //     console.log("false")
@@ -175,6 +193,10 @@ export default {
           if (promise == 1) {
             this.backgroundImgURL=this.backgroundImgURLList[1]
             this.orderNumber = null
+            setTimeout(()=>{
+              this.backgroundImgURL=this.backgroundImgURLList[0]
+              console.log("进入该方法了")
+            },4000)
             return
           }
           this.$router.push({

+ 264 - 0
src/views/index/components/printScan2.vue

@@ -0,0 +1,264 @@
+<template xmlns="http://www.w3.org/1999/html">
+  <div class="saleSelfMachine">
+    <div class="background">
+      <img :src="backgroundImgURL" width="100%" height="100%" />
+    </div>
+    <el-button @click.native="fullScreen" id="full" v-show="false"></el-button>
+    <div class="orderNumberData">
+      <!--v-show="false" disabled="!isEdit"-->
+      <el-input
+        placeholder="请将二维码放置在扫描区"
+        v-model="orderNumber"
+        :focus="true"
+        ref="inputs"
+      >
+      </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
+=======
+      <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>
+      <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">
+      手机二维码对准下方摄像头<br />
+      <div class="arrowDown">⇩</div>
+      &lt;!&ndash; <i
+        class="el-icon-bottom"
+        style="padding-left: 450px;font-size: 300px;color: red"
+      ></i> &ndash;&gt;
+    </div>-->
+    <div class="emg"><span style="">紧急联系人:0818-2521703</span></div>
+  </div>
+</template>
+<script>
+import screenfull from 'screenfull'
+export default {
+  data() {
+    return {
+      orderNumber: null,
+      isEdit: true,
+      edit1: true,
+      backgroundImgURLList:[require('@/assets/saleSelfMachine/00.png'),
+        require('@/assets/saleSelfMachine/01.png'),
+        require('@/assets/saleSelfMachine/02.png'),
+        require('@/assets/saleSelfMachine/03.png')],
+      backgroundImgURL: require('@/assets/saleSelfMachine/00.png')
+    }
+  },
+  created() {
+    this.changfouce()
+  },
+  // watch:{
+  //    data:"toSaleSelfMachine"
+  // },
+  methods: {
+    //打印函数
+    printing(){
+      console.log("进入了打印方法")
+      this.backgroundImgURL=this.backgroundImgURLList[2];
+      setTimeout(()=>{
+        console.log("进入了第一层定时器")
+        this.backgroundImgURL=this.backgroundImgURLList[3]
+        setTimeout(()=>{
+          console.log("进入了第二层定时器")
+          this.backgroundImgURL=this.backgroundImgURLList[0]
+          this.$route.params.index=0
+        },2000)
+      },30000);
+    },
+    //全屏函数
+    fullScreen() {
+      // screenfull.request()
+      // console.log('wbei')
+      // // documentElement 属性以一个元素对象返回一个文档的文档元素
+      // // var el = document.documentElement
+      // // el.requestFullscreen ||
+      // // el.mozRequestFullScreen ||
+      // // el.webkitRequestFullscreen ||
+      // // el.msRequestFullScreen
+      // //   ? el.requestFullscreen() ||
+      // //     el.mozRequestFullScreen() ||
+      // //     el.webkitRequestFullscreen() ||
+      // //     el.msRequestFullscreen()
+      // //   : null
+      var wscript = new ActiveXObject('WScript.Shell') //创建ActiveX
+      if (wscript !== null) {
+        //创建成功
+        wscript.SendKeys('{F11}') //触发f11
+      }
+    },
+    //输入框自动聚焦
+    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
+        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() {
+    document.getElementById('full').click()
+    console.log(screenfull.isFullscreen)
+    /*console.log(this.$route.params.index)
+    if (this.$route.params.index==1){
+      this.printing();
+    }*/
+    /*const timer1 = setInterval(async ()=>{
+      this.backgroundImgURL=this.backgroundImgURLList[0]
+    },3000)*/
+    const timer = setInterval(async () => {
+      // if(this.$refs.inputs.focus==false){
+      //     console.log("false")
+      this.changfouce()
+      //}
+      if (
+        this.orderNumber != null &&
+        this.orderNumber != '' &&
+        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.backgroundImgURL=this.backgroundImgURLList[1]
+            this.orderNumber = null
+            setTimeout(()=>{
+              this.backgroundImgURL=this.backgroundImgURLList[0]
+              console.log("进入该方法了")
+            },4000)
+            return
+          }
+          this.$router.push({
+            path: '/printReceipt2?orderNumber=' + this.orderNumber
+          })
+        }
+      } else if (
+        this.orderNumber != null &&
+        this.orderNumber != '' &&
+        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%;
+    margin-top: 30px;
+    z-index: -1;
+    position: absolute;
+    overflow: hidden;
+  }
+  .orderNumberData {
+    width: 100%;
+    color: #fff;
+    position: absolute;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .tip {
+    width: 1800px;
+    height: 600px;
+    font-size: 100px;
+    padding-left: 350px;
+    padding-top: 500px;
+    color: #4cc9e9;
+    .arrowDown {
+      margin-top: 150px;
+      padding-left: 450px;
+      font-size: 300px;
+      color: red;
+    }
+  }
+  .emg {
+    position: fixed;
+    right: 20px;
+    bottom: 20px;
+    font-size: 30px;
+    color: red;
+    font-weight: 500;
+  }
+}
+</style>

+ 15 - 0
src/views/index/router/index.js

@@ -14,8 +14,10 @@ import download from "@/views/index/components/download.vue";
 import luckDraw from "@/views/index/components/luckDraw.vue";
 
 import printScan1 from "../components/printScan1";
+import printScan2 from "../components/printScan2";
 import printReceipt from "../components/printReceipt";
 import printReceipt1 from "../components/printReceipt1";
+import printReceipt2 from "../components/printReceipt2";
 // 网页登录不可访问
 import page404 from "@/views/index/components/page404.vue";
 
@@ -59,6 +61,14 @@ export const constantRouterMap = [
     },
     component: printScan1
   },
+  {
+    path: "/printScan2",
+    name: "printScan2",
+    meta: {
+      title: "下载"
+    },
+    component: printScan2
+  },
   {
     path: "/printReceipt",
     name: "printReceipt",
@@ -69,6 +79,11 @@ export const constantRouterMap = [
     name: "printReceipt1",
     component: printReceipt1
   },
+  {
+    path: "/printReceipt2",
+    name: "printReceipt2",
+    component: printReceipt2
+  },
   {
     path: "/login",
     name: "login",

+ 5 - 1
src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelAllReport.vue

@@ -292,7 +292,11 @@
           prop="isPrintDelivery"
           label="送货单打印状态"
           align="center"
-        ></el-table-column>
+        >
+          <template slot-scope="scope">
+            <span v-show="scope.row.isPrintDelivery==1">已打印</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="saler" label="业务员" align="center">
         </el-table-column>
         <el-table-column

+ 5 - 1
src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -209,7 +209,11 @@
           label="送货单打印状态"
           align="center"
           width="150px"
-        ></el-table-column>
+        >
+          <template slot-scope="scope">
+            <span v-show="scope.row.isPrintDelivery">已打印</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="saler" label="业务员" align="center">
         </el-table-column>
         <el-table-column