manage-client 3.2.2 → 3.2.6

package/build/dev-server.js

@@ -11,25 +11,17 @@ var compiler = webpack(config)
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-//韶关
-// var fuwu='http://119.146.1.106:8300/'
+var shaoguan='http://119.146.1.106:8300/'
 var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://127.0.0.1:8083/'
-var fuwu_login = 'http://192.168.50.4:8400'
-//公司
-// var fuwu='http://192.168.50.4:8400/'
-var fuwu='http://172.168.1.11:9001/'
-//经纬
-// var fuwu='http://60.222.250.39:8300/'
+var bendi = 'http://127.0.0.1:8976', fuwu_login = 'http://192.168.50.4:8400'
+var fuwu = 'http://192.168.50.4:8400'
+var system = 'http://192.168.50.4:8400'
 //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'
 var proxyTable = {
   '/rs/logic/exportfile': {
-    target: bendi
-  },
-  '/rs/entity':{
-    target:'http://127.0.0.1:8080'
+    target: fuwu
   },
   '/files': {
     target: fuwu
@@ -75,7 +67,7 @@ var proxyTable = {
     target: fuwu
   },
   '/rs/report': {
-    target: bendi
+    target: fuwu
   },
   '/rs/vue': {
     target: fuwu
@@ -86,15 +78,8 @@ var proxyTable = {
   '/rs/logic/SumSettleFileImport': {
     target: 'http://127.0.0.1:8080'
   },
-  '/rs/logic/getBatchOperaPro':{
-    target:  'http://127.0.0.1:8080'
-  },
-  '/rs/logic/machineChargePay':{
-    target:  'http://127.0.0.1:8080'
-  },
   '/rs': {
-    // target: 'http://127.0.0.1:8079'
-    target: fuwu
+    target: bendi
   }
 }
 

package/package.json

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

package/src/components/SellReport/AmountGas.vue

@@ -172,12 +172,12 @@ export default {
     },
     selfSearch (args) {
       this.printTime = this.$login.toStandardTimeString()
-      let orgcondition = ' f_orgid = ' + this.f_orgid
+      let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
       if (this.f_depid[0]) {
-        orgcondition += ' and f_depid = ' + this.f_depid
+        orgcondition += ' and f_depid in (' + this.f_depid + ')'
       }
       if(this.f_operatorid[0]) {
-        orgcondition += ' and f_operatorid = ' + this.f_operatorid
+        orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
       }
       this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
       this.$refs.paged.search(args)

package/src/components/SellReport/BonSummary.vue

@@ -175,13 +175,13 @@
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1=1'
         if (this.f_orgid[0]) {
-          orgcondition += ' and f_orgid = ' + this.f_orgid
+          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
         }
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/BusinessMoneyReport.vue

@@ -175,7 +175,7 @@
           console.log( "condition:" + args.condition)
           let orgcondition = '1=1'
           if (this.f_orgid[0]) {
-            orgcondition += ' and f_orgid = ' + this.f_orgid
+            orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
           }
           let deps = ''
           let i = 0

package/src/components/SellReport/BusinessReport.vue

@@ -182,13 +182,13 @@
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition ='1=1'
         if (this.f_orgid[0]) {
-          orgcondition += ' and f_orgid = ' + this.f_orgid
+          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
         }
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/ChSellReport.vue

@@ -172,12 +172,12 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = ' f_orgid = ' + this.f_orgid
+        let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/ChargeBill.vue

@@ -175,13 +175,13 @@
           this.printTime = this.$login.toStandardTimeString()
           let orgcondition = '1=1'
           if (this.f_orgid[0]) {
-            orgcondition += ' and f_orgid = ' + this.f_orgid
+            orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
           }
           if (this.f_depid[0]) {
-            orgcondition += ' and f_depid = ' + this.f_depid
+            orgcondition += ' and f_depid in (' + this.f_depid + ')'
           }
           if(this.f_operatorid[0]) {
-            orgcondition += ' and f_operatorid = ' + this.f_operatorid
+            orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
           }
           this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
           this.$refs.paged.search(args)

package/src/components/SellReport/ChargeDayTable.vue

@@ -173,12 +173,12 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = ' f_orgid = ' + this.f_orgid
+        let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/ChargeMonthTable.vue

@@ -172,12 +172,12 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = ' f_orgid = ' + this.f_orgid
+        let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/ChargeYearTable.vue

@@ -173,12 +173,12 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = ' f_orgid = ' + this.f_orgid
+        let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/DeptHomePage.vue

@@ -184,7 +184,7 @@
       },
       selfSearch (args) {
         let f_dep=this.f_depid
-        let orgcondition = ' ts.f_orgid = ' + this.f_orgid
+        let orgcondition = ' ts.f_orgid in (' + this.f_orgid + ')'
         if (f_dep[0]) {
           orgcondition += " and ts.f_depid in('"+f_dep[0]+"'"
             for( let i=1;i<f_dep.length;i++){
@@ -193,7 +193,7 @@
           orgcondition +=')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and ts.f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and ts.f_operatorid in (' + this.f_operatorid + ')'
         }
         // console.log(this.orgname,this.depname.toString(),this.operatorname)
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition

package/src/components/SellReport/GasMeterBrand.vue

@@ -160,7 +160,7 @@
         this.$refs.paged.$refs.criteria.search()
       },
       selfSearch (args) {
-        let orgcondition = 'f_orgid = ' + this.f_orgid
+        let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
 
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/GasPriceGroup.vue

@@ -160,7 +160,7 @@
         this.$refs.paged.$refs.criteria.search()
       },
       selfSearch (args) {
-        let orgcondition = 'f_orgid = ' + this.f_orgid
+        let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
 
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/GasSummary.vue

@@ -172,12 +172,12 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = ' f_orgid = ' + this.f_orgid
+        let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/Gasc.vue

@@ -172,12 +172,12 @@ export default {
     },
     selfSearch (args) {
       this.printTime = this.$login.toStandardTimeString()
-      let orgcondition = ' f_orgid = ' + this.f_orgid
+      let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
       if (this.f_depid[0]) {
-        orgcondition += ' and f_depid = ' + this.f_depid
+        orgcondition += ' and f_depid in (' + this.f_depid + ')'
       }
       if(this.f_operatorid[0]) {
-        orgcondition += ' and f_operatorid = ' + this.f_operatorid
+        orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
       }
       this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
       this.$refs.paged.search(args)

package/src/components/SellReport/GetUserNum.vue

@@ -172,12 +172,12 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = 'f.f_orgid = ' + this.f_orgid
+        let orgcondition = 'f.f_orgid in (' + this.f_orgid + ')'
         if (this.f_depid[0]) {
-          orgcondition += ' and f.f_depid = ' + this.f_depid
+          orgcondition += ' and f.f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f.f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f.f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/HandplanBili.vue

@@ -173,12 +173,12 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = 'f_orgid = ' + this.f_orgid
+        let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/HandplanUserCount.vue

@@ -152,7 +152,7 @@
     ready () {
       this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
       this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
-      this.$refs.paged.$refs.criteria.search()
+      // this.$refs.paged.$refs.criteria.search()
       console.log(this.$login.f)
     },
     methods: {

package/src/components/SellReport/ManageGasPrice.vue

@@ -173,12 +173,12 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = 'f_orgid = ' + this.f_orgid
+        let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/ManageGasSumChange.vue

@@ -190,13 +190,13 @@
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition ='1=1'
         if (this.f_orgid[0]) {
-          orgcondition += ' and f_orgid = ' + this.f_orgid
+          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
         }
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid in( ' + this.f_depid.toString()+")"
+          orgcondition += ' and f_depid in (' + this.f_depid.toString() + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition + ' and ' + this.$refs.paged.$refs.criteria.condition
         this.$refs.paged.search(args)

package/src/components/SellReport/ManageGasSumChangeTwo.vue

@@ -195,13 +195,13 @@
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition ='1=1'
         if (this.f_orgid[0]) {
-          orgcondition += ' and f_orgid = ' + this.f_orgid
+          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
         }
         if (this.f_depid[0]) {
           orgcondition += ' and f_depid in( ' + this.f_depid.toString() + ")"
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition + ' and ' + this.$refs.paged.$refs.criteria.condition
         this.$refs.paged.search(args)

package/src/components/SellReport/ManageGasSumOtherCharge.vue

@@ -175,13 +175,13 @@
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition ='1=1'
         if (this.f_orgid[0]) {
-          orgcondition += ' and f_orgid = ' + this.f_orgid
+          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
         }
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/MeterPrice.vue

@@ -175,13 +175,13 @@
           this.printTime = this.$login.toStandardTimeString()
           let orgcondition = '1=1'
           if (this.f_orgid[0]) {
-            orgcondition += ' and f_orgid = ' + this.f_orgid
+            orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
           }
           if (this.f_depid[0]) {
-            orgcondition += ' and f_depid = ' + this.f_depid
+            orgcondition += ' and f_depid in (' + this.f_depid + ')'
           }
           if(this.f_operatorid[0]) {
-            orgcondition += ' and f_operatorid = ' + this.f_operatorid
+            orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
           }
           this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
           this.$refs.paged.search(args)

package/src/components/SellReport/MeterReader.vue

@@ -159,9 +159,9 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = 'f_orgid = ' + this.f_orgid
+        let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/NonResidentGas.vue

@@ -175,13 +175,13 @@
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition ='1=1'
         if (this.f_orgid[0]) {
-          orgcondition += ' and f_orgid = ' + this.f_orgid
+          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
         }
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/OperatorSellReport.vue

@@ -175,7 +175,7 @@
           console.log( "condition:" + args.condition)
           let orgcondition = '1=1'
           if (this.f_orgid[0]) {
-            orgcondition += ' and f_orgid = ' + this.f_orgid
+            orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
           }
           let deps = ''
           let i = 0

package/src/components/SellReport/OutletTable.vue

@@ -178,13 +178,13 @@
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1=1'
         if (this.f_orgid[0]) {
-          orgcondition += ' and f_orgid = ' + this.f_orgid
+          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
         }
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if (this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/PaymentDistribute.vue

@@ -160,7 +160,7 @@
         this.$refs.paged.$refs.criteria.search()
       },
       selfSearch (args) {
-        let orgcondition = 'f_orgid = ' + this.f_orgid
+        let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
 
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/PaymentMethod.vue

@@ -181,7 +181,7 @@
           console.log("condition:" + args.condition)
           let orgcondition = '1=1'
           if (this.f_orgid[0]) {
-            orgcondition += ' and s.f_orgid = ' + this.f_orgid
+            orgcondition += ' and s.f_orgid in (' + this.f_orgid + ')'
           }
           let  deps = ''
           let i = 0

package/src/components/SellReport/QTXManageBusSummary.vue

@@ -168,12 +168,12 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = 'f_orgid = ' + this.f_orgid
+        let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)