sale-client 3.6.72 → 3.6.73

package/package.json

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

package/src/components/revenue/comprehen/gasbrand/AddGasBrand.vue

@@ -104,13 +104,21 @@
 
           </div>
           <div class="col-sm-4 form-group" v-if="gasmessage.f_meter_type[0].includes('卡表')||gasmessage.f_meter_type[0].includes('物联网表')">
-            <label for="hasCard" class="font_normal_body">支持累购</label>
+            <label for="hasCard" class="font_normal_body">是否累购</label>
             <v-select :value.sync="gasmessage.f_support_purchase"
                       :value-single="true"
                       v-model="gasmessage.f_support_purchase"
                       :options='isdecimal' placeholder='是否支持累购'
                       close-on-select style="width: 60%"></v-select>
           </div>
+          <div class="col-sm-4 form-group" v-if="gasmessage.f_meter_type[0].includes('物联网表')">
+            <label for="hasCard" class="font_normal_body">是否扣费</label>
+            <v-select :value.sync="gasmessage.f_issupport_feededuction"
+                      :value-single="true"
+                      v-model="gasmessage.f_issupport_feededuction"
+                      :options='isdecimal' placeholder='是否支持扣费'
+                      close-on-select style="width: 60%"></v-select>
+          </div>
           <div v-if="gasmessage.f_meter_type[0].includes('卡表') || gasmessage.f_hascard[0]==='是'" class="row">
             <div class="col-sm-4 form-group" :class="[$v.f_cardnumber.required ? 'has-error' : 'has-success']">
               <label for="f_card_password"  class="font_normal_body">&nbsp;&nbsp;&nbsp;卡号&nbsp;&nbsp;&nbsp;</label>
@@ -199,6 +207,7 @@ export default {
         f_hascard: '',
         f_support_bluetooth: '',
         f_support_purchase: '',
+        f_issupport_feededuction: '',
         f_share_times: '',
         f_share_open: '',
         f_priority: 100,
@@ -391,6 +400,7 @@ export default {
         f_hascard: '',
         f_support_bluetooth: '',
         f_support_purchase: '',
+        f_issupport_feededuction: '',
         f_police_gas: '',
         f_overdr_lines: '',
         f_share_times: '',

package/src/filiale/gehua/MeterinfoTest.vue

@@ -575,10 +575,7 @@
     },
     props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'overdueset', 'curuser'],
     async ready () {
-      console.log('看看meter里面的数据', this.meter, this.row)
       this.user_State = this.curuser.f_user_state
-      console.log(this.user_State)
-      console.log(this.curuser.f_user_state)
       this.row = Object.assign(this.row, this.meter, {f_use_limit : this.$appdata.getSingleValue('报废年限')})
       if (this.row.f_meter_classify) {
         if (this.row.f_meter_classify === '物联网表') {
@@ -595,13 +592,6 @@
       }
       await this.getConcentrators()
       co(meterBookGen(this))
-      console.log('-----------------111111111-----------------------')
-      console.log(this.curuser)
-      console.log(this.row.f_user_state)
-      console.log(this.row.meter)
-      console.log(this.row.f_meter_classify)
-      console.log(this.user_State)
-      console.log('-------------------11111111---------------------')
     },
     methods: {
       gasDateChange () {
@@ -681,13 +671,6 @@
           co(brandChangeGen(this))
         }
         this.meternumberValidate()
-        console.log('----------------------------------------')
-        console.log(this.user_State)
-        console.log(this.row.f_whether_hairpin)
-        console.log(this.row.f_user_state)
-        console.log(this.row.gasbrand.length)
-        console.log(this.row.gasbrand)
-        console.log('----------------------------------------')
       },
       userTypeChange () {
         this.gasproperties = []

package/src/filiale/macheng/ic_detail/HandQueryUser.vue

@@ -78,7 +78,7 @@
               <th v-show="false"><nobr>抄表月份</nobr></th>
               <th v-show="false"><nobr>用气周期</nobr></th>
               <th><nobr>上传日期</nobr></th>
-              <th><nobr>下发日期</nobr></th>
+              <th><nobr>录入日期</nobr></th>
               <th><nobr>上期底数</nobr></th>
               <th><nobr>本期底数</nobr></th>
               <th><nobr>上期余额</nobr></th>

package/src/filiale/macheng/ic_detail/WebHandQueryUser.vue

@@ -71,7 +71,7 @@
               <th v-show="false"><nobr>抄表月份</nobr></th>
               <th v-show="false"><nobr>用气周期</nobr></th>
               <th><nobr>上传日期</nobr></th>
-              <th><nobr>下发日期</nobr></th>
+              <th><nobr>录入日期</nobr></th>
               <th><nobr>上期底数</nobr></th>
               <th><nobr>本期底数</nobr></th>
               <th><nobr>上期余额</nobr></th>

package/src/plugins/LogicService.js

@@ -236,6 +236,7 @@ let LogicService = {
       f_is_step: model.f_is_step,
       f_priority: model.f_priority,
       f_support_purchase: model.f_support_purchase,
+      f_issupport_feededuction: model.f_issupport_feededuction,
       f_hascard: model.f_hascard,
       f_share_times: model.f_share_times,
       f_share_open: model.f_share_open,