sale-client 3.6.400-preview → 4.0.2-preview

package/package.json

@@ -1,120 +1,120 @@
-{
-  "name": "sale-client",
-  "version": "3.6.400-preview",
-  "description": "收费模块前台组件",
-  "main": "src/index.js",
-  "scripts": {
-    "example": "node build/example-server.js",
-    "dev": "webpack-dev-server --config ./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": {
-    "crypto-js": "^4.1.1",
-    "examples": "^0.1.0",
-    "js-file-download": "0.4.12",
-    "less-loader": "^2.2.3",
-    "qrcodejs2": "^0.0.2",
-    "vue": "^1.0.17",
-    "webpack-dev-server": "^2.11.5",
-    "vue-client": "1.25.3",
-    "yarn": "^1.22.10"
-  },
-  "devDependencies": {
-    "address-client": "3.2.105",
-    "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": "^3.0.2",
-    "terser-webpack-plugin-legacy": "^1.2.5",
-    "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.96",
-    "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.3.2",
-    "url-loader": "^0.5.7",
-    "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": "^3.12.0",
-    "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"
-  }
-}
+{
+  "name": "sale-client",
+  "version": "4.0.2-preview",
+  "description": "收费模块前台组件",
+  "main": "src/index.js",
+  "scripts": {
+    "example": "node build/example-server.js",
+    "dev": "webpack-dev-server --config ./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": {
+    "crypto-js": "^4.1.1",
+    "examples": "^0.1.0",
+    "js-file-download": "0.4.12",
+    "less-loader": "^2.2.3",
+    "qrcodejs2": "^0.0.2",
+    "vue": "^1.0.17",
+    "webpack-dev-server": "^2.11.5",
+    "vue-client": "1.25.3",
+    "yarn": "^1.22.10"
+  },
+  "devDependencies": {
+    "address-client": "3.2.105",
+    "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": "^3.0.2",
+    "terser-webpack-plugin-legacy": "^1.2.5",
+    "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.96",
+    "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.3.2",
+    "url-loader": "^0.5.7",
+    "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": "^3.12.0",
+    "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"
+  }
+}

package/src/components/FilesManage/UserDeviceInfoTest.vue

@@ -63,6 +63,7 @@
                   <!--                  <input type="text" class="input_search" style="width:60%" v-model="row.f_input_person"-->
                   <!--                         placeholder='安装人'>-->
                   <v-select :value.sync="row.f_input_person" v-model="row.f_input_person"
+                            :value-single="true"
                             :options='installperson' placeholder='安装人'
                             close-on-select></v-select>
                 </div>

package/src/components/FilesManage/UserMeterInfoTest.vue

@@ -111,7 +111,7 @@ export default {
         this.devicesinfo = []
         this.devicesinfo = row.devicesinfo
         if (row.f_install_person && row.f_install_person[0]) {
-          this.f_input_person = row.f_install_person[0]
+          this.f_input_person = row.f_install_person
         }
         this.devicesinfo.forEach((row) => {
           row.devicetypes = this.$appdata.getParam('设备类型')

package/src/components/charge/ChargeManage.vue

@@ -202,13 +202,21 @@ export default {
         this.$refs.list.searchNoData()
         this.$refs.card.search()
       },
-      modalsuccess (obj) {
+      async modalsuccess (obj) {
         this.showModal = false
-        this.$refs.list.criteriaShow = false
-        this.row = obj
-        this.cardInfo = this.$refs.list.cardInfo
-        // 将列表只显示该条数据
-        this.$refs.list.refreshRow(obj)
+        let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and (f_write_card = '未写卡' or (f_write_card = '写卡失败' and f_operate_date >= DATEADD(HOUR, -3, GETDATE()))) and f_userfiles_id = '${obj.f_userfiles_id}'`)
+        console.log('获取未写卡记录', getUnWriteSell)
+        if (getUnWriteSell.data.length > 1) {
+          this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
+        } else {
+          this.$refs.list.criteriaShow = false
+          this.row = obj
+          this.row.unWriteSell = getUnWriteSell.data
+          this.cardInfo = this.$refs.list.cardInfo
+          this.$refs.list.criteriaShow = false
+          // 将列表只显示该条数据
+          this.$refs.list.refreshRow(obj)
+        }
       },
       async serRow (obj) {
         let newdata = await this.$resetpost('api/af-revenue/sql/sale_getUser', {

package/src/components/charge/business/refund/IOTRefund.vue

@@ -32,7 +32,6 @@
             <input v-show="false" v-model="model.f_add_gas" v-validate:f_operat_type='{required: true}'>
             <v-select :value.sync="model.f_add_gas" value-single
                       :options='addGas' placeholder='请选择'
-                      disabled
                       selected="是否计入累购"
                       style="width:60%"
                       close-on-select></v-select>
@@ -109,11 +108,7 @@
     // 默认打印格式
     self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
     self.model.f_payment = [self.config.payment]
-    if (self.config.addgas) {
-      self.model.f_add_gas = '计入'
-    } else {
-      self.model.f_add_gas = '计入'
-    }
+
     self.model.f_use_type = self.config.billType
     self.model.f_bill_type = self.model.f_print
     self.hasValidateBill = self.config.hasBillManage
@@ -124,7 +119,6 @@
     data () {
       return {
         config: {
-          addgas:true,
           showupload: false, // 默认不上传附件
           hasPrint: false,  // 默认打票
           hasBillManage: false,  // 默认不启用发票管理
@@ -134,8 +128,8 @@
           billType: '燃气费'
         },
         model: {
-          f_add_gas: '计入',
           f_refund_fee: '',
+          f_add_gas: '计入',
           f_refund_gas: '',
           f_comments: '',
           f_payment: '',
@@ -148,7 +142,7 @@
         randomBusinessId: '',
         resid: [],  // 存放新增的f_files表中id
         validateOk: false,
-
+        addGas: [{label: '计入', value: '计入'}, {label: '不计入', value: '不计入'}],
         printModel: {},
         print: false,
         billUrl: '',
@@ -221,6 +215,10 @@
             f_depname: this.$login.f.deps
           }
         }
+        if (this.model.f_add_gas !== '计入') {
+          param.f_total_fee = this.data.f_total_fee
+          param.f_total_gas = this.data.f_total_gas
+        }
         console.log('退费传参', param)
         let res = await this.$resetpost('api/af-revenue/logic/iotRefund', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行退费吗？`, resolveMsg: '退费成功！！', rejectMsg: '退费失败！！请重试！！'})
         console.log('退费', res)

package/src/components/charge/business/refund/machineRefund.vue

@@ -31,7 +31,6 @@
                     <input v-show="false" v-model="model.f_add_gas" v-validate:f_operat_type='{required: true}'>
                     <v-select :value.sync="model.f_add_gas" value-single
                               :options='addGas' placeholder='请选择'
-                              disabled
                               selected="是否计入累购"
                               style="width:60%"
                               close-on-select></v-select>
@@ -85,11 +84,7 @@
       self.blodid = self.data.f_userinfo_id
       self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
       self.model.f_payment = [self.config.payment]
-      if (self.config.addgas) {
-        self.model.f_add_gas = '计入'
-      } else {
-        self.model.f_add_gas = '计入'
-      }
+
       self.model.f_use_type = self.config.billType
       self.model.f_bill_type = self.model.f_print
       self.hasValidateBill = self.config.hasBillManage
@@ -100,23 +95,22 @@
       data () {
         return {
           config: {
-            addgas:true,
             showupload: false, // 默认不上传附件
             hasPrint: false,  // 默认打票
             hasBillManage: false,  // 默认不启用发票管理
-            overBalance: false,   //为true时退费金额可以大于余额
+            overBalance: false,   // 为true时退费金额可以大于余额
             printType: '普通收据', // 收据/电子票/专用发票/国税发票
             payment: '现金缴费',
             billType: '燃气费'
           },
           model: {
-            f_add_gas: '计入',
             f_refund_fee: '',
+            f_add_gas: '计入',
             f_comments: '',
             f_payment: '',
             f_print: ''
           },
-
+          addGas: [{label: '计入', value: '计入'}, {label: '不计入', value: '不计入'}],
           blodid: '',
           hasValidateBill: false,
           randomBusinessId: '',
@@ -170,13 +164,13 @@
             f_user_id: this.data.f_user_id,
             f_userfiles_id: this.data.f_userfiles_id,
             version: this.data.version,
-            f_refund_fee: this.model.f_refund_fee,
+            f_refund_fee: (this.model.f_refund_fee - 0),
             f_comments: this.model.f_comments,
             f_payment: this.model.f_payment[0],
             f_print: this.model.f_print[0],
             f_price_id: this.data.f_price_id,
             f_add_gas: this.model.f_add_gas,
-            f_total_fee: this.data.f_total_fee,
+            f_total_fee: parseFloat(this.data.f_total_fee) - parseFloat(this.model.f_refund_fee),
             f_stairprice_id: this.data.f_stairprice_id,
             operInfo: {
               f_operator: this.$login.f.name,
@@ -187,7 +181,9 @@
               f_depname: this.$login.f.deps
             }
           }
-
+          if (this.model.f_add_gas !== '计入') {
+            param.f_total_fee = this.data.f_total_fee
+          }
           let res = await this.$resetpost('api/af-revenue/logic/machineRefund', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行退费吗？`, resolveMsg: '退费成功！！', rejectMsg: '退费失败！！请重试！！'})
           console.log('机表退费返回的数据==========>', res)
           let param1 = []