tijhia'

build/utils.js

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

config/index.js

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

src/config/routerBefore.js

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

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

@@ -520,11 +520,9 @@ export default {
         let rows = XLSX.utils.sheet_to_json(
           workbook.Sheets[workbook.SheetNames[0]]
         ) //只取第一页
-        console.log('rows', rows)
         Array.from(rows).forEach((e, index) => {
           let map = {}
           try {
-            debugger
             Object.keys(e).forEach(e1 => {
               if (e1.includes('销售订单编号')) {
                 map.saleOrderNo = e[e1]
@@ -621,12 +619,12 @@ export default {
                 map.salerName = e[e1]
               }
               if (e1.includes('摘要')) {
-                if (e[e1].includes('范围定尺')) {
-                  map.saleRemark = e[e1]
-                } else {
-                  map.saleRemark = e[e1]
+                if (e[e1]) {
+                  let regex = /,定尺范围.*米|,范围定尺.*米/g
+                  console.log(e[e1])
+                  map.saleRemark = e[e1].replace(/,|，/g, ',').split(regex)[0]
                 }
-                map.saleRemark = e[e1]
+                console.log(e[e1])
                 let regex = /钢材.*组/g
                 if (e[e1].match(regex)) {
                   map.saleArea = e[e1].match(regex)[0]
@@ -671,11 +669,10 @@ export default {
             if (map.saleRemark && map.receiveName && map.materialName) {
               that.tableData.push(map)
             }
-          } catch (e) {
-            that.$message.error(e.message)
+          } catch (es) {
+            that.$message.error(es.message)
           }
         })
-        console.log(this.tableData)
         that.addExcelInport()
         // that.dialogTableVisible = true;
         return
@@ -699,8 +696,6 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      console.log(this.tableData)
-      debugger
       //遍历数组,根据摘要和下单客户自动给出销售订单编号
       for (let i = 0; i < this.tableData.length; i++) {
         if (i === 0) {
@@ -754,14 +749,11 @@ export default {
       }, {})
       // result即为所求
       let result = Object.values(map1)
-      console.log(result)
       //遍历数组
       let saleOrderListMap = []
       result.forEach((saleOrderList, index) => {
         let map = {}
         let arr = []
-        console.log('saleOrderList')
-        console.log(saleOrderList)
         saleOrderList.forEach(e => {
           let mapMaterial = {}
           Object.keys(e).forEach(e1 => {
@@ -779,7 +771,6 @@ export default {
         map.mapList = arr
         saleOrderListMap.push(map)
       })
-      console.log(saleOrderListMap)
       this.axios
         .post('/api/v1/ams/addSteelSaleOrderList', saleOrderListMap)
         .then(res => {

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,385 @@
+<template>
+  <div class="tableAllDate">
+    <div class="button-box">
+      <!--v-print="'#pdfDom1'"-->
+      <el-button
+        type="primary"
+        @click="print1()"
+        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>

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>

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({

src/views/index/components/printScan1.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: '/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/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>

src/views/index/router/index.js

@@ -13,7 +13,11 @@ 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";
 
@@ -49,11 +53,37 @@ export const constantRouterMap = [
     },
     component: printScan
   },
+  {
+    path: "/printScan1",
+    name: "printScan1",
+    meta: {
+      title: "下载"
+    },
+    component: printScan1
+  },
+  {
+    path: "/printScan2",
+    name: "printScan2",
+    meta: {
+      title: "下载"
+    },
+    component: printScan2
+  },
   {
     path: "/printReceipt",
     name: "printReceipt",
     component: printReceipt
   },
+  {
+    path: "/printReceipt1",
+    name: "printReceipt1",
+    component: printReceipt1
+  },
+  {
+    path: "/printReceipt2",
+    name: "printReceipt2",
+    component: printReceipt2
+  },
   {
     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/components/inwardSettlement/countDetailOrder.vue

@@ -98,22 +98,22 @@ export default {
     options1GetRequestUrl(){
     if(getCookie("orgCode") == "chengyunshang"){
       this.ssoId=getCookie('userId');
-      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&carrierSsoId="+ getCookie('userId');
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0&carrierSsoId="+ getCookie('userId');
     }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
-      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0"
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0"
     }else{
-      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&userId=" + getCookie("orgCode");
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0&userId=" + getCookie("orgCode");
     }
     },
     //已结算数据
     options2GetRequestUrl(){
      if(getCookie("orgCode") == "chengyunshang"){
       this.ssoId=getCookie('userId');
-      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&carrierSsoId="+ getCookie('userId');
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1&carrierSsoId="+ getCookie('userId');
       }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
-        this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1"
+        this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1"
       }else{
-        this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&userId=" + getCookie("orgCode");
+        this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1&userId=" + getCookie("orgCode");
       }
     },
     onclick() {
@@ -133,7 +133,7 @@ export default {
             getCookie("orgCode") == "wuliuchuyunzhongxin"
           ) {
             this.options1.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0" +
               "&startTime=" +
               startTime +
               "&endTime=" +
@@ -141,7 +141,7 @@ export default {
               "&i" +
               new Date();
             this.options2.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1" +
               "&startTime=" +
               startTime +
               "&endTime=" +
@@ -150,7 +150,7 @@ export default {
               new Date();
           } else if (getCookie("orgCode") == "chengyunshang") {
             this.options1.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&carrierSsoId=" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0&carrierSsoId=" +
               getCookie("userId") +
               "&startTime=" +
               startTime +
@@ -159,7 +159,7 @@ export default {
               "&i" +
               new Date();
             this.options2.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&carrierSsoId=" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1&carrierSsoId=" +
               getCookie("userId") +
               "&startTime=" +
               startTime +
@@ -169,7 +169,7 @@ export default {
               new Date();
           } else {
             this.options1.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&userId=" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0&userId=" +
               getCookie("orgCode") +
               "&startTime=" +
               startTime +
@@ -178,7 +178,7 @@ export default {
               "&i" +
               new Date();
             this.options2.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&userId=" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1&userId=" +
               getCookie("orgCode") +
               "&startTime=" +
               startTime +

src/views/inward/components/truckAppoint/addPlan.vue

@@ -128,7 +128,7 @@ export default {
       console.log(this.mapList);
     },
     // 新增
-    makeSure() {
+    async makeSure() {
       console.log(typeof this.planTruckNumber);
       if (this.carrierId == null || this.state2 == "") {
         this.$alert("请输入承运商！");
@@ -142,18 +142,23 @@ export default {
         planTruckNumber: Number(this.planTruckNumber),
         carrierId: this.carrierId
       };
-      this.axios.post("/api/v1/ams/addTruckPlan", plan).then(res => {
-        console.log(res);
-        if (res.data.code == 200) {
-          this.$message({
-            type: "success",
-            message: "新增成功!"
-          });
-          this.$router.go(-1);
-        } else {
-          this.$message.error("新增失败！");
-        }
-      });
+      try {
+        await this.axios.post("/api/v1/ams/addTruckPlan", plan, {timeout: 45000}).then(res => {
+          console.log(res);
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!"
+            });
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败！");
+          }
+        });
+      }catch (e) {
+        console.log(e)
+        Message.error('网络异常，请刷新页面')
+      }
     },
     // 返回
     cancel() {

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -813,7 +813,7 @@ export default {
       }
     },
     // 新增
-    makeSure() {
+    async makeSure() {
       // console.log(this.form.isMineral);
       // // 判断当前装机是否选择了装机必填
       // console.log("进来了");
@@ -906,8 +906,8 @@ export default {
       }
       if (this.DueTime == null && this.isOpenDueTime == false) {
         //默认选择明天0点
-        var dd=new Date(this.form.requirementTruckTime);
-        dd.setDate(dd.getDate()+1);//获取AddDayCount天后的日期
+        var dd = new Date(this.form.requirementTruckTime);
+        dd.setDate(dd.getDate() + 1);//获取AddDayCount天后的日期
         dd.setHours(null);
         dd.setMinutes(null);
         dd.setSeconds(null);
@@ -934,20 +934,25 @@ export default {
         orgCode: getCookie("orgCode"),
         remark: this.form.Tel + this.capacityTypeName + this.form.typeRemarks
       };
-      this.axios
-        .post("/api/v1/ams/addTruckRequirement", requiremnet)
-        .then(res => {
-          if (res.data.code == 200) {
-            this.$message({
-              type: "success",
-              message: "新增成功!"
-            });
-            this.$router.go(-1);
-          } else {
-            this.$message.error("新增失败！");
-            this.disabled = false;
-          }
-        });
+      try {
+        await this.axios
+          .post("/api/v1/ams/addTruckRequirement", requiremnet,{timeout: 45000})
+          .then(res => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "新增成功!"
+              });
+              this.$router.go(-1);
+            } else {
+              this.$message.error("新增失败！");
+              this.disabled = false;
+            }
+          });
+      } catch (e) {
+        console.log(e)
+        Message.error('网络异常，请刷新页面')
+      }
     },
     func(res) {
       console.log(res);

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",

src/views/queue/components/qmsEnFacotory/addModel.vue

@@ -3,13 +3,13 @@
   <div style="width:100%">
     <page-title>返回</page-title>
     <!-- 第一部分 -->
-    <el-form style="width:400px;margin-left:40%;margin-top:50px">
+    <el-form style="width:500px;margin-left:35%;margin-top:50px">
         <el-form-item style="display:inline" label="未轧规格">
-            <el-select filterable  v-model="spectionsModel">
-                    <el-option v-for="item in models" :value="item" :key="item" :label="item"></el-option>
+            <el-select filterable  v-model="spectionsModel" style="width:300px">
+                    <el-option v-for="item in models" :value="item.materialId" :key="item.materialId" :label="item.materialName"></el-option>
             </el-select>
         </el-form-item>
-        <el-button type="primary" @click="makeSure" style="margin:20px;margin-left:60px">新增</el-button>
+        <el-button type="primary" @click="makeSure" style="margin:20px;margin-left:100px">新增</el-button>
     </el-form>
   </div>
 </template>

src/views/queue/components/qmsEnFacotory/editModel.vue

@@ -3,13 +3,13 @@
   <div style="width:100%">
     <page-title>返回</page-title>
     <!-- 第一部分 -->
-    <el-form style="width:400px;margin-left:40%;margin-top:50px">
+    <el-form style="width:500px;margin-left:35%;margin-top:50px">
         <el-form-item style="display:inline" label="未轧规格">
-            <el-select filterable  v-model="spectionsModel">
-                    <el-option v-for="item in models" :value="item" :key="item" :label="item"></el-option>
+            <el-select filterable  v-model="spectionsModel" style="width:300px">
+                   <el-option v-for="item in models" :value="item.materialId" :key="item.materialId" :label="item.materialName"></el-option>
             </el-select>
         </el-form-item>
-        <el-button type="primary" @click="makeSure" style="margin:20px;margin-left:60px">修改</el-button>
+        <el-button type="primary" @click="makeSure" style="margin:20px;margin-left:100px">修改</el-button>
     </el-form>
   </div>
 </template>
@@ -35,7 +35,7 @@ export default {
         console.log("resultId："+this.$route.params.resultId);
         console.log("spectionsModel："+this.$route.params.spectionsModel);
         this.resultId=this.$route.params.resultId;
-        this.spectionsModel=this.$route.params.spectionsModel;
+        this.spectionsModel=parseInt(this.$route.params.spectionsModel);
     },
     getAllModel(){
       this.axios

src/views/queue/components/qmsEnFacotory/model.vue

@@ -39,6 +39,11 @@
           :row-style="{height:'40px'}"
           style="width: 100%;font-size: 18px">
           <el-table-column
+          align="center"
+            prop="materialName"
+            label="物资名称">
+          </el-table-column>
+          <el-table-column
           align="center"
             prop="spectionsModel"
             label="未轧规格">
@@ -121,7 +126,7 @@ export default {
     },
     updateclick(row) {
       console.log(row);
-      this.$router.push("/editModel/" + row.resultId+"/"+row.spectionsModel);
+      this.$router.push("/editModel/" + row.resultId+"/"+row.materialId);
     },
     addclick() {
       this.$router.push("/addModel");

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -494,7 +494,7 @@ export default {
         columnIndex === 0 ||
         columnIndex === 1 ||
         columnIndex === 2 ||
-        columnIndex === 8 ||
+        columnIndex === 3 ||
         columnIndex === 9 ||
         columnIndex === 10 ||
         columnIndex === 11 ||

src/views/sale/components/offSiteTransportation/transportationPerformance.vue

@@ -177,12 +177,10 @@ export default {
           console.log(res.data);
           this.isShow2 = true;
           this.srcList2 = [];
-          this.src2 = res.data.resultSignedNotePhoto;
+          this.src2 = res.data.resultReceiveNotePhoto;
+          this.srcList2.push(res.data.resultReceiveNotePhoto);
           this.srcList2.push(res.data.resultSignedNotePhoto);
           this.srcList2.push(res.data.resultEmptyContainerPhoto);
-          if (res.data.resultReceiveNotePhoto != null) {
-            this.srcList2.push(res.data.resultReceiveNotePhoto);
-          }
         });
     },
     toPhotoClick(orderNumber) {

src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -186,7 +186,7 @@ export default {
     getStockString() {
       let that = this;
       this.axios
-        .post("/api/v1/wmsh/getLoadPortStockList?apiId=158&i=")
+        .post("/api/v1/wmsh/getLoadPortStockList?apiId=158&pageSize=1000&pageNum=1")
         .then(res => {
           console.log(res);
           if (res.status == "200") {

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

@@ -300,7 +300,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

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

@@ -210,7 +210,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

src/views/statisticalReport/components/tableItem.vue

@@ -93,7 +93,7 @@ export default {
     getStockString() {
       let that = this;
       this.axios
-        .post("/api/v1/wmsh/getLoadPortStockList?apiId=158&i=")
+        .post("/api/v1/wmsh/getLoadPortStockList?apiId=158&pageSize=1000&pageNum=1")
         .then(res => {
           console.log(res);
           if (res.status == "200") {