manage-client 3.3.53 → 3.3.54

package/package.json

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

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

@@ -155,7 +155,7 @@
                   <v-select :value.sync="model.f_price_name"
                             v-model="model.f_price_name"
                             multiple
-                            :options="$parent.$parent.getPricenames"
+                            :options="$parent.$parent.pricenames"
                             condition="f_price_name in {}"
                             ></v-select>
                 </div>
@@ -963,8 +963,36 @@
       })
     },
     methods: {
-      pricetypechanged(){
+      async pricetypechanged(){
         this.$refs.paged.$refs.cri.model.f_price_name = []
+        this.pricenames = []
+        if (this.$refs.paged.$refs.cri.model.pricetype) {
+          let http = new HttpResetClass()
+          let param = {
+            items: 'f_price_name',
+            tablename: 't_stairprice',
+            condition: `f_price_type = '${this.$refs.paged.$refs.cri.model.pricetype[0]}' and f_orgid = '${this.$login.f.orgid}'`,
+            orderitem: 'id'
+          }
+          var res = await http.load('POST', 'rs/sql/manage_singleTable', {data: param}, {resolveMsg: null, rejectMsg: '获取设备列表失败!'})
+          let uniqueMap  = {}
+          let arr = []
+          for (var i = 0; i < res.data.length; i++) {
+            let item = res.data[i];
+            if (!uniqueMap[item.f_price_name]) {
+              arr.push(item);
+              uniqueMap[item.f_price_name] = true;
+            }
+          }
+          console.log('arr',arr)
+          if (arr.length > 0) {
+            arr.forEach(row => {
+              this.pricenames.push({label: row.f_price_name,value: row.f_price_name})
+            })
+          } else {
+            this.pricenames.push({label: '全部', value: ''})
+          }
+        }
       },
       // 获取设备下拉选
       async getEquipment () {
@@ -1244,39 +1272,6 @@
              }
              return aaa
          },
-      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
-              priceArr.push(temp)
-            })
-            if(priceArr.length == 0 ){
-              rs= [{label: '全部', value: ''}]
-            }else{
-              rs = [ ...priceArr]
-            }
-          }
-          if (rs.length === 0) {
-            console.log('rs读出来是空')
-            this.$refs.paged.$refs.cri.model.f_price_name = ''
-          }
-          return rs
-        }
-      },
       getCondition() {
         return {
           startDate: this.$refs.paged.$refs.cri.model.startDate,

package/src/filiale/qianneng/QnAqzzYsmx.vue

@@ -133,6 +133,20 @@
                   <th>
                     <nobr>地址</nobr>
                   </th>
+
+                  <th>
+                    <nobr>奥枫个性化金额</nobr>
+                  </th>
+                  <th>
+                    <nobr>奥枫补贴项金额</nobr>
+                  </th>
+                  <th>
+                    <nobr>宜达个性化金额</nobr>
+                  </th>
+                  <th>
+                    <nobr>宜达补贴项金额</nobr>
+                  </th>
+
                   <th>
                     <nobr>与收费比对结果</nobr>
                   </th>
@@ -163,6 +177,20 @@
                 <td style="text-align: center;">
                   <nobr>{{row.textfield_li9rszuo}}</nobr>
                 </td>
+
+                <td style="text-align: center;">
+                  <nobr>{{row.afgxhje}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.afbtxjec}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.afbtxje}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.ydbtxje}}</nobr>
+                </td>
+
                 <td style="text-align: center;">
                   <nobr>{{row.matchedaofeng}}</nobr>
                 </td>

package/src/filiale/qianneng/exportConfig.js

@@ -223,7 +223,7 @@ export default{
   qnAqzzYsmx:{
     'title':'标题','createtimegmt':'发起时间','originator':'发起人','modifiedtimegmt':'验收时间','modifyuser':'验收人',
     'textfield_li9rszui':'用户编号','textfield_li9rszuj':'用户姓名',
-    'textfield_li9rszuo':'地址','matchedaofeng':'与收费比对结果'
+    'textfield_li9rszuo':'地址','afgxhje':'奥枫个性化金额','afbtxje':'奥枫补贴项金额','ydgxhje':'宜达个性化金额','ydbtxje':'宜达补贴项金额','matchedaofeng':'与收费比对结果'
   },
 }