sale-client 3.6.394-preview → 3.6.396-preview

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://aote-office.8866.org:30785/', 'http://aote-office.8866.org:30785/', 'http://localhost:9026/']
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://localhost:8080', 'http://localhost:9026/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -19,14 +19,11 @@ var devConfig = {
       children: false // 不输出子模块构建信息
     },
     proxy: {
-
-'/api/af-revenue/logic/commonCal': {
-  pathRewrite: {'/api/af-revenue/logic/commonCal': '/logic/commonCal'},
-  target: 'http://127.0.0.1:9026'
-},
-      '/api/af-revenue': {
-        pathRewrite: {'/api/af-revenue': '/'},
-        target: 'http://127.0.0.1:9026'
+      '/api/af-revenue/logic': {
+        pathRewrite: {
+          '/api/af-revenue/logic': '/logic'
+        },
+        target: 'http://localhost:9026/'
       },
       '/api': {
         target: 'http://192.168.50.67:31567'

package/package.json

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

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -736,7 +736,7 @@ export default {
           f_usestate: '',
           // 左右表
           f_aroundmeter: '',
-         p f_garbage_fee: '否',
+          f_garbage_fee: '否',
           f_meter_base: '',
           f_initial_base: 0,
           f_open_way: '发卡开户',

package/src/components/revenue/HandManager/MeterBookAdd.vue

@@ -86,9 +86,9 @@
                         style="width: 60%" v-model="model.f_hand_end_date">
             </datepicker>
           </div>
-          <div :class="[$v.f_period.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
-            <input class="input_search" style="width:60%" type="text" v-model="model.f_period" v-show="false"
-                   v-validate:f_period='{required: true }'>
+          <div :class="[$v.f_book_state.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
+            <input class="input_search" style="width:60%" type="text" v-model="model.f_book_state" v-show="false"
+                   v-validate:f_book_state='{required: true }'>
             <label class="font_normal_body">表&emsp;册&emsp;状&emsp;态&emsp;</label>
             <v-select :value.sync="model.f_book_state" v-model='model.f_book_state'
                       style="width:55%"

package/src/components/revenue/cardHandManage/cardHandManager.vue

@@ -16,7 +16,7 @@
 <script>
   import TabButton from './../comprehen/common/TabButton'
   import Tabs from './../comprehen/common/Tabs'
-  import CardHandAudit from './cardHandAudit.vue'
+
 export default {
     name: 'cardHandManager',
     title: '卡表抄表管理',
@@ -35,7 +35,7 @@ export default {
         show: [true]
       }
     },
-    components: {CardHandAudit, Tabs, TabButton},
+    components: {Tabs, TabButton},
     ready () {
       console.log(this.$refs.list)
     },