Merge remote-tracking branch 'origin/master'

src/components/DilCommonUI/packages/mergeRowTable/src/mergeRowTable.vue

@@ -51,7 +51,7 @@
             :label="scope.row.ROW_ID"
             @click.native.prevent.stop="rowClick(scope.row)"
           >
-            {{ "" }}
+            {{ '' }}
           </el-radio>
         </template>
       </el-table-column>
@@ -117,9 +117,9 @@
 </template>
 
 <script>
-import table from "./mergeRowTable.js";
+import table from './mergeRowTable.js'
 export default {
-  name: "MergeRowTable",
+  name: 'MergeRowTable',
   extends: table,
   props: {
     // 合并行下标
@@ -128,7 +128,7 @@ export default {
     },
     //比对字段
     comparison: {
-      default: ""
+      default: ''
     },
     shiyHeigth: {
       default: null
@@ -145,18 +145,18 @@ export default {
     },
     // 请求地址
     requestUrl: {
-      default: ""
+      default: ''
     },
     // 请求参数 请求体中的参数
     requestQuery: {
       default() {
-        return {};
+        return {}
       }
     },
     // 表头数据
     columnData: {
       default() {
-        return [];
+        return []
       }
     },
     // 是否显示序号
@@ -167,7 +167,7 @@ export default {
     // radio : 显示单选框
     // select : 显示多选框
     selectionType: {
-      default: ""
+      default: ''
     },
     // 是否在数据翻页后保留之前选中的数据（需指定 row-key）
     reserveSelection: {
@@ -186,15 +186,15 @@ export default {
     // Table 的最大高度。合法的值为数字或者单位为 px 的高度。
     //sdada
     maxHeight: {
-      default: "500px"
+      default: '500px'
     },
     // 是否启用排序
     sortable: {
-      default: "custom"
+      default: 'custom'
     },
     // 对齐方式 left/center/right
     align: {
-      default: "center"
+      default: 'center'
     },
     // 是否带有纵向边框
     border: {
@@ -211,13 +211,13 @@ export default {
     // 行的 className 的回调方法，也可以使用字符串为所有行设置一个固定的 className。
     rowClassName: {
       default() {
-        return ({ row, rowIndex }) => "";
+        return ({ row, rowIndex }) => ''
       }
     },
     // 单元格的 className 的回调方法，也可以使用字符串为所有单元格设置一个固定的 className。
     cellClassName: {
       default() {
-        return ({ row, rowIndex }) => "";
+        return ({ row, rowIndex }) => ''
       }
     },
     loading: {
@@ -234,7 +234,7 @@ export default {
     // 每页显示个数选择器的选项设置
     pageSizes: {
       default() {
-        return [10, 20, 50, 100, 200, 1000];
+        return [10, 20, 50, 100, 200, 1000]
       }
     },
     // 每页显示条目个数，支持 .sync 修饰符
@@ -243,36 +243,36 @@ export default {
     },
     //组件布局，子组件名用逗号分隔
     layout: {
-      default: "total, prev, pager, next, sizes, jumper"
+      default: 'total, prev, pager, next, sizes, jumper'
     }
   },
   watch: {
     requestUrl() {
-      this.refreshData();
+      this.refreshData()
     },
     drawer(val) {
       if (val) {
-        this.dataRadioId = null;
+        this.dataRadioId = null
       }
     }
   },
   methods: {
     // 刷新表格数据
     refreshData() {
-      this.requestData();
+      this.requestData()
       // 多选表格清空用户的选择
-      this.$refs.mainTable.clearSelection();
+      this.$refs.mainTable.clearSelection()
     },
     rowDbClick(row) {
-      console.log(row);
-      console.log("我被双击了");
-      this.$emit("rowDbClick", row);
+      console.log(row)
+      console.log('我被双击了')
+      this.$emit('rowDbClick', row)
     },
     toggleRowExpansion(row, expanded) {
-      this.$refs.mainTable.toggleRowExpansion(row, expanded);
+      this.$refs.mainTable.toggleRowExpansion(row, expanded)
     }
   }
-};
+}
 </script>
 
 <style lang="scss" scoped>
@@ -289,4 +289,13 @@ export default {
   font-size: 22px;
   font-weight: 700;
 }
+
+::-webkit-scrollbar {
+  width: 0px;
+  height: 0px;
+}
+::-webkit-scrollbar-thumb {
+  background-color: #dbd9d9;
+  border-radius: 3px;
+}
 </style>

src/config/routerBefore.js

@@ -15,7 +15,9 @@ const whiteList = [
   '/dingtalkWorkFlowMobileEnd',
   '/luckDraw',
   '/printScan',
-  '/printReceipt'
+  '/printScan1',
+  '/printReceipt',
+  '/printReceipt1'
 ]
 
 /**

src/views/appoint/components/saleContract/saleOrderCoproductCarrier.vue

@@ -17,7 +17,7 @@
           <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
               <el-button
-                @click="coproductSendClick(scope.row.saleOrderId)"
+                @click="coproductSendClick(scope.row)"
                 type="text"
                 size="small"
                 >副产品派车</el-button
@@ -55,111 +55,122 @@
   </div>
 </template>
 <script>
-import { getCookie } from "@/utils/util.js";
+import { getCookie } from '@/utils/util.js'
 export default {
-  name: "saleOrder",
+  name: 'saleOrder',
   data() {
     return {
-      activeName: "four",
-      input: "",
+      activeName: 'four',
+      input: '',
       carrierId: null,
       carrierName: null,
       option4: {
         // 表格请求数据的地址
-        requestUrl: ""
+        requestUrl: ''
       },
       //记录旧的row对象 (销售公司已审批)
-      oldRow: "",
+      oldRow: '',
       //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态 (销售公司已审批)
       oldRowCount: 1,
       tableHead: [
         {
-          prop: "materialName",
-          label: "物资名称",
+          prop: 'materialName',
+          label: '物资名称',
           width: 150
         },
         {
-          prop: "specificationModel",
-          label: "规格型号",
+          prop: 'specificationModel',
+          label: '规格型号',
           width: 150
         },
         {
-          prop: "materialNumber",
-          label: "物资件数",
+          prop: 'materialNumber',
+          label: '物资件数',
           width: 100
         },
         {
-          prop: "materialWeight",
-          label: "物资重量",
+          prop: 'materialWeight',
+          label: '物资重量',
           width: 100
         }
       ],
       //(销售公司已审批)
       tableData: []
-    };
+    }
   },
   created() {
-    this.initUrl();
+    this.initUrl()
   },
   methods: {
     initUrl() {
-      if (getCookie("orgCode") == "chengyunshang") {
+      if (getCookie('orgCode') == 'chengyunshang') {
         this.option4.requestUrl =
-          "/api/v1/ams/getSaleOrderListByCarrierSsoId?apiId=409&carrierSsoId=" +
-          getCookie("userId");
+          '/api/v1/ams/getSaleOrderListByCarrierSsoId?apiId=409&carrierSsoId=' +
+          getCookie('userId')
       } else {
         this.option4.requestUrl =
-          "/api/v1/ams/getSaleOrderListByCarrierSsoId?apiId=409";
+          '/api/v1/ams/getSaleOrderListByCarrierSsoId?apiId=409'
       }
     },
     refresh() {
-      this.$router.go(0);
+      this.$router.go(0)
     },
     handleClick(tab, event) {
-      console.log(tab, event);
+      console.log(tab, event)
     },
     onclick() {
-      if (this.activeName == "four") {
+      if (this.activeName == 'four') {
         this.option4.requestUrl =
-          "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&con=" +
-          this.input;
+          '/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&con=' +
+          this.input
       }
     },
-    coproductSendClick(saleOrderId) {
-      this.$router.push("/addSaleOrderCoproductSendCarrier/" + saleOrderId);
+    coproductSendClick(row) {
+      this.$router.push('/addSaleOrderCoproductSendCarrier/' + row.saleOrderId)
+      // this.axios
+      //   .post('/api/v1/ams/getSaleOrderStatus?saleNumber=' + row.saleNumber)
+      //   .then(res => {
+      //     console.log(res.data.data)
+      //     if (res.data.data == 7) {
+      //       this.$message.error('该订单在金蝶已关闭,无法派车')
+      //       return
+      //     } else {
+
+      //     }
+      //   })
     },
     // -------查看物资详情 (已审批)
     detailclick(row) {
       // 记录重复点击次数
       if (this.oldRow === row) {
-        this.oldRowCount += 1;
+        this.oldRowCount += 1
       }
       // 切换当前详情表
-      this.$refs.table.toggleRowExpansion(row);
+      this.$refs.table.toggleRowExpansion(row)
       // 打开前关闭上一个详情表
-      if (this.oldRow != "") {
+      if (this.oldRow != '') {
         if (this.oldRow != row) {
           if (this.oldRowCount % 2 === 1) {
-            this.$refs.table.toggleRowExpansion(this.oldRow);
+            this.$refs.table.toggleRowExpansion(this.oldRow)
           } else {
-            this.oldRowCount = 1;
+            this.oldRowCount = 1
           }
         } else {
-          this.oldRow = null;
-          return;
+          this.oldRow = null
+          return
         }
       }
       // 重置上一个点击对象
-      this.oldRow = row;
+      this.oldRow = row
       // 根据销售订单id查询物资信息
       this.axios
-        .post("/api/v1/ams/getSaleMaterialList?saleOrderId=" + row.saleOrderId)
+        .post('/api/v1/ams/getSaleMaterialList?saleOrderId=' + row.saleOrderId)
         .then(res => {
-          this.tableData = res.data.data;
-        });
+          this.tableData = res.data.data
+        })
     }
   }
-};
+}
 </script>
 <style lang="scss" scoped>
 .salePlan {

src/views/index/components/printReceipt.vue

@@ -329,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/printReceipt1.vue

@@ -0,0 +1,393 @@
+<template>
+  <div class="tableAllDate">
+    <div class="button-box">
+      <el-button
+        type="primary"
+        @click="print1()"
+        v-print="'#pdfDom'"
+        style="width: 500px;height: 120px;font-size: 100px"
+        id="printReceipt"
+        v-show="false"
+      >
+        <!--class="el-icon-printer"-->
+        <!---->
+        打印
+      </el-button>
+    </div>
+    <div id="pdfDom">
+        <div class="blank"></div>
+
+        <div class="title" style="margin: auto">
+          <h5 align="center">{{ shippername }} 物资送货单</h5>
+          <!--        <h5 align="center">物资送货单</h5>-->
+        </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-left: 190px; 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="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>
+    </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>-->
+</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)
+          }
+          /*var beforePrint = function (e) {
+            console.log("正在打印中")
+          };
+
+          var afterPrint = function (e) {
+            //打印后的业务代码
+            console.log("打印结束")
+          };*/
+          /*window.onbeforeprint = beforePrint;
+          window.onafterprint = afterPrint;*/
+          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)
+      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>

src/views/index/components/printScan1.vue

@@ -0,0 +1,242 @@
+<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: {
+    //全屏函数
+    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)
+    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
+            return
+          }
+          this.$router.push({
+            path: '/printReceipt1?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>

src/views/index/router/index.js

@@ -13,7 +13,9 @@ import download from "@/views/index/components/download.vue";
 
 import luckDraw from "@/views/index/components/luckDraw.vue";
 
+import printScan1 from "../components/printScan1";
 import printReceipt from "../components/printReceipt";
+import printReceipt1 from "../components/printReceipt1";
 // 网页登录不可访问
 import page404 from "@/views/index/components/page404.vue";
 
@@ -49,11 +51,24 @@ export const constantRouterMap = [
     },
     component: printScan
   },
+  {
+    path: "/printScan1",
+    name: "printScan1",
+    meta: {
+      title: "下载"
+    },
+    component: printScan1
+  },
   {
     path: "/printReceipt",
     name: "printReceipt",
     component: printReceipt
   },
+  {
+    path: "/printReceipt1",
+    name: "printReceipt1",
+    component: printReceipt1
+  },
   {
     path: "/login",
     name: "login",

src/views/inward/components/inwardFactory/reverseResult.vue

@@ -0,0 +1,144 @@
+// 倒库作业
+<template>
+  <div class="sale">
+    <div class="top">
+      <!-- 框计算 -->
+      <span class="text">卸货时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <!-- excel导出 -->
+      <el-button type="primary" @click="exportData()">
+        <i class="el-icon-download"></i>导出(Excel)
+      </el-button>
+    </div>
+    <div class="tab">
+      <dilTable v-bind.sync="option" ref="excelDom">
+        <!-- <el-table-column fixed="right" label="操作" width="180">
+          <template slot-scope="scope">
+            <div class="step">
+              <el-button
+                @click="detailclick1(scope.row)"
+                type="text"
+                size="small"
+                >运输详情</el-button
+              >
+            </div>
+          </template>
+        </el-table-column> -->
+      </dilTable>
+    </div>
+  </div>
+</template>
+<script>
+import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
+export default {
+  data() {
+    return {
+      inputText: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: ""
+      },
+      startTime: null,
+      endTime: null,
+      drawer: false,
+      direction: "rtl",
+      tableTitle: "倒库统计"
+    };
+  },
+  created() {
+    if (
+      getCookie("orgCode") == "dagangadmin" ||
+      getCookie("orgCode") == "zidonghuabu" ||
+      getCookie("orgCode") == "wuliuchuyunzhongxin"
+    ) {
+      this.option.requestUrl = "/api/v1/tms/getAllReverseResult?apiId=516";
+    } else {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllReverseResult?apiId=516&userId=" +
+        getCookie("orgCode");
+    }
+  },
+  methods: {
+    onclick() {
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          console.log(startTime);
+          console.log(endTime);
+          if (
+            getCookie("orgCode") == "dagangadmin" ||
+            getCookie("orgCode") == "zidonghuabu" ||
+            getCookie("orgCode") == "wuliuchuyunzhongxin"
+          ) {
+            this.option.requestUrl =
+              "/api/v1/tms/getAllReverseResult?apiId=516&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          } else {
+            this.option.requestUrl =
+              "/api/v1/tms/getAllReverseResult?apiId=516&userId=" +
+              getCookie("orgCode") +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+      }
+    }
+  }
+};
+</script>
+<style lang="scss">
+.sale {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 20%;
+    }
+  }
+}
+.el-table th.el-table__cell > .cell {
+  display: inline-block;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  position: relative;
+  vertical-align: middle;
+  padding-left: 10px;
+  padding-right: 10px;
+  width: 100%;
+  text-align: center;
+}
+.step {
+  text-align: center;
+}
+</style>

src/views/inward/router/index.js

@@ -106,7 +106,8 @@ import timeTaskResult from "@/views/inward/components/inwardFactory/timeTaskResu
 import countResult from "@/views/inward/components/inwardFactory/countResult.vue";
 //内转进口矿/国产矿/燃料--内转厂内物资--包月作业
 import monthResult from "@/views/inward/components/inwardFactory/monthResult.vue";
-
+//倒库作业
+import reverseResult from "@/views/inward/components/inwardFactory/reverseResult.vue";
 //**************************************跳转界面**************************************/
 
 //新增采购内转需求
@@ -484,6 +485,12 @@ const constantRouterMap = [
         meta: { code: "xtpzgl-yhgl" },
         component: monthResult
       },
+      {
+        path: "reverseResult",
+        name: "reverseResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: reverseResult
+      },
       /*****************************************跳转页面*****************************************/
       {
         path: "addRequirement",