sale-client 3.6.469 → 3.6.470

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Thu Dec 12 12:54:07 CST 2024
+#Mon Jul 08 09:48:59 CST 2024
 gradle.version=5.2.1

package/package.json

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

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

@@ -317,6 +317,7 @@
             <label class="control-label col-sm-12 flex-row" style="transform: translate(0,8px)">客户地址：{{danhu.info.f_address}}</label>
             <label class="control-label col-sm-6 flex-row" style="transform: translate(0,8px)">上次抄表日期：{{danhu.info.f_input_date}}</label>
             <label class="control-label col-sm-6 flex-row" style="transform: translate(0,8px)">上期底数：{{danhu.info.f_last_tablebase}}</label>
+            <label class="control-label col-sm-6 flex-row" style="transform: translate(0,8px)">本期用量：{{f_current_usage}}</label>
           </div>
         </div>
         <div class="panel panel-primary datapanel">
@@ -331,10 +332,12 @@
               <label for="danhubase" class="control-label" style="transform: translate(0,8px)">本期底数</label>
               <input id="danhubase" type="number" class="input_search " style="width: 60% !important;"
                      v-model="danhu.f_new_tablebase" @keyup.enter.stop="downAndHand"
+                     @blur="tableBaseBlur"
                      placeholder='本期底数'/>
             </div>
           </div>
         </div>
+        <upload :blodid="row.f_userinfo_id" v-if="config.showupload" isremark="true" fusetype="物联网表收费"></upload>
       </article>
       <footer slot="modal-footer">
       </footer>
@@ -418,6 +421,7 @@ export default {
         inputtor: [],
         reason: ''
       },
+      f_current_usage:'',
       auditState: [{label: '全部', value: ''}, {label: '未抄表', value: '未抄表'}, {
         label: '待审核',
         value: '待审核'
@@ -488,6 +492,11 @@ export default {
     document.getElementById(this.inputid).focus()
   },
   methods: {
+    tableBaseBlur () {
+      if (this.danhu.f_new_tablebase) {
+        this.f_current_usage = (this.danhu.f_new_tablebase -0) - (this.danhu.info.f_last_tablebase -0)
+      }
+    },
     imgclose () {
       this.imgshow = false
     },
@@ -617,6 +626,7 @@ export default {
         f_new_tablebase: '',
         info: {}
       }
+      this.f_current_usage = ''
       setTimeout(() => {
         document.getElementById('danhucode').focus()
         this.$refs.paged.$refs.criteria.search()
@@ -921,6 +931,15 @@ export default {
     dblclick: function (row, index) {
       this.row = row
       this.detailsShow = true
+    },
+    // 删除Resid数组元素
+    'delResid' (val) {
+      this.resid.$remove({id: val, f_biobid: ''})
+    },
+    // 增加Resid数组元素
+    'resid' (val) {
+      console.log('-=', val)
+      this.resid.push({id: val, f_biobid: ''})
     }
   }
 }

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

@@ -208,7 +208,7 @@
                             style="width:60%"
                             multiple="true"
                             :options='$parent.$parent.inputtores' placeholder='抄表员'
-                            condition="f_inputtor = '{}'"
+                            condition="f_inputtor in {}" multiple
                             close-on-select
                             v-el:cc></v-select>
                 </div>
@@ -216,16 +216,16 @@
                   <label class="font_normal_body">抄&ensp;表&ensp;册</label>
                   <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
                             :options='$parent.$parent.meterbooks' placeholder='抄表册'
-                            style="width:60%"
+                            style="width:60%" multiple
                             close-on-select
-                            condition="f_meter_book_num = '{}'"></v-select>
+                            condition="f_meter_book_num in {}"></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body" >档案抄表员</label>
                   <v-select :value.sync="model.f_dainputtores"
-                            v-model="model.f_dainputtores"
+                            v-model="model.f_dainputtores" multiple
                             :options='$parent.$parent.dainputtores' placeholder='请选择'
-                            condition="f_dainputtores = '{}'"
+                            condition="f_dainputtores in {}"
                             close-on-select>
                   </v-select>
                 </div>
@@ -504,11 +504,10 @@
   import {HttpResetClass, PagedList} from 'vue-client'
 
   let readySomething = async function (self) {
-
-    self.getinputtores();
-    //加载抄表册
-    self.initmeterbook();
-    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+    self.getinputtores()
+  // 加载抄表册
+  self.initmeterbook()
+  self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
     self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
     // self.$refs.paged.$refs.cri.search()
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
@@ -518,23 +517,23 @@
   }
   export default {
     title: '欠费查询',
-    data() {
+    data () {
       return {
         config: {
           defaultPrint: ['f_userinfo_code', 'f_address']
         },
-        other:[],
-        footer:[],
-        //f_price_name:[],
-        gasproperties:[],
+        other: [],
+        footer: [],
+        // f_price_name:[],
+        gasproperties: [],
         showinfo: false,
         data: {},
-        show:false,
-        rowdata:{},
+        show: false,
+        rowdata: {},
         initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[]
+          org: [this.$login.f.orgid],
+          dep: [],
+          user: []
         },
         model: new PagedList('rs/sql/salearrearsQuery', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
           f_oughtamount: 0,
@@ -543,7 +542,7 @@
           f_oughtfee_new: 0,
           overdue: 0,
           f_garbage_fee: 0,
-          f_balance:0,
+          f_balance: 0,
           f_oughtfee_all: 0,
           f_oughtfee_col: 0
         }),
@@ -554,22 +553,22 @@
         pricenames: [],
         prices: [],
         area: [],
-        //合计数据
+        // 合计数据
         defaultfield: [],
-        //小区
+        // 小区
         residentialArea: [],
         sumsmodel: {},
         f_filialeid: this.$login.f.f_orgid,
-        meterbooks:[{label: '全部',value: ''}],  //抄表册
+        meterbooks: [{label: '全部', value: ''}],  // 抄表册
         // inputtores:[{label: '全部',value: ''}],
-        dainputtores:[{label: '全部',value: ''}],
-        allorgid:[],
-        tempfalg :false,
-        lastorgstr:'',
-        dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
+        dainputtores: [{label: '全部', value: ''}],
+        allorgid: [],
+        tempfalg: false,
+        lastorgstr: '',
+        dypayment: [{label: '全部', value: ''}, {label: '银行代扣', value: '银行代扣'}, {label: '现金缴费', value: '现金缴费'}]
       }
     },
-    ready() {
+    ready () {
       this.hqdainputtores()
       this.getaddress()
       readySomething(this).then(() => {
@@ -580,74 +579,73 @@
     },
     methods: {
 
-      async hqdainputtores() {
+      async hqdainputtores () {
         let param = {
           items: 'DISTINCT f_inputtor',
           tablename: 't_userfiles',
-          condition: `  f_inputtor is NOT null`,
+          condition: `  f_inputtor is NOT null`
         }
-        let getDainputtores = await new HttpResetClass().load("POST",'rs/sql/singleTableParam', {data: param}, {
+        let getDainputtores = await new HttpResetClass().load('POST', 'rs/sql/singleTableParam', {data: param}, {
           resolveMsg: null,
           rejectMsg: null
-        });
+        })
         if (getDainputtores.data.length > 0) {
-          let rs = [];
+          let rs = []
           getDainputtores.data.forEach((item) => {
             if (item.f_inputtor.length > 0) {
               let temp = {
                 label: item.f_inputtor,
                 value: item.f_inputtor
-              };
-              rs.push(temp);
+              }
+              rs.push(temp)
             }
           })
-          this.dainputtores = [{label: '全部', value: ''}, ...rs];
+          this.dainputtores = [{label: '全部', value: ''}, ...rs]
         } else {
-          this.dainputtores = [{label: '全部', value: ''}];
+          this.dainputtores = [{label: '全部', value: ''}]
         }
       },
-      async inputtorchange(){
-        let val = this.$refs.paged.$refs.cri.model.f_inputtor;
-        if(val!=null && val !=""){
-          let param={
-            items:'*',
-            tablename:'t_meter_book',
-            condition:` 1=1 and f_inputtor = '${val}' and f_orgid ='${this.f_filialeid}' and f_book_state='有效' `,
-            orderitem:'id'
+      async inputtorchange () {
+        let val = this.$refs.paged.$refs.cri.model.f_inputtor
+        if (val != null && val != '') {
+          let param = {
+            items: '*',
+            tablename: 't_meter_book',
+            condition: ` 1=1 and f_inputtor = '${val}' and f_orgid ='${this.f_filialeid}' and f_book_state='有效' `,
+            orderitem: 'id'
 
           }
           let getMeterBooks = await this.$resetpost('rs/sql/manage_singleTable', {data: param}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
           if (getMeterBooks.data) {
-            if(getMeterBooks.data.length >0){
-              let rs = [];
-              getMeterBooks.data.forEach((item)=>{
+            if (getMeterBooks.data.length > 0) {
+              let rs = []
+              getMeterBooks.data.forEach((item) => {
                 let temp = {
-                  label:item.f_book_name,
-                  value:item.id
-                };
-                rs.push(temp);
-
+                  label: item.f_book_name,
+                  value: item.id
+                }
+                rs.push(temp)
               })
-              this.meterbooks = [{label: '全部',value: ''}, ...rs];
-              this.$set('$refs.paged.$refs.cri.model.f_meter_book',[getMeterBooks.data[0].id]);
-            }else{
-              this.$set('$refs.paged.$refs.cri.model.f_meter_book','');
-              this.meterbooks = [{label: '全部',value: ''}];
+              this.meterbooks = [{label: '全部', value: ''}, ...rs]
+              this.$set('$refs.paged.$refs.cri.model.f_meter_book', [getMeterBooks.data[0].id])
+            } else {
+              this.$set('$refs.paged.$refs.cri.model.f_meter_book', '')
+              this.meterbooks = [{label: '全部', value: ''}]
             }
           }
-        }else{
-          this.$set('$refs.paged.$refs.cri.model.f_meter_book','');
-          this.meterbooks = [{label: '全部',value: ''}];
-          this.initmeterbook();
+        } else {
+          this.$set('$refs.paged.$refs.cri.model.f_meter_book', '')
+          this.meterbooks = [{label: '全部', value: ''}]
+          this.initmeterbook()
         }
       },
-      async initmeterbook(orgstr){
-        if(orgstr == null ){
-          orgstr = this.f_filialeid;
+      async initmeterbook (orgstr) {
+        if (orgstr == null) {
+          orgstr = this.f_filialeid
         }
-        //获取新的抄表册,先去清理所有的抄表册
-        this.$GetSaleParam.meterbooks = [];
-        //开始加载新的抄表册
+        // 获取新的抄表册,先去清理所有的抄表册
+        this.$GetSaleParam.meterbooks = []
+      // 开始加载新的抄表册
         await this.$LoadParams.loadMeterBook(orgstr)
         this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
       },
@@ -665,28 +663,28 @@
         }
         return [{label: '全部', value: ''}, ...rs]
       },
-      //加载抄表册
-      loadMeterBooks(){
+      // 加载抄表册
+      loadMeterBooks () {
         this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
       },
-      getotherfooter(){
+      getotherfooter () {
         // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
         // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
-        this.other=[];
-        this.footer=[];
-        let exportdata = this.getCondition;
-        let otherInData=[];
-        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
-        let footerData=[],exportfield=this.getfield;
-        footerData.push("合计");
-        let self =this;
-        for(var field in self.sumsmodel){
-          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+        this.other = []
+        this.footer = []
+        let exportdata = this.getCondition
+        let otherInData = []
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
+        let footerData = [], exportfield = this.getfield
+        footerData.push('合计')
+        let self = this
+        for (var field in self.sumsmodel) {
+          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`)
         }
-        this.footer.push(footerData);
-        this.other.push(otherInData);
+        this.footer.push(footerData)
+        this.other.push(otherInData)
       },
-      async  getaddress(){
+      async  getaddress () {
         console.log('开始获取小区')
         let HttpReset = new HttpResetClass()
         var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
@@ -694,16 +692,16 @@
             condition: `1=1 and s.f_filialeid = '${this.$login.f.orgid}'`
           }
         }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
-        console.log('小区',data)
+        console.log('小区', data)
         let house = [{label: '全部', value: ''}]
-        for (let row of data.data){
+        for (let row of data.data) {
           console.log('开始保存小区')
           house.push({label: row.f_residential_area, value: row.f_residential_area})
         }
         this.residentialArea = house
       },
-      //把数据库查询数据转换为下拉数据
-      calculate(rows){
+      // 把数据库查询数据转换为下拉数据
+      calculate (rows) {
         let data = []
         rows.forEach((row, n) => {
           data[n] = {label: row.f_residential_area, value: row.id}
@@ -711,30 +709,29 @@
         return data
       },
 
-      search(){
+      search () {
         this.$refs.paged.$refs.cri.search()
       },
-      cancel() {
+      cancel () {
         this.show = false
       },
-      showmsg(obj){
-        this.rowdata=obj
-        this.show=true
+      showmsg (obj) {
+        this.rowdata = obj
+        this.show = true
       },
       userTypeChange () {
-        this.gasproperties=[]
-        if(this.$refs.paged.$refs.cri.model !==null) {
-          this.$refs.paged.$refs.cri.model.f_gasproperties=''
+        this.gasproperties = []
+        if (this.$refs.paged.$refs.cri.model !== null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties = ''
 
-          console.log("查看客户类型是什么",this.$refs.paged.$refs.cri.model.f_user_type[0])
+          console.log('查看客户类型是什么', this.$refs.paged.$refs.cri.model.f_user_type[0])
           this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
           // this.gasproperties.push({label: '全部', value: ''})
-        }
-        else{
-          this.gasproperties =[{label: '全部', value: ''}]
+        } else {
+          this.gasproperties = [{label: '全部', value: ''}]
         }
       },
-      initParams() {
+      initParams () {
         // 初始化气表品牌
         let brandArr = []
         this.$GetSaleParam.getGasbrand().forEach((item) => {
@@ -750,74 +747,72 @@
           // this.meterstyle[temp.value] = styleArr
         })
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
-        //初始化气表价格
+        // 初始化气表价格
         this.prices = this.$GetSaleParam.getPrice(this.$login.f.orgid)
       },
-      selfSearch(args) {
-        console.log('开始时间',this.$refs.paged.$refs.cri.model.startDate)
-        if (this.$refs.paged.$refs.cri.model.startDate === '' || this.$refs.paged.$refs.cri.model.endDate === ''){
+      selfSearch (args) {
+        console.log('开始时间', this.$refs.paged.$refs.cri.model.startDate)
+        if (this.$refs.paged.$refs.cri.model.startDate === '' || this.$refs.paged.$refs.cri.model.endDate === '') {
           this.$showAlert('请先选择开始时间、结束时间，再进行查询操作！', 'warning', 3000)
         } else {
-          //小区查询条件
+          // 小区查询条件
           let f_orgstr = this.orgCondtionStr
-          let str='1=1 '
-          if(this.$refs.paged.$refs.cri.model.inputstartDate !== ''){
+          let str = '1=1 '
+          if (this.$refs.paged.$refs.cri.model.inputstartDate !== '') {
             str += `and f_input_date>='${this.$refs.paged.$refs.cri.model.inputstartDate}'`
           }
-          if(this.$refs.paged.$refs.cri.model.inputendDate !== ''){
+          if (this.$refs.paged.$refs.cri.model.inputendDate !== '') {
             str += `and f_input_date<='${this.$refs.paged.$refs.cri.model.inputendDate}'`
           }
           args.condition = `${args.condition} and f_meter_type='机表'` + f_orgstr
-          this.model.search(args.condition, args.model,str)
+          this.model.search(args.condition, args.model, str)
           this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
         }
       },
-      clear() {
-        //清空部门和人员
+      clear () {
+        // 清空部门和人员
         this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
-        //部门和人员变为全选
+        // 部门和人员变为全选
         this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
         this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
         Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
           this.$refs.paged.$refs.cri.model[key] = []
         })
-
       },
-      dealmsg(val) {
+      dealmsg (val) {
         val.model = this.model.model
         this.$dispatch('deal-msg', val)
       },
-      show() {
+      show () {
         this.criteriaShow = true
       },
-      hidden() {
+      hidden () {
         this.criteriaShow = !this.criteriaShow
       },
-      async getRes(condition,obj) {
+      async getRes (condition, obj) {
         this.orgCondtionStr = condition
         this.orgname = obj.orgnames[0]
         this.depname = obj.depnames[0]
-
       },
-      async updateParams() {
+      async updateParams () {
         await this.$LoadParams.loadParam(this.f_filialeid)
-        this.inputtores = [];
-        this.inputtores.push({label: "全部", value: ""})
-        if(this.allorgid!=null){
-          this.allorgid.forEach((res)=>{
-            this.inputtores = this.inputtores.concat(this.$GetSaleParam.getresinputtor(res));
+        this.inputtores = []
+        this.inputtores.push({label: '全部', value: ''})
+        if (this.allorgid != null) {
+          this.allorgid.forEach((res) => {
+            this.inputtores = this.inputtores.concat(this.$GetSaleParam.getresinputtor(res))
           })
         }
         this.initParams()
-      },
+      }
     },
-    events:{
-      'getidcard'(IdCard){
-        this.$refs.paged.$refs.cri.model.f_info_idnumber=IdCard.strID
+    events: {
+      'getidcard' (IdCard) {
+        this.$refs.paged.$refs.cri.model.f_info_idnumber = IdCard.strID
       }
     },
     watch: {
-      'model'(val) {
+      'model' (val) {
       },
       // async 'orgCondtionStr'(val) {
       //   this.$refs.paged.$refs.cri.model.f_book_slice_area=[]
@@ -847,15 +842,15 @@
       //     this.updateParams()
       //   }
       // },
-      sumsmodel:{
-        handler: function(val) {
-          this.getotherfooter();
+      sumsmodel: {
+        handler: function (val) {
+          this.getotherfooter()
         },
         deep: true
       }
     },
     computed: {
-      pricetypes() {
+      pricetypes () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
       },
       inputtores () {
@@ -887,7 +882,7 @@
         })
         return Array.from(new Set(result))
       },
-      getCondition() {
+      getCondition () {
         return {
           startDate: this.$refs.paged.$refs.cri.model.startDate,
           endDate: this.$refs.paged.$refs.cri.model.endDate,
@@ -895,23 +890,45 @@
           condValue: `${this.model.condValue}`
         }
       },
-      getfield() {
+      getfield () {
         return {
-          'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_residential_area': '小区名称', 'f_idnumber':'身份证号','f_address': '客户地址',
-          'f_user_phone': '客户电话','f_rent_phone': '备用电话','f_inputtor': '抄表员','f_book_name': '抄表册','f_user_type': '客户类型',
-          'f_gasproperties': '用气性质', 'f_comments': '备注', 'c': '欠费期数', 'f_hand_date': '欠费区间', 'f_oughtamount': '用气量',
-          'f_oughtfee': '用气金额','f_operate_date': '缴费时间', 'f_debt_money': '已交金额', 'f_oughtfee_new': '应交气费',
-          'overdue': '违约金', 'f_garbage_fee': '附加费','f_last_tablebase': '上期抄表底数','f_tablebase': '本期抄表底数','f_balance': '上期余额',
-          'f_oughtfee_all': '合计欠费金额','f_oughtfee_col': '实际欠费金额','f_cost_type':'缴费方式', 'f_meternumber':'表号'
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '客户名称',
+          'f_residential_area': '小区名称',
+          'f_idnumber': '身份证号',
+          'f_address': '客户地址',
+          'f_user_phone': '客户电话',
+          'f_rent_phone': '备用电话',
+          'f_inputtor': '抄表员',
+          'f_book_name': '抄表册',
+          'f_user_type': '客户类型',
+          'f_gasproperties': '用气性质',
+          'f_comments': '备注',
+          'c': '欠费期数',
+          'f_hand_date': '欠费区间',
+          'f_oughtamount': '用气量',
+          'f_oughtfee': '用气金额',
+          'f_operate_date': '缴费时间',
+          'f_debt_money': '已交金额',
+          'f_oughtfee_new': '应交气费',
+          'overdue': '违约金',
+          'f_garbage_fee': '附加费',
+          'f_last_tablebase': '上期抄表底数',
+          'f_tablebase': '本期抄表底数',
+          'f_balance': '上期余额',
+          'f_oughtfee_all': '合计欠费金额',
+          'f_oughtfee_col': '实际欠费金额',
+          'f_cost_type': '缴费方式',
+          'f_meternumber': '表号'
         }
       },
-      usertypes() {
+      usertypes () {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
-      metertypes() {
+      metertypes () {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
       },
-      chargetype() {
+      chargetype () {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('收费类型')]
       }
     }

package/src/filiale/bayan/StockListmain.vue

@@ -20,7 +20,7 @@
                   class="form-group">
                   <label class="font_normal_body">收费人员</label>
                   <input type="text" class="input_search"  style="width: 60%" v-model="model.f_operatorid"
-                         condition="f_operatorid like '%{}%'" placeholder='收费人员'>
+                         condition="f_operator like '%{}%'" placeholder='收费人员'>
                 </div>
                 <div
                   :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"