manage-client 1.21.107-ca → 1.22.4-ca

package/.npmignore

@@ -0,0 +1,10 @@
+src/bootstrap
+.idea/
+.DS_Store
+node_modules/
+dist/static/*.map
+npm-debug.log
+selenium-debug.log
+test/unit/coverage
+test/e2e/reports
+yarn.locknp

package/build/.npmignore

@@ -0,0 +1 @@
+

package/build/dev-server.js

@@ -1,64 +1,93 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-var changan = 'http://192.168.2.84:7003/'
-var proxyTable = {
-  '/rs': {
-    //target: changan
-    target: changan
-  }
-}
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({ action: 'reload' })
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = { target: options }
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-
-// 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'))
-
-
-module.exports = app.listen(8085, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8085')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+var bendi = 'http://127.0.0.1:5001/ldap/', changan = 'http://192.168.2.79:7003/'
+var proxyTable = {
+  // 查找资源服务数据
+  '/rs/sql/manageSingleTable': {
+    target:changan
+  },
+  '/rs/search': {
+    target: changan
+  },
+  '/rs/logic/getLogin': {
+    target: changan
+  },
+  '/rs/logic/getInitData': {
+    target: changan
+  },
+  '/rs/logic/getSaleInitData': {
+    target: changan
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: changan
+  },
+  '/rs/data': {
+    target: changan
+  },
+  '/rs/license': {
+    target: changan
+  },
+  '/xyhf/rs/xyhf': {
+    target: changan
+  },
+  '/rs': {
+    //target: changan
+    target: changan
+  }
+}
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({ action: 'reload' })
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = { target: options }
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+
+// 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'))
+
+
+module.exports = app.listen(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8085')
+})

package/package.json

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

package/src/components/MeterManage/ChargeQuery.vue

@@ -1,11 +1,11 @@
 <template >
-  <div id="stand-work-list" class="flex bg-white p-10">
+  <div id="stand-work-list" class="flex bg-white p-10" style="overflow:hidden;">
       <criteria-paged :model="model" v-ref:paged  >
         <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.search'>
           <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
             <div class="row" width="100%">
               <div class="col-sm-4" >
-                <label class="font_normal_body" >&nbsp;开始时间</label>
+                <label class="font_normal_body" style="width: 40%;" >开始时间</label>
                 <datepicker placeholder="起始时间" style="width:60%"
                             :value.sync="model.f_start_date"
                             v-model="model.f_start_date"
@@ -14,7 +14,7 @@
                 ></datepicker>
               </div>
               <div class="col-sm-4" >
-                <label class="font_normal_body" >结束时间</label>
+                <label class="font_normal_body" style="width: 40%;" >结束时间</label>
                 <datepicker placeholder="结束时间" style="width:60%"
                             :value.sync="model.f_end_date"
                             v-model="model.f_end_date"
@@ -22,8 +22,10 @@
                             condition="f_operate_date <= to_date('{} 23:59:59','yyyy-mm-dd hh24:mi:ss')"
                 ></datepicker>
               </div>
+
+
               <div class="col-sm-4" >
-                <label class="font_normal_body" >状态</label>
+                <label class="font_normal_body"  style="width: 40%;">状态</label>
                 <v-select :value.sync="model.f_state"
                           v-model="model.f_state"
                           style="width:60%"
@@ -31,6 +33,64 @@
                           condition="f_state = '{}'"
                           close-on-select></v-select>
               </div>
+              <div class="form-group col-sm-4">
+                <label class="font_normal_body " style="width: 40%;" >售气公司</label>
+                <v-select :value.sync="model.f_filiale"
+                          v-model="model.f_filiale"
+                          style="width:60%"
+                          :options='$parent.$parent.f_filiale' placeholder='请选择'
+                          condition="f_filiale = '{}'"
+                          close-on-select></v-select>
+                <!--<input-->
+                  <!--type="text"-->
+                  <!--class="form-control" style="width: 60%"-->
+                  <!--v-model="model.f_filiale"-->
+                  <!--condition="f_filiale like '%{}%'"-->
+                  <!--placeholder="售气公司"-->
+                <!--/>-->
+              </div>
+              <div class="form-group col-sm-4">
+                <label class="font_normal_body "  style="width: 40%;">售气部门</label>
+                <v-select :value.sync="model.f_outlets"
+                          v-model="model.f_outlets"
+                          style="width:60%"
+                          :options='$parent.$parent.selldep' placeholder='请选择'
+                          condition="f_outlets = '{}'"
+                          close-on-select></v-select>
+                <!--<input-->
+                  <!--type="text"-->
+                  <!--class="form-control" style="width: 60%"-->
+                  <!--v-model="model.f_outlets"-->
+                  <!--condition="f_outlets like '%{}%'"-->
+                  <!--placeholder="售气部门"-->
+                <!--/>-->
+              </div>
+              <div class="form-group  col-sm-4" >
+                <label class="font_normal_body" style="width: 40%;" >写卡状态</label>
+                <v-select :value.sync="model.f_write_card"
+                          v-model="model.f_write_card"
+                          style="width:60%" :value-single="true"
+                          :options='$parent.$parent.writeCard' placeholder='请选择'
+                          close-on-select></v-select>
+              </div>
+              <div class="form-group  col-sm-4" >
+                <label class="font_normal_body"  style="width: 40%;">指令状态</label>
+                <v-select :value.sync="model.f_instruct_state"
+                          v-model="model.f_instruct_state"
+                          style="width:60%"
+                          :options='$parent.$parent.f_instruct_state' placeholder='请选择'
+                          condition="f_instruct_state = '{}'"
+                          close-on-select></v-select>
+              </div>
+              <div class="form-group  col-sm-4" >
+                <label class="font_normal_body"  style="width: 40%;">收费类型</label>
+                <v-select :value.sync="model.f_type"
+                          v-model="model.f_type"
+                          style="width:60%" multiple
+                          :options='$parent.$parent.f_type' placeholder='请选择'
+                          condition="f_type in {}"
+                          close-on-select></v-select>
+              </div>
               <div class="span" style="float:right;">
                 <button class="btn btn-success"  @click="search()" v-el:cba>查询</button>
               </div>
@@ -45,11 +105,17 @@
               <th><nobr>购气金额</nobr></th>
 <!--              <th><nobr>购气次数</nobr></th>-->
               <th><nobr>收费状态</nobr></th>
+              <th><nobr>收费类型</nobr></th>
               <th><nobr>收费日期</nobr></th>
+              <th><nobr>写卡日期</nobr></th>
               <th><nobr>操作员</nobr></th>
-              <th><nobr>售气单位</nobr></th>
-              <th><nobr>售气部门</nobr></th>
               <th><nobr>售气站点</nobr></th>
+              <th><nobr>售气公司</nobr></th>
+              <th><nobr>售气部门</nobr></th>
+
+              <th><nobr>写卡状态</nobr></th>
+              <th><nobr>执行结果</nobr></th>
+
               <th><nobr>操作员编号</nobr></th>
             </tr>
           </template>
@@ -60,11 +126,15 @@
               <td style="text-align:center">{{row.f_preamount}}</td>
 <!--              <td style="text-align:center">{{row.f_times}}</td>-->
               <td style="text-align:center">{{row.f_state}}</td>
-              <td style="text-align:center">{{row.f_operate_date}}</td>
+              <td style="text-align:center">{{row.f_type}}</td>
+              <td style="text-align:center"><nobr>{{row.f_operate_date}}</nobr></td>
+              <td style="text-align:center"><nobr>{{row.f_write_date}}</nobr></td>
               <td style="text-align:center">{{row.f_operator}}</td>
-              <td style="text-align:center">{{row.f_filiale}}</td>
-              <td style="text-align:center">{{row.f_outlets}}</td>
               <td style="text-align:center">{{row.op_spot}}</td>
+              <td style="text-align:center"><nobr>{{row.f_filiale}}</nobr></td>
+              <td style="text-align:center"><nobr>{{row.f_outlets}}</nobr></td>
+              <td style="text-align:center">{{row.f_write_card}}</td>
+              <td style="text-align:center">{{row.f_instruct_state}}</td>
               <td style="text-align:center">{{row.op_id}}</td>
             </tr>
           </template>
@@ -89,8 +159,13 @@
     data () {
       return {
         condition: '1=1',
-        model: new PagedList('rs/sql/manage_singleTable', 15, {items: '`*`', tablename: '`t_sellinggas`', orderitem: '`f_operate_date DESC`'},{f_pregas: 0,f_preamount: 0}),
+        model: new PagedList('rs/sql/sellQuery', 15, {items: '`*`', tablename: '`t_sellinggas`', orderitem: '`f_operate_date DESC`'},{f_pregas: 0,f_preamount: 0}),
         charge_state: this.$appdata.getParam('收费状态') ? [{label: '全部', value: ''},...this.$appdata.getParam('收费状态')] : [],
+        writeCard: this.$appdata.getParam('写卡状态') ? [{label: '全部', value: ''},...this.$appdata.getParam('写卡状态')] : [],
+        f_instruct_state: this.$appdata.getParam('指令状态') ? [{label: '全部', value: ''},...this.$appdata.getParam('指令状态')] : [],
+        f_filiale: this.$appdata.getParam('售气单位') ? [{label: '全部', value: ''},...this.$appdata.getParam('售气单位')] : [],
+        f_outlets: this.$appdata.getParam('售气部门') ? [{label: '全部', value: ''},...this.$appdata.getParam('售气部门')] : [],
+        f_type: this.$appdata.getParam('收费类型') ? [{label: '全部', value: ''},...this.$appdata.getParam('收费类型')] : [],
         row: null,
         isdeal: true,
         show: false,
@@ -119,11 +194,30 @@
         }else {
           return
         }
+        if(this.$refs.paged.$refs.criteria.model.f_write_card){
+          if(this.$refs.paged.$refs.criteria.model.f_write_card==='无'){
+            this.condition = `${this.condition} and f_write_card is null`
+          }else {
+            this.condition = `${this.condition} and f_write_card = '${this.$refs.paged.$refs.criteria.model.f_write_card}'`
+          }
+        }
         this.model.search(this.condition, this.args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       }
     }
   },
+    computed:{
+      selldep () {
+        let rs = []
+        if(this.$refs.paged.$refs.criteria.model.f_filiale){
+          this.$refs.paged.$refs.criteria.model.f_outlets = ''
+          return [{label: '全部', value: ''}, ...this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_filiale) ]
+        }
+        else {
+          return [{label: '全部', value: ''}]
+        }
+      },
+    },
     watch:{
       args(val){
         this.search()

package/src/components/MeterManage/LiushuiQuery.vue

@@ -5,7 +5,7 @@
           <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
             <div class="row" width="100%">
               <div class="col-sm-4" >
-                <label class="font_normal_body" >&nbsp;开始时间</label>
+                <label class="font_normal_body" style="width: 40%;">&nbsp;开始时间</label>
                 <datepicker placeholder="起始时间" style="width:60%"
                             :value.sync="model.f_start_date"
                             v-model="model.f_start_date"
@@ -13,8 +13,8 @@
                             condition="f_operate_date >= to_date('{} 00:00:00','yyyy-mm-dd hh24:mi:ss')"
                 ></datepicker>
               </div>
-              <div class="col-sm-4" >
-                <label class="font_normal_body" >结束时间</label>
+              <div class="col-sm-4"  >
+                <label class="font_normal_body"  style="width: 40%;">结束时间</label>
                 <datepicker placeholder="结束时间" style="width:60%"
                             :value.sync="model.f_end_date"
                             v-model="model.f_end_date"
@@ -22,6 +22,38 @@
                             condition="f_operate_date <= to_date('{} 23:59:59','yyyy-mm-dd hh24:mi:ss')"
                 ></datepicker>
               </div>
+              <div class=" col-sm-4">
+                <label class="font_normal_body " style="width: 40%;" >售气公司</label>
+                <v-select :value.sync="model.f_filiale"
+                          v-model="model.f_filiale"
+                          style="width:60%"
+                          :options='$parent.$parent.f_filiale' placeholder='请选择'
+                          condition="f_filiale = '{}'"
+                          close-on-select></v-select>
+                <!--<input-->
+                <!--type="text"-->
+                <!--class="form-control" style="width: 60%"-->
+                <!--v-model="model.f_filiale"-->
+                <!--condition="f_filiale like '%{}%'"-->
+                <!--placeholder="售气公司"-->
+                <!--/>-->
+              </div>
+              <div class="col-sm-4">
+                <label class="font_normal_body "  style="width: 40%;">售气部门</label>
+                <v-select :value.sync="model.f_outlets"
+                          v-model="model.f_outlets"
+                          style="width:60%"
+                          :options='$parent.$parent.selldep' placeholder='请选择'
+                          condition="f_outlets = '{}'"
+                          close-on-select></v-select>
+                <!--<input-->
+                <!--type="text"-->
+                <!--class="form-control" style="width: 60%"-->
+                <!--v-model="model.f_outlets"-->
+                <!--condition="f_outlets like '%{}%'"-->
+                <!--placeholder="售气部门"-->
+                <!--/>-->
+              </div>
               <div class="span" style="float:right;">
                 <button class="btn btn-success"  @click="search()" v-el:cba>查询</button>
               </div>
@@ -38,6 +70,10 @@
               <th><nobr>操作人</nobr></th>
               <th><nobr>操作站点</nobr></th>
               <th><nobr>操作时间</nobr></th>
+              <th><nobr>售气公司</nobr></th>
+              <th><nobr>售气部门</nobr></th>
+              <!--<th><nobr>写卡状态</nobr></th>-->
+              <!--<th><nobr>指令执行</nobr></th>-->
               <th><nobr>备注</nobr></th>
             </tr>
           </template>
@@ -50,6 +86,8 @@
               <td style="text-align:center">{{row.f_operator}}</td>
               <td style="text-align:center">{{row.op_spot}}</td>
               <td style="text-align:center">{{row.f_operate_date}}</td>
+              <td style="text-align:center">{{row.f_filiale}}</td>
+              <td style="text-align:center">{{row.f_outlets}}</td>
               <td style="text-align:center">{{row.note}}</td>
             </tr>
           </template>
@@ -74,6 +112,7 @@
     data () {
       return {
         condition: '1=1',
+        f_filiale: this.$appdata.getParam('售气单位') ? [{label: '全部', value: ''},...this.$appdata.getParam('售气单位')] : [],
         model: new PagedList('rs/sql/sale_RecordQuery', 20,
           null,{gas1: 0,fee:0}),
         row: null,
@@ -91,6 +130,18 @@
     ready () {
       this.$refs.paged.$refs.criteria.search()
     },
+    computed:{
+      selldep () {
+        let rs = []
+        if(this.$refs.paged.$refs.criteria.model.f_filiale){
+          this.$refs.paged.$refs.criteria.model.f_outlets = ''
+          return [{label: '全部', value: ''}, ...this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_filiale) ]
+        }
+        else {
+          return [{label: '全部', value: ''}]
+        }
+      },
+    },
     methods: {
       search(args){
       if(this.args && this.args.model) {