sale-client 3.6.261 → 3.6.262-test

package/package.json

@@ -1,120 +1,120 @@
-{
-  "name": "sale-client",
-  "version": "3.6.261",
-  "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.24.137",
-    "yarn": "^1.22.10"
-  },
-  "devDependencies": {
-    "address-client": "3.2.56",
-    "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.62",
-    "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.61",
-    "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": "3.6.262-test",
+  "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.24.137",
+    "yarn": "^1.22.10"
+  },
+  "devDependencies": {
+    "address-client": "3.2.56",
+    "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.62",
+    "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.61",
+    "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/filiale/jingyang/EticketV4/EticketOpenJBPage.vue

@@ -126,11 +126,11 @@
                       :options='is_pax' clear-button>
             </v-select>
           </div>
-          <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_type ? 'has-error' : '']">
+          <div class="col-sm-6 form-group form-input-group" :class="[!invoice_type ? 'has-error' : '']">
             <label class="control-label">发票种类:</label>
-            <v-select v-model="row.f_paper_type"
+            <v-select v-model="invoice_type"
                       placeholder='请选择'
-                      :value.sync="row.f_paper_type"
+                      :value.sync="invoice_type"
                       close-on-select
                       :width="60"
                       :value-single="true"
@@ -292,7 +292,7 @@ export default {
     confirm () {
       this.eticket_msg = false
       this.eticket_show = true
-      this.$refs.eticketbill.openETicket([this.row.id], this.row, '是', this.invoice_is_pax, '机表结算')
+      this.$refs.eticketbill.openETicket(this.row.id, this.row, '机表结算', this.invoice_is_pax, this.invoice_type)
     },
     selfSearch (args) {
       this.selecteds = []

package/src/filiale/tongchuan/bill/CustQueryEticketQueryV4.vue

@@ -131,16 +131,15 @@
                       :options='is_pax' clear-button>
             </v-select>
           </div>
-          <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_type ? 'has-error' : '']">
-            <label class="control-label">发票种类:</label>
-            <v-select v-model="row.f_paper_type"
+          <div class="col-sm-6 form-group form-input-group">
+            <label for="f_print" class="font_normal_body">打印格式</label>
+            <v-select id="print"
+                      v-model="f_print"
                       placeholder='请选择'
-                      :value.sync="row.f_paper_type"
-                      close-on-select
-                      :width="60"
-                      :value-single="true"
-                      :search="false"
-                      :options='invoice_types' clear-button>
+                      :multiple="false"
+                      :value.sync="row.f_print"
+                      :options='printstyle'
+                      close-on-select clear-button v-ref:printstyle>
             </v-select>
           </div>
           <div class="col-sm-12 form-group form-input-group">
@@ -159,14 +158,14 @@
                    v-model="row.f_address_phone" placeholder="开票地址">
           </div>
           <div class="col-sm-12 form-group form-input-group">
-            <label class="control-label">手机推送:</label>
+            <label class="control-label">邮箱推送:</label>
             <input class="form-control col-sm-2"
-                   v-model="row.f_buy_phone" placeholder="手机号码">
+                   v-model="row.f_email" placeholder="邮箱推送">
           </div>
           <div class="col-sm-12 form-group form-input-group">
-            <label class="control-label">邮箱推送:</label>
+            <label class="control-label">备注:</label>
             <input class="form-control col-sm-2"
-                   v-model="row.f_email" placeholder="邮箱推送">
+                   v-model="row.f_remarks" placeholder="备注">
           </div>
         </div>
       </div>
@@ -201,8 +200,6 @@
         invoice_is_pax: '征税',
         is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
         selecteds: [],
-        invoice_types: this.$appdata.getParam('发票种类'),
-        invoice_type: '',
         eticket_show: false,
         eticket_msg: false,
         invoice_show_gas: '否',
@@ -286,10 +283,11 @@
         this.eticket_msg = true
       },
       confirm () {
+        this.row.f_print = this.row.f_print[0]
         this.eticket_msg = false
         this.disabled = false
         this.eticket_show = true
-        this.$refs.eticketbill.openETicket([this.row.id], this.row, '是', this.invoice_is_pax,  this.row.f_type)
+        this.$refs.eticketbill.openETicket(this.row.id, this.row, this.row.f_type)
       },
       eticket_toggle () {
         this.eticket_show = false

package/src/filiale/tongchuan/bill/EticketOpenCard.vue

@@ -232,7 +232,7 @@ export default {
         //
         //     }
         //   })
-        return this.$showAlert('已结算的记录不能再次结算开票', 'warning', 3000)
+        return this.$showAlert('已结算的记录不能再次结算开票','warning',3000)
       }
       let HttpReset = new HttpResetClass()
       let row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
@@ -252,7 +252,7 @@ export default {
       if (!this.row.f_address_phone) {
         this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
       }
-      if (!this.row.f_email) {
+      if(!this.row.f_email){
         this.row.f_email = this.row.f_email
       }
       this.eticket_msg = true
@@ -260,7 +260,7 @@ export default {
     confirm () {
       this.eticket_msg = false
       this.eticket_show = true
-      this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, '是', this.invoice_is_pax, '卡表收费')
+      this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, '是',this.invoice_is_pax, '结算收费')
     },
     selfSearch (args) {
       this.selecteds = []

package/src/filiale/tongchuan/bill/EticketOpenJBPage.vue

@@ -292,7 +292,7 @@ export default {
       this.eticket_msg = false
       this.eticket_show = true
       console.log('>>> 机表结算开票')
-      this.$refs.eticketbill.openETicket([this.row.id], this.row, this.invoice_show_gas, this.invoice_is_pax, '机表结算')
+      this.$refs.eticketbill.openETicket(this.row.id, this.row, this.invoice_show_gas, this.invoice_is_pax, '机表结算')
     },
     selfSearch (args) {
       this.selecteds = []

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-// import FilialeSale from './filiale/wuhai/sale'
+import FilialeSale from './filiale/tongchuan/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'
@@ -22,7 +22,7 @@ Vue.config.silent = true
 all()
 system(false)
 sale()
-// FilialeSale()
+FilialeSale()
 address()
 ldap()
 require('system-clients/src/styles/less/bootstrap.less')