mxx %!s(int64=3) %!d(string=hai) anos
pai
achega
d04c035ab0

+ 0 - 0
src/views/houseSelfCollect/houseSelfCollectPrint.vue → src/views/houseSelfCollect/component/houseSelfCollectPrint.vue


+ 160 - 0
src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -0,0 +1,160 @@
+<!--质检信息-->
+<template>
+  <div class="center">
+    {{printData}}
+    <div class="number">{{ printData.qualityNo }}</div>
+    <table class="table">
+      <tr class="row">
+        <td class="col col-bgc">客户姓名</td>
+        <td class="col" colspan="2">{{ printData.customerName }}</td>
+        <td class="col col-bgc">客户电话</td>
+        <td class="col" colspan="2">{{ printData.customerPhone }}</td>
+        <td class="col col-bgc">车牌号</td>
+        <td class="col">{{ printData.carNumber }}</td>
+      </tr>
+      <tr class="row">
+        <td class="col col-bgc">收货单位</td>
+        <td class="col" colspan="2">{{ printData.receivingUnit }}</td>
+        <td class="col col-bgc">联系人</td>
+        <td class="col" colspan="2">{{ printData.contacts }}</td>
+        <td class="col col-bgc">联系电话</td>
+        <td class="col">{{ printData.contactsPhone }}</td>
+      </tr>
+      <tr class="row">
+        <td class="col col-bgc">货名</td>
+        <td class="col">{{ printData.goodsName }}</td>
+        <td class="col col-bgc">类型</td>
+        <td class="col">{{ printData.customerName }}</td>
+        <td class="col col-bgc">容量(克/升)</td>
+        <td class="col">{{ printData.bulkDensity }}</td>
+        <td class="col col-bgc">不完整粒(%)</td>
+        <td class="col">{{ printData.imperfectGrain }}</td>
+      </tr>
+      <tr class="row">
+        <td class="col col-bgc">等级</td>
+        <td class="col">{{ printData.grade }}</td>
+        <td class="col col-bgc">水分(%)</td>
+        <td class="col">{{ printData.waterContent }}</td>
+        <td class="col col-bgc">热损伤(%)</td>
+        <td class="col">{{ printData.jiaorenli }}</td>
+        <td class="col col-bgc">单价(元/公斤)</td>
+        <td class="col">{{ printData.tidalGrainPrice }}</td>
+      </tr>
+      <tr class="row">
+        <td class="col col-bgc">杂质(%)</td>
+        <td class="col">{{ printData.impurity }}</td>
+        <td class="col col-bgc">霉变粒(%)</td>
+        <td class="col">{{ printData.mildewGrain }}</td>
+        <td class="col col-bgc" colspan="2">购粮性质</td>
+        <td class="col" colspan="2">{{ printData.customerName }}</td>
+      </tr>
+    </table>
+    <div class="bottom">
+      <div class="bottom-row1">
+        <div>质检:{{ printData.qualityInspector }}</div>
+        <div>{{ printData.qualityDate }}</div>
+      </div>
+      <div class="bottom-row2">
+        <div class="left">
+          <img src="../../../../public/img/add.png" alt="" />
+        </div>
+        <div class="config">收货单位签名或盖章</div>
+        <div class="">客户签名</div>
+      </div>
+      <div class="bottom-row3">扫一扫</div>
+      <div class="bottom-row4">
+        <el-button type="primary">关闭</el-button>
+        <el-button type="primary" @click="printSmall">打印小票</el-button>
+        <el-button type="primary" @click="printBig">打印单据</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    components: {},
+    props: {
+      printData: {
+        type: Object
+      }
+    },
+    data() {
+      return {
+
+      }
+    },
+    activated() {
+
+    },
+    methods: {
+    printSmall() {
+      window.location.href =
+        '../../../../static/inspection.html?type=1&dataList=' +
+        JSON.stringify(this.printData)
+    },
+    printBig() {
+      window.location.href =
+        '../../../../static/inspection.html?type=2&dataList=' +
+        JSON.stringify(this.printData)
+    },
+    },
+  }
+</script>
+<style lang="scss" scoped>
+  .number {
+    text-align: right;
+    margin: 0 0 10px 0;
+  }
+
+  table,
+  table tr th,
+  table tr td {
+    border: 2px solid #333333;
+    padding: 5px 0;
+  }
+
+  table {
+    width: 100%;
+    min-height: 25px;
+    line-height: 25px;
+    text-align: center;
+    border-collapse: collapse;
+    border: 3px solid #333333;
+  }
+
+  .col-bgc {
+    background: #f6f7fb;
+  }
+
+  .bottom-row1 {
+    display: flex;
+    justify-content: space-between;
+    margin: 10px 0;
+  }
+
+  .bottom-row2 {
+    display: flex;
+    margin: 10px 0;
+
+    .left {
+      img {
+        width: 41px;
+        height: 41px;
+        margin-right: 118px;
+      }
+    }
+
+    .config {
+      margin-right: 240px;
+    }
+  }
+
+  .bottom-row3 {
+    margin: 10px 0;
+  }
+
+  .bottom-row4 {
+    margin-top: 50px;
+    text-align: center;
+  }
+</style>

+ 0 - 15
src/views/houseSelfCollect/component/routers/route.js

@@ -127,21 +127,6 @@ const houseSelfCollectRouter = {
         keepAlive: true
       }
     },
-    //打印
-    {
-      path: 'houseSelfCollectPrint',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/houseSelfCollectPrint'),
-      name: 'houseSelfCollectPrint',
-      meta: {
-        title: 'houseSelfCollectPrint',
-        shortcutEntrance: 'houseSelfCollectPrint',
-        module: 'procurement.procurementOrder.delete',
-        permissicon: [],
-        keepAlive: true
-      },
-      hidden: true
-    },
     {
       path: 'settlement',
       component: () =>

+ 0 - 0
src/views/houseSelfCollect/component/weightCheck.vue


+ 274 - 253
src/views/houseSelfCollect/inspectInfo.vue

@@ -247,7 +247,15 @@
         </div>
       </ws-form>
     </div>
-    <houseSelfCollectPrint v-show="false"></houseSelfCollectPrint>
+    <el-dialog
+      width="70%"
+      class="table-content"
+      center
+      :visible.sync="isShowPrint"
+      title="粮食质检单"
+    >
+    <inspectInfoPrint :printData="inspect"></inspectInfoPrint>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -263,14 +271,15 @@ import {
   getCount
 } from '@/model/houseSelfCollect/index'
 import { packList } from '@/model/contarct/index'
-import houseSelfCollectPrint from './houseSelfCollectPrint.vue'
+import inspectInfoPrint from './component/inspectInfoPrint.vue'
 export default {
   components: {
-    houseSelfCollectPrint,
+    inspectInfoPrint,
   },
   watch: {},
   data() {
     return {
+      isShowPrint:false,
       // warehouseList: {},
       inspect: {
         tidalGrainPrice: 0,
@@ -335,257 +344,260 @@ export default {
       // + this.verifyinit()
     },
     print() {
-      if (!this.inspect.qualityNo) {
-        this.$message({
-          message: '编号不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.inspect.binNumber) {
-        this.$message({
-          message: '仓位不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.inspect.customerName) {
-        this.$message({
-          message: '客户不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.inspect.storageTagNo) {
-        this.$message({
-          message: '囤位号不能为空',
-          type: 'warning',
-        })
-        return
-      }
+      this.isShowPrint = true
+      // if (!this.inspect.qualityNo) {
+      //   this.$message({
+      //     message: '编号不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.inspect.binNumber) {
+      //   this.$message({
+      //     message: '仓位不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.inspect.customerName) {
+      //   this.$message({
+      //     message: '客户不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.inspect.storageTagNo) {
+      //   this.$message({
+      //     message: '囤位号不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
 
-      if (this.inspect.storageTagNo.length > 10) {
-        this.$message({
-          message: '囤位号不超过10个字符',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.inspect.carNumber) {
-        this.$message({
-          message: '车牌号不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (this.inspect.carNumber.length > 7) {
-        this.$message({
-          message: '车牌号输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.inspect.goodsName) {
-        this.$message({
-          message: '货名不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.inspect.buckleWeightRatio < 0 ||
-        this.inspect.buckleWeightRatio > 2
-      ) {
-        this.$message({
-          message: '扣重比输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        String(this.inspect.buckleWeightRatio).indexOf('.') != -1 &&
-        String(this.inspect.buckleWeightRatio).length -
-          (String(this.inspect.buckleWeightRatio).indexOf('.') + 1) >
-          2
-      ) {
-        this.$message({
-          message: '扣重比输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.inspect.type) {
-        this.$message({
-          message: '类型不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.inspect.type) {
-        this.$message({
-          message: '类型不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.inspect.natureOfGrainPurchase) {
-        this.$message({
-          message: '购粮性质不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.inspect.grade) {
-        this.$message({
-          message: '等级不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.inspect.impurity) {
-        this.$message({
-          message: '杂质不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.inspect.waterContent) {
-        this.$message({
-          message: '水分不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.inspect.mildewGrain) {
-        this.$message({
-          message: '霉变粒不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.inspect.bulkDensity) {
-        this.$message({
-          message: '容重不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.inspect.jiaorenli) {
-        this.$message({
-          message: '热损伤不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.inspect.imperfectGrain) {
-        this.$message({
-          message: '不完整粒不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      //查看当前用户对应货名有未结算状态的送货
-      let count = 0
-      getCount({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        customerName: this.inspect.customerName,
-        goodsName: this.inspect.goodsName,
-      })  .toPromise()
-        .then((response) => {
-             count = response
-        })
-      //  客户下拉校验
-      getamount({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        customerName: this.inspect.customerName,
-        goodsName: this.inspect.goodsName,
-      })
-        .toPromise()
-        .then((response) => {
-          for (let i = 0; i < this.purchasePriceList.length; i++) {
-            if (this.inspect.goodsName == this.purchasePriceList[i].goodsName) {
-              console.log(this.purchasePriceList[i].saleLimit - response)
-              if (this.purchasePriceList[i].saleLimit - response < 50 || count > 0) {
-                // this.$confirm(
-                //   '当前客户已累计销售我司' +
-                //     this.inspect.goodsName +
-                //     response +
-                //     '吨,最高可售' +
-                //     this.purchasePriceList[i].saleLimit +
-                //     '吨。',
-                //   '提示',
-                //   {
-                //     cancelButtonText: '取消',
-                //     type: 'warning',
-                //   }
-                // )
-                //   .then(() => {})
-                //   .catch(() => {
-                //     return false
-                //   })
-                  this.$alert('当前客户已累计销售我司' +this.inspect.goodsName + response +'吨,最高可售' +this.purchasePriceList[i].saleLimit +'吨。',
-                        '提示',
-                        {
-                          confirmButtonText: '确定',
-                          callback: (action) => {
-                            // this.$message({
-                            //   type: 'info',
-                            //   message: `累计售粮已超出上限`,
-                            // })
-                          },
-                        }
-                      )
-              }
-            }
-          }
-        })
-      this.inspect.warehouseName = this.warehouseName
-      this.inspect.compId = sessionStorage.getItem('ws-pf_compId')
-      this.qualityInspector = sessionStorage.getItem('ws-pf_staffName')
-      if (this.types == null) {
-        this.$confirm('确定保存质检信息?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        })
-          .then(() => {
-            inspectAdd(this.inspect)
-              .toPromise()
-              .then((response) => {
-                this.$message.success('保存成功')
-                this.$router.go(-1)
-              })
-          })
-          .catch(() => {
-            return false
-          })
-      } else if (this.types == 3) {
-        this.$confirm('确定保存质检信息?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        })
-          .then(() => {
-            // return
-            getinspectEdit(this.inspect)
-              .toPromise()
-              .then((response) => {
-                this.$message.success('修改成功')
-                // this.xx = true;
-                // let newstr = document.getElementById('print').innerHTML
-                // let oldstr = document.body.innerHTML
-                // document.body.innerHTML = newstr
-                // window.print()
-                // document.body.innerHTML = oldstr
-                // window.location.reload()
-                // this.$router.push({ path: 'paymentManagement' })
-                this.$router.go(-1)
-              })
-          })
-          .catch(() => {
-            return false
-          })
-      }
+      // if (this.inspect.storageTagNo.length > 10) {
+      //   this.$message({
+      //     message: '囤位号不超过10个字符',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.inspect.carNumber) {
+      //   this.$message({
+      //     message: '车牌号不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (this.inspect.carNumber.length > 7) {
+      //   this.$message({
+      //     message: '车牌号输入错误',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.inspect.goodsName) {
+      //   this.$message({
+      //     message: '货名不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (
+      //   this.inspect.buckleWeightRatio < 0 ||
+      //   this.inspect.buckleWeightRatio > 2
+      // ) {
+      //   this.$message({
+      //     message: '扣重比输入错误',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (
+      //   String(this.inspect.buckleWeightRatio).indexOf('.') != -1 &&
+      //   String(this.inspect.buckleWeightRatio).length -
+      //     (String(this.inspect.buckleWeightRatio).indexOf('.') + 1) >
+      //     2
+      // ) {
+      //   this.$message({
+      //     message: '扣重比输入错误',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.inspect.type) {
+      //   this.$message({
+      //     message: '类型不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.inspect.type) {
+      //   this.$message({
+      //     message: '类型不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.inspect.natureOfGrainPurchase) {
+      //   this.$message({
+      //     message: '购粮性质不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.inspect.grade) {
+      //   this.$message({
+      //     message: '等级不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.inspect.impurity) {
+      //   this.$message({
+      //     message: '杂质不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.inspect.waterContent) {
+      //   this.$message({
+      //     message: '水分不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.inspect.mildewGrain) {
+      //   this.$message({
+      //     message: '霉变粒不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.inspect.bulkDensity) {
+      //   this.$message({
+      //     message: '容重不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.inspect.jiaorenli) {
+      //   this.$message({
+      //     message: '热损伤不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // if (!this.inspect.imperfectGrain) {
+      //   this.$message({
+      //     message: '不完整粒不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      // //查看当前用户对应货名有未结算状态的送货
+      // let count = 0
+      // getCount({
+      //   compId: sessionStorage.getItem('ws-pf_compId'),
+      //   customerName: this.inspect.customerName,
+      //   goodsName: this.inspect.goodsName,
+      // })  .toPromise()
+      //   .then((response) => {
+      //        count = response
+      //   })
+      // //  客户下拉校验
+      // getamount({
+      //   compId: sessionStorage.getItem('ws-pf_compId'),
+      //   customerName: this.inspect.customerName,
+      //   goodsName: this.inspect.goodsName,
+      // })
+      //   .toPromise()
+      //   .then((response) => {
+      //     for (let i = 0; i < this.purchasePriceList.length; i++) {
+      //       if (this.inspect.goodsName == this.purchasePriceList[i].goodsName) {
+      //         console.log(this.purchasePriceList[i].saleLimit - response)
+      //         if (this.purchasePriceList[i].saleLimit - response < 50 || count > 0) {
+      //           // this.$confirm(
+      //           //   '当前客户已累计销售我司' +
+      //           //     this.inspect.goodsName +
+      //           //     response +
+      //           //     '吨,最高可售' +
+      //           //     this.purchasePriceList[i].saleLimit +
+      //           //     '吨。',
+      //           //   '提示',
+      //           //   {
+      //           //     cancelButtonText: '取消',
+      //           //     type: 'warning',
+      //           //   }
+      //           // )
+      //           //   .then(() => {})
+      //           //   .catch(() => {
+      //           //     return false
+      //           //   })
+      //             this.$alert('当前客户已累计销售我司' +this.inspect.goodsName + response +'吨,最高可售' +this.purchasePriceList[i].saleLimit +'吨。',
+      //                   '提示',
+      //                   {
+      //                     confirmButtonText: '确定',
+      //                     callback: (action) => {
+      //                       // this.$message({
+      //                       //   type: 'info',
+      //                       //   message: `累计售粮已超出上限`,
+      //                       // })
+      //                     },
+      //                   }
+      //                 )
+      //         }
+      //       }
+      //     }
+      //   })
+      // this.inspect.warehouseName = this.warehouseName
+      // this.inspect.compId = sessionStorage.getItem('ws-pf_compId')
+      // this.qualityInspector = sessionStorage.getItem('ws-pf_staffName')
+      // if (this.types == null) {
+      //   this.$confirm('确定保存质检信息?', '提示', {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning',
+      //   })
+      //     .then(() => {
+      //       inspectAdd(this.inspect)
+      //         .toPromise()
+      //         .then((response) => {
+      //           this.$message.success('保存成功')
+      //           //打印
+      //           // this.$router.go(-1)
+      //         })
+      //     })
+      //     .catch(() => {
+      //       return false
+      //     })
+      // } else if (this.types == 3) {
+      //   this.$confirm('确定保存质检信息?', '提示', {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning',
+      //   })
+      //     .then(() => {
+      //       // return
+      //       getinspectEdit(this.inspect)
+      //         .toPromise()
+      //         .then((response) => {
+      //           this.$message.success('修改成功')
+      //           // this.xx = true;
+      //           // let newstr = document.getElementById('print').innerHTML
+      //           // let oldstr = document.body.innerHTML
+      //           // document.body.innerHTML = newstr
+      //           // window.print()
+      //           // document.body.innerHTML = oldstr
+      //           // window.location.reload()
+      //           // this.$router.push({ path: 'paymentManagement' })
+      //           //打印
+      //           // this.$router.go(-1)
+      //         })
+      //     })
+      //     .catch(() => {
+      //       return false
+      //     })
+      // }
     },
     cancel() {
       this.$router.push({ path: 'inspectionManagement' })
@@ -678,6 +690,15 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+  /deep/.el-dialog__header {
+    text-align: center !important;
+    padding: 10px 0 !important;
+    height: auto !important;
+  }
+
+  /deep/.el-dialog__title {
+    font-size: 24px !important;
+  }
 .center {
   background: #f6f7fc;
 }

+ 3 - 136
src/views/houseSelfCollect/inspectionManagement.vue

@@ -92,72 +92,7 @@
       :visible.sync="isShowPrint"
       title="粮食质检单"
     >
-      <div class="number">{{ printData.qualityNo }}</div>
-      <table class="table">
-        <tr class="row">
-          <td class="col col-bgc">客户姓名</td>
-          <td class="col" colspan="2">{{ printData.customerName }}</td>
-          <td class="col col-bgc">客户电话</td>
-          <td class="col" colspan="2">{{ printData.customerPhone }}</td>
-          <td class="col col-bgc">车牌号</td>
-          <td class="col">{{ printData.carNumber }}</td>
-        </tr>
-        <tr class="row">
-          <td class="col col-bgc">收货单位</td>
-          <td class="col" colspan="2">{{ printData.receivingUnit }}</td>
-          <td class="col col-bgc">联系人</td>
-          <td class="col" colspan="2">{{ printData.contacts }}</td>
-          <td class="col col-bgc">联系电话</td>
-          <td class="col">{{ printData.contactsPhone }}</td>
-        </tr>
-        <tr class="row">
-          <td class="col col-bgc">货名</td>
-          <td class="col">{{ printData.goodsName }}</td>
-          <td class="col col-bgc">类型</td>
-          <td class="col">{{ printData.customerName }}</td>
-          <td class="col col-bgc">容量(克/升)</td>
-          <td class="col">{{ printData.bulkDensity }}</td>
-          <td class="col col-bgc">不完整粒(%)</td>
-          <td class="col">{{ printData.imperfectGrain }}</td>
-        </tr>
-        <tr class="row">
-          <td class="col col-bgc">等级</td>
-          <td class="col">{{ printData.grade }}</td>
-          <td class="col col-bgc">水分(%)</td>
-          <td class="col">{{ printData.waterContent }}</td>
-          <td class="col col-bgc">热损伤(%)</td>
-          <td class="col">{{ printData.jiaorenli }}</td>
-          <td class="col col-bgc">单价(元/公斤)</td>
-          <td class="col">{{ printData.tidalGrainPrice }}</td>
-        </tr>
-        <tr class="row">
-          <td class="col col-bgc">杂质(%)</td>
-          <td class="col">{{ printData.impurity }}</td>
-          <td class="col col-bgc">霉变粒(%)</td>
-          <td class="col">{{ printData.mildewGrain }}</td>
-          <td class="col col-bgc" colspan="2">购粮性质</td>
-          <td class="col" colspan="2">{{ printData.customerName }}</td>
-        </tr>
-      </table>
-      <div class="bottom">
-        <div class="bottom-row1">
-          <div>质检:{{ printData.qualityInspector }}</div>
-          <div>{{ printData.qualityDate }}</div>
-        </div>
-        <div class="bottom-row2">
-          <div class="left">
-            <img src="../../../public/img/add.png" alt="" />
-          </div>
-          <div class="config">收货单位签名或盖章</div>
-          <div class="">客户签名</div>
-        </div>
-        <div class="bottom-row3">扫一扫</div>
-        <div class="bottom-row4">
-          <el-button type="primary">关闭</el-button>
-          <el-button type="primary" @click="printSmall">打印小票</el-button>
-          <el-button type="primary" @click="printBig">打印单据</el-button>
-        </div>
-      </div>
+    <inspectInfoPrint :printData="printData"></inspectInfoPrint>
     </el-dialog>
     <div style="text-align: center">
       <el-pagination
@@ -179,9 +114,9 @@ import {
   getinspectDelete,
   getinspectLook,
 } from '@/model/houseSelfCollect/index'
-
+import inspectInfoPrint from './component/inspectInfoPrint.vue'
 export default {
-  components: {},
+  components: {inspectInfoPrint},
   watch: {},
   data() {
     return {
@@ -339,16 +274,6 @@ export default {
           // window.location.href="../../../static/inspection.html?dataList="+JSON.stringify(response)
         })
     },
-    printSmall() {
-      window.location.href =
-        '../../../static/inspection.html?type=1&dataList=' +
-        JSON.stringify(this.printData)
-    },
-    printBig() {
-      window.location.href =
-        '../../../static/inspection.html?type=2&dataList=' +
-        JSON.stringify(this.printData)
-    },
   },
 }
 </script>
@@ -363,22 +288,6 @@ export default {
   font-size: 24px !important;
 }
 
-table,
-table tr th,
-table tr td {
-  border: 2px solid #333333;
-  padding: 5px 0;
-}
-
-table {
-  width: 100%;
-  min-height: 25px;
-  line-height: 25px;
-  text-align: center;
-  border-collapse: collapse;
-  border: 3px solid #333333;
-}
-
 .title {
   font-size: 20px;
   font-weight: 600;
@@ -419,48 +328,6 @@ table {
 /deep/.el-table--enable-row-transition .el-table__body td {
   text-align: center;
 }
-
-.number {
-  text-align: right;
-  margin: 0 0 10px 0;
-}
-
-.col-bgc {
-  background: #f6f7fb;
-}
-
-.bottom-row1 {
-  display: flex;
-  justify-content: space-between;
-  margin: 10px 0;
-}
-
-.bottom-row2 {
-  display: flex;
-  margin: 10px 0;
-
-  .left {
-    img {
-      width: 41px;
-      height: 41px;
-      margin-right: 118px;
-    }
-  }
-
-  .config {
-    margin-right: 240px;
-  }
-}
-
-.bottom-row3 {
-  margin: 10px 0;
-}
-
-.bottom-row4 {
-  margin-top: 50px;
-  text-align: center;
-}
-
 /deep/.el-dialog__body {
   padding: 20px !important;
 }

+ 1 - 2
src/views/houseSelfCollect/paymentManagement.vue

@@ -280,11 +280,10 @@
 </template>
 <script>
 import {getpayment,selectWarehouseSelf,delpayment,auditpayment,getpaymentexamine} from '@/model/houseSelfCollect/index'
-import houseSelfCollectPrint from './houseSelfCollectPrint.vue'
 import { posthandle } from '@/model/purchasingManagement/index'
 export default {
   components: {
-    houseSelfCollectPrint,
+
   },
   watch: {},
   data() {