Просмотр исходного кода

Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

gjy 3 лет назад
Родитель
Сommit
fb55ef721b

+ 14 - 3
public/static/payprint.html

@@ -123,7 +123,7 @@
 
       .header1 {
         font-size: 24px;
-        margin: 30px 60px 10px 60px;
+        /* margin: 30px 60px 10px 60px; */
         display: flex;
         justify-content: center;
       }
@@ -154,7 +154,7 @@
 
       .sfcard-content img {
         width: 45%;
-        height: 55vh;
+        height: 58vh;
       }
 
       .sfcard-title {
@@ -174,6 +174,9 @@
       .center {
         height: 140vh;
       }
+     /* .onlypz-center{
+        height: 130vh;
+      } */
     </style>
   </head>
   <body>
@@ -779,6 +782,7 @@
         identity: [],
         bank: [],
         selectPrint: false,
+        onlyShowPz:false,
       },
       computed: {},
       methods: {
@@ -822,6 +826,11 @@
         }
         let _type = decodeURIComponent(this.getQueryVariable('type'))
         this.showType = decodeURIComponent(this.getQueryVariable('printTypeList'))
+        // this.pzList = this.showType.split(',')
+        // if((this.showType.indexOf('打印结算凭证')>-1)&&this.pzList.length==1){
+        //   this.onlyShowPz = true
+        // }
+        // this.pageType = decodeURIComponent(this.getQueryVariable('printTypeList'))
         let _data1 = decodeURIComponent(this.getQueryVariable('customerList'))
         if (!_data1) {
           this.customerList1 = JSON.parse(localStorage.getItem('selectPrint_selectCustomerList'))
@@ -878,9 +887,11 @@
           this.smallContent = true
           this.bigContent = false
         }
-
+        if(this.printData.compName==undefined) this.printData.compName=''
         document.title = this.printData.compName + '结算凭证'
         window.print()
+          // sessionStorage.removeItem('selectPrint_selectPrintList');
+          // sessionStorage.removeItem('selectPrint_selectCustomerList');
         window.onafterprint = function(event) {
           window.history.back(-1)
         }

+ 8 - 6
src/views/houseSelfCollect/paymentManagement.vue

@@ -75,7 +75,7 @@
       <template slot="right">
       </template>
     </BaseHeaderLayout>
-    <el-table :data="paymentList" style="width: 100%; margin-top: 20px" ref="paymentList" border height="600" 
+    <el-table :data="paymentList" style="width: 100%; margin-top: 20px" ref="paymentList" border height="600"
       @row-click="handleRowClick" @selection-change="handleSelectionChange" :summary-method="getSummaries" show-summary>
       <el-table-column :selectable="selectInit" type="selection" width="55"></el-table-column>
       <el-table-column type="index" label="序号" width="50">
@@ -308,7 +308,7 @@ import download from '../../components/WsDownload/download'
             '打印身份证(正反面)',
             '打印银行卡(正反面)',
             '打印结算凭证',
-            '打印发票'
+            // '打印发票'
           ]
         },
         row: {},
@@ -362,7 +362,7 @@ import download from '../../components/WsDownload/download'
       this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
       this.getPassYearFormatDate()
       this.getWarehouse()
-      
+
       // this.getList()
     },
     methods: {
@@ -483,7 +483,7 @@ import download from '../../components/WsDownload/download'
         //   .then(response => {
         //     console.log(response)
         //   })
-        
+
         let data = {
           paymentManagementList: this.modification
         }
@@ -500,7 +500,7 @@ import download from '../../components/WsDownload/download'
           .then(response => {
             console.log(response)
             if (response.length > 0) {
-              
+
               var arr=[]
               for (let i = 0; i < response.length; i++) {
                 arr.push({fileUrl:response[i],renameFileName:'发票'+i+'.xml'})
@@ -592,6 +592,8 @@ import download from '../../components/WsDownload/download'
       typePrintClick(type) {
         // type 1批量打印 0单个打印
         //  this.isShowPrint = true
+        this.selectCustomerList=[]
+        this.selectPrintList=[]
         if (type == 1) {
           let index1 = 0;
           let index2 = 0;
@@ -776,7 +778,7 @@ import download from '../../components/WsDownload/download'
           startDate=this.value2[0]?this.value2[0]:''
           endDate=this.value2[1]?this.value2[1]:''
         }
-      
+
       getpayment({
         currentPage: this.currentPage,
         pageSize: this.pageSize,

+ 1 - 6
src/views/houseSelfCollect/weighingManagement.vue

@@ -89,12 +89,6 @@
             <el-radio label="A4" class="label-width" @change="selectType">A4</el-radio>
             <el-radio label="A5" class="label-width" @change="selectType">A5</el-radio>
           </el-radio-group>
-          <!-- <el-checkbox-group v-model="ruleForm.type">
-            <el-checkbox label="打印身份证(正反面)" name="type" class="label-width" @change="selectType"></el-checkbox>
-            <el-checkbox label="打印银行卡(正反面)" name="type" class="label-width" @change="selectType"></el-checkbox>
-            <el-checkbox label="打印结算凭证" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
-            <el-checkbox label="打印发票" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
-          </el-checkbox-group> -->
         </div>
       </div>
       <div class="bottom-btn">
@@ -198,6 +192,7 @@
         }
       },
       typePrintClick() {
+        this.this.jjSelectPrintList = []
         let index1 = 0;
         for (let i = 0; i < this.modification.length; i++) {
           getPrint({