sale-client 3.5.95 → 3.5.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.95",
+  "version": "3.5.97",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/webMeter/paramSave/ParamSet.vue

@@ -52,6 +52,15 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-2" >
+              <label class="font_normal_body">组织机构</label>
+              <res-select :initresid='$parent.$parent.curorgid'
+                          @res-select="$parent.$parent.getorg"
+                          class="select select_list"
+                          restype='organization'
+                          style="width: 60%">
+              </res-select>
+            </div>
             <div class="col-sm-2 ">
               <label class="font_normal_body">表&emsp;号&emsp;</label>
               <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
@@ -259,6 +268,8 @@ export default {
       user: [],
       meterbrand: [],
       meterstyle: {},
+      curorgid: [this.$login.f.orgid],
+      f_orgid: '',
       model: new PagedList('rs/sql/iot_getOpertionList', 20),
       searchshow: false,
       showParame: false,
@@ -321,6 +332,9 @@ export default {
     // this.model.search('1=1')
   },
   methods: {
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+    },
     //    let condition = 'f_meter_type = "物联网表"'
     // this.$resetpost('/rs/sql/getAllBrands',{data:{condition:condition}},{}).then((res)=>{
     //   let arr=[]
@@ -415,11 +429,15 @@ export default {
       this.search()
     },
     selfSearch (args) {
-      args.condition = `${args.condition} `
+      if (this.f_orgid) {
+        args.condition = `f_orgid in ${this.f_orgid} and ${args.condition}`
+      }
       if (this.f_gasbrand_id.length > 0) {
         args.condition += ' and f_gasbrand_id=' + this.f_gasbrand_id[0]
         this.condition = args.condition
         this.model.search(args.condition, args.model)
+      } else {
+        this.$showAlert(`请先选择气表品牌`, 'warning', 0)
       }
       // this.isCheckAll = false
     },