sale-client 3.5.31 → 3.5.34

package/package.json

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

package/src/components/revenue/Common/Movemeter.vue

@@ -373,7 +373,7 @@
         let res = await this.$resetpost('rs/sql/singleTable_OrderBy', {data: {orderitem: 'f_userinfo_id',
           items: '*',
           tablename: 't_user_address',
-          condition: 'f_userinfo_id = ' + this.row.f_userinfo_id}})
+          condition: 'f_userinfo_id = ' + this.row.f_userinfo_id}},{resolveMsg: null,rejectMsg: null})
         console.log('=============', res.data[0])
         let data = {
           f_pcd: res.data[0].f_pcd,

package/src/components/revenue/comprehen/ComprehenOperation/OverCharge/OverUseCharge.vue

@@ -244,6 +244,12 @@ let overChargeGen = async function (self) {
       self.$dispatch('success')
     }
   } catch (error) {
+    console.log('捕获到异常', error)
+    if (error instanceof Object) {
+      self.$showAlert(error.data, 'danger', 0)
+    } else {
+      self.$showAlert(error, 'danger', 0)
+    }
     self.$showAlert(error, 'danger', 0)
     self.$dispatch('refresh')
   }

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

@@ -74,6 +74,16 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">小区名称</label>
+              <v-select :value.sync="model.f_residential_area_id" v-model="model.f_residential_area_id"
+                        :options='$parent.$parent.areaList' placeholder='小区名称'
+                        close-on-select   @select-search="$parent.$parent.getAreaList"
+                        condition="f_residential_area_id = '{}'"
+                        style="width: 60%"
+              >
+              </v-select>
+            </div>
           </div>
         </div>
       </criteria>
@@ -216,7 +226,7 @@
         model: new PagedList('rs/sql/getGasUser', 20, {}),
         condition: '',
         criteriaShow2: false,
-        gasproperties1:[],
+        gasproperties1: [],
         getfield: {},
         show: false,
         gasproperties: [],
@@ -228,18 +238,19 @@
           pricename: '',
           f_comments: ''
         },
-        oldinfo:{
-          f_user_type:'',
-          f_gasproperties:'',
-          f_price_type:'',
-          f_price_name:'',
-          f_price_id:'',
-          f_stairprice_id:''
+        oldinfo: {
+          f_user_type: '',
+          f_gasproperties: '',
+          f_price_type: '',
+          f_price_name: '',
+          f_price_id: '',
+          f_stairprice_id: ''
         },
-        gongyetype: this.$appdata.getParam('用气类别')?[{label: '全部', value: ''}, ...this.$appdata.getParam('用气类别')] : [],
+        areaList: [],
+        gongyetype: this.$appdata.getParam('用气类别') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类别')] : [],
         usertypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
         pricetypes: this.$appdata.getParam('气价类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')] : [],
-        meters: this.$appdata.getParam('气表类型') ? [{label: '全部',value: ''}, ...this.$appdata.getParam('气表类型')] : [],
+        meters: this.$appdata.getParam('气表类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')] : [],
         adjustpricereasons: this.$appdata.getParam('批量调价原因'),
         config: {
           excelHeaders: {
@@ -258,8 +269,33 @@
       this.search()
       this.getfield = this.config.excelHeaders
       loadParamGem(this)
+      this.getAreaList()
     },
     methods: {
+      getAreaList (searchText) {
+        let condition = ' 1 = 1 '
+        if (searchText) {
+          condition = ` f_residential_area like '%${searchText}%' `
+        }
+        let HttpReset = new HttpResetClass()
+        HttpReset.load('POST', 'rs/sql/saleSingleTable?pageNo=1&pageSize=100', {
+          data: {
+            items: 'f_residential_area, id',
+            tablename: 't_area',
+            orderitem: 'id desc',
+            condition: condition
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区信息失败!'}).then((req) => {
+          let redata = []
+          req.data.forEach((row, n) => {
+            redata[n] = {
+              label: row.f_residential_area,
+              value: row.id
+            }
+          })
+          this.areaList = [{label: '全部', value: ''}, ...redata]
+        })
+      },
       userTypeChange1 () {
         this.gasproperties1 = []
         if (this.$refs.paged.$refs.criteria.model !== null) {
@@ -304,7 +340,7 @@
           condition: condition,
           fileuploadid: fileuploadid
         }
-        if(this.priceid){
+        if (this.priceid) {
           if (this.newinfo.pricename[0].f_price_id == this.model.rows[0].f_price_id) {
             this.$showMessage('选择的气价和当前气价相同, 请重新选择')
             return
@@ -318,9 +354,8 @@
           param.f_stairprice_id_old = this.model.rows[0].f_stairprice_id
           let res = await this.$resetpost('rs/logic/pricechangeall', {data: param}, {resolveMsg: '更新成功', rejectMsg: '更新失败'})
           this.$showMessage(`成功批量修改了${res.data}位用户的气价`)
-
-        }else{
-          param.oldinfo=this.param
+        } else {
+          param.oldinfo = this.param
           let res = await this.$resetpost('rs/logic/pricechangebatch', {data: param}, {resolveMsg: '更新成功', rejectMsg: '更新失败'})
           this.$showMessage(`成功批量修改了${res.data}位用户的气价`)
         }
@@ -338,47 +373,45 @@
         this.$refs.paged.$refs.criteria.search()
       },
       changeprice () {
-        let rowdata = this.$refs.paged.$refs.grid.getRowData().length>0? this.$refs.paged.$refs.grid.getRowData():this.model.rows
-          if(this.priceid && this.model.rows.length>0){
-            this.oldinfo = {
-              f_user_type : this.model.rows[0].f_user_type,
-              f_gasproperties : this.model.rows[0].f_gasproperties,
-              f_price_type : this.model.rows[0].f_price_type,
-              f_price_name : this.model.rows[0].f_price_name,
-              f_price_id : this.model.rows[0].f_price_id,
-              f_stairprice_id : this.model.rows[0].f_stairprice_id
-            }
-          } else
-          {
-            this.oldinfo={
-              f_user_type : rowdata[0].f_user_type,
-              f_gasproperties : rowdata[0].f_gasproperties,
-              f_price_type : rowdata[0].f_price_type,
-              f_price_name : rowdata[0].f_price_name
-            }
-          for ( var i = 1 ; i < rowdata.length ; i++ ) {
-            if (rowdata[i].f_user_type !== rowdata[i-1].f_user_type) {
+        let rowdata = this.$refs.paged.$refs.grid.getRowData().length > 0 ? this.$refs.paged.$refs.grid.getRowData() : this.model.rows
+        if (this.priceid && this.model.rows.length > 0) {
+          this.oldinfo = {
+            f_user_type: this.model.rows[0].f_user_type,
+            f_gasproperties: this.model.rows[0].f_gasproperties,
+            f_price_type: this.model.rows[0].f_price_type,
+            f_price_name: this.model.rows[0].f_price_name,
+            f_price_id: this.model.rows[0].f_price_id,
+            f_stairprice_id: this.model.rows[0].f_stairprice_id
+          }
+        } else {
+          this.oldinfo = {
+            f_user_type: rowdata[0].f_user_type,
+            f_gasproperties: rowdata[0].f_gasproperties,
+            f_price_type: rowdata[0].f_price_type,
+            f_price_name: rowdata[0].f_price_name
+          }
+          for (var i = 1; i < rowdata.length; i++) {
+            if (rowdata[i].f_user_type !== rowdata[i - 1].f_user_type) {
               this.oldinfo.f_user_type = ''
             }
-            if (rowdata[i].f_gasproperties !== rowdata[i-1].f_gasproperties) {
+            if (rowdata[i].f_gasproperties !== rowdata[i - 1].f_gasproperties) {
               this.oldinfo.f_gasproperties = ''
             }
-            if (rowdata[i].f_price_type !== rowdata[i-1].f_price_type) {
+            if (rowdata[i].f_price_type !== rowdata[i - 1].f_price_type) {
               this.oldinfo.f_price_type = ''
             }
-            if (rowdata[i].f_price_name != rowdata[i-1].f_price_name) {
+            if (rowdata[i].f_price_name != rowdata[i - 1].f_price_name) {
               this.oldinfo.f_price_name = ''
             }
           }
-
         }
         this.show = true
       },
       selfSearch (args) {
         this.$refs.paged.$refs.grid.selectInit()
-        if(this.priceid){
+        if (this.priceid) {
           args.condition = `${args.condition} and f_price_id = '${this.priceid}'`
-        }else{
+        } else {
           args.condition = `${args.condition} and f_orgid = '${this.$login.f.orgid}'`
         }
         this.condition = args.condition

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

@@ -465,7 +465,7 @@
               <!-- 已抄表，已审核，冲正（状态改为冲正,添加负记录，需要重新下发）-->
               <button type="button" name="button" class="button_search button_spacing width-60"
                       @click.stop="$parent.$parent.$parent.cancelHand(row)"
-                      v-if="row.f_meter_state === '已抄表' && row.maxid==row.id && (row.f_whether_pay === '否' ||  row.f_accounts_state === '自动下账')" >冲正
+                      v-if="row.f_meter_state === '已抄表' && row.maxid==row.id && (row.f_whether_pay === '否' ||  row.f_accounts_state === '自动下账' || (row.f_whether_pay === '是' && row.f_oughtfee == 0 ))" >冲正
               </button>
 
               <!--              <button type="button" name="button" class="btn btn-link"-->

package/src/filiale/dongguan/components/FilesManage/FileUserFiles.vue

@@ -7,7 +7,14 @@
             <criteria @condition-changed="$parent.selfSearch" partial='criteria' v-ref:criteria>
               <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
                 <div class="row">
-
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group">
+                    <label class="font_normal_body">客户电话</label>
+                    <input class="input_search" condition="f_user_phone = '{}'" placeholder='客户电话' style="width:60%"
+                           type="text"
+                           v-model="model.f_user_phone">
+                  </div>
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group"
@@ -17,8 +24,6 @@
                            placeholder='客户编号'
                            style="width:60%" type="text" v-model="model.f_userinfo_code">
                   </div>
-                  <res-select-group v-if="$parent.$parent.clientWidth<1600&&!$parent.$parent.createFile" :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres"  :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group"
@@ -28,7 +33,6 @@
                            placeholder='客户编号'
                            style="width:60%" type="text" v-model="model.f_userinfo_code">
                   </div>
-
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group" v-if="!$parent.$parent.createFile">
@@ -86,7 +90,6 @@
                   </div>
                 </div>
                 <div class="row" v-if="$parent.$parent.criteriaShow">
-
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group"
@@ -96,8 +99,19 @@
                            placeholder='客户编号'
                            style="width:60%" type="text" v-model="model.f_userinfo_code">
                   </div>
-                  <res-select-group  v-if="$parent.$parent.clientWidth<1600&&$parent.$parent.createFile" :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres"  :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-                  <res-select-group v-if="$parent.$parent.clientWidth>=1600" :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres"  :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                  <!--                  身份证号-->
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group">
+                    <label class="font_normal_body">身份证号</label>
+                    <input class="input_search" condition="f_idnumber = '{}'" placeholder='身份证号'
+                           style="width:60%"
+                           type="text"
+                           v-model="model.f_idnumber">
+                  </div>
+<!--                  <res-select-group v-if="$parent.$parent.clientWidth<1600&&!$parent.$parent.createFile" :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres"  :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>-->
+<!--                  <res-select-group  v-if="$parent.$parent.clientWidth<1600&&$parent.$parent.createFile" :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres"  :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>-->
+                  <res-select-group :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres"  :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
 
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
@@ -156,14 +170,6 @@
                   <!--                              close-on-select condition="f_meter_brand='{}'"-->
                   <!--                              placeholder='气表品牌' v-model="model.f_meter_brand"></v-select>-->
                   <!--                  </div>-->
-                  <div
-                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
-                    class="form-group">
-                    <label class="font_normal_body">客户电话</label>
-                    <input class="input_search" condition="f_user_phone = '{}'" placeholder='客户电话' style="width:60%"
-                           type="text"
-                           v-model="model.f_user_phone">
-                  </div>
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group">
@@ -298,6 +304,9 @@
                   <th>
                     <nobr>客户名称</nobr>
                   </th>
+                  <th>
+                    <nobr>身份证号</nobr>
+                  </th>
                   <th>
                     <nobr>表号</nobr>
                   </th>
@@ -349,6 +358,8 @@
                 <td style="text-align: center;">
                   <span @click="$parent.$parent.$parent.dealmsg(row)"><a><b>{{row.f_user_name}}</b></a></span>
                 </td>
+                <!--                身份证号-->
+                <td style="text-align: center;">{{row.f_idnumber}}</td>
                 <td style="text-align: center;">{{row.f_meternumber}}</td>
                 <td style="text-align: center;">{{row.f_card_id}}</td>
                 <td style="text-align: center;">{{row.f_user_phone}}</td>