apply-clients 3.5.3-21 → 3.5.3-22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.5.3-21",
+  "version": "3.5.3-22",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/filiale/qianneng/pc/ServiceView.vue

@@ -949,7 +949,6 @@ export default {
     closePrint () {
       this.showPrint = false
       this.showqrcode = false
-      this.data = {}
     },
     print () {
       this.$refs.print.$refs.print.PrintTable()

package/src/filiale/qianneng/pc/printactivatecard.vue

@@ -13,7 +13,7 @@
       text-align: center;
     }
   </style>
-  <div id="printCharge" v-if="userinfo.f_apply_type == '居民用户报建'||userinfo.f_apply_type == '居民团体单户报建'">
+  <div id="printCharge" v-if="userinfo.f_apply_type == '居民用户报建'||userinfo.f_apply_type == '居民团体单户报建'||userinfo.f_apply_type == '其他报建'">
     <div style="margin-bottom: 10px;text-align: center;" >
       <span style="font-size: 20px;font-weight: 600">{{ $login.f.orgs}}派工流程表</span>
     </div>
@@ -286,7 +286,12 @@ import {HttpResetClass} from 'vue-client'
       },
       jsontostring (row) {
         if (!isEmpty(row)) {
-          return JSON.parse(row).join()
+          if (typeof row === 'string') {
+            return JSON.parse(row).join()
+          }
+          if (Array.isArray(row)) {
+            return row.join()
+          }
         }
         return ''
       }