manage-client 3.2.219 → 3.2.221

package/src/filiale/meihekou/CardHandplanQuery.vue

@@ -133,12 +133,22 @@
                             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 class="col-sm-2 form-group">
+                  <label class="font_normal_body">气价类型</label>
+                  <v-select :value.sync="model.pricetype" v-model="model.pricetype"
+                            @change="$parent.$parent.pricetypechanged"
+                            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"
-                            :options='$parent.$parent.priceName' placeholder='请选择' v-model="model.f_price_name"
-                            condition="f_price_name = '{}'"
-                            close-on-select></v-select>
+                            v-model="model.f_price_name"
+                            multiple
+                            :options="$parent.$parent.getPricenames"
+                            condition="f_price_name in {}"
+                  ></v-select>
                 </div>
               </div>
             </div>
@@ -398,6 +408,7 @@
           f_stair2fee:0,
           f_stair3amount:0,
           f_stair3fee:0}),
+        f_filialeid: this.$login.f.orgid,
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
@@ -434,6 +445,9 @@
       })
     },
     methods: {
+      pricetypechanged(){
+        this.$refs.paged.$refs.cri.model.f_price_name = []
+      },
       getotherfooter(){
         // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
         // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
@@ -594,9 +608,41 @@
       whetherPay() {
         return [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}]
       },
-      priceName() {
+      pricetypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
-      }
+      },
+      getPricenames() {
+        let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;
+        let pricetype = this.$refs.paged.$refs.cri.model.pricetype;
+        console.log("打印一下:",f_user_type,pricetype,this.f_filialeid)
+        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
+        }
+      },
     },
     events:{
       'onFileUpload': function (file, res) {

package/src/main.js

@@ -1,66 +1,66 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-
-// import { sale } from 'sale-client'
-import { system } from 'system-clients'
-import { ldap } from 'ldap-clients'
-import saleManage from './saleManage'
-import webmeterManage from './webmeterManage'
-import reportManage from './reportManage'
-import newmanage from './newmanage'
-import ManageHome from './ManageHome'
-import echarts from 'echarts'
-import AMap from 'vue-amap'
-
-Vue.config.silent = true
-// Vue.mmType = 'AES'
-
-Vue.use(AMap);
-
-// 初始化vue-amap
-AMap.initAMapApiLoader({
-  // 高德key
-  key: '3cec9ae8e2349207f7ac29279e3f4abe',
-  // 插件集合 （插件按需引入）
-  plugin: [
-    "AMap.Autocomplete", //输入提示插件
-    "AMap.PlaceSearch", //POI搜索插件
-    "AMap.Scale", //右下角缩略图插件 比例尺
-    "AMap.OverView", //地图鹰眼插件
-    "AMap.ToolBar", //地图工具条0
-    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    "AMap.PolyEditor", //编辑 折线多，边形
-    "AMap.CircleEditor", //圆形编辑器插件
-    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
-  ],
-  uiVersion: "1.0"
-});
-/** **************************通用组件******************************/
-
-Vue.prototype.$echarts = echarts
-all()
-// sale()
-ldap()
-system(false)
-
-saleManage()
-webmeterManage("wuhai")
-ManageHome()
-newmanage()
-reportManage()
-require('system-clients/src/styles/less/bootstrap.less')
-require('./components/qinhua/Style/qinhuaStyle.less')
-// require('./bootstrap/less/manageStyle/manageChile.less')
-// require('./bootstrap/less/manageStyle/safeStyle.less')
-
-//大屏展示要放开的样式
-// require('system-clients/src/styles/less/manageStyle/manageChile.less')
-// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
-// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
-
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+
+// import { sale } from 'sale-client'
+import { system } from 'system-clients'
+import { ldap } from 'ldap-clients'
+import saleManage from './saleManage'
+import webmeterManage from './webmeterManage'
+import reportManage from './reportManage'
+import newmanage from './newmanage'
+import ManageHome from './ManageHome'
+import echarts from 'echarts'
+import AMap from 'vue-amap'
+
+Vue.config.silent = true
+// Vue.mmType = 'AES'
+
+Vue.use(AMap);
+
+// 初始化vue-amap
+AMap.initAMapApiLoader({
+  // 高德key
+  key: '3cec9ae8e2349207f7ac29279e3f4abe',
+  // 插件集合 （插件按需引入）
+  plugin: [
+    "AMap.Autocomplete", //输入提示插件
+    "AMap.PlaceSearch", //POI搜索插件
+    "AMap.Scale", //右下角缩略图插件 比例尺
+    "AMap.OverView", //地图鹰眼插件
+    "AMap.ToolBar", //地图工具条0
+    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    "AMap.PolyEditor", //编辑 折线多，边形
+    "AMap.CircleEditor", //圆形编辑器插件
+    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
+  ],
+  uiVersion: "1.0"
+});
+/** **************************通用组件******************************/
+
+Vue.prototype.$echarts = echarts
+all()
+// sale()
+ldap()
+system(false)
+
+saleManage()
+webmeterManage("wuhai")
+ManageHome()
+newmanage()
+reportManage()
+require('system-clients/src/styles/less/bootstrap.less')
+require('./components/qinhua/Style/qinhuaStyle.less')
+// require('./bootstrap/less/manageStyle/manageChile.less')
+// require('./bootstrap/less/manageStyle/safeStyle.less')
+
+//大屏展示要放开的样式
+// require('system-clients/src/styles/less/manageStyle/manageChile.less')
+// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
+// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})
+