sale-client 3.5.164 → 3.5.166-1

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://39.108.82.124:8400'
-// 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.164",
+  "version": "3.5.166-1",
   "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/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/chargeNew/thirdSurplus.vue

@@ -144,7 +144,7 @@
     <modal :show.sync="show" width="500px" title="文件导入" v-ref:modal large backdrop="false">
         <article slot="modal-body" class="modal-body">
             <file-upload class="my-file-uploader " name="UploadFile" class="btn btn-success" style="border-radius: 2px;"
-                         action="rs/file/uploadFile" tagname="导入表计" v-ref:file :headers="headers" multiple></file-upload>
+                         action="rs/file/uploadFile" tagname="调价导入" v-ref:file :headers="headers" multiple></file-upload>
         </article>
         <footer slot="modal-footer" class="modal-footer">
         </footer>

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>-->

package/src/components/revenue/base/leftview/Userinfo.vue

@@ -44,7 +44,7 @@
           <span class = "col-sm-7">{{data?data.f_rent_phone:dafault.f_rent_phone}}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;用户状态</label>
+          <label class = "col-sm-5 " >&emsp;客户状态</label>
           <span class = "col-sm-7">{{data?data.f_user_state:dafault.f_user_state}}</span>
         </div>
         <div class="row">
@@ -68,7 +68,7 @@
           <span class = "col-sm-7" style="word-break: break-all">{{data?data.f_people_num:dafault.f_people_num}}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;用户等级</label>
+          <label class = "col-sm-5 " >&emsp;客户等级</label>
           <span class = "col-sm-7" style="word-break: break-all">{{data?data.f_user_level:dafault.f_people_num}}</span>
         </div>
         <div class="row">

package/src/components/revenue/changeInsurance/InsuranceChargesDetails.vue

@@ -7,14 +7,14 @@
             <div novalidate class="form-inline auto" novalidate partial>
               <div class="row">
                   <div class="col-sm-2  form-group">
-                    <label class="font_normal_body" for="f_userinfo_code">用户编号</label>
+                    <label class="font_normal_body" for="f_userinfo_code">客户编号</label>
                     <input id="f_userinfo_code" type="text" class="input_search" style="width: 60%" v-model="model.f_userinfo_code"
-                           condition="f_userinfo_code = '{}'" placeholder='请输入要查询的用户编号'>
+                           condition="f_userinfo_code = '{}'" placeholder='请输入要查询的客户编号'>
                   </div>
                 <div class="col-sm-2  form-group">
-                  <label class="font_normal_body" for="f_user_name">用户姓名</label>
+                  <label class="font_normal_body" for="f_user_name">客户姓名</label>
                   <input id="f_user_name" type="text" class="input_search" style="width: 60%" v-model="model.f_user_name"
-                         condition="f_user_name like '{}'" placeholder='请输入要查询的用户姓名'>
+                         condition="f_user_name like '{}'" placeholder='请输入要查询的客户姓名'>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body" for="f_insurance_type">险&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;种</label>
@@ -63,10 +63,10 @@
                   <nobr>序号</nobr>
                 </th>
                 <th>
-                  <nobr>用户编号</nobr>
+                  <nobr>客户编号</nobr>
                 </th>
                 <th>
-                  <nobr>用户姓名</nobr>
+                  <nobr>客户姓名</nobr>
                 </th>
                 <th>
                   <nobr>身份证号</nobr>

package/src/components/revenue/changeInsurance/InsuranceList.vue

@@ -69,13 +69,13 @@
                   <nobr>序号</nobr>
                 </th>
                 <th>
-                  <nobr>用户编号</nobr>
+                  <nobr>客户编号</nobr>
                 </th>
                 <th>
-                  <nobr>用户姓名</nobr>
+                  <nobr>客户姓名</nobr>
                 </th>
                 <th>
-                  <nobr>用户地址</nobr>
+                  <nobr>客户地址</nobr>
                 </th>
                 <th>
                   <nobr>截止日期</nobr>

package/src/components/revenue/comprehen/ComprehenOperation/OtherGas/OtherGas.vue

@@ -90,8 +90,8 @@
     // 若是气量卡表 temp为金额  若是金额卡表 temp为气量
     if (self.isGas) {
       data.f_pregas = self.model.f_pregas
-      // let fee = await self.$CommonService.gasCalculate(param, self.model.f_pregas)
-      // data.f_preamount = fee.data.chargenum
+      let fee = await self.$CommonService.gasCalculate(param, self.model.f_pregas)
+      data.f_preamount = fee.data.chargenum
     } else {
       data.f_preamount = self.model.f_preamount
       let gas = await self.$CommonService.feeCalculate(param, self.model.f_preamount)

package/src/components/revenue/comprehen/insurance/insuranceGuanL.vue

@@ -60,13 +60,13 @@
               <nobr>客户编号</nobr>
             </th>
             <th>
-              <nobr>用户姓名</nobr>
+              <nobr>客户姓名</nobr>
             </th>
             <th>
-              <nobr>用户电话</nobr>
+              <nobr>客户电话</nobr>
             </th>
             <th>
-              <nobr>用户地址</nobr>
+              <nobr>客户地址</nobr>
             </th>
             <!--<th>-->
               <!--<nobr>保险编号</nobr>-->
@@ -149,7 +149,7 @@
     <modal :backdrop="false" :show.sync="show" v-if="show" >
       <header class="modal-header" slot="modal-header">
         <button @click="show=!show" class="close" type="button"><span>&times;</span></button>
-        <h4 class="modal-title">修改用户保险信息</h4>
+        <h4 class="modal-title">修改客户保险信息</h4>
       </header>
       <article class="modal-body"  slot="modal-body"  style="height:100%;width:100%"  >
         <div class="row">

package/src/components/revenue/machineHandManage/machineHandAudit.vue

@@ -394,7 +394,7 @@
   import * as Util from '../../../Util'
 
   let readyGen = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]
+    self.$refs.paged.$refs.cri.model.startDate =  self.$login.toStartAndEndDateString()[0]
     self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
     await self.$LoadParams.loadMeterBook(self.f_filialeid)
     self.loadMeterBooks()
@@ -414,13 +414,12 @@
           dep: [],
           user: []
         },
-        config: {
-          examine: false
+        config:{
+          examine: false,
         },
         imgfilename: '',
         // 小区
         residentialArea: [],
-        inputtouPerson: [],
         imgshow: false,
         criteriaShow: false,
         orgCondtionStr: '',
@@ -445,8 +444,8 @@
           'f_adjustable_name': '调压箱名称',
           'f_inputtor': '抄表员'
         },
-        auditState: [{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
-        auditState1: [{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
+        auditState:[{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
+        auditState1:[{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
         meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
         resultstate: this.$appdata.getParam('抄表结果状态'),
         meterstates: this.$appdata.getParam('抄表状态') ? [{
@@ -476,7 +475,7 @@
     methods: {
       // 修正本期底数
       amend (row) {
-        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：' + row.f_meter_base)
+        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：'+ row.f_meter_base)
         if (!tablebase) return
         if (tablebase < 0) {
           this.$showAlert(`底数不能小于0，请注意!`, 'warning', 2000)
@@ -597,9 +596,9 @@
         this.imgshow = false
       },
       imgShow (val) {
-        console.log('-----------val2:', val)
+        console.log("-----------val2:",val)
         this.imgfilename = `rs/image/file/` + val
-        console.log('-----------imgfilename2:', this.imgfilename)
+        console.log("-----------imgfilename2:",this.imgfilename)
         this.imgshow = true
       },
       async getaddress () {
@@ -633,17 +632,6 @@
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }
-        // 抄表员查询条件
-        this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
-        if (this.inputtouPerson.length !== 0) {
-          let str = JSON.stringify(this.inputtouPerson)
-          str = str.replace(/"/g, `'`)
-          str = str.replace(/\[/g, ``)
-          str = str.replace(/\]/g, ``)
-          console.log('=====抄表员model22222222222绑定====', str)
-          // 查询多个抄表员时条件
-          args.condition += ` and f_inputtor in  ( ${str} )`
-        }
         this.excelCondition = args.condition
         this.$refs.paged.$refs.grid.selectInit()
         this.model.search(args.condition, args.model)
@@ -708,7 +696,7 @@
       },
       loadMeterBooks () {
         this.meterbooks = this.$GetSaleParam.getMeterBooks()
-      }
+      },
 
     },
     computed: {