sale-client 3.6.128 → 3.6.130

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
+const [ serverRul, localUrl ] = ['https://qnjtkf.cn:7400/#', 'https://qnjtkf.cn:7400/#']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -20,6 +20,9 @@ var devConfig = {
       '/rs/file': {
         target: serverRul
       },
+      '/rs/business': {
+        target: localUrl
+      },
       '/rs/sql/singleTable': {
         target: serverRul
       },

package/package.json

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

package/src/components/chargeBatch/CardList.vue

@@ -193,6 +193,22 @@
    */
   let reprintBatchGen = function *(self, row) {
     try {
+      // 验证是否全部收完
+      let res = yield self.$resetpost('rs/sql/querySingleTable',
+        {
+          data: {
+            items: 'count(id) count',
+            tablename: 't_sellinggas',
+            condition: `f_batch_id = '${row.id}' and f_operate_date >= '${row.f_operate_date}'`
+          }
+        },
+        {resolveMsg: null, rejectMsg: null}).catch((error) => {
+        console.log('异常提示:' + error)
+      })
+      if (res.data[0].count !== row.f_charge_user) {
+        self.$showMessage('该批次未全部收完，不能打印票据明细')
+        return
+      }
       row.f_bill_type = row.type
       row.f_bill_style = '普通收据'
       row.f_operator = self.$login.f.name
@@ -387,7 +403,7 @@ and  th.f_userfiles_id = '${row.f_userfiles_id}' and tsh.f_state='有效'`
         this.cancel_show = false
       },
       cancelSucc () {
-        console.log("-----------------------------撤销成功了，隐藏掉")
+        console.log('-----------------------------撤销成功了，隐藏掉')
         this.cancel_show = false
         this.$dispatch('refresh')
       },

package/src/components/webMeter/meterinfo/NewMeterList.vue

@@ -388,7 +388,7 @@
         networkvalves: this.$appdata.getParam('阀控状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('阀控状态')] : [],
         valvestates: this.$appdata.getParam('阀门状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('阀门状态')] : [],
         searchshow: false,
-        orgcondition: ' and f_filialeid = ' + this.$login.f.orgid,
+        orgcondition: ' and f_filialeid = ' + `'${this.$login.f.orgid}'`,
         getfield: {},
         // 排序
         orderitem: 'f_userinfo_id desc',