sale-client 3.5.245 → 3.5.247

package/package.json

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

package/src/filiale/qianneng/revenue/ChargeOper.vue

@@ -116,7 +116,7 @@ let getBtnsGen = async function (self) {
       }
     }
     // 如果卡上有气，添加购气撤销按钮
-    if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是')) {
+    if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
       self.temp.push({
         name: '购气撤销',
         value: {

package/src/filiale/shanggao/charge/ChargeOper.vue

@@ -117,12 +117,11 @@ let getBtnsGen = async function (self) {
             })
           } else {
           }
-
         }
       }
     }
     // 如果卡上有气，添加购气撤销按钮
-    if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是')) {
+    if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
       self.temp.push({
         name: '购气撤销',
         value: {

package/src/filiale/wenxi/HandplanQuery.vue

@@ -738,6 +738,7 @@
       return {
         iswork:false,
         other:[],
+        condition:'',
         footer:[],
         data: {},
         model: new PagedList('rs/sql/salehandplanQuery', 20, {}, {
@@ -1041,6 +1042,7 @@
         }
 
         args.condition = `${args.condition} and f_meter_classify = '机表' ` + this.orgCondtionStr
+        this.condition = args.condition
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       },
@@ -1183,7 +1185,8 @@
         return {
           startDate: this.$refs.paged.$refs.cri.model.startDate,
           endDate: this.$refs.paged.$refs.cri.model.endDate,
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+          condition: this.condition
+        }
       },
       getfield() {
         return this.config.excelHeaders

package/src/filiale/wenxi/MarginCompensation.vue

@@ -152,6 +152,10 @@ export default {
     }
   },
     methods: {
+      clean () {
+        this.$info('取消操作')
+        this.$dispatch('refresh', this.row)
+      },
       confirm () {
 
         this.$showMessage(`确定对用户${this.row.f_user_name}进行余量补差吗？`, ['confirm', 'cancel']).then(async (res) => {

package/src/plugins/MachineChargeService.js

@@ -17,6 +17,12 @@ let MachineChargeService = {
     if (model2 && model2.f_serial_id) {
       f_serial_id = model2.f_serial_id
     }
+    if (!model2 || !model2.garbage_number) {
+      model2 = {
+        // garbage_number: 0,
+        // garbage_money: 0
+      }
+    }
     let param = {
       garbage_number: model2.garbage_number,
       garbage_money: model2.garbage_money,

package/src/sale.js

@@ -118,7 +118,7 @@ export default function () {
   // 读卡后，卡上信息
   Vue.component('cardinfo', (resolve) => { require(['./components/revenue/base/leftview/CardInfo'], resolve) })
   // 当前选择用户的用户基本信息
-  Vue.component('userinfo', (resolve) => { require(['./components/revenue/base/leftview/Userinfo'], resolve) })
+  Vue.component('sale-userinfo', (resolve) => { require(['./components/revenue/base/leftview/Userinfo'], resolve) })
   // 当前选择用户的表具基本信息
   Vue.component('user-meterinfodetail', (resolve) => { require(['./components/revenue/base/leftview/meterinfodetail'], resolve) })
   // 当前选择用户的其他信息

package/lib/package_2022-06-30-14-06-19.json

@@ -1,117 +0,0 @@
-{
-  "name": "sale-client",
-  "version": "3.4.179-1",
-  "description": "收费模块前台组件",
-  "main": "src/index.js",
-  "scripts": {
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "unit": "karma start test/unit/karma.conf.js",
-    "build": "rimraf lib && mkdirp lib && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aote/product.git"
-  },
-  "dependencies": {
-    "examples": "^0.1.0",
-    "js-file-download": "0.4.12",
-    "less-loader": "^2.2.3",
-    "qrcodejs2": "0.0.2",
-    "vue": "^1.0.17",
-    "yarn": "^1.22.10"
-  },
-  "devDependencies": {
-    "address-client": "3.2.27",
-    "axios": "0.15.3",
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "co": "^4.6.0",
-    "compression-webpack-plugin": "1.1.2",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^3.19.0",
-    "eslint-config-standard": "^10.2.1",
-    "eslint-friendly-formatter": "^3.0.0",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-html": "^3.0.0",
-    "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-node": "^5.2.0",
-    "eslint-plugin-promise": "^3.4.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "filemanager-webpack-plugin": "^2.0.5",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "jsencrypt": "3.0.0-rc.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.7",
-    "less": "^2.7.3",
-    "manage-client": "3.1.8-88",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "moment": "2.24.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "qrcodejs2": "0.0.2",
-    "rimraf": "^2.5.0",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "system-clients": "3.2.0-2",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.24.52",
-    "vue-clipboard2": "0.3.1",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "^1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3",
-    "webpack-parallel-uglify-plugin": "^1.0.0",
-    "weixin-js-sdk": "^1.2.0"
-  },
-  "keywords": [
-    "selling-clients"
-  ],
-  "author": "张桥",
-  "license": "ISC",
-  "directories": {
-    "example": "examples",
-    "test": "test"
-  }
-}