manage-client 3.2.237 → 3.2.239

package/src/filiale/qianneng/QnJgqGsxsmx.vue

@@ -11,9 +11,9 @@
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">月份</label>
                     <v-select :value.sync="model.t_jfyf"
-                              :options='$parent.$parent.jfyfArray' placeholder='请选择' v-model="model.t_jfyf"
+                              :options='$parent.$parent.jfnfArray' placeholder='请选择' v-model="model.t_jfyf" multiple
                               condition="t_jfyf in {}"
-                              close-on-select></v-select>
+                              ></v-select>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">客户编号</label>
@@ -24,9 +24,17 @@
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">用气性质</label>
                     <v-select :value.sync="model.u_xyqxz"
-                              :options='$parent.$parent.gasproperties' placeholder='请选择' v-model="model.u_xyqxz"
-                              condition="f_calculation in {}"
-                              close-on-select></v-select>
+                              :options='$parent.$parent.yqxzArray' placeholder='请选择' v-model="model.u_xyqxz" multiple
+                              condition="u_xyqxz in {}"
+                              ></v-select>
+                  </div>
+
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">表具类型</label>
+                    <v-select :value.sync="model.bjlx"
+                              :options='$parent.$parent.bjlxArray' placeholder='请选择' v-model="model.bjlx" multiple
+                              condition="bjlx in {}"
+                              ></v-select>
                   </div>
 
                   <div class="span" style="float:right;">
@@ -106,6 +114,9 @@
                   <th>
                     <nobr>抄表员</nobr>
                   </th>
+                  <th>
+                    <nobr>通气日期</nobr>
+                  </th>
                 </tr>
               </template>
               <template partial='body'>
@@ -163,6 +174,9 @@
                 <td style="text-align: center;">
                   <nobr>{{row.cbg}}</nobr>
                 </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.tqrq}}</nobr>
+                </td>
               </template>
               <template partial='foot'>
               </template>
@@ -257,7 +271,9 @@
         //小区
         residentialArea: [],
         //缴费月份
-        jfyfArray: [],
+        jfnfArray: [],
+        yqxzArray: [],
+        bjlxArray: [],
         //表册片区
         bookSlice:[{label: '全部',value: ''}],
         inputtores:[{label: '全部',value: ''}],  //抄表员
@@ -278,7 +294,8 @@
       //self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
       //self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
       this.getjfyf()
-
+      this.getBjlx()
+      this.getYqxz()
       this.userTypeChange ();
     },
     methods: {
@@ -341,20 +358,55 @@
         this.residentialArea = house
       },
       async  getjfyf(){
-        console.log('开始获取交费月份')
         let HttpReset = new HttpResetClass()
-        var data = await HttpReset.load('POST', 'rs/sql/qnJgqgetmxjfyf', {
+        var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+          data: {
+            condition: '1=1',
+            tablename: 'qn_jgq_gsmxb',
+            groupitem: 't_jfyf',
+            orderitem: 't_jfyf',
+            items: 't_jfyf'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取失败!'})
+        let nameArr = [{label: '全部', value: ''}]
+        for (let row of data.data){
+          nameArr.push({label: row.t_jfyf, value: row.t_jfyf})
+        }
+        this.jfnfArray = nameArr
+      },
+      async  getYqxz(){
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+          data: {
+            condition: '1=1',
+            tablename: 'qn_jgq_gsmxb',
+            groupitem: 'u_xyqxz',
+            orderitem: 'u_xyqxz',
+            items: 'u_xyqxz'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取失败!'})
+        let nameArr = [{label: '全部', value: ''}]
+        for (let row of data.data){
+          nameArr.push({label: row.u_xyqxz, value: row.u_xyqxz})
+        }
+        this.yqxzArray = nameArr
+      },
+      async  getBjlx(){
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
           data: {
-            condition: `1=1 `
+            condition: '1=1',
+            tablename: 'qn_jgq_gsmxb',
+            groupitem: 'bjlx',
+            orderitem: 'bjlx',
+            items: 'bjlx'
           }
-        }, {resolveMsg: null, rejectMsg: '获取交费月份失败!'})
-        console.log('交费月份',data)
-        let a_jfyf = []
+        }, {resolveMsg: null, rejectMsg: '获取失败!'})
+        let nameArr = [{label: '全部', value: ''}]
         for (let row of data.data){
-          console.log('开始保存交费月份')
-          a_jfyf.push({label: row.t_jfyf, value: row.t_jfyf})
+          nameArr.push({label: row.bjlx, value: row.bjlx})
         }
-        this.jfyfArray = a_jfyf
+        this.bjlxArray = nameArr
       },
       //把数据库查询数据转换为下拉数据
       calculate(rows){

package/src/filiale/qianneng/QnJgqMgqbb.vue

@@ -14,7 +14,7 @@
                     <v-select :value.sync="model.t_jfyf"
                               :options='$parent.$parent.jfnfArray' placeholder='请选择' v-model="model.t_jfyf"
                               condition="t_jfyf in {}"
-                              close-on-select></v-select>
+                              multiple></v-select>
                   </div>
 
                   <div class="col-sm-2 form-group">

package/src/filiale/qianneng/QnJgqMyhzbb.vue

@@ -14,15 +14,15 @@
                   <v-select :value.sync="model.jfnf"
                             :options='$parent.$parent.jfnfArray' placeholder='请选择' v-model="model.jfnf"
                             condition="jfnf in {}"
-                            close-on-select></v-select>
+                            multiple></v-select>
                 </div>
 
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用气性质</label>
                   <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
                             :options='$parent.$parent.gasproperties' placeholder='请选择'
-                            condition="f_gasproperties = '{}'"
-                            close-on-select></v-select>
+                            condition="r_yqxzcfl in {}"
+                            multiple></v-select>
                 </div>
 
                   <div class="span" style="float:right;">

package/src/filiale/qianneng/QnJgqMyxsmx.vue

@@ -14,7 +14,22 @@
                     <v-select :value.sync="model.t_jfyf"
                               :options='$parent.$parent.jfnfArray' placeholder='请选择' v-model="model.t_jfyf"
                               condition="t_jfyf in {}"
-                              close-on-select></v-select>
+                              multiple></v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">用气性质</label>
+                    <v-select :value.sync="model.u_xyqxz"
+                              :options='$parent.$parent.yqxzArray' placeholder='请选择' v-model="model.u_xyqxz" multiple
+                              condition="r_yqxzcfl in {}"
+                    ></v-select>
+                  </div>
+
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">表具类型</label>
+                    <v-select :value.sync="model.bjlx"
+                              :options='$parent.$parent.bjlxArray' placeholder='请选择' v-model="model.bjlx" multiple
+                              condition="bjlx in {}"
+                    ></v-select>
                   </div>
 
                   <div class="col-sm-2 form-group">
@@ -102,6 +117,9 @@
                   <th>
                     <nobr>抄表员</nobr>
                   </th>
+                  <th>
+                    <nobr>通气日期</nobr>
+                  </th>
                 </tr>
               </template>
               <template partial='body'>
@@ -163,6 +181,9 @@
                 <td style="text-align: center;">
                   <nobr>{{row.cbg}}</nobr>
                 </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.tqrq}}</nobr>
+                </td>
               </template>
               <template partial='foot'>
               </template>
@@ -225,6 +246,8 @@ export default {
       },
       gasproperties:[],
       jfnfArray:[],
+      yqxzArray: [],
+      bjlxArray: [],
       //默认打印列
       defaultfield: [],
       config: {
@@ -276,7 +299,9 @@ export default {
     //this.initAreas(this.$login.f.orgid)
     //self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
     //self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
-    this.getJfnf();
+    this.getJfnf()
+    this.getBjlx()
+    this.getYqxz()
   },
   methods: {
     async getinputtores () {
@@ -321,6 +346,40 @@ export default {
       }
       this.jfnfArray = nameArr
     },
+    async  getYqxz(){
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+        data: {
+          condition: '1=1',
+          tablename: 'qn_jgq_mymx',
+          groupitem: 'r_yqxzcfl',
+          orderitem: 'r_yqxzcfl',
+          items: 'r_yqxzcfl'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取失败!'})
+      let nameArr = [{label: '全部', value: ''}]
+      for (let row of data.data){
+        nameArr.push({label: row.r_yqxzcfl, value: row.r_yqxzcfl})
+      }
+      this.yqxzArray = nameArr
+    },
+    async  getBjlx(){
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+        data: {
+          condition: '1=1',
+          tablename: 'qn_jgq_mymx',
+          groupitem: 'bjlx',
+          orderitem: 'bjlx',
+          items: 'bjlx'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取失败!'})
+      let nameArr = [{label: '全部', value: ''}]
+      for (let row of data.data){
+        nameArr.push({label: row.bjlx, value: row.bjlx})
+      }
+      this.bjlxArray = nameArr
+    },
     async getGaspropperties(){
       let HttpReset = new HttpResetClass()
       var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {

package/src/filiale/qianneng/QnJgqXsjgbb.vue

@@ -14,7 +14,7 @@
                     <v-select :value.sync="model.a_yf"
                               :options='$parent.$parent.jfnfArray' placeholder='请选择' v-model="model.a_yf"
                               condition="a_yf in {}"
-                              close-on-select></v-select>
+                              multiple></v-select>
                   </div>
 
                   <div class="span" style="float:right;">

package/src/filiale/qianneng/QnJgqZhdacx.vue

@@ -32,7 +32,7 @@
                   <label class="font_normal_body">用气性质</label>
                   <v-select :value.sync="model.f_gasproperties"
                             :options='$parent.$parent.gasproperties' placeholder='请选择' v-model="model.f_gasproperties"
-                            condition="f_calculation in {}"
+                            condition="f_gasproperties in {}"
                             close-on-select></v-select>
                 </div>
 
@@ -53,38 +53,49 @@
                 </div>
                 <div class="row" v-show="$parent.$parent.criteriaShow">
                   <div class="col-sm-2 form-group">
-                    <label for="startDate" class="font_normal_body">通气日期起</label>
-                    <datepicker id="startDate" placeholder="通气日期起" style="width:60%"
+                    <label for="startDate" class="font_normal_body">开户时间起</label>
+                    <datepicker id="startDate" placeholder="开户日期起" style="width:60%"
                                 v-model="model.startDate"
                                 :value.sync="model.startDate"
                                 :format="'yyyy-MM-dd'"
                                 :show-reset-button="true"
-                                condition="f_gas_date >= '{} 00:00:00'">
+                                condition="f_open_date >= '{} 00:00:00'">
                     </datepicker>
                   </div>
                   <div class="col-sm-2 form-group">
-                    <label for="endDate" class="font_normal_body">通气日期止</label>
-                    <datepicker id="endDate" placeholder="通气日期止" style="width:60%"
+                    <label for="endDate" class="font_normal_body">开户日期止</label>
+                    <datepicker id="endDate" placeholder="开户日期止" style="width:60%"
                                 v-model="model.endDate"
                                 :value.sync="model.endDate"
                                 :format="'yyyy-MM-dd'"
                                 :show-reset-button="true"
-                                condition="f_gas_date <= '{} 23:59:59'">
+                                condition="f_open_date <= '{} 23:59:59'">
                     </datepicker>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">气表类型</label>
                     <v-select :value.sync="model.f_meter_type"
                               :options='$parent.$parent.metertypes()' placeholder='请选择' v-model="model.f_meter_type"
-                              condition="f_meter_type = '{}'"
+                              condition="f_meter_type in {}"
                               close-on-select></v-select>
                   </div>
                   <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">气表品牌</label>
-                    <v-select :value.sync="model.f_meter_brand"
-                              v-model="model.f_meter_brand" multiple
-                              :options='$parent.$parent.meterbrands' placeholder='请选择'
-                              condition="f_meter_brand in {}"
+                    <label class="font_normal_body">客户状态</label>
+                    <v-select :value.sync="model.f_user_state"
+                              v-model="model.f_user_state" multiple
+                              :options='$parent.$parent.yhztArray' placeholder='请选择'
+                              condition="f_user_state in {}"
+                              valueSingle="正常"
+                    ></v-select>
+                  </div>
+
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">表状态</label>
+                    <v-select :value.sync="model.f_table_state"
+                              v-model="model.f_table_state" multiple
+                              :options='$parent.$parent.bjztArray' placeholder='请选择'
+                              condition="f_table_state in {}"
+                              valueSingle="正常"
                     ></v-select>
                   </div>
                   <div class="row">
@@ -95,6 +106,7 @@
                     </div>
                   </div>
                 </div>
+
               </div>
             </criteria>
 
@@ -117,7 +129,7 @@
                     <nobr>客户电话</nobr>
                   </th>
                   <th>
-                    <nobr>通气日期</nobr>
+                    <nobr>开户日期</nobr>
                   </th>
                   <th>
                     <nobr>气价名称</nobr>
@@ -152,6 +164,9 @@
                   <th>
                     <nobr>备注信息</nobr>
                   </th>
+                  <th>
+                    <nobr>通气日期</nobr>
+                  </th>
                 </tr>
               </template>
               <template partial='body'>
@@ -171,7 +186,7 @@
                   <nobr>{{row.f_user_phone}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_gas_date}}</nobr>
+                  <nobr>{{row.f_open_date}}</nobr>
                 </td>
                 <td style="text-align: center;">
                   <nobr>{{row.f_price_name}}</nobr>
@@ -206,6 +221,9 @@
                 <td style="text-align: center;">
                   <nobr>{{row.f_comments}}</nobr>
                 </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_gas_date}}</nobr>
+                </td>
               </template>
               <template partial='foot'>
               </template>
@@ -306,6 +324,8 @@
         deviceInfo:{},
         condition2:'',
 
+        yhztArray:[],
+        bjztArray:[],
 
         weixinSign:[{label:"全部",value:""},{label:"已绑定",value:"已绑定"},{label:"未绑定",value:"未绑定"}],
         //小区
@@ -326,12 +346,48 @@
       }).catch((error) => {
         this.$emit('error', error)
       })
-      this.initAreas(this.$login.f.orgid)
-      self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
-      self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
-
+      //this.initAreas(this.$login.f.orgid)
+      //self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
+      //self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
+      this.getJgqYhzt();
+      this.getJgqBjzt();
     },
     methods: {
+      //-------------------------------------------------------------
+      async getJgqYhzt(){
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+          data: {
+            condition: '1=1',
+            tablename: 'qn_jgq_zhdacx',
+            groupitem: 'f_user_state',
+            orderitem: 'f_user_state',
+            items: 'f_user_state'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取失败!'})
+        let nameArr = [{label: '全部', value: ''}]
+        for (let row of data.data){
+          nameArr.push({label: row.f_user_state, value: row.f_user_state})
+        }
+        this.yhztArray = nameArr
+      },
+      async getJgqBjzt(){
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+          data: {
+            condition: '1=1',
+            tablename: 'qn_jgq_zhdacx',
+            groupitem: 'f_table_state',
+            orderitem: 'f_table_state',
+            items: 'f_table_state'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取失败!'})
+        let nameArr = [{label: '全部', value: ''}]
+        for (let row of data.data){
+          nameArr.push({label: row.f_table_state, value: row.f_table_state})
+        }
+        this.bjztArray = nameArr
+      },
       async getinputtores () {
         // 获取抄表员
         let rs = []
@@ -655,7 +711,7 @@
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('结算方式')]
       },
       metertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表分类')]
       },
       accountsState() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('下账状态')]

package/src/filiale/qianneng/exportConfig.js

@@ -124,9 +124,9 @@ export default{
   },
   qnJgqZhdacx:{
     'f_userinfo_code':'客户编号',	'f_user_name':'客户名称',	'f_user_state':'客户状态',	'f_address':'客户地址',	'f_user_phone':'客户电话',
-    'f_gas_date':'通气日期',	'f_price_name':'气价名称',	'f_meter_type':'气表类型',	'f_meter_brand':'气表品牌',	'f_meter_style':'气表型号',
+    'f_open_date':'开户日期',	'f_price_name':'气价名称',	'f_meter_type':'气表类型',	'f_meter_brand':'气表品牌',	'f_meter_style':'气表型号',
     'f_meternumber':'表号',	 'f_user_type':'客户类型',	'f_gasproperties':'用气性质',	'f_credentials':'证件类型',
-    'f_idnumber':'证件号码',	'f_table_state':'表状态',	'f_comments':'备注信息'
+    'f_idnumber':'证件号码',	'f_table_state':'表状态',	'f_comments':'备注信息', 'f_gas_date':'通气日期'
   },
   qnJgqMgqbb:{
     'b_yhh':'用户号','c_yhmc':'用户名','d_yqdz':'地址','e_spmc':'商品名称','g_cbqj':'抄表期间','h_csqf':'起方','i_cszf':'止方',
@@ -139,7 +139,7 @@ export default{
   qnJgqGsxsmx:{
     'b_yhh':'用户号','c_yhmc':'用户名','d_yqdz':'用气地址','e_spmc':'商品名称','g_cbqj':'抄表期间','h_csqf':'起方','i_cszf':'止方',
     'j_ysql':'气量','k_dj':'单价','l_je':'金额','m_znj':'违约金','o_sjje':'金额合计','u_xyqxz':'用气性质','s_jfrq':'日期',
-    't_jfyf':'月份','bjlx':'表具类型','sfyg':'收费员','cbg':'抄表员'
+    't_jfyf':'月份','bjlx':'表具类型','sfyg':'收费员','cbg':'抄表员','tqrq':'通气日期'
   },
   qnJgqMyhzbb:{
     'b_yhh':'用户号','c_yhmc':'用户名','d_yqdz':'地址','khlx':'客户类型','r_yqxzcfl':'用气性质','nyql':'年用气量','nje':'年用气金额'
@@ -147,7 +147,7 @@ export default{
   qnJgqMyxsmx:{
     'b_yhh':'用户号','c_yhmc':'用户名','d_yqdz':'地址','e_spmc':'商品名称','g_cbqj':'抄表期间','h_csqf':'起方','i_cszf':'止方',
     'j_ysql':'气量','k_dj':'单价','l_je':'金额','m_znj':'违约金',/**'n_jc':'价差',**/'o_sjje':'金额合计','r_yqxzcfl':'用气性质',
-    's_jfrq':'日期','t_jfyf':'月份','bjlx':'表具类型','sfyg':'收费员','cbg':'抄表员'
+    's_jfrq':'日期','t_jfyf':'月份','bjlx':'表具类型','sfyg':'收费员','cbg':'抄表员','tqrq':'通气日期'
   },
   qnJgqXsjgbb:{
     'a_yf':'月份','b_hjql':'合计气量','c_hjhs':'合计户数','d_gyql':'工业气量','e_gyhs':'工业户数','f_syql':'商业气量','g_syhs':'商业户数',