sale-client 4.2.174 → 4.2.176

package/.arts/settings.json

@@ -0,0 +1,3 @@
+{
+    "diffEditor.renderSideBySide": false
+}

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
+const [ serverRul, localUrl ] = ['http://222.83.114.229:31785/', 'http://222.83.114.229:31785/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

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

@@ -152,8 +152,8 @@
             </div>
           </div>
 
-          <div class="row" style="margin-top:5px;" v-show="authArr.includes('优惠权限')">
-            <div class="col-sm-4">
+          <div class="row" style="margin-top:5px;" v-show="authArr.includes('优惠权限')|| hasDisCount">
+            <div class="col-sm-4" v-if="!hasDisCount">
               <label class="font_normal_body">优惠方式</label>
               <v-select v-model="model.f_privilege_id" @blur.native.capture="privilegeCalculate"
                         placeholder='请选择'
@@ -466,6 +466,7 @@
     }
     let getLimit = await self.$resetpost('api/af-revenue/logic/sale_getLimitGas', {data: limit_param}, {
       resolveMsg: null,
+      newly: true,
       rejectMsg: '获取限购值失败！！'
     })
     console.log('获取限购值', getLimit)
@@ -516,6 +517,18 @@
         }
       })
     }
+    // 获取优惠信息
+    if (self.config.newDiscount) {
+      let getDiscount = await self.$resetpost('api/af-revenue/logic/getDiscountInfo', {data: nowrite_param}, {
+        resolveMsg: null,
+        newly: true,
+        rejectMsg: '获取优惠信息失败！！'
+      })
+      if (getDiscount.data.leftDiscount > 0) {
+        self.disCountInfo = getDiscount.data
+        self.hasDisCount = true
+      }
+    }
   }
   export default {
     title: '卡表收费',
@@ -524,12 +537,15 @@
         mjshow: false,
         serialShow: false,
         randomBusinessId: '',
+        hasDisCount: false,
+        disCountInfo: {},
         resid: [],  // 存放新增的f_files表中id
         config: {
           calculatePreByCollection: false, // 可以更具收款来反向计算预购
           notShowFormula: false, // 不显示计算公式,默认显示
           autoCollection: true, // 自动填写收款
           quickSale: false,
+          newDiscount: false, // 新优惠
           showupload: true, // 显示上传
           hasPrint: true,  // 默认打票
           MinSellGas: 0,
@@ -561,6 +577,7 @@
           f_banktransfer_person: '',
           f_banktransfer_date: '',
           f_privilege_id: 0,
+          f_privilege_gas: 0,
           f_privilege_money: 0,
           f_after_discount: 0,
           getDeduct: 0
@@ -705,8 +722,8 @@
           this.model.getDeduct = 0
           if (this.row.f_project_money && this.row.f_project_money > 0) {
             this.model.getDeduct = (this.$CommonService.getDeduct(this.row, this.model.f_pregas) - 0)
-            this.model.f_totalcost = (this.model.f_totalcost - 0 ) + (this.model.getDeduct- 0 )
-            this.model.f_collection = (this.model.f_collection - 0 ) + (this.model.getDeduct- 0 )
+            this.model.f_totalcost = (this.model.f_totalcost - 0) + (this.model.getDeduct - 0)
+            this.model.f_collection = (this.model.f_collection - 0) + (this.model.getDeduct - 0)
           }
           this.calText(dymoney2.data.chargeprice, this.model.getDeduct)
         } catch (error) {
@@ -899,6 +916,23 @@
           }
           this.privilegeCalculate()
         }
+        if (this.hasDisCount) {
+          this.calDisCount()
+        }
+      },
+      async calDisCount () {
+        // 初始化减免金额
+        this.model.f_privilege_money = 0
+        this.model.f_after_discount = this.model.f_collection
+        let param = this.disCountInfo
+        param.f_collection = this.model.f_collection
+        param.f_pregas = this.model.f_pregas
+        let privilegeData = await this.$resetpost('api/af-revenue/logic/calculateDiscount', param, {resolveMsg: null, rejectMsg: '计算优惠金额出错'})
+        // 减免金额
+        this.model.f_privilege_money = privilegeData.data.f_privilege_money
+        this.model.f_privilege_gas = privilegeData.data.f_privilege_gas
+        // 减免后收款金额
+        this.model.f_after_discount = privilegeData.data.f_collection
       },
       // 优惠计算
       async privilegeCalculate () {

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

@@ -128,6 +128,26 @@
               <span v-if="$v.f_collection.dctest" style="color:red ">收款不能小于应收金额</span>
             </div>
           </div>
+          <div class="row" style="margin-top:5px;" v-show="authArr.includes('优惠权限')|| hasDisCount">
+            <div class="col-sm-4" v-if="!hasDisCount">
+              <label class="font_normal_body">优惠方式</label>
+              <v-select v-model="model.f_privilege_id" @blur.native.capture="privilegeCalculate"
+                        placeholder='请选择'
+                        :value.sync="model.f_privilege_id"
+                        :options='privilegeList' clear-button value-single>
+              </v-select>
+            </div>
+            <div class="col-sm-4">
+              <label for="f_preamount" class=" font_normal_body">&nbsp;优惠金额</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_privilege_money"
+                     v-scale="[model.f_privilege_money, row.f_fee_decimal||4]" placeholder="优惠金额" disabled>
+            </div>
+            <div class="col-sm-4">
+              <label for="f_preamount" class=" font_normal_body">&nbsp;实际收款</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_after_discount"
+                     v-scale="[model.f_after_discount, row.f_fee_decimal||4]" placeholder="优惠后收款" disabled>
+            </div>
+          </div>
           <div class="row" v-if="model.f_payment[0].includes('POS')">
             <div class="col-sm-4">
               <label for="f_voucher_number" class="font_normal_body">凭证号</label>
@@ -159,18 +179,19 @@
           <button class="button_clear btn-gn" @click="clean()">取消</button>
         </div>
       </validator>
-      <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_collection"></payment-code>
+      <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_after_discount"></payment-code>
       <upload :blodid="row.f_userinfo_id" v-if="config.showupload" :businessid="randomBusinessId" isremark="true" fusetype="无卡收费"></upload>
     </div>
   </div>
 </template>
 <script>
-  /**
+/**
    *综合业务
    *卡表收费组件
-   */
+ */
+  import {HttpResetClass} from 'vue-client'
 
-    // 输入金额，换算气量
+  // 输入金额，换算气量
   let preamountGen = async function (self) {
     let dymoney = 0
     let calFee = (self.model.f_totalcost - 0) + (self.row.f_balance - 0)
@@ -194,8 +215,8 @@
     Object.assign(self.model, self.model, getGas.data)
     self.model.f_totalcost = ((self.model.f_totalcost - 0) - (dymoney - 0)).toFixed(4)
     // self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
-    if(self.config.floor){
-      self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
+    if (self.config.floor) {
+      self.model.f_totalcost = Math.ceil(self.model.f_totalcost)
     }
     self.calText(getGas.data.chargeprice)
   }
@@ -215,8 +236,8 @@
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
       self.model.f_collection = self.model.f_totalcost
-      if(self.config.floor){
-        self.model.f_collection=Math.ceil(self.model.f_collection)
+      if (self.config.floor) {
+        self.model.f_collection = Math.ceil(self.model.f_collection)
       }
       self.calText(getAmount.data.chargeprice)
     }
@@ -294,7 +315,7 @@
       f_user_id: self.row.f_user_id,
       f_stairprice_id: self.row.f_stairprice_id
     }
-    let getLimit = await self.$resetpost('api/af-revenue/logic/sale_getLimitGas', {data: limit_param}, {resolveMsg: null, rejectMsg: '获取限购值失败！！'})
+    let getLimit = await self.$resetpost('api/af-revenue/logic/sale_getLimitGas', {data: limit_param}, {resolveMsg: null, newly: true, rejectMsg: '获取限购值失败！！'})
     console.log('获取限购值', getLimit)
     self.hasLimit = getLimit.data.hasLimit
     if (self.hasLimit) {
@@ -314,6 +335,21 @@
         }
       }
     }
+    // 获取优惠信息
+    if (self.config.newDiscount) {
+      let nowrite_param = {
+        f_userfiles_id: self.row.f_userfiles_id
+      }
+      let getDiscount = await self.$resetpost('api/af-revenue/logic/getDiscountInfo', {data: nowrite_param}, {
+        resolveMsg: null,
+        newly: true,
+        rejectMsg: '获取优惠信息失败！！'
+      })
+      if (getDiscount.data.leftDiscount > 0) {
+        self.disCountInfo = getDiscount.data
+        self.hasDisCount = true
+      }
+    }
   }
   export default {
     title: '无卡收费',
@@ -321,10 +357,13 @@
       return {
         serialShow: false,
         resid: [],  // 存放新增的f_files表中id
+        hasDisCount: false,
+        disCountInfo: {},
         config: {
           calculatePreByCollection: false, // 可以更具收款来反向计算预购
           notShowFormula: false, // 不显示计算公式,默认显示
           hasPrint: true,  // 默认打票
+          newDiscount: false,
           hasBillManage: false,  // 默认不启用发票管理
           floor: false,  // 是否取整收费
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
@@ -340,6 +379,11 @@
           f_preamount: 0,
           f_totalcost: 0,
           f_curbalance: 0,
+          f_privilege_id: 0,
+          f_privilege_gas: 0,
+          f_privilege_money: 0,
+          f_after_discount: 0,
+          getDeduct: 0,
           f_collection: '',
           f_balance: 0,
           f_print: [],
@@ -363,7 +407,7 @@
         // 下拉框值
         paytype: this.$appdata.getParam('付款方式'),
         printstyle: this.$appdata.getParam('打印格式'),
-        writecard: [{label: '写卡',value:'写卡'},{label: '不写卡',value:'不写卡'}],
+        writecard: [{label: '写卡', value: '写卡'}, {label: '不写卡', value: '不写卡'}],
         mjshow: false
       }
     },
@@ -443,6 +487,86 @@
           }
         })
       },
+      // 根据选择的付款方式 获取优惠列表
+      async getPrivilegeList () {
+        // 初始化下拉选择列表
+        this.privilegeList = [{label: '无优惠', value: '0'}]
+        // 初始为无优惠
+        this.model.f_privilege_id = '0'
+        if (this.model.f_payment && this.model.f_payment.length) {
+          // 查询条件
+          let payments = JSON.stringify(this.model.f_payment)
+          payments = payments.replace('[', '(').replace(']', ')').replace(/"/g, '\'')
+          let HttpReset = new HttpResetClass()
+          let privilege = await HttpReset.load('POST', 'api/af-revenue/sql/singleTable_OrderBy', {
+            data: {
+              items: 'id,f_privilege_name,f_privilege_type',
+              tablename: 't_privilege',
+              condition: `f_payment in ${payments} and f_gasproperties = '${this.row.f_gasproperties}' and f_user_type = '${this.row.f_user_type}' and f_perform_date <= GETDATE() and f_end_date >= GETDATE() and f_state = '有效'`,
+              orderitem: 'id'
+            }
+          }, {resolveMsg: null, rejectMsg: '查询优惠信息失败'})
+          // 查询结果放到下拉列表
+          for (let p of privilege.data) {
+            this.privilegeList.push({label: p.f_privilege_name, value: p.id, type: p.f_privilege_type})
+          }
+          this.privilegeCalculate()
+        }
+        if (this.hasDisCount) {
+          this.calDisCount()
+        }
+      },
+      async calDisCount () {
+        // 初始化减免金额
+        this.model.f_privilege_money = 0
+        this.model.f_after_discount = this.model.f_collection
+        let param = this.disCountInfo
+        param.f_collection = this.model.f_collection
+        param.f_pregas = this.model.f_pregas
+        let privilegeData = await this.$resetpost('api/af-revenue/logic/calculateDiscount', param, {resolveMsg: null, rejectMsg: '计算优惠金额出错'})
+        // 减免金额
+        this.model.f_privilege_money = privilegeData.data.f_privilege_money
+        this.model.f_privilege_gas = privilegeData.data.f_privilege_gas
+        // 减免后收款金额
+        this.model.f_after_discount = privilegeData.data.f_collection
+      },
+      // 优惠计算
+      async privilegeCalculate () {
+        // 初始化减免金额
+        this.model.f_privilege_money = 0
+        this.model.f_after_discount = this.model.f_collection
+        // 判断是否是自定义优惠
+        if (parseInt(this.model.f_privilege_id)) {
+          for (let p of this.privilegeList) {
+            if (p.value == this.model.f_privilege_id && p.type == '自定义') {
+              this.model.f_privilege_money = window.prompt('请输入你想优惠的金额')
+              if (!(/^[1-9]\d*(\.\d+)?$/).test(this.model.f_privilege_money) || !(/^[1-9]\d*(\.\d+)?$/).test(this.model.f_privilege_money)) {
+                this.$showMessage('金额输入格式不正确!')
+                this.model.f_privilege_money = 0
+                return
+              }
+              if ((this.model.f_privilege_money - 0) >= this.model.f_collection) {
+                this.$showMessage('减免金额不能大于等于收款金额')
+                this.model.f_privilege_money = 0
+                return
+              }
+            }
+          }
+        }
+        // 优惠方式, 收款 缺一不计算
+        if (this.model.f_payment && this.model.f_payment.length && parseInt(this.model.f_privilege_id) && this.model.f_collection) {
+          let c = {
+            f_privilege_id: this.model.f_privilege_id,
+            f_collection: this.model.f_collection,
+            f_privilege_money: this.model.f_privilege_money
+          }
+          let privilegeData = await this.$resetpost('api/af-revenue/logic/calculatePrivilege', c, {resolveMsg: null, rejectMsg: '计算优惠金额出错'})
+          // 减免金额
+          this.model.f_privilege_money = privilegeData.data.f_privilege_money
+          // 减免后收款金额
+          this.model.f_after_discount = privilegeData.data.f_collection
+        }
+      },
       clean () {
         this.$info('取消操作')
         this.$dispatch('refresh', this.row)
@@ -496,15 +620,49 @@
       }
     },
     watch: {
+      'model.f_payment.length' (val) {
+        console.log('付款方式多选。。', val)
+        if (val > 1 && !this.model.f_preamount) {
+          this.model.f_payment = ['现金缴费']
+          this.$showAlert('请先计算付款金额', 'warning', 2000)
+        } else {
+          this.paymentModel = []
+
+          this.model.f_payment.forEach((res) => {
+            let temp = {
+              f_payment: res,
+              f_money: 0
+            }
+            this.paymentModel.push(temp)
+          })
+          this.$resetValidation()
+
+          // 获取计算优惠
+          this.getPrivilegeList()
+        }
+      },
       'model.f_payment' (val) {
-        if (val == '免交') {
+        let _payment = this.$appdata.getSingleValue('需要输入业务单号的付款方式') || ''
+        if (val == '免交' || _payment.includes(val)) {
           this.mjshow = true
         } else {
           this.mjshow = false
         }
+        // if(this.row.f_collection_type == '按气量'){
+        //   this.pregas();
+        // }else{
+        //   this.preamount();
+        // }
+      },
+      'model.f_collection' (val) {
+        // 获取计算优惠
+        this.getPrivilegeList()
       }
     },
     computed: {
+      authArr () {
+        return this.$login.r ? this.$login.r : []
+      },
       'curbalance' () {
         if (this.model.f_preamount) {
           if (this.config.calculatePreByCollection) {

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

@@ -109,7 +109,7 @@
                            v-ref:givechange></give-change>
             </div>
           </div>
-          <div class="row" style="margin-top:5px;" v-show="authArr.includes('优惠权限')">
+          <div class="row" style="margin-top:5px;" v-show="authArr.includes('优惠权限') || hasDisCount">
             <div class="col-sm-4 form-group">
               <label class="font_normal_body">优惠方式</label>
               <v-select v-model="model.f_privilege_id" @blur.native.capture="privilegeCalculate"
@@ -318,7 +318,7 @@ let preamountGen = async function (self) {
   }
   self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
   self.calText(getGas.data.chargeprice)
-  self.pricetext = getGas.data.chargeprice[0].pricetext ? getGas.data.chargeprice[0].pricetext:null
+  self.pricetext = getGas.data.chargeprice[0].pricetext ? getGas.data.chargeprice[0].pricetext : null
 }
 
 // 输入气量，换算金额
@@ -339,7 +339,7 @@ let pregasGen = async function (self) {
     if (self.config.floor) {
       self.model.f_collection = Math.ceil(self.model.f_collection)
     }
-    self.pricetext = getAmount.data.chargeprice[0].pricetext?getAmount.data.chargeprice[0].pricetext:null
+    self.pricetext = getAmount.data.chargeprice[0].pricetext ? getAmount.data.chargeprice[0].pricetext : null
     self.calText(getAmount.data.chargeprice)
   }
 }
@@ -447,6 +447,7 @@ let asyncShowCardSellGas = async function (self) {
   let http = new HttpResetClass()
   let getLimit = await http.load('POST', 'api/af-revenue/logic/sale_getLimitGas', {data: limit_param}, {
     resolveMsg: null,
+    newly: true,
     rejectMsg: '获取限购值失败！！'
   })
   console.log('获取限购值', getLimit)
@@ -472,6 +473,21 @@ let asyncShowCardSellGas = async function (self) {
       }
     }
   }
+  // 获取优惠信息
+  if (self.config.newDiscount) {
+    let nowrite_param = {
+      f_userfiles_id: self.row.f_userfiles_id
+    }
+    let getDiscount = await self.$resetpost('api/af-revenue/logic/getDiscountInfo', {data: nowrite_param}, {
+      resolveMsg: null,
+      newly: true,
+      rejectMsg: '获取优惠信息失败！！'
+    })
+    if (getDiscount.data.leftDiscount > 0) {
+      self.disCountInfo = getDiscount.data
+      self.hasDisCount = true
+    }
+  }
 }
 
 export default {
@@ -480,12 +496,15 @@ export default {
     return {
       serialShow: false,
       pricetext: null,
+      hasDisCount: false,
+      disCountInfo: {},
       resid: [],
       config: {
         notShowFormula: false, // 不显示计算公式,默认显示
         calculatePreByCollection: false, // 可以更具收款来反向计算预购
         showupload: true,  // 默认不显示上传附件
         hasPrint: false,  // 默认打票
+        newDiscount: false,
         floor: true,  // 是否取整收费
         hasBillManage: false,  // 默认不启用发票管理
         billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
@@ -506,6 +525,7 @@ export default {
         f_meter_type: '',
         f_voucher_number: '',
         f_privilege_id: 0,
+        f_privilege_gas: 0,
         f_privilege_money: 0,
         f_after_discount: 0
       },
@@ -842,6 +862,23 @@ export default {
         }
         this.privilegeCalculate()
       }
+      if (this.hasDisCount) {
+        this.calDisCount()
+      }
+    },
+    async calDisCount () {
+      // 初始化减免金额
+      this.model.f_privilege_money = 0
+      this.model.f_after_discount = this.model.f_collection
+      let param = this.disCountInfo
+      param.f_collection = this.model.f_collection
+      param.f_pregas = this.model.f_pregas
+      let privilegeData = await this.$resetpost('api/af-revenue/logic/calculateDiscount', param, {resolveMsg: null, rejectMsg: '计算优惠金额出错'})
+      // 减免金额
+      this.model.f_privilege_money = privilegeData.data.f_privilege_money
+      this.model.f_privilege_gas = privilegeData.data.f_privilege_gas
+      // 减免后收款金额
+      this.model.f_after_discount = privilegeData.data.f_collection
     },
     // 优惠计算
     async privilegeCalculate () {

package/src/components/manualsemmary/ManualSummaryManage.vue

@@ -0,0 +1,310 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <criteria-paged :model="model" v-ref:paged @sort="sort">
+        <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch">
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <div class="col-sm-3 form-group">
+                <label class="font_normal_body">用户姓名：</label>
+                <input type="text" class="input_search" v-model="model.f_user_name"
+                       condition="f_user_name like '%{}%'" placeholder='请输入用户姓名'>
+              </div>
+              <div class="col-sm-3 form-group">
+                <label class="font_normal_body">用户标识：</label>
+                <input type="text" class="input_search" v-model="model.f_user_id"
+                       condition="f_user_id like '%{}%'" placeholder='请输入用户标识'>
+              </div>
+              <div class="col-sm-3 form-group">
+                <label class="font_normal_body">用户地址：</label>
+                <input type="text" class="input_search" v-model="model.f_user_address"
+                       condition="f_user_address like '%{}%'" placeholder='请输入用户地址'>
+              </div>
+              <div class="col-sm-3 form-group">
+                <label class="font_normal_body">回复人：</label>
+                <input type="text" class="input_search" v-model="model.f_attendant"
+                       condition="f_attendant like '%{}%'" placeholder='请输入回复人'>
+              </div>
+            </div>
+            <div class="row">
+              <div class="col-sm-3 form-group">
+                <label class="font_normal_body">转人工时间：</label>
+                <div style="display: flex; align-items: center;">
+                  <datepicker placeholder="开始日期"
+                              style="width: 100px; margin-right: 5px;"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd'"></datepicker>
+                  <span style="margin: 0 5px;">~</span>
+                  <datepicker placeholder="结束日期"
+                              style="width: 100px;"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd'"></datepicker>
+                </div>
+              </div>
+              <div class="col-sm-3 form-group">
+                <label class="font_normal_body">人工回复时间：</label>
+                <div style="display: flex; align-items: center;">
+                  <datepicker placeholder="开始日期"
+                              style="width: 100px; margin-right: 5px;"
+                              v-model="model.startMsgDate"
+                              :value.sync="model.startMsgDate"
+                              :format="'yyyy-MM-dd'"></datepicker>
+                  <span style="margin: 0 5px;">~</span>
+                  <datepicker placeholder="结束日期"
+                              style="width: 100px;"
+                              v-model="model.endMsgDate"
+                              :value.sync="model.endMsgDate"
+                              :format="'yyyy-MM-dd'"></datepicker>
+                </div>
+              </div>
+              <div class="col-sm-6 form-group" style="text-align: right;">
+                <button class="button_search button_spacing" @click="search()">查询</button>
+                <button class="button_clear button_spacing" @click="clear()">重置</button>
+                <export-excel
+                  :data="getCondition"
+                  :field="getfield"
+                  sqlurl="rs/logic/userExport"
+                  sql-name="userQuery"
+                  template-name='用户导出'
+                  :choose-col="true">
+                </export-excel>
+              </div>
+            </div>
+          </div>
+        </criteria>
+
+        <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th><input type='checkbox' v-model="allSelect" @change="selectAll"></th>
+              <th>序号</th>
+              <th>
+                <nobr>
+                  <data-order field="f_user_name" name="用户姓名"
+                              :order.sync="orderFields.f_user_name"></data-order>
+                </nobr>
+              </th>
+              <th>
+                <nobr>
+                  <data-order field="f_user_id" name="用户标识"
+                              :order.sync="orderFields.f_user_id"></data-order>
+                </nobr>
+              </th>
+              <th>
+                <nobr>
+                  <data-order field="f_user_address" name="用户地址"
+                              :order.sync="orderFields.f_user_address"></data-order>
+                </nobr>
+              </th>
+              <th>
+                <nobr>
+                  <data-order field="f_ivr_time" name="转人工时间"
+                              :order.sync="orderFields.f_ivr_time"></data-order>
+                </nobr>
+              </th>
+              <th>
+                <nobr>
+                  <data-order field="f_msg_time" name="人工回复时间"
+                              :order.sync="orderFields.f_msg_time"></data-order>
+                </nobr>
+              </th>
+              <th>
+                <nobr>
+                  <data-order field="f_attendant" name="回复人"
+                              :order.sync="orderFields.f_attendant"></data-order>
+                </nobr>
+              </th>
+              <th>
+                <nobr>
+                  <data-order field="f_rate" name="评价等级"
+                              :order.sync="orderFields.f_rate"></data-order>
+                </nobr>
+              </th>
+            </tr>
+          </template>
+
+          <template partial='body' scope="row">
+            <tr>
+              <td><input type='checkbox' @change="selectRow($event, row)" :checked="row.selected"></td>
+              <td>{{ $index + 1 }}</td>
+              <td>{{ row.f_user_name }}</td>
+              <td>{{ row.f_user_id }}</td>
+              <td>{{ row.f_user_address }}</td>
+              <td>{{ row.f_ivr_time }}</td>
+              <td>{{ row.f_msg_time }}</td>
+              <td>{{ row.f_attendant }}</td>
+              <td>{{ row.f_rate }}</td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+
+export default {
+  data() {
+    return {
+      model: new PagedList('rs/sql/saleSingleTable', 20, {
+        tablename: 't_text_log'
+      }, {
+        f_user_name: '',
+        f_user_id: '',
+        f_user_address: '',
+        f_ivr_time: '',
+        f_msg_time: '',
+        f_attendant: '',
+        f_rate: ''
+      }),
+      allSelect: false,
+      orderFields: {
+        f_user_name: 'no',
+        f_user_id: 'no',
+        f_user_address: 'no',
+        f_ivr_time: 'no',
+        f_msg_time: 'no',
+        f_attendant: 'no',
+        f_rate: 'no'
+      },
+      getfield: {
+        'f_user_name': '用户姓名',
+        'f_user_id': '用户标识',
+        'f_user_address': '用户地址',
+        'f_ivr_time': '转人工时间',
+        'f_msg_time': '人工回复时间',
+        'f_attendant': '回复人',
+        'f_rate': '评价等级'
+      }
+    }
+  },
+  methods: {
+    search() {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    clear() {
+      Object.keys(this.model).forEach(key => {
+        if (key !== 'items' && key !== 'tablename') {
+          this.model[key] = ''
+        }
+      })
+      this.$refs.paged.$refs.criteria.model.f_user_name = ''
+      this.$refs.paged.$refs.criteria.model.f_user_id = ''
+      this.$refs.paged.$refs.criteria.model.f_user_address = ''
+      this.$refs.paged.$refs.criteria.model.f_attendant = ''
+      this.startDate = ''
+      this.endDate = ''
+      this.startMsgDate = ''
+      this.endMsgDate = ''
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selectAll(event) {
+      this.model.rows.forEach(row => {
+        row.selected = event.target.checked
+      })
+    },
+    selectRow(event, row) {
+      row.selected = event.target.checked
+    },
+    sort(field) {
+      this.orderFields[field] = this.orderFields[field] === 'asc' ? 'desc' : 'asc'
+    }
+  },
+  computed: {
+    getCondition() {
+      let condition = ''
+      if (this.model.f_user_name) {
+        condition += ` and f_user_name like '%${this.model.f_user_name}%'`
+      }
+      if (this.model.f_user_id) {
+        condition += ` and f_user_id like '%${this.model.f_user_id}%'`
+      }
+      if (this.model.f_user_address) {
+        condition += ` and f_user_address like '%${this.model.f_user_address}%'`
+      }
+      if (this.model.f_attendant) {
+        condition += ` and f_attendant like '%${this.model.f_attendant}%'`
+      }
+      if (this.startDate && this.endDate) {
+        condition += ` and f_ivr_time between '${this.startDate}' and '${this.endDate}'`
+      }
+      if (this.startMsgDate && this.endMsgDate) {
+        condition += ` and f_msg_time between '${this.startMsgDate}' and '${this.endMsgDate}'`
+      }
+      return condition
+    }
+  }
+}
+</script>
+
+<style scoped>
+.flex-row {
+  display: flex;
+  flex-direction: row;
+}
+
+.basic-main {
+  width: 100%;
+}
+
+.form-group {
+  margin-bottom: 15px;
+}
+
+.input_search {
+  width: 200px;
+  padding: 6px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+
+.button_search {
+  background-color: #007bff;
+  color: white;
+  padding: 6px 12px;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+}
+
+.button_clear {
+  background-color: #6c757d;
+  color: white;
+  padding: 6px 12px;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+}
+
+.button_spacing {
+  margin-left: 10px;
+}
+
+.list_area {
+  width: 100%;
+  border-collapse: collapse;
+  margin-top: 10px;
+}
+
+.list_area th,
+.list_area td {
+  padding: 8px;
+  text-align: left;
+  border-bottom: 1px solid #ddd;
+}
+
+.list_area th {
+  background-color: #f2f2f2;
+  position: sticky;
+  top: 0;
+  z-index: 1;
+}
+
+.list_area tr:hover {
+  background-color: #f5f5f5;
+}
+</style>

package/src/filiale/dexin/BlackList/BlackListList.vue

@@ -4,7 +4,14 @@
       <criteria @condition-changed='$parent.selfSearch' partial='criteria' v-ref:cri>
         <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
           <div class="row">
-            <res-select-group :style="$parent.$parent.style" :show-component="['company','slicearea']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getorg" v-ref:sel></res-select-group>
+            <res-select-group :style="$parent.$parent.style" :show-component="['company']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getorg" v-ref:sel></res-select-group>
+            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}"
+                 v-if="!$parent.$parent.downshow&&!$parent.$parent.$parent.isdetail">
+              <label class="font_normal_body">地&emsp;&emsp;址</label>
+              <input  :size="model.f_street ? model.f_address.length * 2 : 4" class="input_search" condition="f_street like '%{}%'" placeholder='区/县' style="width:60%"
+                      type="text"
+                      v-model="model.f_street">
+            </div>
             <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}">
               <label class="font_normal_body">用户编号</label>
               <input class="input_search" condition="f_userinfo_code like '%{}%'" placeholder="用户编号" style="width:60%"
@@ -139,7 +146,7 @@
             <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>卡号</th>
             <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>电话</th>
             <th style="text-align: center;">地址</th>
-            <th style="text-align: center;">片区</th>
+            <th style="text-align: center;">区/县</th>
             <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>安检日期</th>
             <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>限购日期</th>
             <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>操作人</th>
@@ -156,7 +163,7 @@
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_card_id}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_user_phone}}</td>
           <td style="text-align: center;">{{row.f_address}}</td>
-          <td style="text-align: center;">{{row.f_zones}}</td>
+          <td style="text-align: center;">{{row.f_street}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_last_check_date}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_parameter_value}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_operator}}</td>
@@ -207,8 +214,8 @@
           'f_last_check_date': '安检日期',
           'f_parameter_value': '限购日期',
           'f_comments': '限购原因',
-          'f_zones': '片区',
-          'f_user_type': '用户类型'
+          'f_user_type': '用户类型',
+          'f_street': '区/县'
         }
       }
     },
@@ -223,6 +230,7 @@
     ready () {
       this.getAuthority()
       this.search()
+      this.getAreaAddressList()
     },
     methods: {
       selected (row) {
@@ -235,6 +243,7 @@
           this.blackImport = '黑名单导入'
         }
       },
+
       async getRes (condition, obj) {
         console.log('condition =', condition)
         console.log('obj =', obj)

package/src/filiale/tongchuan/ManualSummaryManage.vue

@@ -0,0 +1,219 @@
+<template>
+  <div class="basic-main" style="height: 98%">
+    <div class="flex">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria partial='criteria' v-ref:criteria @condition-changed='$parent.selfSearch'>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <!-- 用户姓名查询 -->
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">用户姓名</label>
+                <input type="text" class="input_search"
+                       style="width:60%"
+                       v-model="model.f_user_name"
+                       condition="f_user_name like '%{}%'"
+                       placeholder="请输入用户姓名"/>
+              </div>
+
+              <!-- 用户标识查询 -->
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">用户标识</label>
+                <input type="text" class="input_search"
+                       style="width:60%"
+                       v-model="model.f_user_id"
+                       condition="f_user_id like '%{}%'"
+                       placeholder="请输入用户标识"/>
+              </div>
+
+              <!-- 回复人查询 -->
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">回复人</label>
+                <input type="text" class="input_search"
+                       style="width:60%"
+                       v-model="model.f_attendant"
+                       condition="f_attendant like '%{}%'"
+                       placeholder="请输入回复人"/>
+              </div>
+
+              <!-- 查询按钮 -->
+              <div class="span col-sm-2 form-group button-range" style="float: right">
+                <button class="button_search button_spacing" @click="search()" v-el:cx>查询</button>
+                <button class="button_clear button_spacing" @click="clear">清空</button>
+                <div style="float: right" class="button_spacing"
+                     :class="{'button_shrink_top': criteriaShow,'button_shrink_bottom': !criteriaShow}"
+                     @click="criteriaShow = !criteriaShow"></div>
+              </div>
+            </div>
+
+            <!-- 扩展查询条件 -->
+            <div class="row" v-show="criteriaShow">
+              <!-- 转人工时间范围 -->
+              <div class="col-sm-3 form-group">
+                <label class="font_normal_body">转人工起始时间</label>
+                <datepicker placeholder='转人工起始时间' style="width:60%"
+                            v-model="model.ivrStartDate"
+                            :value.sync="model.ivrStartDate"
+                            :format="'yyyy-MM-dd HH:mm:ss'"
+                            :show-reset-button="true"
+                            condition="f_ivr_time >= '{}'">
+                </datepicker>
+              </div>
+              <div class="col-sm-3 form-group">
+                <label class="font_normal_body">转人工结束时间</label>
+                <datepicker placeholder='转人工结束时间' style="width:60%"
+                            v-model="model.ivrEndDate"
+                            :value.sync="model.ivrEndDate"
+                            :format="'yyyy-MM-dd HH:mm:ss'"
+                            :show-reset-button="true"
+                            condition="f_ivr_time <= '{}'">
+                </datepicker>
+              </div>
+
+              <!-- 人工回复时间范围 -->
+              <div class="col-sm-3 form-group">
+                <label class="font_normal_body">回复起始时间</label>
+                <datepicker placeholder='回复起始时间' style="width:60%"
+                            v-model="model.msgStartDate"
+                            :value.sync="model.msgStartDate"
+                            :format="'yyyy-MM-dd HH:mm:ss'"
+                            :show-reset-button="true"
+                            condition="f_msg_time >= '{}'">
+                </datepicker>
+              </div>
+              <div class="col-sm-3 form-group">
+                <label class="font_normal_body">回复结束时间</label>
+                <datepicker placeholder='回复结束时间' style="width:60%"
+                            v-model="model.msgEndDate"
+                            :value.sync="model.msgEndDate"
+                            :format="'yyyy-MM-dd HH:mm:ss'"
+                            :show-reset-button="true"
+                            condition="f_msg_time <= '{}'">
+                </datepicker>
+              </div>
+            </div>
+          </div>
+        </criteria>
+
+        <!-- 数据表格 -->
+        <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th>序号</th>
+              <th>用户姓名</th>
+              <th>用户标识</th>
+              <th>转人工时间</th>
+              <th>人工回复时间</th>
+              <th>回复人</th>
+              <th>评价等级</th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr>
+              <td style="text-align:center">{{$index+1}}</td>
+              <td style="text-align:center">{{row.f_user_name}}</td>
+              <td style="text-align:center">{{row.f_user_id}}</td>
+              <td style="text-align:center">{{row.f_ivr_time}}</td>
+              <td style="text-align:center">{{row.f_msg_time}}</td>
+              <td style="text-align:center">{{row.f_attendant}}</td>
+              <td style="text-align:center">{{row.f_rate}}</td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+
+export default {
+  title: '转人工管理',
+  data() {
+    return {
+      model: new PagedList('rs/sql/saleSingleTable', 20, {
+        tablename: '`t_text_log`',
+        items: '`*`'
+      }),
+      criteriaShow: false,
+      condition2: '',
+      rateOptions: [
+        {label: '全部', value: ''},
+        {label: '1星', value: 1},
+        {label: '2星', value: 2},
+        {label: '3星', value: 3},
+        {label: '4星', value: 4},
+        {label: '5星', value: 5}
+      ]
+    }
+  },
+  ready() {
+    this.search()
+  },
+  methods: {
+    search() {
+      this.selfSearch({condition: '1=1', model: this.model})
+    },
+
+    clear() {
+      // 清空所有查询条件
+      this.model.f_user_name = ''
+      this.model.f_user_id = ''
+      this.model.f_attendant = ''
+      this.model.f_rate = ''
+      this.model.ivrStartDate = ''
+      this.model.ivrEndDate = ''
+      this.model.msgStartDate = ''
+      this.model.msgEndDate = ''
+
+      // 清空后自动查询
+      this.search()
+    },
+
+    selfSearch(args) {
+      let condition = args.condition || '1=1'
+
+      // 用户姓名条件
+      if (this.model.f_user_name) {
+        condition += ` and f_user_name like '%${this.model.f_user_name}%'`
+      }
+
+      // 用户标识条件
+      if (this.model.f_user_id) {
+        condition += ` and f_user_id like '%${this.model.f_user_id}%'`
+      }
+
+      // 回复人条件
+      if (this.model.f_attendant) {
+        condition += ` and f_attendant like '%${this.model.f_attendant}%'`
+      }
+
+
+      // 转人工时间范围条件 - 使用 SQL Server 兼容的格式
+      if (this.model.ivrStartDate && this.model.ivrEndDate) {
+        condition += ` and f_ivr_time between '${this.model.ivrStartDate}' and '${this.model.ivrEndDate}'`
+      } else if (this.model.ivrStartDate) {
+        condition += ` and f_ivr_time >= '${this.model.ivrStartDate}'`
+      } else if (this.model.ivrEndDate) {
+        condition += ` and f_ivr_time <= '${this.model.ivrEndDate}'`
+      }
+
+      // 人工回复时间范围条件 - 使用 SQL Server 兼容的格式
+      if (this.model.msgStartDate && this.model.msgEndDate) {
+        condition += ` and f_msg_time between '${this.model.msgStartDate}' and '${this.model.msgEndDate}'`
+      } else if (this.model.msgStartDate) {
+        condition += ` and f_msg_time >= '${this.model.msgStartDate}'`
+      } else if (this.model.msgEndDate) {
+        condition += ` and f_msg_time <= '${this.model.msgEndDate}'`
+      }
+
+      console.log('转人工管理查询条件:', condition)
+      this.condition2 = condition
+      this.model.search(condition, args.model)
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+</style>

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/HuaiLai/sale'
+import FilialeSale from './filiale/dexin/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'

package/src/plugins/CardService.js

@@ -455,6 +455,7 @@ let CardService = {
   // 无卡收费
   noCardSellGas (model, row) {
     let f_serial_number = ''
+    let f_privilege_gas = 0
     if (model.f_serial_number) {
       f_serial_number = model.f_serial_number
     }
@@ -462,6 +463,9 @@ let CardService = {
     if (model.f_write_card) {
       f_write_card = model.f_write_card
     }
+    if (model.f_privilege_gas) {
+      f_privilege_gas = model.f_privilege_gas
+    }
     let param = {
       f_userinfo_id: row.f_userinfo_id,
       f_serial_number: f_serial_number,
@@ -470,6 +474,10 @@ let CardService = {
       f_pregas: model.f_pregas,
       f_write_money: model.f_write_money,
       f_balance: row.f_balance,
+      // 优惠金额
+      f_privilege_money: model.f_privilege_money,
+      f_privilege_gas: f_privilege_gas,
+      f_after_discount: model.f_after_discount,
       f_preamount: model.f_preamount,
       f_total_gas: (row.f_total_gas - 0) + (model.f_pregas - 0),
       f_write_totalgas: (row.f_write_totalgas - 0) + (model.f_pregas - 0),