sale-client 3.5.60 → 3.5.62

package/build/dev-server.js

@@ -1,171 +1,164 @@
-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://121.36.106.17:8400', bendi1 = 'http://127.0.0.1:8080/'// 公司测试服务
-var fuwu = 'http://121.36.106.17:8400'
-// var fuwu = 'http://121.36.106.17:8400/'
-// 铜川正式
-//  var fuwu = 'http://61.134.55.234:9999/'
-// 铜川测试
-// var fuwu = 'http://61.134.55.234:9999/'
-// var fuwu = 'http://60.222.250.39:8300/'
-// 韶关
-// var fuwu = 'http://119.146.1.106:8300/'
-// 巩义测试服务
-// var fuwu = 'http://192.168.0.227:8400'
-// 燎原测试服务
-// var fuwu = 'http://121.41.19.238:8400  '
-// var fuwu = 'http://121.41.19.238:9001/'
-
-// var fuwu = 'http://139.214.92.34:8301/'
-
-var proxyTable = {
-  '/rs/logic/saleExport': {
-    target: fuwu
-  },
-  '/rs/logic/saleGetExportProgress': {
-    target: fuwu
-  },
-  '/rs/file': {
-    target: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/entity/t_material_info': {
-    target: bendi1
-  },
-  // 查找资源服务数据
-  '/rs/logic/query_material': {
-    target: bendi1
-  },
-  '/rs/logic/getSaleInitData': {
-    target: fuwu
-  },
-  '/invoice': {
-    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/sql/manage_getarealist': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getstreetlist': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: 'http://121.36.106.17:8400/'
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/webmeter': {
-    target: 'http://192.168.50.4:8450'
-  },
-  '/rs': {
-    // target: 'http://192.168.30.63:8081/'
-    // target: 'http://121.36.106.17:8400/'
-    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'))
-
-module.exports = app.listen(8089, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8089')
-})
+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://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
+// 公司测试服务
+var fuwu = 'http://121.36.106.17:8400'
+// var fuwu = 'http://121.36.106.17:8400/'
+// 铜川正式
+//  var fuwu = 'http://61.134.55.234:9999/'
+// 铜川测试
+// var fuwu = 'http://61.134.55.234:9999/'
+// var fuwu = 'http://60.222.250.39:8300/'
+// 韶关
+// var fuwu = 'http://119.146.1.106:8300/'
+// 巩义测试服务
+// var fuwu = 'http://192.168.0.227:8400'
+// 燎原测试服务
+// var fuwu = 'http://121.41.19.238:8400  '
+// var fuwu = 'http://121.41.19.238:9001/'
+
+// var fuwu = 'http://139.214.92.34:8301/'
+
+var proxyTable = {
+  '/rs/logic/saleExport': {
+    target: fuwu
+  },
+  '/rs/logic/saleGetExportProgress': {
+    target: fuwu
+  },
+  '/rs/file': {
+    target: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData': {
+    target: fuwu
+  },
+  '/invoice': {
+    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/sql/manage_getarealist': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getstreetlist': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: 'http://121.36.106.17:8400/'
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/webmeter': {
+    target: 'http://192.168.50.4:8450'
+  },
+  '/rs': {
+    // target: 'http://192.168.30.63:8081/'
+    // target: 'http://121.36.106.17:8400/'
+    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'))
+
+module.exports = app.listen(8089, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8089')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.60",
+  "version": "3.5.62",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManage/MeterinfoTest.vue

@@ -700,7 +700,7 @@
       },
       async meternumberValidate () {
         let http1 = new HttpResetClass()
-        let res1 = await http1.load('POST', '/rs/sql/getBrandAndType', {data: {condition: ` mi.f_meternumber = '${this.row.f_meternumber}' and mi.f_filialeid= '${this.$login.f.orgid}'`}}, {resolveMsg: null, rejectMsg: '获取默认气表品牌型号失败！！'})
+        let res1 = await http1.load('POST', '/rs/sql/getBrandAndType', {data: {condition: ` mi.f_meternumber = '${this.row.f_meternumber}'`}}, {resolveMsg: null, rejectMsg: '获取默认气表品牌型号失败！！'})
         if (res1.data.length > 0) {
           // 替换表号自带的气表品牌和型号
           let meterbrands = this.meterbrands

package/src/components/charge/business/OtherChargeNew.vue

@@ -48,7 +48,6 @@
               <div class="col-sm-4" :class="{'has-success':row.f_unitprice,'has-error':!row.f_unitprice}">
                 <label style="" for="f_unitprice" class=" font_normal_body">*单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;价</label>
                 <input class="input_search" style="width:60%" type="number" min="1" @blur.prevent="getcollection()"
-                       v-validate:f_unitprice='{required: true, dctest: config.checkFlag?[0, ">=" ]: [0, ">" ] }'
                        v-model="row.f_unitprice"
                        :value.sync="row.f_unitprice"
                        placeholder="单价" v-next-el='sl'>
@@ -346,8 +345,8 @@ export default {
   },
   methods: {
     setTypeprice (val) {
-      if (val && this.model.otherdetail[val] && this.model.otherdetail[val].f_typenumber) {
-        let unitprice = this.$appdata.getSingleValue(this.model.otherdetail[val].f_typenumber)
+      if (this.model.otherdetail[val] && this.model.otherdetail[val].f_typenumber[0]) {
+        let unitprice = this.$appdata.getSingleValue(this.model.otherdetail[val].f_typenumber[0])
         if (unitprice !== undefined) {
           this.model.otherdetail[val].f_unitprice = unitprice
         }

package/src/components/revenue/Common/PrintBill.vue

@@ -1,132 +1,132 @@
-<template>
-  <div class="auto form-horizontal" >
-    <modal :show.sync="show &&!billConfig.autoPrint"  v-ref:modal large backdrop="false">
-      <header slot="modal-header" class="modal-header">
-        <h3 style="color:black" class="modal-title">收费发票</h3>
-      </header>
-      <article slot="modal-body" class="modal-body">
-<!--        <div v-if="bill.data">-->
-<!--          {{{bill.data}}}-->
-<!--        </div>-->
-        <validator name='v'>
-          <form class="form-horizontal  select-overspread">
-            <div class="row" style="display: flex;justify-content: center;" id='normal-bill' v-if="bill.data">
-              {{{bill.data}}}
-            </div>
-          </form>
-        </validator>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <div v-if="billConfig.hasBillManage">
-          <div class="col-sm-2" >
-            <span><strong>发票号:{{model.f_using_number}}</strong></span>
-          </div>
-        </div>
-        <button type="button" class="btn btn-success" @click='print(true)'>选择打印机打印</button>
-        <button type="button" class="btn btn-success" @click='print()' @keyup.enter="print()" v-el:confirmbutton>打印</button>
-        <report-print id='normal-bill' top='5mm' left='5mm'  width='90%'  height='80%' :notrepeat="true" :showbtn="false" v-ref:reportprint></report-print>
-        <button type="button" class="btn btn-default"  @click='cancel()' v-if="!billConfig.hasBillManage">取消</button>
-      </footer>
-    </modal>
-  </div>
-</template>
-<script>
-  import { DataModel } from 'vue-client'
-
-  let getBillData = async function (self, val) {
-    console.log('temp:', self)
-    let temp = {
-      reprint: "'正常'",
-      operator: `'${self.$login.f.name}'`,
-      condition: self.data.id
-    }
-    if (self.data.fillgasid) {
-      temp.condition = `"${self.data.fillgasid}"`
-    }
-    console.log('self.billData.url:', self.billData.url)
-    self.bill = new DataModel(self.billData.url, temp)
-    await self.bill.search(self.data.id)
-    // 获取发票号
-    self.model.f_using_number = self.billData.bill.number
-  }
-
-  export default {
-    title: '收费发票',
-    data () {
-      return {
-        model: {
-          f_using_number: null
-        },
-        bill: {},
-        messShow: false
-      }
-    },
-    props: ['show','data','billData', 'billConfig'],
-    ready () {
-      console.log('打票', this.billConfig, this.billData)
-    },
-    methods: {
-      // 确认按钮获得焦点
-      confirmbuttonfocus () {
-        this.$nextTick(() => {
-          this.$els.confirmbutton.focus()
-        })
-      },
-      cancel  () {
-        this.$dispatch('toggle')
-      },
-      getbill () {
-        this.$refs.reportprint.isPrint = true
-        let val = true
-        getBillData(this, val).then(() => {
-          this.$emit('ready')
-        }).catch((error) => {
-          this.$emit('error', error)
-        })
-      },
-      async print (select) {
-        // 更新系统发票
-        try {
-          if (this.billConfig.hasBillManage) {
-            if (this.data.f_bill_type != '清算单') { await this.$CommonService.openPaperBill(this.data.id, this.data.f_bill_type, this.billConfig.billType, this.billData.bill, '正常') }
-          } else {
-            await this.$resetpost('rs/logic/sale_billReprint', {data: this.data}, {resolveMsg: null, rejectMsg: '票据补打出错！！'})
-          }
-          if (select) {
-            this.$refs.reportprint.print(true)
-          } else {
-            this.$refs.reportprint.print()
-          }
-        } catch (error) {
-          this.$dispatch('refresh')
-        }
-      }
-    },
-    watch: {
-      'show' (val) {
-        if (val) {
-          getBillData(this, val).then(() => {
-            if(this.billConfig.autoPrint){
-              this.print()
-            }
-            this.$emit('ready')
-          }).catch((error) => {
-            this.$emit('error', error)
-          })
-          this.confirmbuttonfocus()
-        }
-      }
-    },
-    events: {
-      'print' () {
-        // 对票据明细进行更新或插入操作
-        this.$dispatch('printok', '发票打印', this.data)
-      },
-      'print-error' () {
-        this.$dispatch('error', '发票打印', this.data, null)
-      }
-    }
-  }
-</script>
-<style >
-</style>
+<template>
+  <div class="auto form-horizontal" >
+    <modal :show.sync="show &&!billConfig.autoPrint"  v-ref:modal large backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h3 style="color:black" class="modal-title">收费发票</h3>
+      </header>
+      <article slot="modal-body" class="modal-body">
+<!--        <div v-if="bill.data">-->
+<!--          {{{bill.data}}}-->
+<!--        </div>-->
+        <validator name='v'>
+          <form class="form-horizontal  select-overspread">
+            <div class="row" style="display: flex;justify-content: center;" id='normal-bill' v-if="bill.data">
+              {{{bill.data}}}
+            </div>
+          </form>
+        </validator>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <div v-if="billConfig.hasBillManage">
+          <div class="col-sm-2" >
+            <span><strong>发票号:{{model.f_using_number}}</strong></span>
+          </div>
+        </div>
+        <button type="button" class="btn btn-success" @click='print(true)'>选择打印机打印</button>
+        <button type="button" class="btn btn-success" @click='print()' @keyup.enter="print()" v-el:confirmbutton>打印</button>
+        <report-print id='normal-bill' top='5mm' left='5mm'  width='90%'  height='80%' :notrepeat="true" :showbtn="false" v-ref:reportprint></report-print>
+        <button type="button" class="btn btn-default"  @click='cancel()' v-if="!billConfig.hasBillManage">取消</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+  import { DataModel } from 'vue-client'
+
+  let getBillData = async function (self, val) {
+    console.log('temp:', self)
+    let temp = {
+      reprint: "'正常'",
+      operator: `'${self.$login.f.name}'`,
+      condition: self.data.id
+    }
+    if (self.data.fillgasid) {
+      temp.condition = `"${self.data.fillgasid}"`
+    }
+    console.log('self.billData.url:', self.billData.url)
+    self.bill = new DataModel(self.billData.url, temp)
+    await self.bill.search(self.data.id)
+    // 获取发票号
+    self.model.f_using_number = self.billData.bill.number
+  }
+
+  export default {
+    title: '收费发票',
+    data () {
+      return {
+        model: {
+          f_using_number: null
+        },
+        bill: {},
+        messShow: false
+      }
+    },
+    props: ['show','data','billData', 'billConfig'],
+    ready () {
+      console.log('打票', this.billConfig, this.billData)
+    },
+    methods: {
+      // 确认按钮获得焦点
+      confirmbuttonfocus () {
+        this.$nextTick(() => {
+          this.$els.confirmbutton.focus()
+        })
+      },
+      cancel  () {
+        this.$dispatch('toggle')
+      },
+      getbill () {
+        this.$refs.reportprint.isPrint = true
+        let val = true
+        getBillData(this, val).then(() => {
+          this.$emit('ready')
+        }).catch((error) => {
+          this.$emit('error', error)
+        })
+      },
+      async print (select) {
+        // 更新系统发票
+        try {
+          if (this.billConfig.hasBillManage) {
+            if (this.data.f_bill_type != '清算单') { await this.$CommonService.openPaperBill(this.data.id, this.data.f_bill_type, this.billConfig.billType, this.billData.bill, '正常') }
+          } else {
+            await this.$resetpost('rs/logic/sale_billReprint', {data: this.data}, {resolveMsg: null, rejectMsg: '票据补打出错！！'})
+          }
+          if (select) {
+            this.$refs.reportprint.print(true)
+          } else {
+            this.$refs.reportprint.print()
+          }
+        } catch (error) {
+          this.$dispatch('refresh')
+        }
+      }
+    },
+    watch: {
+      'show' (val) {
+        if (val) {
+          getBillData(this, val).then(() => {
+            if(this.billConfig.autoPrint){
+              this.print()
+            }
+            this.$emit('ready')
+          }).catch((error) => {
+            this.$emit('error', error)
+          })
+          this.confirmbuttonfocus()
+        }
+      }
+    },
+    events: {
+      'print' () {
+        // 对票据明细进行更新或插入操作
+        this.$dispatch('printok', '发票打印', this.data)
+      },
+      'print-error' () {
+        this.$dispatch('error', '发票打印', this.data, null)
+      }
+    }
+  }
+</script>
+<style >
+</style>