提交代码

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/views/index/components/printReceipt.vue

@@ -175,13 +175,12 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin-left: 190px; font-size: 20px;height: 40px"
+            style="margin-left: 690px; font-size: 20px;height: 40px"
             width="1000px"
             class="tablePart6"
           >
             <tr>
-              <th style="width: 14.5%;text-align: left">签收人：</th>
-              <th style="width: 14.5%;text-align: left">签收时间：</th>
+              <th style="width: 14.5%;text-align: left">签收人及签收时间：</th>
             </tr>
           </table>
         </div>
@@ -304,6 +303,16 @@ 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()
         })
     },
@@ -320,7 +329,7 @@ export default {
     print1() {
       let orderNumber = this.$route.query.orderNumber
       this.axios.post('/api/v1/tms/changeNumber?orderNumber=' + orderNumber)
-      this.backScan()
+      //this.backScan()
     },
     backScan() {
       this.$router.go(-1)

src/views/index/components/printScan.vue

@@ -38,15 +38,15 @@
       >
       </el-switch>-->
     </div>
-    <div class="tip">
+<!--    <div class="tip">
       手机二维码对准下方摄像头<br />
       <div class="arrowDown">⇩</div>
-      <!-- <i
+      &lt;!&ndash; <i
         class="el-icon-bottom"
         style="padding-left: 450px;font-size: 300px;color: red"
-      ></i> -->
-    </div>
-    <div class="emg"><span style="">紧急联系人:曾16670077829</span></div>
+      ></i> &ndash;&gt;
+    </div>-->
+    <div class="emg"><span style="">紧急联系人:0818-2521703</span></div>
   </div>
 </template>
 <script>
@@ -57,7 +57,11 @@ export default {
       orderNumber: null,
       isEdit: true,
       edit1: true,
-      backgroundImgURL: require('@/assets/saleSelfMachine/backgroundImg.jpg')
+      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() {
@@ -94,12 +98,12 @@ export default {
         this.$refs.inputs.focus()
       })
     },
-    fullScreen() {
+    /*fullScreen() {
       if (screenfull.isEnabled && !screenfull.isFullscreen) {
         screenfull.request()
         this.edit1 = false
       }
-    },
+    },*/
     /*async querynumber(){
       console.log(this.orderNumber)
       let orderNumber=this.orderNumber
@@ -149,7 +153,9 @@ export default {
   mounted() {
     document.getElementById('full').click()
     console.log(screenfull.isFullscreen)
-    // this.changfouce();
+    const timer1 = setInterval(async ()=>{
+      this.backgroundImgURL=this.backgroundImgURLList[0]
+    },3000)
     const timer = setInterval(async () => {
       // if(this.$refs.inputs.focus==false){
       //     console.log("false")
@@ -167,7 +173,7 @@ export default {
           let promise = await this.querynumber(this.orderNumber)
           console.log(promise)
           if (promise == 1) {
-            this.$message.error('你已经打印过了')
+            this.backgroundImgURL=this.backgroundImgURLList[1]
             this.orderNumber = null
             return
           }
@@ -183,7 +189,7 @@ export default {
         //清空输入框，免得一次多个重复订单还无法删除
         this.orderNumber = null
       }
-    }, 1000)
+    }, 3000)
     this.$once('hook:beforeDestroy', () => {
       clearInterval(timer)
     })