Browse Source

修改打印问题

caojunjie 4 years ago
parent
commit
2eb9e48c3d

+ 11 - 6
src/components/Pagination/index.vue

@@ -1,13 +1,13 @@
 <template>
-  <div :class="{'hidden':hidden}" class="pagination-container">
-
+  <div :class="{'hidden':hidden}" class="pagination-container" style="padding-bottom: 20px">
     <el-input
       v-model="list.pageSize"
       style="
       width: 160px;
-      float: right;
-"
+      float: right;"
+      size="small"
       @change="input"
+      @input="inputEt"
     ></el-input>
     <el-pagination
       style="margin-right: 200px"
@@ -69,7 +69,7 @@ export default {
   data(){
     return{
       list:{
-        pageSize:'',
+        pageSize:10,
       }
     }
   },
@@ -96,10 +96,15 @@ export default {
       if(this.list.pageSize != 0){
         this.pageSize = Number(this.list.pageSize)
       }else {
-        this.list.pageSize = ''
+        this.list.pageSize = 10
       }
       this.handleSizeChange()
     },
+    inputEt(){
+      if (!this.list.pageSize){
+        this.list.pageSize = 10
+      }
+    },
     handleSizeChange(val) {
       this.$emit('pagination', { page: this.currentPage, limit: val })
       if (this.autoScroll) {

+ 5 - 5
src/views/purchaseIssue/index.vue

@@ -39,7 +39,7 @@
 <!--        :total="total"-->
 <!--      >-->
 <!--      </el-pagination>-->
-      <div style="float: right">
+      <div style="float: right;margin-bottom: 10px">
       <pagination
         v-show="total > 0"
         :total="total"
@@ -118,7 +118,7 @@
         width="70%"
         style="background-color: #1c84c6"
       >
-        <div ref="print">
+        <div ref="print" style="color: #000000">
           <h1 style="text-align: center;font-weight:bold">{{ formList.fsbuName }}</h1>
           <div style="display: flex;justify-content: space-between;margin-bottom: 10px">
             <div style="width: 200px;height: 20px;font-size: 14px;">客户项目:{{projectName}}</div>
@@ -1603,7 +1603,7 @@ export default {
           this.revocationOfApproval(2)
           break
         case '打印':
-          console.log(this.listData.fFeeid,this.contentList)
+          // console.log(this.listData.fFeeid,this.contentList)
           this.formList.createBy = Cookies.get('userName')
           for(let ul in this.dataList.fGoodsid){
             if (this.$refs.avatar.form.fGoodsid == this.dataList.fGoodsid[ul].value){
@@ -1726,7 +1726,7 @@ export default {
   border-spacing: 0;
   background-color: transparent;
   display: table;
-  width: 100%;
+  width: 99%;
   max-width: 100%;
   margin: 0 auto;
 }
@@ -1734,7 +1734,7 @@ export default {
   text-align: center;
   vertical-align: middle;
   font-size: 14px;
-  color: #333333;
+  color: #000000;
   padding: 8px 12px;
 }
 

+ 1 - 1
src/views/purchaseRequest/index.vue

@@ -37,7 +37,7 @@
 <!--        layout="sizes, prev, pager, next"-->
 <!--        :total="total">-->
 <!--      </el-pagination>-->
-      <div style="float: right">
+      <div style="float: right;margin-bottom: 10px">
       <pagination
         v-show="total > 0"
         :total="total"

+ 1 - 1
src/views/reportAnalysis/inoutStatistics.vue

@@ -34,7 +34,7 @@
 <!--      layout="sizes, prev, pager, next"-->
 <!--      :total="total">-->
 <!--    </el-pagination>-->
-    <div style="float: right">
+    <div style="float: right;margin-bottom: 10px">
     <pagination
       v-show="total > 0"
       :total="total"

+ 1 - 1
src/views/reportAnalysis/salesStatistics.vue

@@ -24,7 +24,7 @@
       :setRowList="setRowList"
       :tatolLabel="tatolLabel"
     />
-    <div style="float: right">
+    <div style="float: right;margin-bottom: 10px">
 
       <pagination
         v-show="total > 0"

+ 1 - 1
src/views/warehouse/inStock/index.vue

@@ -30,7 +30,7 @@
         :listStyle="listStyle"
         :isItHidden="isItHidden"
         :queryList="queryList"/>
-      <div style="float: right">
+      <div style="float: right;margin-bottom: 10px">
       <pagination
         v-show="total > 0"
         :total="total"

+ 2 - 2
src/views/warehouse/outStock/index.vue

@@ -30,7 +30,7 @@
         :listStyle="listStyle"
         :isItHidden="isItHidden"
         :queryList="queryList"/>
-      <div style="float: right">
+      <div style="float: right;margin-bottom: 10px">
       <pagination
         v-show="total > 0"
         :total="total"
@@ -121,7 +121,7 @@
           <tr v-for="(item,index) in this.detailData" :key="index">
             <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{detailForm.fBsdate}}</td>
             <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fFeeid}}</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fFeeunitid}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fCurrencyName}}</td>
             <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fQty}}</td>
             <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{detailForm.corpName}}</td>
             <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fAmount}}</td>