manage-client 3.2.26 → 3.2.27

package/build/dev-server.js

@@ -1,174 +1,174 @@
-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()
-
-// 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 shaoguan='http://119.146.1.106:8300/'
-var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://119.36.179.19:8000', fuwu_login = 'http://192.168.50.4:8400'
-var fuwu = 'http://119.36.179.19:8000'
-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: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData':{
-    target: fuwu
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: fuwu
-  },
-  '/rs/path/getParams': {
-    target: fuwu
-  },
-  '/rs/data': {
-    target: fuwu
-  },
-  '/rs/license': {
-    target: fuwu
-  },
-  '/rs/db': {
-    target: fuwu
-  },
-  '/excel': {
-    target: fuwu
-  },
-  '/rs/config': {
-    target: fuwu
-  },
-  '/rs/sql/getLicenseById': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: fuwu
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/rs/file': {
-    target: fuwu
-  },
-  '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs': {
-    target: bendi
-  }
-}
-
-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')())
-// 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(8087, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8087')
-})
+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()
+
+// 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 shaoguan='http://119.146.1.106:8300/'
+var qtx='http://36.103.222.144:6300/'
+var bendi = 'http://127.0.0.1:8084/', 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: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData':{
+    target: fuwu
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/path/getParams': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: fuwu
+  },
+  '/rs/license': {
+    target: fuwu
+  },
+  '/rs/db': {
+    target: fuwu
+  },
+  '/excel': {
+    target: fuwu
+  },
+  '/rs/config': {
+    target: fuwu
+  },
+  '/rs/sql/getLicenseById': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: fuwu
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/rs/file': {
+    target: fuwu
+  },
+  '/rs/logic/SumSettleFileImport': {
+    target: 'http://127.0.0.1:8080'
+  },
+  '/rs': {
+    target: bendi
+  }
+}
+
+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')())
+// 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(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8085')
+})

package/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

package/package.json

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

package/src/components/SellReport/ChargePrick.vue

@@ -2,11 +2,9 @@
   <div class="basic-main" style="height: 100%">
     <criteria-paged :model="model" :pager='false' v-ref:paged>
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
-        <p class="bg-info text-center" style="padding: 8px;">操作员收款日结账单</p>
-        <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
           <div class="row">
-            <div class="col-sm-3" >
+            <div class="col-sm-2" >
               <label class="font_normal_body" for="startDate">开始日期:</label>
               <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
                           v-model="model.startDate"
@@ -16,7 +14,7 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <div class="col-sm-3" >
+            <div class="col-sm-2" >
               <label  class="font_normal_body" for="endDate">结束日期:</label>
               <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
                           v-model="model.endDate"
@@ -26,22 +24,24 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <div class="col-sm-3 form-group" >
-              <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
-              <right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%"></right-tree>
-            </div>
-            <div class="col-sm-3 form-group">
-              <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
-              <v-select id="oper" style="width: 60%"
-                          :multiple="false"
-                        @change="$parent.$parent.getOpe"
-                          :value.sync="model.f_operatorid"
-                            v-model="model.f_operatorid"
-                        :options='$parent.$parent.userresid' placeholder='请选择'
-                        condition="f_operatorid in {}">
-              </v-select>
-            </div>
-            <div class="col-sm-3 form-group">
+            <res-select-group :show-component="['company','operator']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+<!--            <div class="col-sm-3 form-group" >-->
+<!--              <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>-->
+<!--              <right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%"-->
+<!--              ></right-tree>-->
+<!--            </div>-->
+<!--            <div class="col-sm-2 form-group">-->
+<!--              <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>-->
+<!--              <v-select id="oper" style="width: 60%"-->
+<!--                          :multiple="false"-->
+<!--                        @change="$parent.$parent.getOpe"-->
+<!--                          :value.sync="model.f_operatorid"-->
+<!--                            v-model="model.f_operatorid"-->
+<!--                        :options='$parent.$parent.userresid' placeholder='请选择'-->
+<!--                        condition="f_operatorid in {}">-->
+<!--              </v-select>-->
+<!--            </div>-->
+            <div class="col-sm-2 form-group">
               <label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
               <v-select :value.sync="model.f_payment" multiple
                         v-model="model.f_payment"
@@ -94,56 +94,21 @@
           </tr>
           </tfoot>
         </table>
-        {{{ $parent.reportStr}}}
       </div>
     </criteria-paged>
-    <modal :show.sync="show" v-ref:modal small backdrop="false">
-      <header slot="modal-header" class="modal-header">
-        <h4 class="modal-title">输入文件名称</h4>
-      </header>
-      <article slot="modal-body" class="modal-body">
-        <div class="form-group">
-          <input  type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
-        </div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
-        <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
-      </footer>
-    </modal>
   </div>
 </template>
 
 <script>
 import {DataModel, HttpResetClass} from 'vue-client'
   import co from 'co'
-  let saveFile = function * (self) {
-    // 线验证文件是否重名
-    let count = yield self.$resetpost('rs/sql/manageSingleTable',
-      {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
-      {resolveMsg: null, rejectMsg: null})
-    if (count.data.length > 0) {
-      self.$showAlert('无法保存，文件名重名', 'warning', 3000)
-      return
-    }
-    let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
-      f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
-      f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
-      f_outlets: this.$login.f.depname})
-    if (saveBack.data.status === 'succeed') {
-      self.show = false
-      self.filename = ''
-      // 后台保存完成，通知刷新
-      self.$dispatch('save-success', self.filename)
-    }
-  }
+
 let getData = function * (self) {
-  let load = new HttpResetClass()
-  load.load("POST",'rs/sql/manageSingleTable',
+    new HttpResetClass().load("POST",'rs/sql/manageSingleTable',
     {
       data: {
         tablename: 't_user',
-        condition: `state = '在职' and f_department_name is not null`
+        condition: `1=1`
       }
     },
     {resolveMsg: null, rejectMsg: null})
@@ -161,16 +126,20 @@ let getData = function * (self) {
         printTime: this.$login.toStandardTimeString(),
         depresid: [],
         userresid: [],
-        f_orgid: '',
+        initres: {
+          org:[this.$login.f.orgid],
+          user:[]
+        },
+        //f_orgid: '',
         // f_depid: this.$login.f.depids,
-        f_operatorid: '',
-        operatorid: [],
-        depid: [],
-        tablen:0,
+        // f_operatorid: '',
+        // operatorid: [],
+        // depid: [],
+        tablen: 0,
         orgname: '',
-        depname: '',
+        // depname: '',
         operatorname: '',
-        orgCondtionStr: '1=1',
+        orgCondtionStr: '',
         model: new DataModel('rs/report/chargePrick', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
           f_orgid: 'this.model.f_orgid'}),
         reportStr: null,
@@ -196,78 +165,30 @@ let getData = function * (self) {
       console.log(this.$login.f)
     },
     methods: {
-      getOpe(val){
-        this.operatorname = this.userresid.filter(x => x.value == val).map(x=>x.label).toString()
-        console.log('dep',this.operatorname )
-      },
       searchData () {
         this.$refs.paged.$refs.criteria.search()
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
+
         let orgcondition = '1 = 1'
-        if(this.f_orgid[0]){
-          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
+        if (this.orgCondtionStr) {
+          orgcondition += this.orgCondtionStr
         }
-
-        // if(this.f_operatorid[0]) {
-        //   orgcondition += ' and f_operatorid in(' + this.f_operatorid + ')'
-        // }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)
       },
-      getRes (obj) {
+      getRes (condition,obj) {
         console.log('gs>>>>>>>>>>>>', obj)
-        this.orgname = obj.res[0]
-        // this.depresid = obj.resids
-        // this.userresid = obj.resids
-        this.f_orgid = obj.resids
-      },
-      getuser ( obj, val) {
-        this.operatorname = val[0]
-        this.f_operatorid = obj
-      },
-      // 根据文件路径获取储存的报表内容
-      getFileContent (path) {
-        this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-          this.reportStr = res.data.filecontent
-          this.model.state = '正确'
-        })
-      },
-      confirm () {
-        if (!this.filename || this.filename === '') {
-          this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
-        }
-        let saveGen = saveFile(this)
-        co(saveGen)
-      },
-      close () {
-        this.show = false
-      },
-      // 将报表保存成文件
-      confirmReport () {
-        this.show = true
-        this.filename = this.data.f_report_name + this.$login.toStandardDateString()
+        this.orgCondtionStr = condition
+        this.orgname = obj.orgnames.map(item => item.split('-')[0]).toString()
+        this.operatorname = this.userresid.filter(x => obj.operatornames.includes(x.value)).map(x=>x.label).toString()
+
       }
     },
     watch: {
-      'data' (val) {
-        if (val.f_files_path) {
-          this.getFileContent(val.f_files_path)
-        } else {
-          this.reportStr = null
-        }
-      },
       'model.data' (val) {
-        let len=0
-        let a=val.split('</tr>')
-        for(let i=0;i<a.length;i++){
-          if(a[i].split('</td>').length-1>len){
-            len=a[i].split('</td>').length-1
-          }
-          continue
-        }
-        this.tablen=len
+        this.tablen = val.split('</tr>').map(item => item.split('</td>').length-1).reduce((x, y) => x > y ? x : y)
       }
     },
     computed: {

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

@@ -339,6 +339,9 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               补气金额合计:&emsp;{{sumsmodel.f_remanent_money}}
             </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              户数合计:&emsp;{{sumsmodel.hushu}}
+            </td>
           </tr>
         </table>
         <!--<colligate-details :showinfo="showinfo" :businesstype="businesstype" :data="data" @close-info="showinfo=false"></colligate-details>-->
@@ -409,7 +412,7 @@
         footer:[],
         meterbrands: [],
         pricenames: [],
-        model: new PagedList('rs/sql/changeMeterQuery', 20, {}, {f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0}),
+        model: new PagedList('rs/sql/changeMeterQuery', 20, {}, {f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
@@ -498,14 +501,16 @@
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
 
       },
-      selfSearch(args) {
+     async selfSearch(args) {
         if (this.data) {
           this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
           this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
         }
         args.condition = `${args.condition}` + this.orgCondtionStr
-        this.model.search(args.condition, args.model)
+        await this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+        this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
+
       },
       clear() {
         //清空部门和人员