sale-client 3.5.287 → 3.5.288

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['http://127.0.0.1:8080/', 'http://192.168.50.4:8400/']
+const [localUrl, serverRul] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
 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.5.287",
+  "version": "3.5.288",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/revenue/comprehen/StairPrice/GasPriceUser.vue

@@ -313,7 +313,20 @@
       },
       async modifyUser () {
         let rowdata = this.$refs.paged.$refs.grid.getRowData()
-        let condition = rowdata.length == 0 ? this.condition : ''
+        if (rowdata.length === 0) {
+          // 提示
+          let res = await this.$showMessage(`当前未选择用户，将会针对查询结果进行调价，共 ${this.model.count} 户，是否继续？`, ['confirm', 'cancel'])
+          if (res !== 'confirm') {
+            return
+          }
+        } else {
+          // 提示
+          let res = await this.$showMessage(`当前共选择用户 ${rowdata.length} 户，是否对 ${rowdata.length} 位用户进行调价？`, ['confirm', 'cancel'])
+          if (res !== 'confirm') {
+            return
+          }
+        }
+        let condition = rowdata.length === 0 ? this.condition : ''
         let com = rowdata.map((row) => { return row.f_userfiles_id }).join(',')
         let fileuploadid = this.$refs.fileupload.fileInfoData.map((row) => { return row.id }).join(',')
 

package/src/filiale/gehua/MeterinfoTest.vue

@@ -99,7 +99,7 @@
             <v-select :value.sync="row.f_valve_state" :options='valvestate' placeholder='阀门状态' close-on-select
                       v-model='row.f_valve_state'></v-select>
           </div>
-          <div class="col-sm-4 form-group" :class="[$m.way.required ? 'has-error' : '']" v-if="row.gasbrand.length > 0 && row.gasbrand[0].f_meter_type == '物联网表'">
+          <div class="col-sm-4 form-group" :class="[$m.way.required ? 'has-error' : '']" v-if="row.gasbrand.length > 0 && row.gasbrand[0].f_meter_type == '物联网表' && row.gasbrand[0].f_hascard == '是'">
             <label for="f_open_way" class="font_normal_body">开户方式</label>
             <v-select :value.sync="row.f_open_way" v-model='row.f_open_way'
                       placeholder='开户方式' :options='openWay'

package/src/filiale/shanxian/OtherChargeNew.vue

@@ -9,7 +9,7 @@
           <div style="margin-top:10px;" v-for="(index, row) in model.otherdetail">
             <div class="row">
               <div class="col-sm-4" :class="{'has-success':row.f_brand_spec,'select-error':!row.f_brand_spec}">
-                <label for="f_brand_spec" class="font_normal_body " title="参数名称：品名及规格">收费类型</label>
+                <label for="f_brand_spec" class="font_normal_body " title="参数名称：品名及规格">收费项目</label>
                 <v-select id="f_brand_spec"
                           placeholder='请选择'
                           v-model="row.f_brand_spec"

package/src/filiale/shanxian/components/FilesManage/MeterinfoTest.vue

@@ -225,7 +225,7 @@
           <div class="col-sm-4 form-group" >
             <label for="f_position" class="font_normal_body"  title="参数:安装位置">&ensp;安装位置</label>
             <v-select :value.sync="row.f_position" v-model="row.f_position"
-                      :options='positions' placeholder='安装位置' :value-single="true"
+                      :options='positions' placeholder='安装位置'
                       close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group" v-show="true">
@@ -601,14 +601,11 @@
         f_scrap_date: '',
         f_install_date:'',
         adjustables: [],
-        adjustable: [],
-        f_position: ''
+        adjustable: []
       }
     },
     props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'overdueset', 'curuser'],
     async ready () {
-      console.log('单县----------------------------------------',this.row)
-
       // 安装日期默认是建档日期
       if (this.row.f_install_date == null || this.row.f_install_date == '') {
         this.row.f_install_date = Util.toStandardTimeString()
@@ -630,15 +627,11 @@
       this.row = Object.assign(this.row, this.meter, {})
 
       if (this.meter.f_user_type == '民用'){
-        this.row.f_position = '厨房'
-        console.log('厨房是不是true--------->',this.row.f_position)
+        this.row.f_position = ['厨房']
       }
       if (!this.row.f_use_limit){
         this.row.f_use_limit = 10
-        console.log('使用年限---------->',this.row.f_use_limit)
       }
-
-      console.log('合并后得数据----------->', this.row)
       this.orginCardId = this.row.f_card_id
 
       if(this.row.f_meter_classify){
@@ -748,11 +741,8 @@
       priceChange (val) {
         if (val.length > 0) {
           this.row.f_user_type = [val[0].f_user_type]
-          console.log('777777777777',this.row.f_user_type[0])
           if (this.row.f_user_type[0] == '民用'){
-            this.row.f_position = '厨房'
-          }else {
-            this.row.f_position = ''
+            this.row.f_position = ['厨房']
           }
           this.row.f_gasproperties = [val[0].f_gasproperties]
           this.row.pricetype = val[0].f_price_type

package/src/filiale/shanxian/components/FilesManage/UserGeneralInfoTest.vue

@@ -475,7 +475,7 @@ export default {
         row.f_meter_book_num = row.f_meter_book_num && row.f_meter_book_num.length > 0 ? [row.f_meter_book_num] : ''
         row.f_userfiles_address = row.f_userfiles_address && row.f_userfiles_address.length > 0 ? [row.f_userfiles_address] : ''
         row.f_inputtor = row.f_inputtor ? [row.f_inputtor] : ''
-        row.f_position = row.f_position ? [row.f_position] : ''
+        row.f_position = row.f_position && row.f_position.length > 0 ? [row.f_position] : ''
 
         row.f_user_type = row.f_user_type ? [row.f_user_type] : ''
         row.f_gasproperties = row.f_gasproperties ? [row.f_gasproperties] : ''

package/src/filiale/shanxian/components/charge/ChargeOper.vue

@@ -76,6 +76,9 @@ let getBtnsGen = async function (self) {
           if(getBtns[i].name == '物联网表收费' || getBtns[i].name == '卡表收费'){
             getBtns[i].name = '燃气充值'
           }
+          if(getBtns[i].name == '其他收费'){
+            getBtns[i].name = '安全保障产品'
+          }
           self.temp.push(getBtns[i])
         }
         console.log(i)

package/src/filiale/shanxian/components/revenue/ChargeList.vue

@@ -91,9 +91,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 = '{}'"
@@ -114,9 +114,9 @@
                        condition="f_card_id like '%{}%'">
               </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_usetype"
-                          placeholder='使用类型'
+                          placeholder='居民生活'
                           :value.sync="model.f_usetype"
                           :options='$parent.$parent.usetype'
                           condition="u.f_usetype = '{}'"

package/src/filiale/tongchuan/ChargeList.vue

@@ -159,7 +159,7 @@
         </div>
         </div>
       </criteria>
-      <data-grid :model="model"   partial='list' class="list_area table_sy" v-ref:grid v-if="false" >
+      <data-grid :model="model"   partial='list' class="list_area table_sy" v-ref:grid v-show="$parent.showList" >
         <template partial='head' >
           <tr>
             <th style="white-space: nowrap;" >序号</th>
@@ -343,6 +343,7 @@
 
   let cardBtnGen = async function (self, val) {
     self.cardInfo = val.data
+    self.showList = false
 
     // 判断读卡是否需要卡密码
     console.log('读卡上的信息', self.cardInfo)
@@ -444,6 +445,7 @@
           self.model.rows = getUser.data
           self.model.pageIndex = 1
           self.model.state = '正确'
+          self.showList = true
           self.$dispatch('clean')
           self.$showAlert('该卡号出现重复，请确认该客户信息之后双击进入！！', 'warning', 5000)
         }
@@ -451,6 +453,7 @@
         self.model.rows = getUser.data
         self.model.pageIndex = 1
         self.model.state = '正确'
+        self.showList = true
         self.$dispatch('clean')
         self.$showAlert('该卡号出现重复，请确认该客户信息之后双击进入！！', 'warning', 5000)
       }
@@ -569,6 +572,7 @@
           })
           if (!hasMatchingData) {
             self.model.rows = getUser.data
+            self.showList = false
             self.model.pageIndex = 1
             self.model.state = '正确'
             self.$dispatch('clean')
@@ -576,6 +580,7 @@
           }
         } else {
           self.model.rows = getUser.data
+          self.showList = false
           self.model.pageIndex = 1
           self.model.state = '正确'
           self.$dispatch('clean')
@@ -599,6 +604,7 @@
       return {
         // 公司下拉
         curorgid: [this.$login.f.orgid],
+        showList: false,
         f_orgid: '',
         // 打开页面组织机构全选
         allFlag: true,
@@ -632,7 +638,7 @@
           'f_price_type': '气价类型',
           'f_price_name': '气价名称',
           'fenleixinxi': '分类信息',
-          'f_imei':'终端号'
+          'f_imei': '终端号'
         },
         filialeName: [],
         outletsname: [],
@@ -674,7 +680,7 @@
         recordModel: {rows: []},
         clientWidth: document.body.clientWidth,
         showCardError: false,
-        createpersons:[]
+        createpersons: []
       }
     },
     props: {
@@ -726,15 +732,15 @@
           this.$refs.paged.$refs.cri.model[key] = []
         })
       },
-      async initQier(){
-        let http =new HttpResetClass()
-        let res=await  http.load("POST","rs/sql/querySingleTable",{data: {
-            items:'f_createfile_person',
-            tablename: 't_userinfo',
-            condition: `f_filialeid = ${this.$login.f.orgid} group by f_createfile_person `
-          }
-        },{resolveMsg: null, rejectMsg: null})
-        let persons=[]
+      async initQier () {
+        let http = new HttpResetClass()
+        let res = await http.load('POST', 'rs/sql/querySingleTable', {data: {
+          items: 'f_createfile_person',
+          tablename: 't_userinfo',
+          condition: `f_filialeid = ${this.$login.f.orgid} group by f_createfile_person `
+        }
+        }, {resolveMsg: null, rejectMsg: null})
+        let persons = []
         res.data.forEach((item) => {
           let res2 = {}
           res2.label = item.f_createfile_person
@@ -761,10 +767,11 @@
         }
       },
       searchNoData () {
+        this.showList = false
         this.specialCondition = true
         this.$refs.paged.$refs.cri.model.aa = '1!=1'
         this.$refs.paged.$refs.cri.conditions.aa = '1!=1'
-        //this.search()
+        // this.search()
       },
       clean () {
         this.cardInfo = ''
@@ -780,6 +787,7 @@
       },
 
       async selfSearch (args) {
+        this.showList = false
         if (!this.f_orgid) {
           this.getorg([this.$login.f.orgid])
         }

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import wenxi from './filiale/yuansheng/sale'
+import wenxi from './filiale/tongchuan/sale'
 // import FilialeSale from './filiale/yuansheng/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'