sale-client 3.6.127 → 3.6.128

package/package.json

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

package/src/components/FilesManage/FileUserFiles.vue

@@ -248,7 +248,7 @@
                   <div
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                           class="form-group" >
-                    <label class="font_normal_body">客户等级</label>
+                    <label class="font_normal_body" title="参数名称:用户等级">客户等级</label>
                     <v-select :options='$parent.$parent.userlevel' :search='true'
                               :value.sync="model.userlevel"
                               close-on-select

package/src/components/revenue/HandManager/CardHand.vue

@@ -86,7 +86,7 @@
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">用户姓名</label>
                 <input style="width:60%" type="text" class="form-control" v-model="model.f_user_name" placeholder='用户姓名'
-                       condition="f_user_name = '{}'">
+                       condition="f_user_name like '%{}%'">
               </div>
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">用户地址</label>

package/src/filiale/rongcheng/HandManager.vue

@@ -71,7 +71,7 @@
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">客户姓名</label>
                 <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name" placeholder='客户姓名'
-                       condition="f_user_name = '{}'">
+                       condition="f_user_name like '%{}%'">
               </div>
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">小&ensp;&ensp;&ensp;&ensp;区</label>

package/src/filiale/shexian/UserInfoDetailManageNew.vue

@@ -92,7 +92,7 @@
 <script>
   import {HttpResetClass} from 'vue-client'
   // 导入IC卡相关查询界面
-  import ChangeMeterQueryUser from '../../components/common/userinfo_detail/ic_detail/ChangeMeterQueryUser'
+  import ChangeMeterQueryUser from './ic_detail/ChangeMeterQueryUser'
   import ChargeQueryUser from './ChargeQueryUser'
   import ChargeRecordQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeRecordQuery'
   import FillCardQueryUser from '../../components/common/userinfo_detail/ic_detail/FillCardQueryUser'

package/src/filiale/shexian/ic_detail/ChangeMeterQueryUser.vue

@@ -0,0 +1,241 @@
+<template >
+  <div class="flex" style="justify-content: space-between;">
+    <div @keyup.enter="search" style="">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
+          <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+            <div class="row">
+
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">开始时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
+                            class="datepicker"
+                            condition="f_changemeter_date >= '{} 00:00:00' "
+                            placeholder="起始时间"
+                            style="width:60%"
+                            v-model="model.f_start_date"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group" >
+                <label class="font_normal_body" >结束时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
+                            class="datepicker"
+                            condition="f_changemeter_date <= '{} 23:59:59'"
+                            placeholder="结束时间"
+                            style="width:60%"
+                            v-model="model.f_end_date"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">换表类型</label>
+                <v-select :options='$parent.$parent.changeType' :value.sync="model.f_change_type"
+                          close-on-select
+                          condition="f_change_type='{}'"
+                          placeholder='换表类型'
+                          style="width:60%"
+                          v-model="model.f_change_type"
+                ></v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">换表状态</label>
+                <v-select :value.sync="model.f_state" v-model='model.f_state'
+                          style="width:60%"
+                          :options='$parent.$parent.isstates' placeholder='换表状态'
+                          close-on-select
+                          condition="f_state = '{}'"></v-select>
+              </div>
+              <div style="float: right">
+                <button @click="search()" class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
+                <print-data :defaultfield="$parent.$parent.defaultfield" :field="$parent.$parent.fields" :is-selected="true" :model="$parent.$parent.printModel"
+                            @print-data="$parent.$parent.print()" print-name="换表流水" ></print-data>
+              </div>
+
+
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+
+              <th><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>
+              <th><nobr>换表费</nobr></th>
+              <th><nobr>操作人</nobr></th>
+              <th><nobr>状态</nobr></th>
+              <th><nobr>换表日期</nobr></th>
+              <th><nobr>换表原因</nobr></th>
+            </tr>
+          </template>
+          <template partial='body' partial='list' v-ref:grid>
+            <tr >
+
+              <td style="text-align: center;"><nobr>{{row.f_type}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_using_base_old}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_remanent_gas}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_meter_brand_old}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_meternumber_old}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_changemeter_fee}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_state}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_reason}}/{{row.f_othereason}}</nobr></td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+
+  export default {
+    title: '收费',
+    data () {
+      return {
+        condition: '1=1',
+        model: new PagedList('rs/sql/sale_ChangeMeterQuery', 20),
+        // 控制单选
+        radio: [],
+        // 选中的页
+        all: [],
+        isstates: this.$appdata.getParam('是否有效') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('是否有效')] : [],
+        // row数据
+        rowsdata: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userinfo_id',
+        fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_type': '换表类型', 'f_meter_base': '旧表底数', 'f_newmeter_base': '新表底数', 'f_changemeter_fee': '换表费', 'f_operator': '操作员', 'f_changemeter_date': '换表日期'},
+        defaultfield: [
+          'f_userinfo_code', 'f_user_name', 'f_type', 'f_meter_base', 'f_newmeter_base', 'f_changemeter_fee', 'f_operator', 'f_changemeter_date'
+        ],
+        printModel: {
+          rows: []
+        }
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      async search () {
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' `
+        this.model.search(this.condition, this.model)
+        let http = new HttpResetClass()
+        let res = await http.load('POST', 'rs/sql/sale_ChangeMeterQuery', {
+          data: {
+            condition: this.condition
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        this.printModel.rows = res.data
+      },
+      // 多选框初始化
+      selectInit () {
+        this.rowsdata = []
+        this.all = []
+        this.radio = []
+      },
+      print () {
+        this.selectInit()
+      },
+      select () {
+        let index = this.model.pageIndex - 1
+        if (!this.radio[index]) {
+          this.radio.$set(index, [])
+        }
+        if (this.all[index]) {
+          // 数据
+          this.rowsdata[index] = Object.assign([], this.model.rows)
+          // 勾选
+          for (var i = 0; i < this.model.rows.length; i++) {
+            this.radio[index].$set(i, true)
+          }
+        } else {
+          // 数据
+          this.rowsdata[index] = []
+          // 不勾选
+          for (var i = 0; i < this.model.rows.length; i++) {
+            this.radio[index].$set(i, false)
+          }
+        }
+        let z = 0
+        for (let i = 0; i < this.all.length; i++) {
+          for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
+            this.printModel.rows[z++] = this.rowsdata[i][j]
+          }
+        }
+      },
+      selectOne (event, row, i) {
+        let index = this.model.pageIndex - 1
+        if (!this.rowsdata[index]) {
+          this.rowsdata[index] = []
+        }
+        if (!this.radio[index]) {
+          this.radio.$set(index, [])
+        }
+        if (event.target.checked) {
+          // 数据
+          this.rowsdata[index][i] = row
+          // 勾选
+          this.radio[index].$set(i, true)
+          // 判断是否全部选中
+          var allState = true
+          if (this.model.rows.length != this.radio[index].length) {
+            allState = false
+          }
+          for (var state of this.radio[index]) {
+            if (!state) {
+              allState = false
+            }
+          }
+          if (allState) {
+            this.all.$set(index, true)
+          } else {
+            this.all.$set(index, false)
+          }
+        } else {
+          // 数据
+          this.rowsdata[index][i] = []
+          // 不勾选
+          this.radio[index].$set(i, false)
+          // 任意取消一个则全选状态设为false
+          this.all.$set(index, false)
+        }
+        let z = 0
+        this.printModel.rows = []
+        for (let i = 0; i < this.all.length; i++) {
+          for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
+            if (this.rowsdata[i][j] && this.rowsdata[i][j].f_user_id) {
+              this.printModel.rows[z++] = this.rowsdata[i][j]
+            }
+          }
+        }
+      }
+    },
+    computed: {
+      ischecked () {
+        return function (index, i) {
+          if (!this.radio[index]) {
+            return false
+          }
+          return this.radio[index][i]
+        }
+      },
+      changeType () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('换表类型')]
+      }
+    }
+  }
+</script>