sale-client 3.6.259 → 3.6.260-test

package/package.json

@@ -1,120 +1,120 @@
-{
-  "name": "sale-client",
-  "version": "3.6.259",
-  "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.260-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/components/revenue/Common/EticketModal.vue

@@ -13,13 +13,13 @@
               <input class="form-control col-sm-2"
                      v-model="row.f_paper_name" placeholder="开票名称">
             </div>
-            <div class="col-sm-6 form-group form-input-group">
+            <div class="col-sm-6 form-group form-input-group" :class="[ row.invoice_is_pax.length < 1 ? 'has-error' : '']">
               <nobr class="col-sm-4"><label class="control-label">是否征税:</label></nobr>
               <v-select v-model="row.invoice_is_pax"
                         placeholder='请选择'
                         :value.sync="row.invoice_is_pax"
                         close-on-select
-                        :width="60" disabled
+                        :width="60"
                         :value-single="true"
                         :search="false"
                         :options='is_pax' clear-button>
@@ -56,7 +56,7 @@
       </article>
       <footer slot="modal-footer" class="modal-footer">
         <button type="button" class="btn button_search"
-                :disabled="!(row.f_paper_name&&row.f_address_phone&&row.f_taxpayer_id.length>=16 && row.f_taxpayer_id.length<=18)"
+                :disabled="!(row.f_paper_name&&row.f_address_phone&&row.f_taxpayer_id.length>=16 && row.f_taxpayer_id.length<=18&&row.invoice_is_pax.length >0)"
                 @click='confirm'>确认收费
         </button>
       </footer>
@@ -85,7 +85,7 @@ export default {
   },
   watch: {
     'row'(){
-      this.row.invoice_is_pax=['征税']
+      this.row.invoice_is_pax = '征税'
     }
   },
   events: {}

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

@@ -73,6 +73,7 @@ export default {
         let result = await axios.post('/invoice/rs/logic/getInvoice', Object.assign({
           id,
           f_charge_type,
+          isTax: model.invoice_is_pax === '征税' ? '1' : '0',
           bill_type: model.f_print ? model.f_print : null,
           f_paper_name: model.f_paper_name,
           f_taxpayer_id: model.f_taxpayer_id,

package/src/components/revenue/comprehen/Bill/EticketV4/CustQueryEticket.vue

@@ -167,7 +167,7 @@
     <footer slot="modal-footer" class="modal-footer">
       <button type="button" class="btn button_search"
               :disabled="!(row.f_paper_name&&row.f_address_phone)"
-              @click='confirm'>确认收费
+              @click='confirm'>确认开票
       </button>
     </footer>
   </modal>
@@ -278,6 +278,7 @@
       },
       confirm () {
         this.row.f_print = this.row.f_print[0]
+        this.row.invoice_is_pax = this.invoice_is_pax
         this.eticket_msg = false
         this.disabled = false
         this.eticket_show = true

package/src/components/revenue/comprehen/Bill/EticketV4/EticketManage.vue

@@ -1,18 +1,18 @@
 <template>
   <tab-button v-ref:list>
-    <tabs header="开票记录">
+    <tabs header="开票记录" v-if="permission('开票记录查询')">
       <e-ticket-record-list-query-v4></e-ticket-record-list-query-v4>
     </tabs>
-    <tabs header="物联网表结算">
+    <tabs header="物联网表结算" v-if="permission('物联网表结算开票')">
       <e-ticket-open-iot-query-v4></e-ticket-open-iot-query-v4>
     </tabs>
-    <tabs header="卡表结算">
+    <tabs header="卡表结算"  v-if="permission('卡表结算开票')">
       <e-ticket-open-card-query-v4></e-ticket-open-card-query-v4>
     </tabs>
-    <tabs header="机表抄表结算">
+    <tabs header="机表抄表结算" v-if="permission('机表抄表结算开票')">
       <e-ticket-open-hand-query-v4></e-ticket-open-hand-query-v4>
     </tabs>
-    <tabs header="自定义开票">
+    <tabs header="自定义开票" v-if="permission('自定义开票')">
       <cust-query-eticket-query-v4></cust-query-eticket-query-v4>
     </tabs>
   </tab-button>
@@ -41,6 +41,13 @@ export default {
   },
   ready () {},
   methods: {
+    permission (name) {
+      if (!this.$login.r.find(value => value == name)) {
+        return false
+      } else {
+        return  true
+      }
+    },
     cancel (obj) {
       this.listpage = true
     },

package/src/filiale/haile/leftview/Userinfo.vue

@@ -83,6 +83,18 @@
           <label class="col-sm-5">旧客户编号</label>
           <span class="col-sm-7">{{ data ? data.f_olduserinfo_code : dafault.f_userinfo_code }}</span>
         </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class="col-sm-5">开关阀状态</label>
+          <span class="col-sm-7">{{ data ? data.f_valve_state : '' }}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('机表')">
+          <label class="col-sm-5">开关阀状态</label>
+          <span class="col-sm-7">{{ data ? data.f_bqf_state : '' }}</span>
+        </div>
+        <div class="row" v-if="!data.f_meter_type.includes('卡表')">
+          <label class="col-sm-5">开关阀原因</label>
+          <span class="col-sm-7">{{ data ? data.f_off_valve_reason : '' }}</span>
+        </div>
         <modal v-if="showselectncuserinfo" :show.sync="showselectncuserinfo" width="40%" title="修正客户电话号码"
                v-ref:modal large backdrop="false">
           <article slot="modal-body" class="modal-body">