sale-client 3.6.411 → 3.6.412

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://localhost:8080/', 'http://192.168.50.67:30785']
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://192.168.50.67:30785/', 'http://192.168.50.67:30785']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/components/revenue/base/rightview/CardList.vue

@@ -434,7 +434,7 @@
           } else {
             name = 'rs/report/machine_bill'
           }
-        } else if (type === '物联网收费' || type === '物联网收费撤销' || type === '物联网开户' || type === '物联网赠气') {
+        } else if (type === '物联网收费' || type === '物联网收费撤销' || type === '物联网开户') {
           if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
             name = 'rs/report/fmy_iot_bill'
           } else {
@@ -458,7 +458,7 @@
               name = 'rs/report/sendCard_bill'
             }
           }
-        } else if (type === '卡表收费' || type === '卡表收费撤销' || type === '卡表赠气' || type === '卡表收费撤销') {
+        } else if (type === '卡表收费' || type === '卡表收费撤销' || type === '卡表收费撤销') {
           if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
             name = 'rs/report/fmy_card_bill'
           } else {

package/src/filiale/yangchun/FilesManage/UserEssentialInfoTest.vue

@@ -308,6 +308,16 @@
             <label for="f_process_id" class="font_normal_body">&ensp;{{getConfigLabelName('f_expiration_date','保险结束日期')}}</label>
             <input type="text" v-model="baseinfo.base.userfees.f_expiration_date" disabled class="input_search" style="width:60%">
           </div>
+          <div class="col-sm-4 form-group"
+               v-show="(formconfig && formconfig.f_gas_type && formconfig.f_gas_type.required) || !onlyshowmust">
+            <label for="f_gas_type" class="font_normal_body">&ensp;{{getConfigLabelName('f_gas_type','抵扣单价')}}</label>
+            <input type="text" v-model="baseinfo.base.f_gas_type"  class="input_search" style="width:60%">
+          </div>
+          <div class="col-sm-4 form-group"
+               v-show="(formconfig && formconfig.f_project_money && formconfig.f_project_money.required) || !onlyshowmust">
+            <label for="f_project_money" class="font_normal_body">&ensp;{{getConfigLabelName('f_project_money','抵扣金额')}}</label>
+            <input type="text" v-model="baseinfo.base.f_project_money" disabled class="input_search" style="width:60%">
+          </div>
 
         </div>
         <div class="row">

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/bayan/sale'
+import FilialeSale from './filiale/jinbin/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'