manage-client 3.2.238 → 3.2.240

package/package.json

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

package/src/components/sale/businessquery/ChangeMeterQuery.vue

@@ -204,6 +204,18 @@
                 <th>
                   <nobr>付款方式</nobr>
                 </th>
+                <th>
+                  <nobr>气表底数</nobr>
+                </th>
+                <th>
+                  <nobr>表上余额</nobr>
+                </th>
+                <th>
+                  <nobr>累购气量</nobr>
+                </th>
+                <th>
+                  <nobr>累购金额</nobr>
+                </th>
                 <th>
                   <!--<nobr>客户地址</nobr>-->
                   <data-order field="f_address" name="客户地址"
@@ -281,6 +293,18 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_payment}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_base}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_balance_amount}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.leigougas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.leigoumoney}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
@@ -358,6 +382,9 @@
               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;font-weight: bold">
+              表上余额合计:&emsp;{{sumsmodel.f_balance_amount}}
+            </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               换表费合计:&emsp;{{sumsmodel.f_changemeter_fee}}
             </td>
@@ -436,7 +463,7 @@
         footer:[],
         meterbrands: [],
         pricenames: [],
-        model: new PagedList('rs/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
+        model: new PagedList('rs/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_balance_amount: 0,f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],

package/src/components/sale/businessquery/FMYGasQuery.vue

@@ -108,7 +108,7 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户表号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model.trim="model.f_meternumber"
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                          condition="f_meternumber like '%{}%'" placeholder='客户表号'>
                 </div>
                 <div class="col-sm-2 form-group">

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

@@ -256,7 +256,7 @@ export default{
     'f_type': '换表类型', 'f_changemeter_fee': '换表费', 'f_meternumber_old': '旧表号', 'f_meternumber': '新表号',
     'f_meter_brand_old': '旧气表品牌', 'f_meter_brand': '新气表品牌', 'f_remanent_gas': '补气量', 'f_remanent_money': '补气金额',
     'f_comments': '备注', 'f_change_operator': '换表人', 'f_state': '状态', 'f_operate_date': '操作日期', 'f_payment': '付款方式', 'f_othereason': '换表原因',
-    'f_operator': '人员', 'f_depname': '部门', 'f_orgname': '公司'
+    'f_operator': '人员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meter_base': '气表底数', 'f_balance_amount': '表上余额', 'leigougas': '累购气量', 'leigoumoney': '累购金额'
   },
   changemeterprintConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_address': '客户地址',

package/src/components/sale/filesquery/RecordInfoQuery.vue

@@ -125,7 +125,7 @@
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">燃气表号</label>
-                    <input type="text" style="width:60%" class="input_search" v-model.trim="model.f_meternumber"
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                            condition="f_meternumber like '%{}%'" placeholder='燃气表号'>
                   </div>
 
@@ -148,7 +148,7 @@
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">表&emsp;&emsp;号</label>
-                    <input type="text" style="width:60%" class="input_search" v-model.trim="model.f_meter_number"
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_meter_number"
                            condition="f_meternumber = '{}'" placeholder='表号'>
                   </div>
                   <div class="col-sm-2 form-group">
@@ -396,7 +396,7 @@
                   </div>
                   <div class="col-sm-2 form-group" >
                     <label class="font_normal_body">气表表号</label>
-                    <input  type="text" style="width:60%" class="input_search" v-model.trim="model.f_meternumber"
+                    <input  type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                             condition="f_meternumber like '%{}%'" placeholder='气表表号'>
                   </div>
                   <div class="col-sm-2 form-group">

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

@@ -194,14 +194,6 @@
                        <!--condition="new_days <= {}" v-next-el='new_days' v-el:new_days-->
                 <!--&gt;-->
               <!--</div>-->
-            <div class="col-sm-2 form-group">
-              <label class="font_normal_body">小区</label>
-              <input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_residential_area"
-                     placeholder='请输入小区'
-                     condition="f_residential_area like '%{}%'"
-              >
-            </div>
-
           </div>
 
 

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

@@ -115,12 +115,9 @@
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">用户状态</label>
               <v-select
-                placeholder='用户状态'
-                value-single
+                placeholder='正常'
                 style="width:60%"
-                :value.sync="model.f_user_state"
-                v-model="model.f_user_state"
-                :options='$parent.$parent.userstate'
+                :value.sync="f_user_state"
                 close-on-select condition="f_user_state ='{}'">
               </v-select>
             </div>
@@ -145,13 +142,6 @@
                         close-on-select>
               </v-select>
             </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">小区</label>
-                <input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_residential_area"
-                       placeholder='请输入小区'
-                       condition="f_residential_area like '%{}%'"
-                >
-              </div>
 
           </div>
 
@@ -372,7 +362,8 @@
           {label: '用气性质', value: 'f_gasproperties'},
           {label: '分公司', value: 'f_orgname'},
           {label: '最长失联天数', value: 'max_days_type'},
-        ]
+        ],
+        f_user_state:'正常'
       }
     },
     ready() {

package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue

@@ -176,13 +176,6 @@
                                       close-on-select>
                             </v-select>
                           </div>
-                          <div class="col-sm-2 form-group">
-                            <label class="font_normal_body">小区</label>
-                            <input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_residential_area"
-                                   placeholder='请输入小区'
-                                   condition="f_residential_area like '%{}%'"
-                            >
-                          </div>
                         </div>
                     </div>
                 </criteria>

package/src/filiale/WEINAN/NewAccountQuery.vue

@@ -14,7 +14,7 @@
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_operate_date >= '{} 00:00:00'">
+                              condition="f_open_date >= '{} 00:00:00'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -24,7 +24,7 @@
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_operate_date <= '{} 23:59:59'">
+                              condition="f_open_date <= '{} 23:59:59'">
                   </datepicker>
                 </div>
                 <div class="span" style="float:right;">
@@ -171,10 +171,10 @@
                 <nobr>{{row.isbgl}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.operator}}</nobr>
+                <nobr>{{row.f_operator}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_operate_date}}</nobr>
+                <nobr>{{row.f_open_date}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.depname}}</nobr>

package/src/filiale/huayin/ChangeMeterQuery.vue

@@ -166,7 +166,7 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">表&emsp;&emsp;号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model.trim="model.f_meternumber"
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                          condition="f_meternumber = '{}'" placeholder='表号'>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -176,7 +176,7 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">旧&emsp;表&emsp;号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model.trim="model.f_meternumber"
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                          condition="f_meternumber_old = '{}'" placeholder='旧表号'>
                 </div>
                 <div class="col-sm-2 form-group">

package/src/filiale/qianneng/QnJgqGshzbb.vue

@@ -15,7 +15,7 @@
                   <v-select :value.sync="model.a_jfyf"
                             :options='$parent.$parent.jfyfArray' placeholder='请选择' v-model="model.a_jfyf"
                             condition="a_jfyf in {}"
-                            close-on-select></v-select>
+                            multiple></v-select>
                 </div>
 
                   <div class="col-sm-2 form-group">
@@ -270,20 +270,21 @@
         this.residentialArea = house
       },
       async  getjfyf(){
-        console.log('开始获取交费月份')
         let HttpReset = new HttpResetClass()
-        var data = await HttpReset.load('POST', 'rs/sql/qnJgqgetjfyf', {
+        var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
           data: {
-            condition: `1=1 `
+            condition: '1=1',
+            tablename: 'qn_jgq_hzb',
+            groupitem: 'a_jfyf',
+            orderitem: 'a_jfyf',
+            items: 'a_jfyf'
           }
-        }, {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.a_jfyf, value: row.a_jfyf})
+          nameArr.push({label: row.a_jfyf, value: row.a_jfyf})
         }
-        this.jfyfArray = a_jfyf
+        this.jfyfArray = nameArr
       },
 
 

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;">