sale-client 3.6.72 → 3.6.74

package/package.json

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

package/src/components/revenue/comprehen/Bill/EticketV4/EticketRecordList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="auto basic-main" style="height:95%">
-    <criteria-paged :model="model" v-ref:paged>
+    <criteria-paged :model="model" v-ref:paged @sort="sort">
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
@@ -16,6 +16,12 @@
                      condition="f_user_name = '{}'" placeholder="用户姓名"
               >
             </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">客户地址</label>
+              <input type="text" class="form-control" v-model="model.f_buy_address_phone" style="width:60%"
+                     condition="f_buy_address_phone like '%{}%'" placeholder="用户姓名"
+              >
+            </div>
             <div class="form-group col-sm-2">
               <label class="font_normal_body">票据状态</label>
               <v-select id="f_bill_state"
@@ -32,6 +38,12 @@
             <div style="float: right">
               <button class="button_search" @click="search()">查 询</button>
               <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.fields"
+                            sqlurl="rs/logic/saleExport" sql-name="eticket_query"
+                            template-name='发票记录导出'
+                            :choose-col="true">
+              </export-excel>
               <div
                 :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                 @click="$parent.$parent.criteriaShow=!$parent.$parent.criteriaShow"
@@ -63,6 +75,28 @@
                           style="width:60%">
               </datepicker>
             </div>
+            <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
+              <label class="font_normal_body">发票金额</label>
+              <div class="row">
+                <input type="text" style="width:27%" class="input_search" v-model="model.f_collection_small"
+                       condition="f_total_money >= {} " placeholder="">
+                <label class="font_normal_body"> ≤ x ≤ </label>
+                <input type="text" style="width:27%" class="input_search" v-model="model.f_collection_big"
+                       condition="f_total_money <= {} " placeholder="">
+              </div>
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">开票人&nbsp;&nbsp;</label>
+              <input type="text" class="form-control" v-model="model.f_operator" style="width:60%"
+                     condition="f_operator = '{}' " placeholder="开票人"
+              >
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">收款人&nbsp;&nbsp;</label>
+              <input type="text" class="form-control" v-model="model.sell_operator" style="width:60%"
+                     condition="sell_operator = '{}'" placeholder="收款人"
+              >
+            </div>
           </div>
         </div>
       </criteria>
@@ -79,7 +113,8 @@
               <nobr>客户地址电话</nobr>
             </th>
             <th>
-              <nobr>实收金额</nobr>
+              <data-order field="f_total_money" name="实收金额"
+                          :order.sync="$parent.$parent.$parent.orderFields.f_total_money"></data-order>
             </th>
             <th>
               <nobr>不含税金额</nobr>
@@ -105,6 +140,12 @@
             <th>
               <nobr>开票时间</nobr>
             </th>
+            <th>
+              <nobr>开票人</nobr>
+            </th>
+            <th>
+              <nobr>收款人</nobr>
+            </th>
             <th>
               <nobr>查看发票</nobr>
             </th>
@@ -127,6 +168,8 @@
             <th style="text-align:center">{{ row.f_bill_state }}</th>
             <th style="text-align:center">{{ row.f_charge_type }}</th>
             <th style="text-align:center">{{ row.f_operate_date }}</th>
+            <th style="text-align:center">{{ row.f_operator }}</th>
+            <th style="text-align:center">{{ row.sell_operator }}</th>
             <th style="text-align:center">
               <button class="btn btn-link" v-if="row.f_bill_url"
                       @click="$parent.$parent.$parent.watch_ch(row.f_bill_url)">
@@ -186,7 +229,7 @@ export default {
   title: '发票管理',
   data () {
     return {
-      model: new PagedList('rs/sql/eticket_query', 20),
+      model: new PagedList('rs/sql/eticket_query', 20, {orderitem: this.orderitem ? '"' + this.orderitem + ' "' : `'f_operate_date desc'`}),
       criteriaShow: false,
       eticket_show: false,
       orgCondtionStr: '',
@@ -202,6 +245,27 @@ export default {
       show: false,
       bz: '',
       row: {},
+      orderFields: {
+        f_operate_date: 'desc'
+      },
+      // 排序
+      orderitem: '',
+      fields: {
+        'f_userinfo_code': '客户编号',
+        'f_user_name': '客户姓名',
+        'f_buy_address_phone': '用户地址',
+        'f_total_money': '实收金额',
+        'f_tax_money': '不含税金额',
+        'f_invoice_type': '发票类型',
+        'f_bill_code': '发票代码',
+        'f_fpqqlsh': '发票流水号',
+        'f_bill_number': '发票号码',
+        'f_bill_state': '发票状态',
+        'f_charge_type': '发票类型',
+        'f_operate_date': '开票时间',
+        'f_operator': '开票人',
+        'sell_operator': '收款人'
+      },
       install_show: false
     }
   },
@@ -223,6 +287,23 @@ export default {
     selfSearch (args) {
       this.model.search(args.condition, args.model)
     },
+    sort (field, rule) {
+      // 将所有排序方式设为不排序，实现相互排斥
+      for (let key in this.orderFields) {
+        if (key === field) {
+          this.orderFields[key] = rule
+        } else {
+          this.orderFields[key] = 'no'
+        }
+      }
+      // 如果新规则不排序，还原为默认排序
+      if (rule === 'no') {
+        this.model.paramSource.orderitem = `'${this.orderitem}'`
+      } else {
+        this.model.paramSource.orderitem = `'${field} ${rule}'`
+      }
+      this.search()
+    },
     async confirm () {
       this.eticket_show = true
       await this.$refs.eticketbill.rushRedInvoice({id: this.row.f_sell_id, eticket_id: this.row.id, bz: this.bz})
@@ -256,6 +337,12 @@ export default {
     }
   },
   computed: {
+    getCondition () {
+      return {
+        condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+        orderitem: this.orderitem ? `${this.orderitem}` :  " f_operate_date desc"
+      }
+    }
   },
   events: {
     'search' () {

package/src/components/revenue/comprehen/ComprehenOperation/FeeDeduction/feeDeduction.vue

@@ -114,6 +114,7 @@ export default {
             f_add_gas: this.model.f_add_gas,
             f_userinfo_id: this.data.f_userinfo_id,
             f_user_id: this.data.f_user_id,
+            f_calculation:this.data.f_calculation,
             f_userfiles_id: this.data.f_userfiles_id,
             f_user_name: this.data.f_user_name,
             f_user_type: this.data.f_user_type,

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,