manage-client 1.22.61-ca → 1.22.63-ca

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "1.22.61-ca",
+  "version": "1.22.63-ca",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/sale/config/exportConfig.js

@@ -58,6 +58,7 @@ export default{
     'f_type': '收费类型',
     'f_state': '状态',
     'f_operate_date': '收费日期',
+    'f_write_date': '写卡时间',
     'f_operator': '操作员',
     'f_filiale': '售气单位',
     'f_outlets': '售气部门',

package/src/components/webmeter/DrillData/NewUserGasAll.vue

@@ -35,7 +35,7 @@
                     <button @click="$parent.$parent.clearmsg" class="button_clear button_spacing">清空</button>
                     <export-excel :data="{condition:$parent.$parent.condition,startDate:model.startDate,endDate:model.endDate,orderitem:$parent.$parent.orderDefault}"
                                   :field="$parent.$parent.getfield"
-                                  sqlurl="rs/logic/exportfile" sql-name="webmeter_getUserGasList" template-name='表具查询'
+                                  sqlurl="rs/logic/exportfile" sql-name="getNewUserGasAll" template-name='表具查询'
                                   v-ref:exports
                                   :choose-col="true"></export-excel>
                     <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
@@ -313,128 +313,128 @@
   </div>
 </template>
 <script>
-  import {PagedList} from 'vue-client'
-  import UserGasEcharts from './UserGasEcharts'
-  import * as Util from '../../../Util'
-  import getLodop from '../../../plugins/LodopFuncs'
-  import plugins from '../../../plugins/GetLoginInfoService'
-  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
-  export default {
-    title: '用气分析',
-    props: ['data'],
-    components: {UserGasEcharts},
-    data() {
-      return {
-        model: new PagedList('/rs/sql/getNewUserGasAll', 20, {
-          startDate: 'this.model.startDate',
-          endDate: 'this.model.endDate'
-        }, {
-          f_oughtamount: 0,
-          f_oughtfee: 0
-        }),
-        orderFields: {
-          f_meternumber: 'no',
-          f_oughtamount: 'no'
-        },
-        getGroupNameByDate: [
-          {label: '年份', value: 'year'},
-          {label: '月份', value: 'month'},
-          {label: '周', value: 'week'}
-        ],
-        meterbrands: [],
-        criteriaShow: false,
-        orderDefault:'f_meternumber',
-        reportStr: null,
-        show: false,
-        initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[]
-        },
-        outlets: [],
-        operator: [],
-        filename: '',
-        searchshow: true,
-        startDate: '',
-        endDate: '',
-        echarts: false,
-        isActiveTotalForm: false,
-        condition: '1=1',
-        getfield: {},
-        config: {
-          excelHeaders: {
-            'f_userinfo_code':'客户编号',
-            'f_user_type':'客户类型',
-            'f_gasproperties': '用气性质',
-            'f_user_name': '客户名称',
-            'f_address':'用气地址',
-            'f_meternumber': '表号',
-            'f_balance':'期初余额(元)',
-            'f_last_tablebase': '上期底数',
-            'f_tablebase':'本期底数',
-            'f_last_hand_date':'上期上报时间',
-            'f_end_hand_date':'本期上报时间',
-            'f_oughtamount':'用气量(m³)',
-            'days':'用气天数',
-            'aveg':'平均用气量(m³)',
-            'f_oughtfee':'用气金额(元)',
-            'f_curbalance':'期末结余(元)'
-          }
-        },
-        groupname: ['year'],
-        getgroupname: [
-          {label: '年份', value: 'year'},
-          {label: '月份', value: 'month'},
-          {label: '周', value: 'week'},
-          {label: '日', value: 'day'}
-        ],
-        // orgCondtionStr: ' and h.f_orgid in (' + this.$login.f.orgid + ')',
-        orgCondtionStr: '(' + this.$login.f.orgid + ')',
-        orgid:[this.$login.f.orgid]
-      }
-    },
-    ready() {
-      this.$refs.paged.$refs.cri.model.startDate = Util.toStartDate() + ' 00:00:00'
-      this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
-      this.$LoadParams.loadParam()
-      // this.$refs.paged.$refs.cri.search()
-      this.getfield = this.config.excelHeaders
-    },
-    methods: {
-      sort (field, rule) {
-        console.log(rule)
-        // 将所有排序方式设为不排序，实现相互排斥
-        for (let key in this.orderFields) {
-          if (key === field) {
-            this.orderFields[key] = rule
-          } else {
-            this.orderFields[key] = 'no'
-          }
-        }
-        this.startDate = this.$refs.paged.$refs.cri.model.startDate
-        this.endDate = this.$refs.paged.$refs.cri.model.endDate
-        if (this.endDate == '' || this.startDate == '') {
-          return this.$showMessage("时间区间的开始和结束时间不能为空！")
+import {PagedList} from 'vue-client'
+import UserGasEcharts from './UserGasEcharts'
+import * as Util from '../../../Util'
+import getLodop from '../../../plugins/LodopFuncs'
+import plugins from '../../../plugins/GetLoginInfoService'
+import plugin from 'system-clients/src/plugins/GetLoginInfoService'
+export default {
+  title: '用气分析',
+  props: ['data'],
+  components: {UserGasEcharts},
+  data() {
+    return {
+      model: new PagedList('/rs/sql/getNewUserGasAll', 20, {
+        startDate: 'this.model.startDate',
+        endDate: 'this.model.endDate'
+      }, {
+        f_oughtamount: 0,
+        f_oughtfee: 0
+      }),
+      orderFields: {
+        f_meternumber: 'no',
+        f_oughtamount: 'no'
+      },
+      getGroupNameByDate: [
+        {label: '年份', value: 'year'},
+        {label: '月份', value: 'month'},
+        {label: '周', value: 'week'}
+      ],
+      meterbrands: [],
+      criteriaShow: false,
+      orderDefault: 'f_meternumber',
+      reportStr: null,
+      show: false,
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
+      },
+      outlets: [],
+      operator: [],
+      filename: '',
+      searchshow: true,
+      startDate: '',
+      endDate: '',
+      echarts: false,
+      isActiveTotalForm: false,
+      condition: '1=1',
+      getfield: {},
+      config: {
+        excelHeaders: {
+          'f_userinfo_code': '客户编号',
+          'f_user_type': '客户类型',
+          'f_gasproperties': '用气性质',
+          'f_user_name': '客户名称',
+          'f_address': '用气地址',
+          'f_meternumber': '表号',
+          'f_balance': '期初余额(元)',
+          'f_last_tablebase': '上期底数',
+          'f_tablebase': '本期底数',
+          'f_last_hand_date': '上期上报时间',
+          'f_end_hand_date': '本期上报时间',
+          'f_oughtamount': '用气量(m³)',
+          'days': '用气天数',
+          'aveg': '平均用气量(m³)',
+          'f_oughtfee': '用气金额(元)',
+          'f_curbalance': '期末结余(元)'
         }
-        // 如果新规则不排序，还原为默认排序
-        if (rule === 'no') {
-          this.model.paramSource.orderitem = `'${this.orderDefault}'`
+      },
+      groupname: ['year'],
+      getgroupname: [
+        {label: '年份', value: 'year'},
+        {label: '月份', value: 'month'},
+        {label: '周', value: 'week'},
+        {label: '日', value: 'day'}
+      ],
+      // orgCondtionStr: ' and h.f_orgid in (' + this.$login.f.orgid + ')',
+      orgCondtionStr: '(' + this.$login.f.orgid + ')',
+      orgid: [this.$login.f.orgid]
+    }
+  },
+  ready() {
+    this.$refs.paged.$refs.cri.model.startDate = Util.toStartDate() + ' 00:00:00'
+    this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
+    this.$LoadParams.loadParam()
+    // this.$refs.paged.$refs.cri.search()
+    this.getfield = this.config.excelHeaders
+  },
+  methods: {
+    sort(field, rule) {
+      console.log(rule)
+      // 将所有排序方式设为不排序，实现相互排斥
+      for (let key in this.orderFields) {
+        if (key === field) {
+          this.orderFields[key] = rule
         } else {
-          this.model.paramSource.orderitem = `'${field} ${rule}'`
+          this.orderFields[key] = 'no'
         }
-        this.$refs.paged.$refs.cri.search()
-        let condition = this.$refs.paged.$refs.cri.condition
-        console.log(this.model.paramSource)
-        this.model.search(condition)
-        // this.userSearch()
-      },
-      // 查询开关
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
-      SaveAsFile(str) {
-        this.$showMessage('您是否需要导出本页数据？', ['confirm', 'cancel']).then((res) => {
-          if (res === 'confirm') {
+      }
+      this.startDate = this.$refs.paged.$refs.cri.model.startDate
+      this.endDate = this.$refs.paged.$refs.cri.model.endDate
+      if (this.endDate == '' || this.startDate == '') {
+        return this.$showMessage("时间区间的开始和结束时间不能为空！")
+      }
+      // 如果新规则不排序，还原为默认排序
+      if (rule === 'no') {
+        this.model.paramSource.orderitem = `'${this.orderDefault}'`
+      } else {
+        this.model.paramSource.orderitem = `'${field} ${rule}'`
+      }
+      this.$refs.paged.$refs.cri.search()
+      let condition = this.$refs.paged.$refs.cri.condition
+      console.log(this.model.paramSource)
+      this.model.search(condition)
+      // this.userSearch()
+    },
+    // 查询开关
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    SaveAsFile(str) {
+      this.$showMessage('您是否需要导出本页数据？', ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
           let style = '<style>' +
             'td {border-width: 1px;padding: 2px;border-style: solid; border-color:black; border-collapse:collapse;} .tdright{text-align: right;}  .tdcenter{text-align: center;}</style>';
           let strHtml = style + document.getElementById(str).innerHTML;
@@ -445,153 +445,156 @@
           LODOP.SAVE_TO_FILE('用气分析.xls')
         }
       })
-      },
-      clearmsg() {
-        this.$refs.paged.$refs.cri.model = {}
-      },
-      initParams() {
-        // 初始化气表品牌
-        let brandArr = []
-        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
-          let temp = {}
-          temp.label = item.label
+    },
+    clearmsg() {
+      this.$refs.paged.$refs.cri.model = {}
+    },
+    initParams() {
+      // 初始化气表品牌
+      let brandArr = []
+      this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+        let temp = {}
+        temp.label = item.label
         temp.value = item.value.f_meter_brand
         brandArr.push(temp)
       })
-        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
-      },
-      getPricenames (model) {
-        let f_user_type = model.f_user_type
-        let f_gasproperties = model.f_gasproperties
-        let f_price_type = model.f_price_type
-        console.log('气价。，。。', f_user_type, f_gasproperties, f_price_type)
-        let rs = []
-        if (f_user_type.length === 1 && f_gasproperties.length === 1 && f_price_type.length === 1) {
-          let params = {
-            f_user_type: f_user_type[0],
-            f_gasproperties: f_gasproperties[0],
-            f_price_type: f_price_type[0],
-            filter: this.$login.f.f_fengongsi
-          }
-          rs = this.$GetSaleParam.getPrice(params)
-        }
-        if (rs.length === 0) {
-          // this.row.f_price_name = ''
-        }else{
-          for(let i=0;i<rs.length;i++){
-            rs[i].lable = rs[i].lable
-            rs[i].value = rs[i].value.f_price_id
-          }
+      this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+    },
+    getPricenames(model) {
+      let f_user_type = model.f_user_type
+      let f_gasproperties = model.f_gasproperties
+      let f_price_type = model.f_price_type
+      console.log('气价。，。。', f_user_type, f_gasproperties, f_price_type)
+      let rs = []
+      if (f_user_type.length === 1 && f_gasproperties.length === 1 && f_price_type.length === 1) {
+        let params = {
+          f_user_type: f_user_type[0],
+          f_gasproperties: f_gasproperties[0],
+          f_price_type: f_price_type[0],
+          filter: this.$login.f.f_fengongsi
         }
-        return rs
-      },
-      search(args) {
-        this.model.paramSource.orderitem =this.model.paramSource.orderitem ? this.model.paramSource.orderitem: `'${this.orderDefault}'`
-        this.startDate = this.$refs.paged.$refs.cri.model.startDate
-        this.endDate = this.$refs.paged.$refs.cri.model.endDate
-        if (this.endDate == '' || this.startDate == '') {
-          return this.$showMessage("时间区间的开始和结束时间不能为空！")
+        rs = this.$GetSaleParam.getPrice(params)
+      }
+      if (rs.length === 0) {
+        // this.row.f_price_name = ''
+      } else {
+        for (let i = 0; i < rs.length; i++) {
+          rs[i].lable = rs[i].lable
+          rs[i].value = rs[i].value.f_price_id
         }
-        // this.condition = this.$refs.paged.$refs.cri.condition + ` ${this.orgCondtionStr}`
-        if (this.orgCondtionStr)
-          this.condition = this.$refs.paged.$refs.cri.condition
-        else
-          this.condition = this.$refs.paged.$refs.cri.condition
-        args.condition = this.condition
-        this.model.search(args.condition, args.model)
-      },
-      // 显示柱状图
-      showEcharts() {
-        this.echarts = true
-        this.isActiveTotalForm = false
-      },
-      notShowTotalForm() {
-        this.echarts = false
-        this.isActiveTotalForm = false
-      },
-      // 不显示柱状图
-      notShowEcharts() {
-        this.echarts = false
-        this.isActiveTotalForm = false
-      },
-      // 显示汇总数据表格
-      showTotalForm() {
-        this.echarts = false
-        this.isActiveTotalForm = true
-      },
-      close() {
-        this.show = false
-      },
-      getRes(obj) {
-        this.orgCondtionStr = plugins.convertToIn(obj)
-      },
-      getorg(obj) {
-        this.orgCondtionStr = plugin.convertToIn(obj.resids)?plugin.convertToIn(obj.resids):'(' + this.$login.f.orgid + ')'
       }
-      // getRes(condition,obj) {
-      //   this.orgCondtionStr = condition
-      //   this.orgname = obj.orgnames[0]
-      //   this.depname = obj.depnames[0]
-      // }
+      return rs
     },
-    watch: {
-      'data'(val) {
-        if (val.f_files_path) {
-          this.getFileContent(val.f_files_path)
-        } else {
-          this.reportStr = null
-        }
+    search(args) {
+      this.model.paramSource.orderitem = this.model.paramSource.orderitem ? this.model.paramSource.orderitem : `'${this.orderDefault}'`
+      this.startDate = this.$refs.paged.$refs.cri.model.startDate
+      this.endDate = this.$refs.paged.$refs.cri.model.endDate
+      if (this.endDate == '' || this.startDate == '') {
+        return this.$showMessage("时间区间的开始和结束时间不能为空！")
       }
+      // this.condition = this.$refs.paged.$refs.cri.condition + ` ${this.orgCondtionStr}`
+      if (this.orgCondtionStr)
+        this.condition = this.$refs.paged.$refs.cri.condition
+      else
+        this.condition = this.$refs.paged.$refs.cri.condition
+      args.condition = this.condition
+      this.model.search(args.condition, args.model)
     },
-    computed: {
-      Gasusertype() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
-      },
-      valveStatus() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
-      },
-      pricetype() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
-      },
-      Gasproperties() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
-      },
-      f_opera_area() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('运营区域')]
-      },
-      f_distinct() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('行政区域')]
-      },
-      deviceType() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('设备类型')]
-      },
-      // 抄表员下拉框数据
-      inputtors () {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表员')]
+    // 显示柱状图
+    showEcharts() {
+      this.echarts = true
+      this.isActiveTotalForm = false
+    },
+    notShowTotalForm() {
+      this.echarts = false
+      this.isActiveTotalForm = false
+    },
+    // 不显示柱状图
+    notShowEcharts() {
+      this.echarts = false
+      this.isActiveTotalForm = false
+    },
+    // 显示汇总数据表格
+    showTotalForm() {
+      this.echarts = false
+      this.isActiveTotalForm = true
+    },
+    close() {
+      this.show = false
+    },
+    getRes(obj) {
+      this.orgCondtionStr = plugins.convertToIn(obj)
+    },
+    getorg(obj) {
+      this.orgCondtionStr = plugin.convertToIn(obj.resids) ? plugin.convertToIn(obj.resids) : '(' + this.$login.f.orgid + ')'
+    }
+    // getRes(condition,obj) {
+    //   this.orgCondtionStr = condition
+    //   this.orgname = obj.orgnames[0]
+    //   this.depname = obj.depnames[0]
+    // }
+  },
+  watch: {
+    'data'(val) {
+      if (val.f_files_path) {
+        this.getFileContent(val.f_files_path)
+      } else {
+        this.reportStr = null
       }
     }
+  },
+  computed: {
+    Gasusertype() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+    valveStatus() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
+    },
+    pricetype() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
+    },
+    Gasproperties() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+    },
+    f_opera_area() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('运营区域')]
+    },
+    f_distinct() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('行政区域')]
+    },
+    deviceType() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('设备类型')]
+    },
+    // 抄表员下拉框数据
+    inputtors() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表员')]
+    }
   }
+}
 </script>
 <style>
-  .mystyle {
-    float: right;
-    padding-right: 10%;
-  }
-  .mystyle1 {
-    padding-top: 10px;
-  }
-  .mystyle2 {
-    width: 100%;
-    height: 35px;
-    /*background: #00A3F0;*/
-    padding-left: 15px;
-    float: left;
-  }
-  .datapanel {
-    color: #333;
-    background-color: white;
-    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
-    padding: 10px 10px 10px 10px;
-    border-radius: 15px;
-  }
+.mystyle {
+  float: right;
+  padding-right: 10%;
+}
+
+.mystyle1 {
+  padding-top: 10px;
+}
+
+.mystyle2 {
+  width: 100%;
+  height: 35px;
+  /*background: #00A3F0;*/
+  padding-left: 15px;
+  float: left;
+}
+
+.datapanel {
+  color: #333;
+  background-color: white;
+  box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
+  padding: 10px 10px 10px 10px;
+  border-radius: 15px;
+}
 </style>

package/src/reportManage.js

@@ -25,7 +25,7 @@ export default function () {
     require(['./components/WebReport/UserGasAll'], resolve)
   })
   Vue.component('new-user-gas-all', (resolve) => {
-    require(['./components/WebReport/NewUserGasAll'], resolve)
+    require(['./components/webmeter/DrillData/NewUserGasAll'], resolve)
   })
   // 报表展示组件(异常统计报表)
   Vue.component('abnormal-info', (resolve) => {