manage-client 3.3.97 → 3.3.99-sx

package/src/filiale/ancheng/businessquery/FMYGasQuery.vue

@@ -145,6 +145,21 @@
                             condition="f_gasproperties = '{}'"
                             close-on-select></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气价类型</label>
+                  <v-select :value.sync="model.pricetype" v-model="model.pricetype"
+                            placeholder='气价类型' :options="$parent.$parent.pricetypes"
+                            close-on-select v-ref:type>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气价名称</label>
+                  <v-select :value.sync="model.f_price_name"
+                            v-model="model.f_price_name"
+                            :options="$parent.$parent.getPricenames"
+                            condition="f_price_name = '{}'"
+                            close-on-select></v-select>
+                </div>
                 <!--表册片区-->
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">表册片区</label>
@@ -230,6 +245,9 @@
                 <th>
                   <nobr>气表类型</nobr>
                 </th>
+                <th>
+                  <nobr>气价名称</nobr>
+                </th>
                 <th>
                   <nobr>气价详情</nobr>
                 </th>
@@ -314,6 +332,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_classify}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_price_name}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_price_value}}</nobr>
               </td>
@@ -735,6 +756,51 @@ import exportConfig from './../exportConfig'
       credentials () {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('证件类型')]
       },
+      pricetypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
+      },
+      // 获取气价
+      getPricenames() {
+        let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;
+        let f_gasproperties = this.$refs.paged.$refs.cri.model.f_gasproperties;
+        let pricetype = this.$refs.paged.$refs.cri.model.pricetype;
+        console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          let rs = []
+          let priceArr = []
+          if ( pricetype.length >0) {
+            let params = {
+              f_price_type: pricetype[0],
+              filter: this.f_filialeid,
+              prices: this.prices
+            }
+            this.$MagGetSaleParam.getPrice(params).forEach((item) => {
+              let temp = {}
+              temp.label = item.label
+              temp.value = item.value.f_price_name
+              if(f_user_type && f_user_type.length >0){
+                if(f_user_type== item.value.f_user_type) {
+                  if (f_gasproperties && f_gasproperties !=='') {
+                    if (f_gasproperties == item.value.f_gasproperties) {
+                      priceArr.push(temp)
+                    }
+                  } else {
+                    priceArr.push(temp)
+                  }
+                }
+              }else {
+                priceArr.push(temp)
+              }
+            })
+            rs = [{label: '全部', value: ''}, ...priceArr]
+          }
+          if (rs.length === 0) {
+            console.log('rs读出来是空')
+            this.$refs.paged.$refs.cri.model.f_price_name = ''
+          }
+          return rs
+        }
+      },
       metertype () {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
       }

package/src/filiale/ancheng/exportConfig.js

@@ -414,6 +414,7 @@ export default{
     "f_meternumber": "表号",
     "f_meter_brand": "气表品牌",
     "f_meter_classify": "气表类型",
+    "f_price_name": "气价名称",
     "f_price_value": "气价详情",
     "f_balance": "账户余额",
     "f_pregas": "预购气量",