manage-client 3.2.219 → 3.2.221

package/build/dev-server.js

@@ -21,7 +21,7 @@ var qtx= 'http://36.103.222.144:6300/'
 // var fuwu = 'http://203.57.101.233:9001'
 var bendi = 'http://192.168.50.4:8400'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://127.0.0.1:8080'
+var wode = 'http://127.0.0.1:8090'
 // 192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'

package/package.json

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

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

@@ -101,12 +101,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>
@@ -282,6 +292,7 @@
           dep:[],
           user:[],
         },
+        f_filialeid: this.$login.f.orgid,
         show:false,
         rowdata:{},
         criteriaShow: false,
@@ -313,6 +324,9 @@
       })
     },
     methods: {
+      pricetypechanged(){
+        this.$refs.paged.$refs.cri.model.f_price_name = []
+      },
       Fileinput(){
         this.batchmoneyShow=true;
       },
@@ -436,6 +450,38 @@
       },
     },
     computed: {
+      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
+        }
+      },
       getCondition() {
         return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
           orderitem: this.orderitem?`${this.orderitem}`: " f_input_date desc "}
@@ -464,9 +510,9 @@
       whetherPay() {
         return [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}]
       },
-      priceName() {
+      pricetypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
-      }
+      },
     },
     events:{
       'onFileUpload': function (file, res) {

package/src/filiale/WEINAN/NewAccountQuery.vue

@@ -14,7 +14,7 @@
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_open_date >= '{} 00:00:00'">
+                              condition="f_operate_date >= '{} 00:00:00'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -24,7 +24,7 @@
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_open_date <= '{} 23:59:59'">
+                              condition="f_operate_date <= '{} 23:59:59'">
                   </datepicker>
                 </div>
                 <div class="span" style="float:right;">