Merge branch 'dev' of git.echepei.com:zhujiawei/Warehouse_management_ui into dev

src/views/reportManagement/Statistics/index.vue

@@ -217,6 +217,8 @@
       :data="whgenlegList"
       show-summary
       :summary-method="getSum"
+      ref="table"
+      :height="tableHeight"
     >
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column
@@ -477,10 +479,11 @@ import draggable from "vuedraggable";
 export default {
   name: "Whgenleg",
   components: {
-    Treeselect,draggable 
+    Treeselect,draggable
   },
   data() {
     return {
+      tableHeight: '0',
       //仓库树状下拉
       fWarehouseidOption: [],
       options: [
@@ -644,6 +647,20 @@ export default {
     };
   },
   created() {
+    let date = new Date();
+    let year = parseInt(date.getFullYear())
+    let month = parseInt(date.getMonth() + 1)
+    let currentMonth = date.getMonth()
+    let nextMonth = ++currentMonth
+    let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天
+    let oneDay = 1000*60*60*24
+    let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
+    let day = lastTime.getDate()
+    if (day < 10) {
+      day = '0' + day
+    }
+    this.$set(this.queryParams,'timeInterval', [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59'])
+
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
     this.getList();
@@ -655,6 +672,16 @@ export default {
     });
     this.getRow();
   },
+  mounted() {
+    this.$nextTick(() => {
+      // 根据浏览器高度设置初始高度
+      this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160
+      // 监听浏览器高度变化，改变表格高度
+      window.onresize = () => {
+        this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
+      }
+    })
+  },
   methods: {
     //列设置全选
     allChecked() {

src/views/reportManagement/generalLedgerCr/index.vue

@@ -217,6 +217,8 @@
       :data="payableList"
       show-summary
       :summary-method="getSum"
+      ref="table"
+      :height="tableHeight"
     >
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column type="index" label="行号" align="center" width="80" fixed=""/>
@@ -378,6 +380,7 @@ export default {
   components: {},
   data() {
     return {
+      tableHeight: '0',
       payableList: [],
       // 货权方(客户数据)
       fMblnoOptions: [],
@@ -492,6 +495,20 @@ export default {
     };
   },
   created() {
+    let date = new Date();
+    let year = parseInt(date.getFullYear())
+    let month = parseInt(date.getMonth() + 1)
+    let currentMonth = date.getMonth()
+    let nextMonth = ++currentMonth
+    let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天
+    let oneDay = 1000*60*60*24
+    let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
+    let day = lastTime.getDate()
+    if (day < 10) {
+      day = '0' + day
+    }
+    this.queryParams.timeExamine = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59']
+
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
     this.getList();
@@ -500,6 +517,16 @@ export default {
     });
     this.getRow();
   },
+  mounted() {
+    this.$nextTick(() => {
+      // 根据浏览器高度设置初始高度
+      this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160
+      // 监听浏览器高度变化，改变表格高度
+      window.onresize = () => {
+        this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
+      }
+    })
+  },
   methods: {
     //列设置全选
     allChecked() {
@@ -782,4 +809,4 @@ export default {
   background-color: rgba(0, 0, 0, 0.05);
   height: 100%;
 }
-</style>
+</style>

src/views/reportManagement/generalLedgerDr/index.vue

@@ -218,6 +218,8 @@
       :data="receivableList"
       show-summary
       :summary-method="getSum"
+      ref="table"
+      :height="tableHeight"
     >
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column
@@ -382,6 +384,7 @@ export default {
   components: { draggable },
   data() {
     return {
+      tableHeight: '0',
       // 货权方(客户数据)
       fMblnoOptions: [],
       // 贸易方式(数据字典),对应t_trademodels 字典
@@ -495,6 +498,20 @@ export default {
     };
   },
   created() {
+    let date = new Date();
+    let year = parseInt(date.getFullYear())
+    let month = parseInt(date.getMonth() + 1)
+    let currentMonth = date.getMonth()
+    let nextMonth = ++currentMonth
+    let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天
+    let oneDay = 1000*60*60*24
+    let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
+    let day = lastTime.getDate()
+    if (day < 10) {
+      day = '0' + day
+    }
+    this.queryParams.timeExamine = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59']
+
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
     this.getList();
@@ -503,6 +520,16 @@ export default {
     });
     this.getRow();
   },
+  mounted() {
+    this.$nextTick(() => {
+      // 根据浏览器高度设置初始高度
+      this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160
+      // 监听浏览器高度变化，改变表格高度
+      window.onresize = () => {
+        this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
+      }
+    })
+  },
   methods: {
     //列设置全选
     allChecked() {
@@ -785,4 +812,4 @@ export default {
   background-color: rgba(0, 0, 0, 0.05);
   height: 100%;
 }
-</style>
+</style>

src/views/reportManagement/outExcel/index.vue

@@ -87,7 +87,7 @@
       </span>
     </el-dialog>
 
-    <el-table v-loading="loading" :data="stockDate">
+    <el-table v-loading="loading" :data="stockDate" ref="table" :height="tableHeight">
       <el-table-column type="index" label="序号" align="center" />
       <el-table-column
         v-for="(item, index) in getRowList"
@@ -122,6 +122,7 @@ export default {
   components: {},
   data() {
     return {
+      tableHeight: '0',
       // 遮罩层
       loading: true,
       queryParams: {
@@ -223,6 +224,16 @@ export default {
     this.getList();
     this.getRow();
   },
+  mounted() {
+    this.$nextTick(() => {
+      // 根据浏览器高度设置初始高度
+      this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160
+      // 监听浏览器高度变化，改变表格高度
+      window.onresize = () => {
+        this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
+      }
+    })
+  },
   methods: {
     //列设置全选
     allChecked() {

src/views/reportManagement/profitGeneralLedger/index.vue

@@ -235,7 +235,7 @@
         <el-button type="primary" @click="save()">确 定</el-button>
       </span>
     </el-dialog>
-    <el-table v-loading="loading" :data="receivableList" show-summary :summary-method="getSum">
+    <el-table v-loading="loading" :data="receivableList" show-summary :summary-method="getSum" ref="table" :height="tableHeight">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column type="index" label="行号" align="center" width="100"/>
         <el-table-column
@@ -299,6 +299,7 @@ export default {
   components: {draggable},
   data() {
     return {
+      tableHeight: '0',
       //费用名称
       fWbuOptions:[],
       businessInTypeOption:[],
@@ -422,6 +423,20 @@ export default {
     }
   },
   created() {
+    let date = new Date();
+    let year = parseInt(date.getFullYear())
+    let month = parseInt(date.getMonth() + 1)
+    let currentMonth = date.getMonth()
+    let nextMonth = ++currentMonth
+    let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天
+    let oneDay = 1000*60*60*24
+    let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
+    let day = lastTime.getDate()
+    if (day < 10) {
+      day = '0' + day
+    }
+    this.queryParams.timeExamine = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59']
+
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
     /* 远程模糊查询费用名称 */
@@ -443,6 +458,16 @@ export default {
     })
     this.getRow();
   },
+  mounted() {
+    this.$nextTick(() => {
+      // 根据浏览器高度设置初始高度
+      this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160
+      // 监听浏览器高度变化，改变表格高度
+      window.onresize = () => {
+        this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
+      }
+    })
+  },
   methods: {
     //列设置全选
     allChecked() {

src/views/reportManagement/singleTicket/index.vue

@@ -120,7 +120,10 @@
     </el-form>
     <el-table
       :data="tableData"
-      style="width: 100%">
+      style="width: 100%"
+      ref="table1"
+      :height="tableHeight1"
+    >
       <el-table-column type="selection" width="60" align="center" />
       <el-table-column type="index" label="行号" align="center"/>
       <el-table-column prop="fBusinessType" label="作业类型" width="180" align="center"/>
@@ -148,7 +151,10 @@
     </h3>
     <el-table
       :data="costData"
-      style="width: 100%">
+      style="width: 100%"
+      ref="table2"
+      :height="tableHeight2"
+    >
       <el-table-column type="selection" width="60" align="center" />
       <el-table-column type="index" label="行号" align="center"/>
       <el-table-column prop="createTime" label="日期" width="180" align="center"/>
@@ -169,6 +175,8 @@ export default {
   name: "index",
   data(){
     return{
+      tableHeight1: '0',
+      tableHeight2: '0',
       query:{},
       costData:[],
       formInline:{},
@@ -177,6 +185,40 @@ export default {
       fMblnoOptions:[]
     }
   },
+  created() {
+    let date = new Date();
+    let year = parseInt(date.getFullYear())
+    let month = parseInt(date.getMonth() + 1)
+    let currentMonth = date.getMonth()
+    let nextMonth = ++currentMonth
+    let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天
+    let oneDay = 1000*60*60*24
+    let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
+    let day = lastTime.getDate()
+    if (day < 10) {
+      day = '0' + day
+    }
+    this.$set(this.query,'bsdateList', [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59'])
+
+  },
+  mounted() {
+    this.$nextTick(() => {
+      // 根据浏览器高度设置初始高度
+      this.tableHeight1 = (window.innerHeight - this.$refs.table1.$el.offsetTop - 160) / 2
+      // 监听浏览器高度变化，改变表格高度
+      window.onresize = () => {
+        this.tableHeight1 = (window.innerHeight - this.$refs.table1.$el.offsetTop - 70) /2
+      }
+    });
+    this.$nextTick(() => {
+      // 根据浏览器高度设置初始高度
+      this.tableHeight2 = (window.innerHeight - this.$refs.table1.$el.offsetTop - 160) / 2
+      // 监听浏览器高度变化，改变表格高度
+      window.onresize = () => {
+        this.tableHeight2 = (window.innerHeight - this.$refs.table1.$el.offsetTop - 70) /2
+      }
+    })
+  },
   methods:{
     getList(){
       listpayable(this.query).then(res=>{

src/views/reportManagement/whgenleg/index.vue

@@ -240,6 +240,8 @@
       :data="whgenlegList"
       show-summary
       :summary-method="getSum"
+      ref="table"
+      :height="tableHeight"
     >
       <el-table-column
         type="index"
@@ -404,6 +406,7 @@ export default {
   },
   data() {
     return {
+      tableHeight: '0',
       //仓库树状下拉
       fWarehouseidOption: [],
       // 客户(客户数据)
@@ -632,6 +635,20 @@ export default {
     };
   },
   created() {
+    let date = new Date();
+    let year = parseInt(date.getFullYear())
+    let month = parseInt(date.getMonth() + 1)
+    let currentMonth = date.getMonth()
+    let nextMonth = ++currentMonth
+    let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天
+    let oneDay = 1000*60*60*24
+    let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
+    let day = lastTime.getDate()
+    if (day < 10) {
+      day = '0' + day
+    }
+    this.queryParams.orgStorageDate = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59']
+
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
     this.getList();
@@ -643,6 +660,16 @@ export default {
     });
     this.getRow();
   },
+  mounted() {
+    this.$nextTick(() => {
+      // 根据浏览器高度设置初始高度
+      this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160
+      // 监听浏览器高度变化，改变表格高度
+      window.onresize = () => {
+        this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
+      }
+    })
+  },
   methods: {
     //列设置全选
     allChecked() {

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -1378,7 +1378,7 @@ export default {
     if (day < 10) {
       day = '0' + day
     }
-    this.queryParams.timeInterval = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59']
+    this.$set(this.queryParams,'timeInterval', [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59'])
 
     this.getList();
     this.getDicts("tax_rate").then((response) => {