manage-client 4.1.102 → 4.1.104-lsby

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.1.102",
+    "version": "4.1.104-lsby",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {
@@ -67,11 +67,11 @@
         "style": "0.0.3",
         "style-loader": "^0.20.3",
         "swiper": "^5.4.5",
-        "system-clients": "3.2.90-tongchuan",
+        "system-clients": "4.0.12",
         "ldap-clients": "3.0.96",
         "url-loader": "^0.5.7",
         "vue-amap": "0.5.10",
-        "vue-client": "1.25.29",
+        "vue-client": "1.26.6",
         "vue-hot-reload-api": "^1.2.0",
         "vue-html-loader": "^1.0.0",
         "vue-loader": "8.2.1",

package/src/filiale/bayan/ChargeQuery.vue

@@ -811,28 +811,19 @@
           <tr style="position: relative" class="table-bordered">
             <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;font-weight: bold">
               气量合计:&emsp;{{(sumsmodel.f_pregas - 0).toFixed(2)}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              应交金额合计:&emsp;{{(sumsmodel.fee - 0).toFixed(2)}}
+              卡表收费合计:&emsp;{{(sumsmodel.f_preamount - 0).toFixed(2)}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              违约金合计:&emsp;{{sumsmodel.f_delaypay}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              燃气费合计:&emsp;{{(sumsmodel.f_preamount - 0).toFixed(2)}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              预存金额合计:&emsp;{{sumsmodel.f_yucun}}
+              物联网收费合计:&emsp;{{sumsmodel.f_yucun}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               收款合计:&emsp;{{(sumsmodel.f_collection - 0).toFixed(2)}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              优惠合计:&emsp;{{sumsmodel.f_privilege_money}}
             </td>
               <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
                   一阶气量合计:&emsp;{{(sumsmodel.f_stairamount1 -0).toFixed(2)}}

package/src/filiale/bayan/RecordInfoQuery.vue

@@ -493,6 +493,30 @@
                       condition="f_network_valve='{}'">
                     </v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">类型</label>
+                    <v-select
+                      placeholder='类型'
+                      :value.sync="model.f_type"
+                      style="width:60%"
+                      v-model="model.f_type"
+                      :options='$parent.$parent.types'
+                      close-on-select
+                      condition="f_type='{}'">
+                    </v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">用户等级</label>
+                    <v-select
+                      placeholder='用户等级'
+                      :value.sync="model.f_user_level"
+                      style="width:60%"
+                      v-model="model.f_user_level"
+                      :options='$parent.$parent.userlevels'
+                      close-on-select
+                      condition="f_type='{}'">
+                    </v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -536,6 +560,12 @@
                   <th>
                     <nobr>联系电话</nobr>
                   </th>
+                  <th>
+                    <nobr>类型</nobr>
+                  </th>
+                  <th>
+                    <nobr>用户等级</nobr>
+                  </th>
                   <th>
                     <nobr>建档日期</nobr>
                   </th>
@@ -725,6 +755,8 @@
                 <td style="text-align: center;"><nobr>{{row.f_idnumber}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_type}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_user_level}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_createfile_date}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_contract_id}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_gas_date}}</nobr></td>
@@ -966,6 +998,8 @@
         pricenames:[],
         dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
         networkvalves: this.$appdata.getParam('自动阀控') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('自动阀控')] : [],
+        types: this.$appdata.getParam('类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('类型')] : [],
+        userlevels: this.$appdata.getParam('用户等级') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')] : [],
       }
     },
     ready(){

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

@@ -557,6 +557,8 @@ export default {
     'f_meternumber': '表号'
   }, compreConfig: {
     'f_user_state': '客户状态',
+    'f_type': '类型',
+    'f_user_level': '用户等级',
     'f_userinfo_code': '客户编号',
     'f_olduserinfo_code': '档案编号',
     'f_card_id': '卡号',
@@ -573,7 +575,7 @@ export default {
     'f_subscribe_date': '预约通气时间',
     'f_price_name': '气价名称',
     'f_position': '安装位置',
-    'f_meter_type': '类型',
+    'f_meter_type': '表类型',
     'f_meter_brand': '品牌',
     'f_meternumber': '表号',
     'f_metertitles': '表封号',

package/src/filiale/qingtongxia/MonthGasQuery.vue

@@ -68,7 +68,6 @@
                                     <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
                                            condition="f_address like '%{}%'" placeholder='客户地址'>
                                 </div>
-
                                 <div class="col-sm-2 form-group">
                                     <label class="font_normal_body" title="参数名称:用户类型">客户类型</label>
                                     <v-select :value.sync="model.f_user_type"
@@ -103,6 +102,20 @@
                                           condition="f_meter_style in {}"
                                           ></v-select>
                               </div>
+                              <div class="col-sm-2 form-group">
+                                <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
+                                <v-select :value.sync="model.f_residential_area"
+                                          class="select_list select"
+                                          enter-push
+                                          multiple = "true"
+                                          v-model="model.f_residential_area"
+                                          style="width: 60%"
+                                          :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                                          close-on-select>
+
+                                </v-select>
+                              </div>
+
                               <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
 
                             </div>
@@ -256,7 +269,7 @@
     </div>
 </template>
 <script>
-    import { PagedList } from 'vue-client'
+import {HttpResetClass, PagedList} from 'vue-client'
     import defaultPrint from '../../components/sale/config/DefaultPrint'
     import exportConfig from '../../components/sale/config/exportConfig.js'
     let readySomething = async function(self) {
@@ -316,13 +329,38 @@
                 f_filialeid: this.$login.f.f_orgid,
                 f_orgid: this.$login.f.orgid,
                 f_depid: this.$login.f.depids,
-                f_operatorid: this.$login.f.id
+                f_operatorid: this.$login.f.id,
+              residentialArea: []
             }
         },
         ready () {
             readySomething(this)
+            this.getaddress()
         },
         methods: {
+          async  getaddress(){
+            console.log('开始获取小区')
+            let HttpReset = new HttpResetClass()
+            var data = await HttpReset.load('POST', 'api/af-revenue/sql/manage_getarealist', {
+              data: {
+                condition: `1=1 and s.f_filialeid = '${this.$login.f.orgid}'`
+              }
+            }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+            console.log('小区',data)
+            let house = []
+            for (let row of data.data){
+              console.log('开始保存小区')
+              house.push({label: row.f_residential_area, value: row.f_residential_area})
+            }
+            this.residentialArea = house
+          },
+          calculate(rows){
+            let data = []
+            rows.forEach((row, n) => {
+              data[n] = {label: row.f_residential_area, value: row.id}
+            })
+            return data
+          },
           getotherfooter() {
             // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
             // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
@@ -359,6 +397,17 @@
                 this.show = false
             },
             selfSearch(args) {
+              this.area =  this.$refs.paged.$refs.cri.model.f_residential_area
+              console.log("=====小区model绑定====",this.area)
+              if(this.area.length !== 0){
+                let str = JSON.stringify(this.area)
+                str = str.replace(/"/g,`'`)
+                str = str.replace(/\[/g,``)
+                str = str.replace(/\]/g,``)
+                console.log("=====小区model22222222222绑定====",str)
+                //查询多个小区时条件
+                args.condition += ` and f_residential_area in  ( ${str} )`
+              }
                 args.condition = `${args.condition} ` + this.orgCondtionStr
                 // let f_orgstr = this.orgCondtionStr + 'and f_orgid = ' + this.f_orgid
                 // args.condition = `${args.condition} ` + f_orgstr