manage-client 3.3.143 → 3.3.145

package/package.json

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

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

@@ -182,12 +182,11 @@ export default {
       this.residentialArea = house
     },
     permission(name) {
-      if (this.$login.r.find(value => value == '综合查询')) {
-        if (!this.$login.r.find(value => value == name)) {
-          return false
-        }
+      if (!this.$login.r.find(value => value == name)) {
+        return false
+      }else{
+        return  true
       }
-      return true
     },
     cancel(obj) {
       this.listpage = true

package/src/filiale/lixianV3/BusinessManage.vue

@@ -172,6 +172,7 @@ export default {
   components: {Tabs, TabButton},
   ready() {
     this.getaddress()
+    console.log(this.$login.r)
   },
   methods: {
     async  getaddress(){
@@ -190,12 +191,11 @@ export default {
       this.residentialArea = house
     },
     permission(name) {
-      if (this.$login.r.find(value => value == '综合查询')) {
-        if (!this.$login.r.find(value => value == name)) {
-          return false
-        }
+      if (!this.$login.r.find(value => value == name)) {
+        return false
+      }else{
+        return  true
       }
-      return true
     },
     cancel(obj) {
       this.listpage = true

package/src/filiale/shanxian/EchartsBox.vue

@@ -39,12 +39,12 @@
     <div style="height: 97%;" v-if="showPage === 1">
       <div class="flex-row" style="flex: 1;border-bottom: 1px dashed #888;height: 48%">
         <div style="flex: 1;border-right: 1px dashed #888;width: 50%">
-          <site-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'
+          <site-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
                         v-ref:pay></site-manager>
           <!--        <test></test>-->
         </div>
         <div style="flex: 1;width: 50%">
-          <bank-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'
+          <bank-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
                         v-ref:pay></bank-manager>
         </div>
       </div>
@@ -52,7 +52,7 @@
 
         <div class="flex-row" style="flex: 1;width: 50%;border-right: 1px dashed #888;">
           <div style="flex: 1;">
-            <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'
+            <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
                         v-ref:pay></paymentpie>
           </div>
           <!--          <div style="flex: 1;">-->
@@ -61,7 +61,7 @@
         </div>
 
         <div style="flex: 1;width: 50%">
-          <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'
+          <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
                           v-ref:pay></bussiness-type>
         </div>
       </div>
@@ -104,7 +104,7 @@ export default {
       jurisdiction: this.$login.r,
       model: {
         id: [this.$login.f.orgid],
-        orgid: this.$login.f.orgid,
+        orgid: [this.$login.f.orgid],
         startDate: Util.toStandardDateString(),
         endDate: Util.toStandardDateString()
       }
@@ -123,17 +123,8 @@ export default {
       }
     },
     getRes (obj) {
-      console.log('obj--------',obj)
-      let stringValue = ''
-      for (var i = 0; i < obj.length; i++) {
-        if (i === obj.length - 1) {
-          stringValue = stringValue + "'" + obj[i] + "'"
-        } else {
-          stringValue = stringValue + "'" + obj[i] + "',"
-        }
-      }
-      console.log('stringValue--------',stringValue)
-      this.model.orgid = stringValue
+      console.log('this.obj', obj)
+      this.model.orgid = obj
     }
   }
 }