sale-client 3.6.222 → 3.6.224

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.222",
+  "version": "3.6.224",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManage/UserDeviceInfoTest.vue

@@ -306,9 +306,7 @@ export default {
       console.log('表具信息', this.devicesinfo)
     },
     expireDate (index) {
-      if (this.devicesinfo[index].f_make_date === '' || this.devicesinfo[index].f_make_date === undefined || this.devicesinfo[index].f_service_life === 0 || this.devicesinfo[index].f_service_life === undefined) {
-
-      } else {
+      if (this.devicesinfo[index].f_make_date && this.devicesinfo[index].f_service_life) {
         var b = new Date(this.devicesinfo[index].f_make_date)
         var year = (b.getFullYear() - 0) + (this.devicesinfo[index].f_service_life - 0)
         var month = (b.getMonth() - 0) + 1
@@ -322,9 +320,7 @@ export default {
       }
     },
     ljgexpireDate (index) {
-      if (this.devicesinfo[index].f_pipeinstall_date === '' || this.devicesinfo[index].f_pipeinstall_date === undefined || this.devicesinfo[index].f_service_liferg === 0 || this.devicesinfo[index].f_service_liferg === undefined) {
-
-      } else {
+      if (this.devicesinfo[index].f_pipeinstall_date && this.devicesinfo[index].f_service_liferg) {
         var b = new Date(this.devicesinfo[index].f_pipeinstall_date)
         var year = (b.getFullYear() - 0) + (this.devicesinfo[index].f_service_liferg - 0)
         var month = (b.getMonth() - 0) + 1

package/src/components/revenue/HandManager/CardHand.vue

@@ -460,7 +460,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
         cardCentalData: '',
         getfield: {
           'f_userinfo_code': '户编号',
-          'f_user_name': '基本信息',
+          'f_user_name': '用户名称',
+          'f_gasproperties': '用气性质',
+          'f_user_phone': '用户电话',
+          'f_address': '用户地址',
           'f_meternumber': '表号',
           'f_inputtor': '抄表员',
           'f_total_fee': '总购金额',
@@ -487,6 +490,11 @@ import {HttpResetClass, PagedList} from 'vue-client'
       this.$refs.paged.$refs.criteria.model.startDate = Util.toStartAndEndDateString()[0]
       this.$refs.paged.$refs.criteria.model.endDate = Util.toStartAndEndDateString()[1]
       loadParamGem(this)
+      this.$nextTick(() => {
+        if (this.shengyu == 'false') {
+          this.getfield.f_shengyu_gas = '剩余气量'
+        }
+      })
     },
     methods: {
       hidden () {

package/src/components/revenue/cardHandManage/cardsHand.vue

@@ -489,9 +489,11 @@ export default {
       getfield: {
         'id': '抄表单编号',
         'f_userinfo_code': '客户编号',
-        'f_user_name': '基本信息',
+        'f_user_name': '客户姓名',
         'f_meternumber': '表号',
-        'f_user_phone': '用户电话',
+        'f_gasproperties': '用气性质',
+        'f_user_phone': '客户电话',
+        'f_address': '客户地址',
         'f_inputtor': '抄表员',
         'total_fee': '总购金额',
         'total_gas': '累购气量',
@@ -500,6 +502,7 @@ export default {
         'f_input_date': '抄表录入日期',
         'f_last_tablebase': '上期底数',
         'f_tablebase': '本期底数',
+        'f_shengyu_gas': '剩余气量',
         'f_actualtablebase': '实际用量',
         'f_img_path': '附件查看',
         'f_sign_img': '签章图片',