ccj преди 10 месеца
родител
ревизия
0d08befcde
променени са 3 файла, в които са добавени 337 реда и са изтрити 318 реда
  1. 328 307
      public/static/warehousePrint.html
  2. 2 2
      src/components/balanceAlert.vue
  3. 7 9
      src/views/warehousenew/warehouseManagementList.vue

+ 328 - 307
public/static/warehousePrint.html

@@ -1,326 +1,347 @@
 <!DOCTYPE html>
 <html>
-  <head>
+
+<head>
     <meta charset="utf-8" />
     <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
     <title></title>
     <style>
-      table,
-      table tr th,
-      table tr td {
-        border: 2px solid #333333;
-        padding: 5px 0;
-      }
-
-      #app {
-        height: 88vh;
-        position: relative;
-      }
-
-      .content {
-        width: 1000px;
-        /* height: 583px; */
-        margin: auto;
-        /* position: absolute; */
-        /* top: -5vh; */
-        /* bottom: 0;
+        table,
+        table tr th,
+        table tr td {
+            border: 2px solid #333333;
+            padding: 5px 0;
+        }
+
+        #app {
+            height: 88vh;
+            position: relative;
+        }
+
+        .content {
+            width: 1000px;
+            /* height: 583px; */
+            margin: auto;
+            /* position: absolute; */
+            /* top: -5vh; */
+            /* bottom: 0;
         left: 0;
         right: 0; */
-      }
-
-      table {
-        width: 100%;
-        text-align: center;
-        border-collapse: collapse;
-        border: 3px solid #333333;
-      }
-
-      .col-bgc {
-        background: #f6f7fb;
-      }
-
-      .bottom-row1 {
-        display: flex;
-        justify-content: space-between;
-        margin: 20px 0;
-      }
-
-      .bottom-row2 {
-        display: flex;
-        margin: 10px 0;
-      }
-
-      img {
-        width: 41px;
-        height: 41px;
-        /* margin-right: 118px; */
-      }
-
-      .config {
-        margin-right: 240px;
-      }
-
-      .bottom-row3 {
-        margin: 10px 0;
-      }
-
-      .title {
-        text-align: center;
-        font-size: 24px;
-      }
-
-      .number {
-        text-align: right;
-        margin-bottom: 10px;
-      }
-
-      .small-row {
-        display: flex;
-      }
-
-      .small-content {
-        width: 400px;
-        margin: 0 auto;
-        border: 1px solid #ccc;
-        padding: 20px 20px 160px 20px;
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        margin: auto;
-        height: 650px;
-      }
-
-      .small-title {
-        text-align: center;
-        font-size: 18px;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-      }
-
-      .small-row {
-        display: flex;
-        justify-content: space-between;
-        margin: 10px;
-      }
-
-      .small-img {
-        margin-right: 0;
-      }
-
-      .sign {
-        margin-right: 100px;
-      }
-
-      .header {
-        display: flex;
-        justify-content: space-between;
-        font-size: 16px;
-        margin: 10px 0;
-      }
-
-      .header1 {
-        font-size: 24px;
-        margin: 30px 60px 10px 60px;
-        display: flex;
-        justify-content: center;
-      }
-
-      .line {
-        height: 2px;
-        width: 410px;
-        margin: 3px auto;
-        background: black;
-      }
-
-      .line:nth-of-type(3) {
-        margin-bottom: 30px;
-      }
-
-      .header-top {
-        display: flex;
-        justify-content: space-between;
-      }
-
-      .sfcard {}
-
-      .sfcard-content {
-        display: flex;
-        align-items: center;
-        justify-content: space-evenly;
-      }
-
-      .sfcard-content img {
-        width: 45%;
-        height: 50vh;
-      }
-
-      .sfcard-title {
-        font-size: 28px;
-        text-align: center;
-        margin: 10px 0;
-      }
-
-      .avatar {
-        margin-bottom: 120px;
-      }
-
-      .avatar:nth-of-type(2) {
-        margin-bottom: 140px;
-      }
-
-      .center {
-        height: calc(100vh - 8px);
-      }
+        }
+
+        table {
+            width: 100%;
+            text-align: center;
+            border-collapse: collapse;
+            border: 3px solid #333333;
+        }
+
+        .col-bgc {
+            background: #f6f7fb;
+        }
+
+        .bottom-row1 {
+            display: flex;
+            justify-content: space-between;
+            margin: 20px 0;
+        }
+
+        .bottom-row2 {
+            display: flex;
+            margin: 10px 0;
+        }
+
+        img {
+            width: 41px;
+            height: 41px;
+            /* margin-right: 118px; */
+        }
+
+        .config {
+            margin-right: 240px;
+        }
+
+        .bottom-row3 {
+            margin: 10px 0;
+        }
+
+        .title {
+            text-align: center;
+            font-size: 24px;
+        }
+
+        .title12 {
+            margin-top: 20px;
+        }
+
+        .number {
+            text-align: right;
+            margin-bottom: 10px;
+        }
+
+        .small-row {
+            display: flex;
+        }
+
+        .small-content {
+            width: 400px;
+            margin: 0 auto;
+            border: 1px solid #ccc;
+            padding: 20px 20px 160px 20px;
+            position: absolute;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            margin: auto;
+            height: 650px;
+        }
+
+        .small-title {
+            text-align: center;
+            font-size: 18px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+
+        .small-row {
+            display: flex;
+            justify-content: space-between;
+            margin: 10px;
+        }
+
+        .small-img {
+            margin-right: 0;
+        }
+
+        .sign {
+            margin-right: 100px;
+        }
+
+        .header {
+            display: flex;
+            justify-content: space-between;
+            font-size: 16px;
+            margin: 10px 0;
+        }
+
+        .header1 {
+            font-size: 24px;
+            margin: 30px 60px 10px 60px;
+            display: flex;
+            justify-content: center;
+        }
+
+        .line {
+            height: 2px;
+            width: 410px;
+            margin: 3px auto;
+            background: black;
+        }
+
+        .line:nth-of-type(3) {
+            margin-bottom: 30px;
+        }
+
+        .header-top {
+            display: flex;
+            justify-content: space-between;
+        }
+
+        .sfcard {}
+
+        .sfcard-content {
+            display: flex;
+            align-items: center;
+            justify-content: space-evenly;
+        }
+
+        .sfcard-content img {
+            width: 45%;
+            height: 50vh;
+        }
+
+        .sfcard-title {
+            font-size: 28px;
+            text-align: center;
+            margin: 10px 0;
+        }
+
+        .avatar {
+            margin-bottom: 120px;
+        }
+
+        .avatar:nth-of-type(2) {
+            margin-bottom: 140px;
+        }
+
+        .center {
+            height: calc(100vh - 8px);
+        }
     </style>
-  </head>
-  <body>
+</head>
+
+<body>
     <div id="app" v-cloak>
-      <div class="center">
-        <div class="title">{{company?company:"黑龙江中天昊元贸易有限公司"}}<span v-if="type == '2'">出</span><span v-if="type == '3'">入</span>库单</div>
-        <div class='title12'>
-          <span>仓库名:</span>
-          <span>{{warehouseName}}</span>
-          <span v-if='printData[0].qualityInspector'>质检员:</span>
-          <span v-if='printData[0].qualityInspector'>{{printData[0].qualityInspector}}</span>
-          <span v-if='printData[0].reInspector'>复检员:</span>
-          <span v-if='printData[0].reInspector'>{{printData[0].reInspector}}</span>
-          <span>检斤员:</span>
-          <span>{{printData[0].secretaryWeigher}}</span>
-          <p>
-            <span>值班日期:</span>
-            <span>{{startDate}}</span>
-            <span>到</span>
-            <span>{{endDate}}</span>
-          </p>
-          <p>
-            <span>货名:</span>
-            <span>{{printData[0].goodsName}}</span>
-            <span style="margin-left:100px">质量单位:吨</span>
-            <span style="margin-left:100px">车数:{{printData.length}}辆</span>
-          </p>
+        <div class="center">
+            <div class="title">{{company}}<span v-if="type == '2'">出</span><span v-if="type == '3'">入</span>库单</div>
+            <div class='title12'>
+                <span>仓库名:</span>
+                <span>{{warehouseName}}</span>
+                <span v-if='printData[0].qualityInspector'>质检员:</span>
+                <span v-if='printData[0].qualityInspector'>{{printData[0].qualityInspector}}</span>
+                <span>检斤员:</span>
+                <span>{{printData[0].secretaryWeigher}}</span>
+                <p>
+                    <span>日期:</span>
+                    <span>{{startDate}}</span>
+                    <span>到</span>
+                    <span>{{endDate}}</span>
+                </p>
+                <p>
+                    <span>货名:</span>
+                    <span>{{printData[0].goodsName}}</span>
+                    <span style="margin-left:100px">质量单位:吨</span>
+                    <span style="margin-left:100px">车数:{{printData.length}}辆</span>
+                </p>
+            </div>
+            <table class="table">
+                <tr class="row">
+                    <th>业务编号</th>
+                    <th v-if="type == '2'">出库日期</th>
+                    <th v-if="type == '3'">入库日期</th>
+                    <th>车牌号</th>
+                    <th>仓位号</th>
+                    <th>水分</th>
+                    <th>容重</th>
+                    <th>杂质</th>
+                    <th>毛重</th>
+                    <th>皮重</th>
+                    <th v-if="printData[0].goodsName.indexOf('潮粮') != -1">潮粮净重</th>
+                    <th v-else>净重</th>
+                    <th v-if="printData[0].goodsName.indexOf('潮粮') != -1">折干净重</th>
+
+                </tr>
+                <tr class="row" v-for="(item,index) in printData">
+                    <td class="col">{{item.busNo.substring(8)}}</td>
+                    <td class="col">{{item.inOutDate}}</td>
+                    <td class="col">{{item.carNo}}</td>
+                    <td class="col">{{item.binNumber}}</td>
+                    <td class="col">{{item.waterContent}}</td>
+                    <td class="col">{{item.bulkDensity}}</td>
+                    <td class="col">{{item.impurity}}</td>
+                    <td class="col">{{item.grossWeight}}</td>
+                    <td class="col">{{item.tare}}</td>
+                    <td class="col">{{item.netWeight}}</td>
+                    <td class="col" v-if="printData[0].goodsName.indexOf('潮粮') != -1">{{item.pureWeight}}</td>
+                </tr>
+                <tr class="row">
+                    <td class="col">合计</td>
+                    <td class="col"></td>
+                    <td class="col"></td>
+                    <td class="col"></td>
+                    <td class="col"></td>
+                    <td class="col"></td>
+                    <td class="col"></td>
+                    <td class="col">{{maoZhong.toFixed(3)}}</td>
+                    <td class="col">{{piZhong.toFixed(3)}}</td>
+                    <td class="col">{{jingZhong.toFixed(3)}}</td>
+                    <td class="col" v-if="printData[0].goodsName.indexOf('潮粮') != -1">{{item.ganZhong.toFixed(3)}}</td>
+                </tr>
+            </table>
         </div>
-        <table class="table">
-          <tr class="row">
-            <th v-if="type == '2'">出库日期</th>
-            <th v-if="type == '3'">入库日期</th>
-            <th>车牌号</th>
-            <th>仓位号</th>
-            <th>箱一号</th>
-            <th>箱二号</th>
-            <th>毛重</th>
-            <th>皮重</th>
-            <th>净重</th>
-          </tr>
-          <tr class="row" v-for="(item,index) in printData">
-            <td class="col">{{item.inOutDate}}</td>
-            <td class="col">{{item.carNo}}</td>
-            <td class="col">{{item.binNumber.indexOf("托盘")!= -1?item.binNumber.replace("托盘",""):item.binNumber}}</td>
-            <td class="col">{{item.boxNo}}</td>
-            <td class="col">{{item.boxNoOther}}</td>
-            <td class="col">{{item.grossWeight}}</td>
-            <td class="col">{{item.tare}}</td>
-            <td class="col">{{item.netWeight}}</td>
-          </tr>
-          <tr class="row">
-            <td class="col">合计</td>
-            <td class="col"></td>
-            <td class="col"></td>
-            <td class="col"></td>
-            <td class="col"></td>
-            <td class="col">{{maoZhong.toFixed(3)}}</td>
-            <td class="col">{{piZhong.toFixed(3)}}</td>
-            <td class="col">{{jingZhong.toFixed(3)}}</td>
-          </tr>
-        </table>
-      </div>
 
     </div>
-  </body>
-  <script src="../cdn/vue/2.6.10/vue.min.js"></script>
-  <script src="../cdn/element-ui/2.13.2/index.js"></script>
-  <script type="text/javascript">
+</body>
+<script src="../cdn/vue/2.6.10/vue.min.js"></script>
+<script src="../cdn/element-ui/2.13.2/index.js"></script>
+<script type="text/javascript">
     new Vue({
-      el: '#app',
-      data: {
-        showType: [],
-        printData: [{
-          identityAuthenticationInfo: {},
-          qualityInspectionManagement: {},
-          weighingManagement: {},
-          customerNumberCard: {},
-        }],
-        printData1: [],
-        customerList: {},
-        customerList1: [],
-
-        date: '',
-        warehouseName: "",
-        type: "",
-        maoZhong: 0,
-        piZhong: 0,
-        jingZhong: 0,
-        binNos: [],
-        binNoShow: "",
-        startDate: "",
-        endDate: "",
-        company:""
-      },
-      computed: {},
-      methods: {
-        dealNo(str) {
-          return str.slice(4)
+        el: '#app',
+        data: {
+            showType: [],
+            printData: [{
+                identityAuthenticationInfo: {},
+                qualityInspectionManagement: {},
+                weighingManagement: {},
+                customerNumberCard: {},
+            }],
+            printData1: [],
+            customerList: {},
+            customerList1: [],
+
+            date: '',
+            warehouseName: "",
+            type: "",
+            maoZhong: 0,
+            piZhong: 0,
+            jingZhong: 0,
+            ganZhong: 0,
+            binNos: [],
+            binNoShow: "",
+            startDate: "",
+            endDate: "",
+            company: ""
         },
-        tableRowClassName({
-          row,
-          rowIndex
-        }) {
-          if (rowIndex === 1) {
-            return 'warning-row'
-          } else if (rowIndex === 3) {
-            return 'success-row'
-          }
-          return ''
+        computed: {},
+        methods: {
+            dealNo(str) {
+                return str.slice(4)
+            },
+            tableRowClassName({
+                row,
+                rowIndex
+            }) {
+                if (rowIndex === 1) {
+                    return 'warning-row'
+                } else if (rowIndex === 3) {
+                    return 'success-row'
+                }
+                return ''
+            },
+            getQueryVariable(variable) {
+                var query = window.location.search.substring(1)
+                var vars = query.split('&')
+                for (var i = 0; i < vars.length; i++) {
+                    var pair = vars[i].split('=')
+                    if (pair[0] == variable) {
+                        return pair[1]
+                    }
+                }
+                return false
+            },
+            printSmall() { },
+            printBig() { }
         },
-        getQueryVariable(variable) {
-          var query = window.location.search.substring(1)
-          var vars = query.split('&')
-          for (var i = 0; i < vars.length; i++) {
-            var pair = vars[i].split('=')
-            if (pair[0] == variable) {
-              return pair[1]
+        mounted() {
+            // console.log(API_CONFIG,1111111111)
+            // var ippath=API_CONFIG.devServer.proxy['/pb'].target
+
+            this.company = localStorage.getItem("ws-pf_compName")
+            this.date = new Date().toLocaleString()
+            this.type = decodeURIComponent(this.getQueryVariable('type'))
+            this.warehouseName = decodeURIComponent(this.getQueryVariable('warehouseName'))
+            if (this.warehouseName == '先锋新屯分库') {
+                this.company = '哈尔滨大生实业有限责任公司北安分公司'
+            }
+            this.startDate = this.getQueryVariable('startDate').replace('%20', ' ')
+            this.endDate = this.getQueryVariable('endDate').replace('%20', ' ')
+            this.printData = JSON.parse(sessionStorage.getItem('inOutWarehouse_Print'))
+            for (var count = 0; count < this.printData.length; count++) {
+                this.maoZhong += this.printData[count].grossWeight
+                this.piZhong += this.printData[count].tare
+                this.jingZhong += this.printData[count].netWeight
+                this.ganZhong += this.printData[count].pureWeight
+            }
+            // document.title = this.printData.compName + '结算凭证'
+            window.print()
+            window.onafterprint = function (event) {
+                window.history.back(-1)
             }
-          }
-          return false
         },
-        printSmall() {},
-        printBig() {}
-      },
-      mounted() {
-        // console.log(API_CONFIG,1111111111)
-        // var ippath=API_CONFIG.devServer.proxy['/pb'].target
-
-        this.company = localStorage.getItem("ws-pf_compName")
-        this.date = new Date().toLocaleString()
-        this.type = decodeURIComponent(this.getQueryVariable('type'))
-        this.warehouseName = decodeURIComponent(this.getQueryVariable('warehouseName'))
-        this.startDate = this.getQueryVariable('startDate').replace('%20',' ')
-        this.endDate = this.getQueryVariable('endDate').replace('%20',' ')
-        this.printData = JSON.parse(sessionStorage.getItem('inOutWarehouse_Print'))
-        for (var count = 0; count < this.printData.length; count++) {
-          this.maoZhong += this.printData[count].grossWeight
-          this.piZhong += this.printData[count].tare
-          this.jingZhong += this.printData[count].netWeight
-        }
-        // document.title = this.printData.compName + '结算凭证'
-        window.print()
-        window.onafterprint = function(event) {
-          window.history.back(-1)
-        }
-      },
-      watch: {}
+        watch: {}
     })
-  </script>
-</html>
+</script>
+
+</html>

+ 2 - 2
src/components/balanceAlert.vue

@@ -101,7 +101,7 @@ export default {
             this.param = 2400
           } else if (
             this.deptBudgetList.warehouseName == '测试库1200' ||
-            this.deptBudgetList.warehouseName == '依安新屯库'
+            this.deptBudgetList.warehouseName == '先锋新屯分库'
           ) {
             this.param = 1200
           } else {
@@ -173,7 +173,7 @@ export default {
             this.deptBudgetList.warehouseName == '洮南向阳乡金昊' ||
             this.deptBudgetList.warehouseName == '佳屹农仓储库' ||
             this.deptBudgetList.warehouseName == '测试库1200' ||
-            this.deptBudgetList.warehouseName == '依安新屯库'
+            this.deptBudgetList.warehouseName == '先锋新屯分库'
           ) {
             console.log('value:', value)
             var start = new Date().getTime()

+ 7 - 9
src/views/warehousenew/warehouseManagementList.vue

@@ -536,10 +536,10 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="仓库类型" span="1" prop="warehouseName">
+            <el-form-item label="仓位编号" span="1" prop="warehouseName">
               <el-select
                 v-model="parameter.binNumber"
-                placeholder="请选择仓库类型"
+                placeholder="请选择仓位编号"
                 filterable
                 clearable
               >
@@ -552,9 +552,7 @@
               </el-select>
             </el-form-item>
             <el-form-item
-              v-if="
-                compName == '辽宁佳屹农商贸有限公司' && headerText != '导出记录'
-              "
+              v-if="headerText != '导出记录'"
               label="货名"
               span="1"
               prop="warehouseName"
@@ -838,11 +836,11 @@ export default {
         let date = new Date()
         var year = date.getFullYear()
         var month = date.getMonth() + 1
-        var strDate = date.getDate()
+        var strDate = date.getDate() + 1
         if (strDate < 10) {
           strDate = '0' + strDate
         }
-        var pastdate = new Date(date.getTime() - 24 * 60 * 60 * 1000)
+        var pastdate = new Date(date.getTime())
         this.StartDate =
           pastdate.getFullYear() +
           '-' +
@@ -966,7 +964,7 @@ export default {
           }
         }
       } else if (this.headerText == '打印记录') {
-        if (this.parameter.binNumber == '全部合营') {
+        if (this.parameter.binNumber == '全部仓位') {
           this.parameter.binNumber = ''
         }
         addselectinfoList({
@@ -985,7 +983,7 @@ export default {
           .toPromise()
           .then(response => {
             if (response.records.length == 0) {
-              this.$message.error('暂未查到所要打印的出入库信息')
+              this.$message.warning('暂未查到所要打印的出入库信息')
             } else {
               var warehousePrint = response.records
               if (this.parameter.proportion) {