manage-client 3.2.161 → 3.2.164

package/build/dev-server.js

@@ -1,176 +1,179 @@
-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://192.168.50.4:8400'
-// var bendi = 'http://172.168.1.11:9001'
-var fuwu = 'http://192.168.50.4:8400'
-// var fuwu = 'http://203.57.101.233:9001'
-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: bendi
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/rs/file': {
-    target: bendi
-  },
-  '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs': {
-    target: fuwu
-  }
-}
-
-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')
-})
+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://192.168.50.4:8400'
+// var bendi = 'http://172.168.1.11:9001'
+var fuwu = 'http://172.168.1.11:9001/'
+// var fuwu = 'http://203.57.101.233:9001'
+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
+  },
+  '/rs/sql/otherChargeQuery': {
+    target: 'http://localhost:8080/'
+  },
+  '/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: bendi
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/rs/file': {
+    target: bendi
+  },
+  '/rs/logic/SumSettleFileImport': {
+    target: 'http://127.0.0.1:8080'
+  },
+  '/rs': {
+    target: fuwu
+  }
+}
+
+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/package.json

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

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

@@ -115,6 +115,9 @@
     <tabs header="增值业务汇总查询"  v-if="permission('增值业务汇总查询')">
       <valueadd-count-query  @deal-msg="dealMsg" :selectorg.sync="selectOrgid" ></valueadd-count-query>
     </tabs>
+    <tabs header="受理单查询"  v-if="permission('受理单查询')">
+      <print-sheet-query  @deal-msg="dealMsg" :selectorg.sync="selectOrgid" ></print-sheet-query>
+    </tabs>
   </tab-button>
   <!--  </div>-->
   <!--  <div v-if="!listpage">-->

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

@@ -0,0 +1,212 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main">
+      <div class="flex">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              condition="ps.f_operate_date >= '{}'"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                  >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              condition="ps.f_operate_date <= '{}'"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                  >
+                  </datepicker>
+                </div>
+                <!--<div class="form-group col-sm-2">-->
+                  <!--<label class="font_normal_body">选择小区</label>-->
+                  <!--<v-select :value.sync="model.f_residential_area" :value-single="true"-->
+                            <!--class="select_list select"-->
+                            <!--style="width: 60%"-->
+                            <!--v-model="model.f_residential_area"-->
+                            <!--:options='$parent.$parent.residentialArea' placeholder='选择小区'-->
+                            <!--condition="ua.f_residential_area = '{}'"-->
+                            <!--close-on-select search="true">-->
+                  <!--</v-select>-->
+                <!--</div>-->
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="printSheetQuery"
+                                template-name='受理单查询导出'
+                                :choose-col="true"></export-excel>
+                  <print-data  :model="$parent.model" :field="$parent.$parent.getfield"
+                               :defaultfield="$parent.$parent.defaultfield"
+                              titletable="受理单查询导出"></print-data>
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <res-select-group :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="ua.f_userinfo_code = '{}' " placeholder="用户编号">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用户姓名</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition="ui.f_user_name = '{}' " placeholder="用户姓名">
+                </div>
+                <div class="form-group col-sm-3">
+                  <label class="font_normal_body">打印次数</label>
+                  <v-input :value.sync="$parent.f_print_num" :expression.sync = 'model.f_print_num'
+                           condition="f_print_num {}" v-model="model.f_print_num"  style="width: 60%"
+                           typeof="number"
+                           placeholder="打印条数" ></v-input>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid  :model="model" partial='list' class="list_area table_sy" v-ref:grid >
+            <template partial='head'>
+              <tr>
+                <th v-for="(key,value ) in $parent.$parent.$parent.config.pageFilds" ><nobr>{{value}}</nobr></th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;" v-for="(key,value ) in $parent.$parent.$parent.config.pageFilds"><nobr>{{row[key]}}</nobr></td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList, HttpResetClass} from 'vue-client'
+  import defaultPrint from '../config/DefaultPrint'
+  import exportConfig from "../config/exportConfig";
+  import plugins from "../../../plugins/GetLoginInfoService";
+
+  let readySomething = async function (self) {
+    self.initParams()
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+  }
+
+  export default {
+    title: '受理单打印查询',
+    data() {
+      let model = new PagedList('rs/sql/printSheetQuery', 20, {
+        startdate: 'this.model.startDate',
+        enddate: 'this.model.endDate'
+      })
+      model.f_filialeid = this.$login.f.orgid
+      return {
+        //默认打印列
+        defaultfield: [],
+        config: {
+          pageFilds:{
+              'f_userinfo_code': '用户编号', 'f_user_name': '用户姓名', 'f_user_phone': '用户电话',  'f_user_type': '用户类型' ,'f_address':'用户地址',
+              'f_operate_date':'操作时间','f_print_time':'打印时间','f_print_num':'打印次数','f_orgname':'组织机构','f_depname':'部门','f_operator':'操作人'
+          },
+          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone','f_user_type','f_address','f_operate_date','f_print_time']
+        },
+        data: {},
+        other: [],
+        footer: [],
+        meterbrands: [],
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[]
+        },
+        model: model,
+        criteriaShow: false,
+        f_filialeid: this.$login.f.orgid,
+        orgid: [this.$login.f.orgid],
+        //小区
+        residentialArea: [],
+        orgCondtionStr: '',
+      }
+    },
+    ready() {
+      this.getaddress()
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      // async getaddress() {
+      //   console.log('开始获取小区')
+      //   let HttpReset = new HttpResetClass()
+      //   var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
+      //     data: {
+      //       condition: `1=1 and s.f_filialeid = '${this.$login.f.orgid}'`
+      //     }
+      //   }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+      //   console.log('小区', data)
+      //   let house = [{label: '全部', value: ''}]
+      //   for (let row of data.data) {
+      //     console.log('开始保存小区')
+      //     house.push({label: row.f_residential_area, value: row.f_residential_area})
+      //   }
+      //   this.residentialArea = house
+      // },
+      selfSearch(args) {
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+      },
+      async getRes(condition,obj) {
+        console.log(condition,"========")
+        this.orgCondtionStr = condition
+
+      },
+      clear() {
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      }
+    },
+    watch: {
+
+    },
+    computed: {
+
+      getCondition() {
+        var con = ""
+        if (this.orgCondtionStr) {
+          con = `${this.$refs.paged.$refs.cri.condition} ` + this.orgCondtionStr
+        } else {
+          con = `${this.$refs.paged.$refs.cri.condition}`
+        }
+        return {
+          condition: con
+        }
+      },
+      getfield() {
+        return this.config.pageFilds
+      }
+    }
+
+  }
+</script>