sale-client 3.4.172 → 3.4.174

package/package.json

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

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -173,7 +173,8 @@ export default {
         fireinfo:{},
         address: {
           id: '',
-          f_address: ''
+          f_address: '',
+          f_address_state:''
         }
       },
       show_userinfodevices: false,
@@ -296,6 +297,9 @@ export default {
         this.data.baseinfo.base.version = this.row.version
       }
       console.log('档案保存之前，。。。', this.data)
+      if(this.data.meterinfo[0].f_gas_date != null){
+        this.data.addressinfo.f_address_state = '已通气'
+      }
       // 获取保存数据
       Object.assign(this.fileSaveData, {}, this.$FileManageService.fileSaveBefore(this.data))
       // 如果是修改, 则展示修改的明细给用户

package/src/components/charge/business/CardChangeFill.vue

@@ -264,13 +264,13 @@
       console.log('换表发卡数据返回', res.data.sellid, res.data.fillgasid, res, self.model)
 
       // 开始打票
-      if (self.config.hasPrint && res.data.sellid && res.data.fillgasid) {
+      if (self.config.hasPrint) {
         if (self.model.f_print.indexOf('电子发票') == -1) {
           if (self.config.hasBillManage) {
             // 启用发票管理，获取票据管理中的票号并存储记录
             console.log('进入票据之前。。', res.data.sellid)
-            self.row.id = res.data.sellid
-            self.row.fillgasid = res.data.fillgasid
+            if (res.data.sellid) self.row.id = res.data.sellid
+            if (res.data.fillgasid) self.row.fillgasid = res.data.fillgasid
             self.row.f_bill_type = '卡表收费'
             self.row.f_bill_style = self.model.f_print[0]
             self.print = true
@@ -285,25 +285,6 @@
             self.$dispatch('success')
           }
         }
-      } else if (self.config.hasPrint && res.data.sellid && !res.data.fillgasid) {
-        self.billData.url = 'rs/report/card_bill'
-        if (self.model.f_print.indexOf('电子发票') == -1) {
-          if (self.config.hasBillManage) {
-            // 启用发票管理，获取票据管理中的票号并存储记录
-            self.row.id = res.data.sellid
-            self.row.f_bill_type = '卡表收费'
-            self.row.f_bill_style = self.model.f_print[0]
-            self.print = true
-          } else {
-            self.row.id = res.data.sellid
-            self.print = true
-          }
-        } else {
-          if (self.model.f_print[0] === '电子发票') {
-            self.$CommonService.openEticket(res.data.id, '售气收费')
-            self.$dispatch('success')
-          }
-        }
       } else {
         self.$showAlert('补气购气成功', 'success', 2000)
         self.$dispatch('success')

package/src/components/revenue/base/leftview/meterinfodetail.vue

@@ -22,12 +22,12 @@
           <span class="col-sm-7" style="color: brown">{{data?data.f_table_state:dafault.f_table_state}}</span>
         </div>
         <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按金额'">
-          <label class = "col-sm-5 " >表上余额</label>
-          <span class = "col-sm-7" style="">{{data?data.f_balance_amount:dafault.f_balance_amount}}</span>
+          <label class = "col-sm-5 " style="color: brown">表上余额</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_balance_amount:dafault.f_balance_amount}}</span>
         </div>
         <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按气量'">
-          <label class = "col-sm-5 " >表上余量</label>
-          <span class = "col-sm-7" style="">{{data?data.f_balance_gas:dafault.f_balance_gas}}</span>
+          <label class = "col-sm-5 " style="color: brown">表上余量</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_balance_gas:dafault.f_balance_gas}}</span>
         </div>
         <div class="row">
           <label class = "col-sm-5 " >初始表底数</label>

package/src/components/revenue/comprehen/ComprehenOperation/OtherGas/OtherGas.vue

@@ -51,7 +51,7 @@
           </div>
         </form>
         <print-bill :show="print" :bill-config='config' :bill-data='billData' :data='row' @toggle="close" @printok="printok"  v-ref:printbill></print-bill>
-        <accept-bill :show="acceptprint" :bill-url='acceptUrl' v-on:toggle="close" :data='row' :billdata="printData" v-ref:acceptbill @closeaccept="closeAccept"></accept-bill>
+        <accept-bill :show="acceptprint" :bill-url='acceptUrl' v-on:toggle="closeAccept" :data='row' :billdata="printData" v-ref:acceptbill @closeaccept="closeAccept"></accept-bill>
         <div style="text-align:right;margin-top: 2%">
           <button class="button_search" @click="accept()" v-if="config.hasAcceptance" :disabled='!$v.valid'>受理单</button>
           <button class="button_search" @click="confirm()"  :disabled='!$v.valid' >确认</button>