manage-client 3.3.69 → 3.3.70

package/package.json

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

package/src/components/SellReport/DepartmentPrick.vue

@@ -217,11 +217,22 @@ import {DataModel, HttpResetClass} from 'vue-client'
         this.operatorname = this.userresid.filter(x => x.value ==val).map(x=>x.label).toString()
         console.log('dep',this.operatorname )
       },
+      getParamStr (array) {
+        let stringValue = ''
+        for (let i = 0; i < array.length; i++) {
+          if (i === array.length - 1) {
+            stringValue = stringValue + "'" + array[i] + "'"
+          } else {
+            stringValue = stringValue + "'" + array[i] + "',"
+          }
+        }
+        return stringValue
+      },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1=1'
         if (this.f_orgid[0]) {
-          orgcondition += `  and f_orgid in ('${this.f_orgid}')`
+          orgcondition += `  and f_orgid in (${this.getParamStr(this.f_orgid)})`
         }
 
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition

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

@@ -456,7 +456,7 @@
           }
         }
         if (this.meter_classify == '机表') {
-          if (!this.$refs.paged.$refs.cri.model.handsellcishumax && !this.$refs.paged.$refs.cri.model.handsellcishumax) {
+          if (!this.$refs.paged.$refs.cri.model.handsellcishumin && !this.$refs.paged.$refs.cri.model.handsellcishumax) {
             args.condition = args.condition + "and sellcishu > 0"
           }
         }