sale-client 4.1.230 → 4.2.1-ronghao

package/src/filiale/jiaxian/ChangeRecord.vue

@@ -28,6 +28,12 @@
 
               <div style="float: right">
                 <button @click="search()"  class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
+                <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
+                              :field="$parent.$parent.fields" :header="$parent.$parent.other"
+                              sqlurl="api/af-revenue/logic/saleExport"
+                              :sql-name="'getChangeRecord'"
+                              template-name='变更查询导出'
+                              :choose-col="true"></export-excel>
                 <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>
@@ -96,11 +102,13 @@
         rowsdata: [],
         fields: {'f_userinfo_code': '用户编号',
           'f_user_name': '姓名',
+          'f_field_name': '修改列',
           'f_used_content': '旧修改内容',
           'f_new_content': '新修改内容',
           'f_state': '操作状态',
           'f_operator': '操作人',
-          'f_operate_date': '操作日期'},
+          'f_operate_date': '操作日期'
+        },
         defaultfield: [
           'f_userinfo_code',
           'f_user_name',
@@ -112,7 +120,11 @@
         ],
         printModel: {
           rows: []
-        }
+        },
+        other: [],
+        footer: [],
+        // 合计数据
+        sumsmodel: {}
       }
     },
     props: ['row'],
@@ -125,6 +137,23 @@
       // }
     },
     methods: {
+      getotherfooter () {
+        // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+        // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+        this.other = []
+        this.footer = []
+        // let exportdata = this.getCondition;
+        let otherInData = []
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
+        let footerData = [], exportfield = this.fields
+        footerData.push('合计')
+        let self = this
+        for (var field in self.sumsmodel) {
+          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`)
+        }
+        this.footer.push(footerData)
+        this.other.push(otherInData)
+      },
       async search () {
         this.condition = `f_userinfo_id = '${this.row.f_userinfo_id}' and f_orgid = '${this.$login.f.orgid}' and  ${this.$refs.paged.$refs.criteria.condition}`
         this.model.search(this.condition, this.model)
@@ -228,6 +257,19 @@
           }
           return this.radio[index][i]
         }
+      },
+      getCondition () {
+        return {
+          condition: this.condition
+        }
+      }
+    },
+    watch: {
+      sumsmodel: {
+        handler: function (val) {
+          this.getotherfooter()
+        },
+        deep: true
       }
     }
   }

package/src/filiale/jiaxian/FillCardQueryUser.vue

@@ -0,0 +1,250 @@
+<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_operate_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_operate_date <= '{} 23:59:59' "
+                            placeholder="结束时间"
+                            style="width:60%"
+                            v-model="model.f_end_date"
+                ></datepicker>
+              </div>
+
+              <div style="float: right">
+                <button @click="search()" class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
+                <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
+                              :field="$parent.$parent.fields" :header="$parent.$parent.other"
+                              sqlurl="api/af-revenue/logic/saleExport"
+                              :sql-name="'sale_FillCardQuery'"
+                              template-name='补卡查询导出'
+                              :choose-col="true"></export-excel>
+                <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>
+            </tr>
+          </template>
+          <template partial='body' partial='list' v-ref:grid>
+            <tr >
+              <td style="text-align: center;"><nobr>{{row.f_card_id}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_ispick_table}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_reason}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_cardfees}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_operate_date}}</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('api/af-revenue/sql/sale_FillCardQuery', 20),
+        // 控制单选
+        radio: [],
+        // 选中的页
+        all: [],
+        // row数据
+        rowsdata: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
+        fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_card_id': '卡号', 'f_meter_brand': '气表品牌', 'f_reason': '补卡原因', 'f_cardfees': '卡费', 'f_operate_date': '补卡日期'},
+        defaultfield: [
+          'f_userinfo_code', 'f_user_name', 'f_card_id', 'f_meter_brand', 'f_reason', 'f_cardfees', 'f_operate_date'
+        ],
+        printModel: {
+          rows: []
+        },
+        other: [],
+        footer: [],
+        // 合计数据
+        sumsmodel: {}
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.search()
+    },
+    methods: {
+      getotherfooter () {
+        // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+        // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+        this.other = []
+        this.footer = []
+        // let exportdata = this.getCondition;
+        let otherInData = []
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
+        let footerData = [], exportfield = this.fields
+        footerData.push('合计')
+        let self = this
+        for (var field in self.sumsmodel) {
+          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`)
+        }
+        this.footer.push(footerData)
+        this.other.push(otherInData)
+      },
+      async search () {
+        if (this.row.f_meter_type.includes('卡表')) {
+          this.condition = `${this.searchValue} = '${this.row[this.searchValue]}' `
+          if (this.$refs.paged.$refs.criteria.condition) {
+            this.condition += `and ${this.$refs.paged.$refs.criteria.condition}`
+          }
+          this.model.search(this.condition, this.model)
+          let http = new HttpResetClass()
+          let res = await http.load('POST', 'api/af-revenue/sql/sale_FillCardQuery', {
+            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]
+        }
+      },
+      fillcardType () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('补卡类型')]
+      },
+      getCondition () {
+        return {
+          condition: this.condition
+        }
+      }
+    },
+    watch: {
+      sumsmodel: {
+        handler: function (val) {
+          this.getotherfooter()
+        },
+        deep: true
+      }
+    }
+  }
+</script>

package/src/filiale/jiaxian/FillGasQueryUser.vue

@@ -0,0 +1,270 @@
+<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.f_operate_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.f_type  <= '{} 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.fillgasType' :value.sync="model.f_type "
+                          close-on-select
+                          condition="f.f_type ='{}'"
+                          placeholder='补气类型'
+                          v-model="model.f_type "></v-select>
+              </div>
+              <div style="float: right">
+                <button @click="search()" class="button_search"  style="margin-right: 10px" v-el:cba>查询</button>
+                <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
+                              :field="$parent.$parent.fields" :header="$parent.$parent.other"
+                              sqlurl="api/af-revenue/logic/saleExport"
+                              :sql-name="'sale_FillGasQuery'"
+                              template-name='补气查询导出'
+                              :choose-col="true"></export-excel>
+                <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>
+            </tr>
+          </template>
+          <template partial='body' partial='list' v-ref:grid>
+            <tr >
+              <td style="text-align: center;"><nobr>{{row.f_pregas}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_preamount}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_type }}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_comments}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+    <table class="table-hover">
+      <tr class="table-bordered" style="position: relative">
+        <td
+          style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+          汇总信息
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          气量合计:&emsp;{{model.sums.f_pregas}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          金额合计:&emsp;{{model.sums.f_preamount}}
+        </td>
+      </tr>
+    </table>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+
+  export default {
+    title: '收费',
+    data () {
+      return {
+        condition: '1=1',
+        model: new PagedList('api/af-revenue/sql/sale_FillGasQuery', 20, {}, {
+          f_pregas: 0,
+          f_preamount: 0
+        }),
+        // 控制单选
+        radio: [],
+        // 选中的页
+        all: [],
+        // row数据
+        rowsdata: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
+        fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_pregas': '补气量', 'f_preamount': '补气金额', 'f_type ': '补气类型', 'f_operate_date': '补气日期'},
+        defaultfield: [
+          'f_userinfo_code', 'f_user_name', 'f_pregas', 'f_preamount', 'f_type ', 'f_operate_date'
+        ],
+        printModel: {
+          rows: []
+        },
+        other: [],
+        footer: [],
+        // 合计数据
+        sumsmodel: {}
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.sumsmodel= this.$refs.paged.$refs.grid.model.sums
+      this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      getotherfooter () {
+        // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+        // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+        this.other = []
+        this.footer = []
+        // let exportdata = this.getCondition;
+        let otherInData = []
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
+        let footerData = [], exportfield = this.fields
+        footerData.push('合计')
+        let self = this
+        for (var field in self.sumsmodel) {
+          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`)
+        }
+        this.footer.push(footerData)
+        this.other.push(otherInData)
+      },
+      async search () {
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f.${this.searchValue} = '${this.row[this.searchValue]}'`
+        this.model.search(this.condition, this.model)
+        let http = new HttpResetClass()
+        let res = await http.load('POST', 'api/af-revenue/sql/sale_FillGasQuery', {
+          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]
+        }
+      },
+      fillgasType () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('补气类型')]
+      },
+      getCondition () {
+        return {
+          condition: this.condition
+        }
+      }
+    },
+    watch: {
+      sumsmodel: {
+        handler: function (val) {
+          this.getotherfooter()
+        },
+        deep: true
+      }
+    }
+  }
+</script>