sale-client 3.7.32-bayan → 3.7.33-bayan

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:31567/', 'http://localhost:8080/', 'http://192.168.50.67:30785']
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:31567/', 'http://localhost:8080/', 'http://192.168.50.67:31567']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -21,13 +21,13 @@ var devConfig = {
     proxy: {
 
       '/rs/file': {
-        // pathRewrite: {
-        //   '^/rs/file/': '/api/af-revenue/file/'
-        // },
-        target: localUrl
+        pathRewrite: {
+          '^/rs/file/': '/api/af-revenue/file/'
+        },
+        target: serverRul
       },
       '/api': {
-        target: serverRul
+        target: v4Url
       },
       '/sketch': {
         target: serverRul,
@@ -104,6 +104,9 @@ var devConfig = {
       '/rs/logic/webHandReverse': {
         target: 'http://localhost:8085'
       },
+      '/rs/sql/address_getAddress': {
+        target: 'http://127.0.0.1:8081'
+      },
       '/rs/logic': {
         target: localUrl
       },
@@ -117,7 +120,7 @@ var devConfig = {
         target: serverRul
       },
       '/rs': {
-        target: localUrl
+        target: serverRul
         // changeOrigin: true
       }
     }

package/package.json

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

package/src/filiale/bayan/FilesManageNew/UserEssentialInfoTest.vue

@@ -237,6 +237,17 @@
             </v-select>
           </div>
         </div>
+        <div class="row">
+          <div style="" class="col-sm-4 form-group" v-if="getConfigShowItem('f_type')"
+               v-show="(formconfig && formconfig.f_type && formconfig.f_type.required) || !onlyshowmust"
+               :class="[$v.f_type.required ? 'has-error' : '']">
+            <label for="f_zuhu_phone" class="font_normal_body">{{getConfigLabelName('f_type','类型')}}</label>
+            <v-select id="f_type" :value.sync="baseinfo.base.f_type"  v-model="baseinfo.base.f_type"
+                      :value-single="true"
+                      :placeholder="getConfigPlaceholder('f_type','类型')"
+                      :options='type' style="width: 65%" close-on-select></v-select>
+          </div>
+        </div>
         <div class="row">
           <a style="text-decoration: none;font-weight: 300;float: left;color: #333;margin-top: 15px;font-weight: 500"
              v-if="baseinfo.base.f_cost_type[0] === '银行代扣'">银行信息</a>
@@ -334,6 +345,7 @@ export default {
       userstates: [{label: '预备', value: '预备'}],
       housetype: this.$appdata.getParam('房屋类型'),
       mgq: this.$appdata.getParam('是否煤改气'),
+      type: this.$appdata.getParam('类型'),
       costtype: this.$appdata.getParam('付款类型'),
       printstate: this.$appdata.getParam('建档打印类型') ? [{label: '暂不选择', value: '暂不选择'}, ...this.$appdata.getParam('建档打印类型')] : [{label: '暂不选择', value: '暂不选择'}],
       peopleMax: this.$appdata.getSingleValue('最大人口数'),

package/src/filiale/bayan/UserEssentialInfoTest.vue

@@ -159,6 +159,15 @@
                    v-validate:f_zuhu_phone=getConfigValidate("f_zuhu_phone",false)
                    :placeholder="getConfigPlaceholder('f_zuhu_phone','租户电话')">
           </div>
+          <div style="" class="col-sm-4 form-group" v-if="getConfigShowItem('f_type')"
+               v-show="(formconfig && formconfig.f_type && formconfig.f_type.required) || !onlyshowmust"
+               :class="[$v.f_type.required ? 'has-error' : '']">
+            <label for="f_zuhu_phone" class="font_normal_body">{{getConfigLabelName('f_type','类型')}}</label>
+            <v-select id="f_type" :value.sync="baseinfo.base.f_type"  v-model="baseinfo.base.f_type"
+                      :value-single="true"
+                      :placeholder="getConfigPlaceholder('f_type','类型')"
+                      :options='type' style="width: 65%" close-on-select></v-select>
+          </div>
         </div>
         <div class="row">
           <div style="" class="col-sm-8 form-group"
@@ -406,6 +415,7 @@
         banknames: this.$appdata.getParam('银行名称'),
         userstates: this.$appdata.getParam('用户状态'),
         mgq: this.$appdata.getParam('是否煤改气'),
+        type: this.$appdata.getParam('类型'),
         signature: this.$appdata.getParam('是否签署合同'),
         peopleMax: this.$appdata.getSingleValue('最大人口数'),
         pointsMax: this.$appdata.getSingleValue('最大用气点数量'),