浏览代码

Merge branch 'develop_yh13' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh13

chenrui 2 年之前
父节点
当前提交
bf6784df36

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.4",
+    "version": "2.2.5",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 1 - 1
src/views/common/chooseDealer.vue

@@ -211,7 +211,7 @@ export default {
       if(this.pageType!='viewDealers'){
         this.$refs.subarea.clearData()
       }
-      
+      this.$refs.areaList.clearData()
       this.$refs.table.refresh(true)
       this.$refs.table.clearSelected()
     },

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/list.vue

@@ -162,7 +162,7 @@
     <baseDataModal :show="openBaseModal" @close="openBaseModal=false"></baseDataModal>
     <!-- 打印预览 -->
     <commonModal modalTit="费用报销单打印预览" width="700pt" okText="立即打印" :openModal="showTipModal" @cancel="showTipModal=false" @ok="$refs.printModal.prints()">
-      <previewModal ref="printModal" @printOk="printOk"></previewModal>
+      <previewModal v-if="showTipModal" ref="printModal" @printOk="printOk"></previewModal>
     </commonModal>
   </a-card>
 </template>

+ 2 - 2
src/views/expenseManagement/expenseReimbursement/previewModal.vue

@@ -149,7 +149,7 @@ export default {
         const h = html[i].clientHeight
         printCons.push({
           h: h<=pageHeight?pageHeight:h,
-          t: '<div style="height:'+(h<=pageHeight?(pageHeight+'px'):'auto')+';">'+html[i].innerHTML+'</div>'
+          t: '<div style="height:'+(h<=pageHeight?(pageHeight+'px'):'auto')+';border:1px solid #fff;">'+html[i].innerHTML+'</div>'
         })
       }
       // 排序从小到大
@@ -162,7 +162,7 @@ export default {
       this.$store.state.app.curActionPermission = 'B_eRPrint'
       // html, type, callback, printLogParams
       // console.log(htmlStr)
-      jGPlPrint(htmlStr.join('').split('&-NEWPAGE-&'), 'preview', function (res) {
+      jGPlPrint(htmlStr.join('').split('&-NEWPAGE-&'), 'print', function (res) {
         _this.$store.state.app.curActionPermission = ''
         _this.$emit('printOk', res)
       },null,'费用报销单')

+ 2 - 2
src/views/salesManagement/receiptPrint/printModel.vue

@@ -112,7 +112,7 @@ export default {
         const h = html[i].clientHeight
         printCons.push({
           h: h<=pageHeight?pageHeight:h,
-          t: '<div style="height:'+(h<=pageHeight?(pageHeight+'px'):'auto')+';">'+html[i].innerHTML+'</div>'
+          t: '<div style="height:'+(h<=pageHeight?(pageHeight+'px'):'auto')+';border:1px solid #fff;">'+html[i].innerHTML+'</div>'
         })
       }
 
@@ -127,7 +127,7 @@ export default {
       this.$store.state.app.curActionPermission = 'B_SkPrint'
       // html, type, callback, printLogParams
       this.spinning = true
-      jGPlPrint(htmlStr.join('').split('&-NEWPAGE-&'), 'preview', function (res) {
+      jGPlPrint(htmlStr.join('').split('&-NEWPAGE-&'), 'print', function (res) {
         if(res){
           _this.handleCommonCancel()
         }