sale-client 3.5.165 → 3.5.166-2

package/build/dev-server.js

@@ -10,17 +10,23 @@ var compiler = webpack(config)
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
+var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400'
 // 公司测试服务
-// var fuwu = 'http://192.168.50.4:8400'
+// var fuwu = 'http://192.168.50.4:8450'
+// 梅河口
+// var fuwu = 'http://139.214.92.34:8301'
+// 单县
+// var fuwu = 'http://119.187.112.234:8400'
+// 中盛
 // var fuwu = 'http://39.99.85.14:8400'
-var fuwu = 'http://121.36.60.63:8700/'
-// var fuwu = 'http://47.93.217.125:8400'
-// var fuwu = 'http://121.36.106.17:8400/'
-// 铜川正式
+// 燎原
+var fuwu = 'http://121.40.52.133:9001'
+// 葛华
+// var fuwu = 'http://219.138.226.181:8401'
+// 乌海
+// var fuwu = 'http://203.57.101.233:8400'
+// 铜川
 //  var fuwu = 'http://61.134.55.234:9999/'
-// 铜川测试
-// var fuwu = 'http://61.134.55.234:9999/'
 // var fuwu = 'http://60.222.250.39:8300/'
 // 韶关
 // var fuwu = 'http://119.146.1.106:8300/'

package/package.json

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

package/src/components/FilesManage/FileUserFiles.vue

@@ -119,10 +119,10 @@
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group">
-                    <label class="font_normal_body">用户类型</label>
+                    <label class="font_normal_body">客户类型</label>
                     <v-select :options='$parent.$parent.user_type' :value.sync="model.f_user_type"
                               close-on-select condition="f_user_type='{}'"
-                              placeholder='用户类型' v-model="model.f_user_type"></v-select>
+                              placeholder='客户类型' v-model="model.f_user_type"></v-select>
                   </div>
                   <div
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
@@ -239,11 +239,11 @@
                   <div
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                           class="form-group" >
-                    <label class="font_normal_body">用户等级</label>
+                    <label class="font_normal_body">客户等级</label>
                     <v-select :options='$parent.$parent.userlevel' :search='true'
                               :value.sync="model.userlevel"
                               close-on-select
-                              condition="f_user_level = '{}'" placeholder='用户等级'
+                              condition="f_user_level = '{}'" placeholder='客户等级'
                               v-model='model.userlevel'></v-select>
                   </div>
                   <div
@@ -308,10 +308,10 @@
                     <nobr>客户电话</nobr>
                   </th>
                   <th  v-if="!$parent.$parent.$parent.isOper">
-                    <nobr>地址信息</nobr>
+                    <nobr>客户地址</nobr>
                   </th>
                   <th>
-                    <nobr>用户类型</nobr>
+                    <nobr>客户类型</nobr>
                   </th>
                   <th>
                     <nobr>用气性质</nobr>
@@ -332,7 +332,7 @@
                     <nobr>状态</nobr>
                   </th>
                   <th >
-                    <nobr>用户等级</nobr>
+                    <nobr>客户等级</nobr>
                   </th>
                   <!--<th>-->
                   <!--<nobr v-if="this.$login.r.includes('通知单打印')||this.$login.r.includes('流程表打印') ">下载</nobr>-->

package/src/components/FilesManage/MeterinfoTest.vue

@@ -6,6 +6,22 @@
           <a style="font-size: 16px;font-weight: 500;">表具信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
         </div>
         <div class="row" >
+          <div class="col-sm-4 form-group" :class="[$m.brand.required ? 'has-error' : '']">
+            <label for="gasbrand" class="font_normal_body">气表品牌</label>
+            <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems"
+                   v-validate:brand='{required: true }'>
+            <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
+                      search @change='brandChange' v-model='row.gasbrand' :disabled="curuser.f_user_state != '预备'" v-ref:brand></v-select>
+          </div>
+          <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
+            <label for="gasmodel" class="font_normal_body">气表型号</label>
+            <input type="text" v-show="false" v-model="$refs.model.selectedItems"
+                   v-validate:model='{required: true }'>
+            <v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
+                      close-on-select
+                      v-model='row.gasmodel' :disabled="row.gasbrand.length === 0 || curuser.f_user_state != '预备'" v-ref:model></v-select>
+          </div>
+
           <div class="col-sm-4 form-group" v-if="isiot" :class="[$m.f_meternumber.required ? 'has-error' : '']">
             <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
             <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
@@ -38,21 +54,6 @@
                    :disabled="!jurisdiction.includes('档案信息查询修改')">
           </div>
 
-          <div class="col-sm-4 form-group" :class="[$m.brand.required ? 'has-error' : '']">
-            <label for="gasbrand" class="font_normal_body">气表品牌</label>
-            <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems"
-                   v-validate:brand='{required: true }'>
-            <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
-                      search @change='brandChange' v-model='row.gasbrand' :disabled="curuser.f_user_state != '预备'" v-ref:brand></v-select>
-          </div>
-          <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
-            <label for="gasmodel" class="font_normal_body">气表型号</label>
-            <input type="text" v-show="false" v-model="$refs.model.selectedItems"
-                   v-validate:model='{required: true }'>
-            <v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
-                      close-on-select
-                      v-model='row.gasmodel' :disabled="row.gasbrand.length === 0 || curuser.f_user_state != '预备'" v-ref:model></v-select>
-          </div>
           <div class="col-sm-4 form-group" title="涉及权限:【档案信息查询修改】">
             <label for="f_meter_base" class="font_normal_body">&ensp;累购气量</label>
             <input type="number" class="input_search" style="width:60%" v-model="row.f_total_gas" placeholder='累购气量'

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -93,7 +93,7 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
+          <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">

package/src/components/FilesManageNew/FileUserFiles.vue

@@ -225,7 +225,7 @@
                     <nobr>客户电话</nobr>
                   </th>
                   <th  v-if="!$parent.$parent.$parent.isOper">
-                    <nobr>地址信息</nobr>
+                    <nobr>客户地址</nobr>
                   </th>
                   <th>
                     <nobr>状态</nobr>

package/src/components/UserFiles/UserPriceChangeManage.vue

@@ -88,7 +88,7 @@
                     <nobr>卡号</nobr>
                   </th>
                   <th>
-                    <nobr>地址信息</nobr>
+                    <nobr>客户地址</nobr>
                   </th>
                   <th>
                     <nobr>气价名称</nobr>
@@ -347,6 +347,9 @@
   import Vue from 'vue'
 
   let loadParamGem = async function (self) {
+    if (!self.f_filialeid) {
+      self.f_filialeid = self.$login.f.orgid
+    }
     await self.$LoadParams.loadParam(self.f_filialeid)
   }
 

package/src/components/charge/ChargeList.vue

@@ -90,9 +90,9 @@
                           close-on-select style="width: 60%"></v-select>
               </div>
               <div class="form-group col-sm-3">
-                <label class="font_normal_body">用户等级</label>
+                <label class="font_normal_body">客户等级</label>
                 <v-select v-model="model.f_user_level"
-                          placeholder='用户等级'
+                          placeholder='客户等级'
                           :value.sync="model.f_user_level"
                           :options='$parent.$parent.userlevel'
                           condition="i.f_user_level = '{}'"

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

@@ -105,7 +105,7 @@
                 <th><nobr>客户编号</nobr></th>
                 <th><nobr>表号</nobr></th>
                 <th><nobr>姓名</nobr></th>
-                <th><nobr>用户类型</nobr></th>
+                <th><nobr>客户类型</nobr></th>
                 <th><nobr>气表类型</nobr></th>
                 <th><nobr>气价名称</nobr></th>
 <!--                <th><nobr>地址</nobr></th>-->