manage-client 4.0.66 → 4.0.67

package/build/dev-server.js

@@ -19,7 +19,7 @@ var qtx= 'http://36.103.222.144:6300/'
 // var bendi = 'http://203.57.101.233:9001/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://203.57.101.233:9001/'
+var bendi = 'http://192.168.50.67:31567/'
 // var bendi = 'http://119.187.112.234:8400/'
 var wode = 'http://203.57.101.233:9001/'
 // 192.168.
@@ -34,7 +34,7 @@ var proxyTable = {
 
   },
   '/api': {
-    target: 'http://203.57.101.233:9001/'
+    target: bendi
 
   },
   '/rs/sql/chargeQuery_by_gasproperties': {
@@ -99,7 +99,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs': {
-    target: wode
+    target: bendi
   }
 }
 
@@ -131,60 +131,14 @@ Object.keys(proxyTable).forEach(function (context) {
 
 // handle fallback for HTML5 history API
 app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
 
-// serve webpack bundle output
 app.use(devMiddleware)
 
-// enable hot-reload and state-preserving
-// compilation error display
 app.use(hotMiddleware)
 
 // serve pure static assets
 app.use('/static', express.static('./static'))
 
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/reports'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/ldap'
-//   })
-// })
-// app.all('/excel/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/charge'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82/charge'
-//   })
-// })
-
-// app.all('/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-// app.all('/rs/user', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-
 module.exports = app.listen(8015, function (err) {
   if (err) {
     console.log(err)

package/package.json

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

package/src/components/SellReport/fugou/FgUserGasType.vue

@@ -24,6 +24,14 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body" title="分组项一">分组项</label>
+              <v-select :value.sync="model.f_public_group1"
+                        v-model="model.f_public_group1"
+                        v-ref:groupone
+                        :options='$parent.$parent.group1' placeholder='请选择'
+                        close-on-select></v-select>
+            </div>
             <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
           </div>
           <div class="span" style = "float:right;">
@@ -94,15 +102,20 @@ export default {
       f_orgid: this.$login.f.orgid,
       f_depid: this.$login.f.depids,
       // f_operatorid: this.$login.f.id,
+      f_public_group1: '',
       operatorid: [],
       depid: [],
+      group1Name: '',
       orgname: '',
       depname: '',
       criteriaShow: false,
       operatorname: '',
       orgCondtionStr: '1=1',
-      model: new DataModel('api/af-revenue/report/fg_mysell_report', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-        f_orgid: 'this.model.f_orgid'}),
+      model: new DataModel('api/af-revenue/report/fg_mysell_report', {startDate: 'this.model.startDate',
+        endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid',
+        f_public_group1: 'this.model.f_public_group1[0]',
+        group1Name: 'this.model.group1Name'}),
       reportStr: null,
       resshow:['company','department','operator'],
       spans: 0,
@@ -124,6 +137,13 @@ export default {
     },
     selfSearch (args) {
       this.printTime = this.$login.toStandardTimeString()
+      this.$refs.paged.$refs.criteria.model.group1Name = this.$refs.paged.$refs.criteria.$refs.groupone.selectedItems
+      let name1 = args.model.f_public_group1
+      if (name1 == null || name1 == '') {
+        alert("请选择分组项！！！")
+        return
+      }
+      console.log(args.model.f_public_group1)
       let orgcondition = '1=1'
       let orgstr = this.orgCondtionStr
       orgcondition = orgcondition + orgstr
@@ -162,6 +182,12 @@ export default {
     }
   },
   computed: {
+    group1() {
+      return [{label:'用气性质', value:'f_gasproperties'},
+        {label:'用气类型', value:'f_user_gas_type'}
+
+      ]
+    }
   }
 }
 </script>

package/src/components/SellReport/fugou/FgUserTags.vue

@@ -24,6 +24,14 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body" title="分组项">分组项</label>
+              <v-select :value.sync="model.f_public_group1"
+                        v-model="model.f_public_group1"
+                        v-ref:groupone
+                        :options='$parent.$parent.group1' placeholder='请选择'
+                        close-on-select></v-select>
+            </div>
             <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
           </div>
           <div class="span" style = "float:right;">
@@ -93,16 +101,20 @@ export default {
       userresid: [],
       f_orgid: this.$login.f.orgid,
       f_depid: this.$login.f.depids,
+      f_public_group1: '',
       // f_operatorid: this.$login.f.id,
       operatorid: [],
       depid: [],
+      group1Name: '',
       orgname: '',
       depname: '',
       criteriaShow: false,
       operatorname: '',
       orgCondtionStr: '1=1',
       model: new DataModel('api/af-revenue/report/fg_fmysell_report', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-        f_orgid: 'this.model.f_orgid'}),
+        f_orgid: 'this.model.f_orgid',
+        f_public_group1: 'this.model.f_public_group1[0]',
+        group1Name: 'this.model.group1Name'}),
       reportStr: null,
       resshow:['company','department','operator'],
       spans: 0,
@@ -124,6 +136,13 @@ export default {
     },
     selfSearch (args) {
       this.printTime = this.$login.toStandardTimeString()
+      this.$refs.paged.$refs.criteria.model.group1Name = this.$refs.paged.$refs.criteria.$refs.groupone.selectedItems
+      let name1 = args.model.f_public_group1
+      if (name1 == null || name1 == '') {
+        alert("请选择分组项！！！")
+        return
+      }
+      console.log(args.model.f_public_group1)
       let orgcondition = '1=1'
       let orgstr = this.orgCondtionStr
       orgcondition = orgcondition + orgstr
@@ -162,6 +181,12 @@ export default {
     }
   },
   computed: {
+    group1() {
+      return [{label:'用气性质', value:'f_gasproperties'},
+        {label:'用户标签', value:'f_user_tags'}
+
+      ]
+    }
   }
 }
 </script>