sale-client 3.5.24 → 3.5.27

package/.babelrc

@@ -1,5 +1,5 @@
-{
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"],
-  "comments": false
-}
+{
+  "presets": ["es2015", "stage-2"],
+  "plugins": ["transform-runtime"],
+  "comments": false
+}

package/package.json

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

package/src/components/FilesManage/FileUserFiles.vue

@@ -58,8 +58,6 @@
                     <button @click="$parent.$parent.importFile" class="button_export button_spacing"
                             style="float: right" v-if="false">导入
                     </button>
-                    <button  class="button_search button_spacing" style="width: 90px" @click="$parent.$parent.downloadFiles()">模板下载
-                    </button>
                     <!--                    <button class="button_search" style="width: 90px" @click=" $parent.$parent.selectaddress()">选择地址</button>-->
                     <button @click="$parent.$parent.xiaohu()"
                             class="button_delete button_spacing"
@@ -407,9 +405,11 @@
       <footer slot="modal-footer" class="modal-footer">
       </footer>
     </modal>
-    <modal :show.sync="batchMeterShow" width="500px" title="文件导入" v-ref:modal large backdrop="false">
+    <modal :show.sync="batchMeterShow" width="570px" title="文件导入" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body">
-        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <file-upload class="my-file-uploader col-sm-9" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <button  class="button_clear btn-gn"  style="margin-top: 10px;background-color: #6aa6e2;"  @click="downloadFiles()">模板下载
+        </button>
       </article>
       <footer slot="modal-footer" class="modal-footer">
       </footer>

package/src/components/FilesManage/MeterinfoTest.vue

@@ -185,7 +185,7 @@
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">表具使用年限</label>
-            <input type="number" class="input_search" style="width:60%" v-model="fireinfo.f_use_limit"
+            <input type="number" class="input_search" style="width:60%" v-model="row.f_use_limit"
                    placeholder='表具使用年限' >
           </div>
           <div class="col-sm-4 form-group">
@@ -794,8 +794,19 @@
         } else {
           this.ratioshow = false
         }
+      },
+      'row.f_gas_date' (val) {
+        if (!this.row.f_use_limit) {
+          this.row.f_use_limit = this.$appdata.getSingleValue('使用年限')
+        }
+        if (!this.row.f_scrap_date && this.row.f_gas_date) {
+          if (this.row.f_use_limit !== undefined) {
+            let date = new Date(this.row.f_gas_date)
+            let year = date.getFullYear() + (this.row.f_use_limit / 1)
+            this.row.f_scrap_date = year + this.row.f_gas_date.slice(4)
+          }
+        }
       }
-
     },
     computed: {
 

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -106,6 +106,13 @@
             <input type="text" v-model="baseinfo.base.f_zuhu_phone" class="input_search" style="width:60%"
                    placeholder="租户电话">
           </div>
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-8 form-group">
+            <label for="f_zuhu_idnumber" class="font_normal_body">租户身份证</label>
+            <input type="text" v-model="baseinfo.base.f_zuhu_idnumber" class="input_search" style="width:80%"
+                   placeholder="租户身份证">
+          </div>
           <div style="" class="col-sm-4 form-group">
             <label for="f_is_mgq" class="font_normal_body ">&ensp;付款类型</label>
             <v-select id="f_is_mgq" :value.sync="baseinfo.base.f_cost_type"  v-model="baseinfo.base.f_cost_type"

package/src/components/charge/ChargeList.vue

@@ -326,11 +326,11 @@
    */
   import {HttpResetClass, PagedList} from 'vue-client'
   import DetailManage from './DetailManage'
-  import Vue from "vue";
+  import Vue from 'vue'
 
-  let cardBtnGen = async function (self, val) {
+let cardBtnGen = async function (self, val) {
     self.cardInfo = val.data
-
+    let getUser = null
     // 判断读卡是否需要卡密码
     console.log('读卡上的信息', self.cardInfo)
 
@@ -342,8 +342,32 @@
             self.readCardParam = self.model.rows[0].f_card_password
             self.cardInfo = await self.$refs.paged.$refs.cri.$refs.readcard.readCard2(self.model.rows[0].f_card_password)
           } else {
-            self.$showAlert('此卡需要先获取客户信息。请通过条件查询该客户信息之后进行读卡！！', 'warning', 2000)
-            return
+            if (self.cardInfo.Factory == 'JiBiao' || self.cardInfo.Factory == 'JiChengADSystem') {
+              // 获取用户信息
+              getUser = await self.$resetpost('rs/sql/sale_getUser', {
+                data: {
+                  condition: `f_meter_type in ('机表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
+          and u.f_filialeid = '${self.$login.f.orgid}' and f_whether_hairpin != '未发'`,
+                  orderitem: `${self.orderitem} Desc`
+                }
+              }, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
+            } else {
+              // 获取用户信息
+              getUser = await self.$resetpost('rs/sql/sale_getUser', {
+                data: {
+                  condition: `gb.f_meter_type in ('气量卡表', '金额卡表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
+          and u.f_filialeid = '${self.$login.f.orgid}' and f_alias='${self.cardInfo.Factory}' and f_whether_hairpin != '未发'`,
+                  orderitem: `${self.orderitem} Desc`
+                }
+              }, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
+            }
+            if (getUser.data.length == 1 && getUser.data[0].f_alias === self.cardInfo.Factory) {
+              self.readCardParam = getUser.data[0].f_card_password
+              self.cardInfo = await self.$refs.paged.$refs.cri.$refs.readcard.readCard2(getUser.data[0].f_card_password)
+            } else {
+              self.$showAlert('此卡需要先获取客户信息。请通过条件查询该客户信息之后进行读卡！！', 'warning', 2000)
+              return
+            }
           }
         }
       }
@@ -421,12 +445,12 @@
           let hasMatchingData = false
           getUser.data.forEach((res, index) => {
             if (self.model.rows[0].f_userfiles_id == res.f_userfiles_id) {
-            self.model.rows = [getUser.data[index]]
-            self.model.state = '正确'
-            hasMatchingData = true
-            self.$dispatch('dblclick', getUser.data[index], 0, self.cardInfo)
-          }
-        })
+              self.model.rows = [getUser.data[index]]
+              self.model.state = '正确'
+              hasMatchingData = true
+              self.$dispatch('dblclick', getUser.data[index], 0, self.cardInfo)
+            }
+          })
           if (!hasMatchingData) {
             self.model.rows = getUser.data
             self.model.pageIndex = 1
@@ -548,12 +572,12 @@
           let hasMatchingData = false
           getUser.data.forEach((res, index) => {
             if (self.model.rows[0].f_userfiles_id == res.f_userfiles_id) {
-            self.model.rows = [getUser.data[index]]
-            self.model.state = '正确'
-            hasMatchingData = true
-            self.$dispatch('dblclick', getUser.data[index], 0, self.cardInfo)
-          }
-        })
+              self.model.rows = [getUser.data[index]]
+              self.model.state = '正确'
+              hasMatchingData = true
+              self.$dispatch('dblclick', getUser.data[index], 0, self.cardInfo)
+            }
+          })
           if (!hasMatchingData) {
             self.model.rows = getUser.data
             self.model.pageIndex = 1
@@ -640,7 +664,7 @@
         // 读卡是否需要额外参数
         readCardNeedParam: false,
         readCardParam: {},
-      systemTimes: '',
+        systemTimes: '',
         userCode: '',
         userName: '',
         userAddress: '',
@@ -656,9 +680,9 @@
 
         // 流水记录显示
         recordModel: {rows: []},
-      clientWidth: document.body.clientWidth,
+        clientWidth: document.body.clientWidth,
         showCardError: false
-    }
+      }
     },
     props: {
       orderitem: {
@@ -681,7 +705,7 @@
       window.onresize = () => {
         return (() => {
           this.clientWidth = document.body.clientWidth
-      })()
+        })()
       }
     },
     methods: {
@@ -699,16 +723,16 @@
       clear () {
         Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
           this.$refs.paged.$refs.cri.model[key] = []
-      })
+        })
       },
       initQueryParam () {
         let arr = []
         this.$GetSaleParam.getGasbrand().forEach((item) => {
           let temp = {}
           temp.label = item.label
-        temp.value = item.value.f_meter_brand
-        arr.push(temp)
-      })
+          temp.value = item.value.f_meter_brand
+          arr.push(temp)
+        })
         this.meterbrand = [{label: '全部', value: ''}, ...arr]
       },
       search () {
@@ -738,32 +762,32 @@
       },
 
       async selfSearch (args) {
-    if (!this.f_orgid) {
-      this.getorg([this.$login.f.orgid])
-    }
-    if (this.f_orgid) {
-      args.condition = `u.f_filialeid in ${this.f_orgid} and ${args.condition}`
-    }
-    this.excelCondition = args.condition
-    args.condition = `${args.condition}`
-    if (this.defbtn === '发卡售气') {
-      args.condition = `${args.condition} and f_whether_hairpin = '未发' and f_meter_classify like '%卡表%'`
-    }
-    this.isPager = true
-    this.criteriaShow = true
-    this.$parent.warningInfo=null
-    this.cardInfo = ''
-    if (!this.specialCondition) {
-      if (args.condition.includes('1!=1')) {
-        args.condition = args.condition.replace('1!=1', '1=1')
-      }
-    }
-    this.specialCondition = false
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        if (this.f_orgid) {
+          args.condition = `u.f_filialeid in ${this.f_orgid} and ${args.condition}`
+        }
+        this.excelCondition = args.condition
+        args.condition = `${args.condition}`
+        if (this.defbtn === '发卡售气') {
+          args.condition = `${args.condition} and f_whether_hairpin = '未发' and f_meter_classify like '%卡表%'`
+        }
+        this.isPager = true
+        this.criteriaShow = true
+        this.$parent.warningInfo = null
+        this.cardInfo = ''
+        if (!this.specialCondition) {
+          if (args.condition.includes('1!=1')) {
+            args.condition = args.condition.replace('1!=1', '1=1')
+          }
+        }
+        this.specialCondition = false
 
-    await this.model.search(args.condition, args.model)
-    if (this.model.rows.length == 1) {
-      this.$parent.toBusiness(this.model.rows[0])
-    }
+        await this.model.search(args.condition, args.model)
+        if (this.model.rows.length == 1) {
+          this.$parent.toBusiness(this.model.rows[0])
+        }
   },
   cardBtn (val) {
     this.clear()
@@ -885,8 +909,8 @@
   },
   computed: {
     authArr () {
-      console.log('this.$login.r:',this.$login.r)
-      console.log('this.$login.r.includes:',this.$login.r.includes('收费综合导出权限'))
+      console.log('this.$login.r:', this.$login.r)
+      console.log('this.$login.r.includes:', this.$login.r.includes('收费综合导出权限'))
       return this.$login.r ? this.$login.r : []
     }
   }

package/src/components/charge/ChargeOper.vue

@@ -49,7 +49,9 @@
     } else {
       self.temp = []
       for (let i = 0; i < getBtns.length; i++) {
-        if (self.$login.r.includes(getBtns[i].name)) {
+        // 不需要权限的按钮
+        let noInclude = getBtns[i].name === '垃圾费收费'
+        if (noInclude || self.$login.r.includes(getBtns[i].name)) {
           // 进行权限验证
           self.temp.push(getBtns[i])
         }

package/src/components/revenue/base/rightview/CardList.vue

@@ -116,8 +116,7 @@
                 <transfermanage-detail :data="row" v-if="row.type === '过户'"></transfermanage-detail>
                 <othercharge-detail :data="row" v-if="row.type === '其他收费欠费登记'||row.type === '其他收费'||row.type === '维修收费'"></othercharge-detail>
                 <inputtorchange-detail :data="row" v-if="row.type === '抄表员变更'"></inputtorchange-detail>
-                <offgasaddgas-detail :data="row"
-                                     v-if=" row.type === '换表补气' ||row.type === '其他补气' || row.type === '清零补气' || row.type === '掉气补气'||row.type==='物联网补费'||row.type==='物联网扣费'||row.type==='机表补费'||row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气' " ></offgasaddgas-detail>
+                <offgasaddgas-detail :data="row" v-if=" row.type === '换表补气' ||row.type === '其他补气' || row.type === '清零补气' || row.type === '掉气补气'||row.type==='物联网补费'||row.type==='物联网扣费'||row.type==='机表补费'||row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气' " ></offgasaddgas-detail>
                 <iotopen-detail :data="row" v-if="row.type === '开通'"></iotopen-detail>
                 <iotmetercenter-detail :data="row" v-if="row.type === '物联网收费' || row.type === '物联网开户' || row.type === '调价退费' || row.type === '调价补费'||row.type === '退押金'  "></iotmetercenter-detail>
                 <overuserchange-detail :data="row" v-if="row.type === '超用收费'"></overuserchange-detail>
@@ -134,10 +133,8 @@
                 <autoaccounts-cancel-detail :data="row" v-if="row.type === '自动下账撤销'"></autoaccounts-cancel-detail>
                 <transfermanage-cancel-detail :data="row" v-if="row.type === '过户撤销'"></transfermanage-cancel-detail>
                 <cardmetercenter-cancel-detail :data="row" v-if="row.type === '卡表收费撤销'"></cardmetercenter-cancel-detail>
-                <machinemetercenter-cancel-detail :data="row"
-                                                  v-if="row.type === '机表收费撤销'"></machinemetercenter-cancel-detail>
-                <machinemetercenter-cancel-detail :data="row"
-                                                  v-if="row.type == '预存缴费撤销'"></machinemetercenter-cancel-detail>
+                <machinemetercenter-cancel-detail :data="row" v-if="row.type === '机表收费撤销'"></machinemetercenter-cancel-detail>
+                <machinemetercenter-cancel-detail :data="row" v-if="row.type == '预存缴费撤销'"></machinemetercenter-cancel-detail>
                 <othercharge-cancel-detail :data="row" v-if="row.type === '其他收费撤销'"></othercharge-cancel-detail>
                 <replacecardmanage-cancel-detail :data="row" v-if="row.type === '补卡撤销'"></replacecardmanage-cancel-detail>
                 <iotmetercenter-cancel-detail :data="row" v-if="row.type === '物联网收费撤销'"></iotmetercenter-cancel-detail>
@@ -148,6 +145,7 @@
                 <advance-delivery-detail :data="row" v-if="row.type ==='卡表预交' "></advance-delivery-detail>
                 <machinemetercenter-detail :data="row" v-if="row.type === '预存缴费'||row.type == '调价预存'"></machinemetercenter-detail>
                 <gasloss-detail :data="row" v-if="row.type === '气损收费' || row.type === '气损收费撤销'"></gasloss-detail>
+                <garbage-detail :data="row" v-if="row.type === '垃圾费收费'"></garbage-detail>
               </div>
               <div style="margin-top: 8px;background: #FFF;" v-if="!$parent.$parent.$parent.isSelected(row)">
                 <span>{{row.f_describe}}</span>
@@ -462,6 +460,8 @@
           } else {
             name = 'rs/report/iot_sell'
           }
+        } else if (type === '垃圾费收费') {
+          name = 'rs/report/garbageChargeReport'
         }
         return name
       },

package/src/components/revenue/base/rightview/carddetail/GarbageDetail.vue

@@ -0,0 +1,59 @@
+<template>
+  <div class="auto">
+    <partial-view v-ref:pv>
+      <div class="row">
+        <label class = "col-sm-4">开始日期:</label>
+        <span class = "col-sm-8" style="text-align:left">{{model.min_hand_date}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">结束日期:</label>
+        <span class = "col-sm-8" style="text-align:left">{{model.max_hand_date}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">缴费月数:</label>
+        <span class = "col-sm-8" style="text-align:left">{{model.month}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">总金额:</label>
+        <span class = "col-sm-8" style="text-align:left">{{model.money}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">操作人:</label>
+        <span class = "col-sm-8" style="text-align:left">{{data.f_operator}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">操作时间:</label>
+        <span class = "col-sm-8" style="text-align:left">{{data.f_operate_date}}</span>
+      </div>
+    </partial-view>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '垃圾费收费详情',
+    props: ['data'],
+    data () {
+      return {
+        model: {}
+      }
+    },
+    ready () {
+      let sql = 'garbageDetail'
+      let condition = {
+        recordId: this.data.id
+      }
+      this.$info(`加载数据中..., sql:${sql}`)
+      this.$refs.pv.load('rs/logic/getOneData', {data: {sql: sql, params: condition}}).then((a) => {
+        this.$info(`成功获取到数据！, data:${JSON.stringify(a.data)}`)
+        this.model = a.data
+      }).catch((error) => {
+        if (error.status) {
+          this.$warn(`加载数据出错, ${JSON.stringify(error)}`)
+          return
+        }
+        throw error
+      })
+    }
+  }
+</script>