manage-client 3.3.8 → 3.3.9

package/src/filiale/shanxian/ChargeQuery.vue

@@ -339,7 +339,7 @@
             </div>
           </criteria>
 
-          <data-grid :model="model" partial='list' class="list_area table_sy" style="height: 95%" v-ref:grid>
+          <data-grid :model="model" partial='list' class="list_area table_sy" style="height: 95%" :modelval="$parent.$parent.modelval" v-ref:grid >
             <template partial='head'>
               <tr>
                 <th>
@@ -824,7 +824,7 @@
       </footer>
     </modal>
   </div>
-  <high-meter-idcard :show.sync="false"  v-ref:highcard  ></high-meter-idcard>
+<!--  <high-meter-idcard :show.sync="false"  v-ref:highcard  ></high-meter-idcard>-->
 </template>
 
 <script>
@@ -862,6 +862,7 @@
     await self.$MagLoadParams.loadParam()
     self.initParams()
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
+    self.$refs.paged.$refs.grid.modelval = self.modelval
   }
   export default {
     props:['data'],
@@ -953,6 +954,7 @@
         //   {label: '二阶', value: '二阶'},
         //   {label: '三阶', value: '三阶'}
         // ]
+        modelval: ['用户编号','用户名称','用户地址','用户型号','用气性质','气量','收款','收费日期','一阶单价','二阶单价','三阶单价']
       }
     },
     ready() {
@@ -1005,14 +1007,14 @@
         cardBtnGen(this, val)
       },
       async initmeterbook(orgstr){
-        if(orgstr == null ){
-          orgstr = this.f_filialeid;
-        }
-        //获取新的抄表册,先去清理所有的抄表册
-        this.$GetSaleParam.meterbooks = [];
-        //开始加载新的抄表册
-        await this.$LoadParams.loadMeterBook(orgstr)
-        this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
+        // if(orgstr == null ){
+        //   orgstr = this.f_filialeid;
+        // }
+        // //获取新的抄表册,先去清理所有的抄表册
+        // this.$GetSaleParam.meterbooks = [];
+        // //开始加载新的抄表册
+        // await this.$LoadParams.loadMeterBook(orgstr)
+        // this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
       },
       async getinputtores () {
         // 获取抄表员
@@ -1106,7 +1108,7 @@
         //初始化气表价格
         this.prices = this.$MagGetSaleParam.getPrices();
       },
-      selfSearch(args) {
+      async selfSearch(args) {
         if (this.data) {
           this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
           this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
@@ -1120,10 +1122,12 @@
         if(this.IdCardInfo!=''){
           args.condition +=` and f_idnumber='${this.IdCardInfo}'`
         }
-        this.model.search(args.condition, args.model)
+        await this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
         this.card=''
         this.IdCardInfo=''
+        await this.$refs.paged.$refs.grid.InitializedData()
+        await this.$refs.paged.$refs.grid.displayColumnSettings(undefined)
       },
       clear() {
         //清空部门和人员

package/src/filiale/wenxi/GasDeviceQuery.vue

@@ -45,7 +45,10 @@
                   <div class="span" style="float:right;">
                     <button class="button_search button_spacing" @click="search()">查询</button>
                     <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
-                    <button  class="button_clear button_spacing"  style="margin-top: 10px;background-color: #6aa6e2;"  @click="$parent.$parent.downloadFiles()">导出</button>
+                    <export-excel :data="$parent.$parent.getCondition"
+                                  :field="$parent.$parent.getExportField"
+                                  sqlurl="rs/wxEasyExcel/gasDeviceExport" sql-name="myGasDeviceQuery" template-name='民用用气设备查询'
+                                  :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>
                   </div>
                 </div>
@@ -187,7 +190,7 @@
                   <th colspan="6"><nobr>燃气灶具连接管</nobr></th>
                   <th colspan="5"><nobr>燃气热水器</nobr></th>
                   <th colspan="5"><nobr>燃气壁挂炉</nobr></th>
-                  <th colspan="5"><nobr>燃气保险信息</nobr></th>
+                  <th colspan="4"><nobr>燃气保险信息</nobr></th>
                   <th colspan="2"><nobr>初次充值信息</nobr></th>
 <!--                  <th colspan="2"><nobr>每年充值</nobr></th>-->
                   <th colspan="7"><nobr>安检信息</nobr></th>
@@ -805,33 +808,6 @@
         }
         this.residentialArea = house
       },
-      async downloadFiles() {
-        if (this.condition2) {
-          let data = {
-            sqlName: 'myGasDeviceQuery',
-            condition: this.condition2,
-            fileName: '民用用气设备查询'
-          }
-          let HttpReset = new HttpResetClass()
-          let res = await HttpReset.load('POST', 'rs/deviceExport/gasDevices', {
-            data: data
-          }, {resolveMsg: null, rejectMsg: null})
-          if (res){
-            let downurl = 'rs/deviceExport/download?filename=民用用气设备查询.xlsx';
-            this.$resetget(downurl, {}).then(res => {
-              var link = document.createElement('a');
-              link.target = "_blank"
-              link.href = downurl;
-              link.setAttribute("download", "民用用气设备查询.xlsx"); //指定下载后的文件名，防跳转
-              document.body.appendChild(link);
-              link.click();
-            })
-          }
-        } else {
-          this.$showAlert('查询条件为空，请查询后再导出', 'warning', 3000)
-          return
-        }
-      },
       //把数据库查询数据转换为下拉数据
       calculate(rows){
         let data = []
@@ -1002,7 +978,7 @@
         return data
       },
       getExportField() {
-        return exportConfig.userConfig
+        return exportConfig.gasDeviceConfig
       },
       addressstate() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]

package/src/filiale/wenxi/config/exportConfig.js

@@ -910,7 +910,64 @@ export default{
     'f_overCurrentProtection': '过流保护',
     'f_die_meter': '死表',
     'f_upload_type': '上报类型'
+  },
+  gasDeviceConfig: {
+    'f_userinfo_code': '客户编号',
+    'f_user_name': '客户名称',
+    'f_idnumber': '身份证号',
+    'f_user_phone': '联系电话',
+    'f_residential_area': '小区名称',
+    'f_address': '客户地址',
+    'f_user_state': '客户状态',
+    'f_meter_brand': '品牌',
+    'f_meternumber': '表号',
+    'f_meter_type': '类型',
+    'f_table_state': '型号',
+    'f_meter_style': '表向',
+    'f_aroundmeter': '上报类型',
+    'f_position': '安装位置',
+    'f_install_date': '安装日期',
+    'f_createfile_date': '建档日期',
+    'f_contract_date': '合同日期',
+    'f_open_date': '开户日期',
+    'f_open_person': '开户操作人',
+    'f_gas_date': '通气日期',
+    'f_gas_person': '通气人员',
+    'ventilation_years': '通气年限',
+    'alarm_brand': '报警器品牌',
+    'alarm_num': '数量',
+    'alarm_make_date': '生产日期',
+    'alarm_exp_date': '超期提醒',
+    'zaoju_brand': '灶具品牌',
+    'zaoju_num': '数量',
+    'zaoju_make_date': '生产日期',
+    'zaoju_exp_date': '超期提醒',
+    'f_has_pepe': '有无不锈钢波纹管',
+    'f_pipe_num': '数量',
+    'f_is_zibifa': '有无自闭阀',
+    'f_zibifa_num': '数量',
+    'zaoju_pipe_expdate': '超期提醒',
+    'reshui_brand': '品牌',
+    'reshui_num': '数量',
+    'reshui_make_date': '生产日期',
+    'reshui_exp_date': '超期提醒',
+    'bigua_brand': '品牌',
+    'bigua_num': '数量',
+    'bigua_make_date': '生产日期',
+    'bigua_exp_date': '超期提醒',
+    'f_fee_type': '类型',
+    'f_money': '金额(元)',
+    'fee_operate_date': '日期',
+    'f_expiration_date': '充值时间',
+    'f_min_operate_date': '金额(元)',
+    'f_preamount': '安检日期',
+    'f_upload_date': '安检人员',
+    'f_checker_name': '用气总量',
+    'f_total_gas': '总充值额',
+    'f_balance_gas': '剩余气量',
+    'f_defect_content': '发现问题',
+    'f_repair_date': '整改日期',
+    'f_comments': '备注'
   }
-
 }
 

package/src/main.js

@@ -1,72 +1,66 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-
-// import { sale } from 'sale-client'
-import { system } from 'system-clients'
-import { ldap } from 'ldap-clients'
-import saleManage from './saleManage'
-import webmeterManage from './webmeterManage'
-import reportManage from './reportManage'
-import FilialeSaleManage from './filiale/qianneng/sale'
-import FilialeWebmeterManage from './filiale/qianneng/webmeterManage'
-import FilialeReportManage from './filiale/qianneng/reportManage'
-import newmanage from './newmanage'
-import ManageHome from './ManageHome'
-import echarts from 'echarts'
-import AMap from 'vue-amap'
-
-Vue.config.silent = true
-// Vue.mmType = 'AES'
-
-Vue.use(AMap);
-
-// 初始化vue-amap
-AMap.initAMapApiLoader({
-  // 高德key
-  key: '3cec9ae8e2349207f7ac29279e3f4abe',
-  // 插件集合 （插件按需引入）
-  plugin: [
-    "AMap.Autocomplete", //输入提示插件
-    "AMap.PlaceSearch", //POI搜索插件
-    "AMap.Scale", //右下角缩略图插件 比例尺
-    "AMap.OverView", //地图鹰眼插件
-    "AMap.ToolBar", //地图工具条0
-    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    "AMap.PolyEditor", //编辑 折线多，边形
-    "AMap.CircleEditor", //圆形编辑器插件
-    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
-  ],
-  uiVersion: "1.0"
-});
-/** **************************通用组件******************************/
-
-Vue.prototype.$echarts = echarts
-all()
-// sale()
-ldap()
-system(false)
-
-saleManage()
-webmeterManage()
-ManageHome()
-newmanage()
-reportManage()
-FilialeSaleManage()
-FilialeWebmeterManage()
-FilialeReportManage()
-require('system-clients/src/styles/less/bootstrap.less')
-require('./components/qinhua/Style/qinhuaStyle.less')
-// require('./bootstrap/less/manageStyle/manageChile.less')
-// require('./bootstrap/less/manageStyle/safeStyle.less')
-
-//大屏展示要放开的样式
-// require('system-clients/src/styles/less/manageStyle/manageChile.less')
-// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
-// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
-
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+
+// import { sale } from 'sale-client'
+import { system } from 'system-clients'
+import { ldap } from 'ldap-clients'
+import saleManage from './saleManage'
+import webmeterManage from './webmeterManage'
+import reportManage from './reportManage'
+import newmanage from './newmanage'
+import ManageHome from './ManageHome'
+import echarts from 'echarts'
+import AMap from 'vue-amap'
+
+Vue.config.silent = true
+// Vue.mmType = 'AES'
+
+Vue.use(AMap);
+
+// 初始化vue-amap
+AMap.initAMapApiLoader({
+  // 高德key
+  key: '3cec9ae8e2349207f7ac29279e3f4abe',
+  // 插件集合 （插件按需引入）
+  plugin: [
+    "AMap.Autocomplete", //输入提示插件
+    "AMap.PlaceSearch", //POI搜索插件
+    "AMap.Scale", //右下角缩略图插件 比例尺
+    "AMap.OverView", //地图鹰眼插件
+    "AMap.ToolBar", //地图工具条0
+    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    "AMap.PolyEditor", //编辑 折线多，边形
+    "AMap.CircleEditor", //圆形编辑器插件
+    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
+  ],
+  uiVersion: "1.0"
+});
+/** **************************通用组件******************************/
+
+Vue.prototype.$echarts = echarts
+all()
+// sale()
+ldap()
+system(false)
+
+saleManage()
+webmeterManage()
+ManageHome()
+newmanage()
+reportManage()
+require('system-clients/src/styles/less/bootstrap.less')
+require('./components/qinhua/Style/qinhuaStyle.less')
+// require('./bootstrap/less/manageStyle/manageChile.less')
+// require('./bootstrap/less/manageStyle/safeStyle.less')
+
+//大屏展示要放开的样式
+// require('system-clients/src/styles/less/manageStyle/manageChile.less')
+// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
+// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})
+