manage-client 3.3.232 → 3.3.234

package/package.json

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

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

@@ -10,7 +10,8 @@ export default {
     'f_idnumber': '身份证号',
     'f_balance': '账户余额',
     'f_user_level': '客户等级',
-    'f_user_type': '用户类型',
+    'f_user_type': '客户类型',
+    'f_gasproperties': '用气性质',
     'f_address': '客户地址',
     'f_residential_area': '小区',
     'f_building': '楼栋',

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

@@ -66,9 +66,17 @@
                     <label class="font_normal_body">客户类型</label>
                     <v-select :value.sync="model.f_user_type"
                               v-model="model.f_user_type" condition="f_user_type = '{}'"
+                              @change="$parent.$parent.userTypeChange()"
                               :options='$parent.$parent.userTypes' placeholder='请选择'
                               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_gasproperties" v-model="model.f_gasproperties"
+                              :options='$parent.$parent.gasproperties' placeholder='请选择'
+                              condition="f_gasproperties = '{}'"
+                              close-on-select></v-select>
+                  </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人数&nbsp;&nbsp;&nbsp;&nbsp;</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_people_num"
@@ -335,6 +343,9 @@
                   <th>
                     <nobr>客户类型</nobr>
                   </th>
+                  <th>
+                    <nobr>用气性质</nobr>
+                  </th>
                   <th>
                     <data-order field="f_address" name="客户地址"
                                 :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
@@ -434,6 +445,9 @@
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_user_type}}</nobr>
                 </td>
+                <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_gasproperties}}</nobr>
+                </td>
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_address}}</nobr>
                 </td>
@@ -589,6 +603,7 @@
         printshow: false,
         all: false,
         fields: {},
+        gasproperties: [],
         //排序
         orderitem:'f_userinfo_code desc',
         orderFields: {
@@ -718,6 +733,16 @@
       cancel(obj) {
         this.show = false
       },
+      userTypeChange() {
+        this.gasproperties = []
+        if (this.$refs.paged.$refs.cri.model !== null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties = ''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+        } else {
+          this.gasproperties = [{label: '全部', value: ''}]
+        }
+      },
+
       showmsg(obj){
 
         this.rowdata=obj

package/src/filiale/kelai/NewGasStatistics.vue

@@ -369,8 +369,8 @@ export default {
     getheader() {
       this.other=[];
       let date = []
-      date.push(`起始时间:${this.$refs.paged.$refs.cri.model.startDate}`)
-      date.push(`终止时间:${this.$refs.paged.$refs.cri.model.endDate}`)
+      date.push(`起始时间:${this.$refs.paged.$refs.criteria.model.startDate}`)
+      date.push(`终止时间:${this.$refs.paged.$refs.criteria.model.endDate}`)
       this.other.push(date)
     },
     initParams() {

package/src/stores/MagLoadParams.js

@@ -8,7 +8,9 @@ let loadParamGen = async function (f_filialeid) {
 
   if (GetSaleParam.gasbrands.length === 0 && GetSaleParam.prices.length === 0 && GetSaleParam.adjustables.length === 0 ) {
     let getParams = await http.load('POST','api/af-revenue/logic/getSaleInitData', {data: {f_orgid: f_filialeid?f_filialeid: Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
-    if (getParams.data) {
+    if (getParams.data && getParams.data.data) {
+      MagLoadParams.organizeData(getParams.data.data)
+    }else if (getParams.data) {
       MagLoadParams.organizeData(getParams.data)
     }
   } else {
@@ -16,9 +18,11 @@ let loadParamGen = async function (f_filialeid) {
       GetSaleParam.prices = []
       GetSaleParam.adjustables = []
       let getParams = await http.load('POST','api/af-revenue/logic/getSaleInitData', {data: {f_orgid: f_filialeid ? f_filialeid : Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
-      if (getParams.data) {
-        MagLoadParams.organizeData(getParams.data)
-      }
+    if (getParams.data && getParams.data.data) {
+      MagLoadParams.organizeData(getParams.data.data)
+    }else if (getParams.data) {
+      MagLoadParams.organizeData(getParams.data)
+    }
   }
 }