manage-client 3.2.214 → 3.2.215

package/package.json

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

package/src/filiale/WEINAN/CancellationQuery.vue

@@ -177,9 +177,7 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
-              <td style="text-align: center;" v-if="row.f_state === '销户'&& row.num== 1">
                 <nobr><a href="#" @click="$parent.$parent.$parent.enable(row)">启用</a> | <a href="#" @click="$parent.$parent.$parent.modifyAddress(row)">修改地址</a></nobr>
-              </td>
               <td style="text-align: center;" v-else>
               </td>
               <td style="text-align: center;"><nobr>

package/src/filiale/zhongsheng/ChargeQuery.vue

@@ -147,12 +147,11 @@
                 </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"
+                  <v-select :value.sync="$parent.$parent.f_price_name"
+                            v-model="$parent.$parent.f_price_name"
                             multiple
-                            :options="$parent.$parent.getPricenames"
-                            condition="f_price_name in {}"
-                            ></v-select>
+                            :options="$parent.$parent.getPricenames">
+                    </v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表编号</label>
@@ -789,6 +788,7 @@
      data() {
       return {
         IdCardInfo:'',
+        f_price_name:[],
         card:'',
         isSingleUser: null,
         startDate1:'',
@@ -1034,6 +1034,25 @@
         if(this.IdCardInfo!=''){
           args.condition +=` and f_idnumber='${this.IdCardInfo}'`
         }
+        let stringValue = ''
+        if(this.f_price_name.length > 0){
+          if (this.f_price_name.includes('非居民2.54')) {
+            for (var i = 0; i < this.f_price_name.length; i++) {
+              stringValue = stringValue + "'" + this.f_price_name[i] + "',"
+            }
+            stringValue = stringValue + "'非居民2.4'"
+            args.condition += 'and f_price_name in ('+stringValue+')'
+          }else {
+            for (var i = 0; i < this.f_price_name.length; i++) {
+              if (i === this.f_price_name.length - 1) {
+                stringValue = stringValue + "'" + this.f_price_name[i] + "'"
+              } else {
+                stringValue = stringValue + "'" + this.f_price_name[i] + "',"
+              }
+            }
+            args.condition += 'and f_price_name in ('+stringValue+')'
+          }
+        }
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
         this.card=''