sale-client 3.6.413 → 3.6.415

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Jul 08 09:48:59 CST 2024
+#Wed Oct 30 09:57:55 CST 2024
 gradle.version=5.2.1

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://192.168.50.67:30785/', 'http://192.168.50.67:30785']
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://localhost:8080/', 'http://192.168.50.67:30785']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -60,7 +60,7 @@ var devConfig = {
         target: serverRul
       },
       '/rs/logic/getSaleInitData': {
-        target: serverRul
+        target: localUrl
       },
       // 用户登录服务地址
       '/rs/user': {

package/package.json

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

package/src/components/charge/ChargeOper.vue

@@ -76,20 +76,18 @@ let getBtnsGen = async function (self) {
             })
           }
         } else {
-          if (getBtns[i].name !== '限制购气' || self.$login.r.includes('限制购气')) {
-            self.temp.push(getBtns[i])
-          }
+          self.temp.push(getBtns[i])
         }
         console.log(self.temp[i])
       }
     }
-    // 检查是否需要展示限制购气按钮
-    if (self.$login.r.includes('限制购气')) {
-      let limitGasButton = getBtns.find(btn => btn.name === '限制购气')
-      if (limitGasButton) {
-        self.temp.push(limitGasButton)
-      }
-    }
+    // // 检查是否需要展示限制购气按钮
+    // if (self.$login.r.includes('限制购气')) {
+    //   let limitGasButton = getBtns.find(btn => btn.name === '限制购气')
+    //   if (limitGasButton) {
+    //     self.temp.push(limitGasButton)
+    //   }
+    // }
     // 如果有未写卡记录，添加线下写卡按钮
     if (self.data.unWriteSell) {
       if (self.data.unWriteSell.length > 0) {

package/src/components/revenue/comprehen/ComprehenOperation/MeterEnable/EnableManage.vue

@@ -90,7 +90,7 @@ let meterEnable = async function (self, model, row) {
     f_zones: self.$login.f.zones
   }
   await self.$resetpost('rs/entity/t_enable', data, {resolveMsg: '表具启用成功', rejectMsg: '表具启用失败'})
-  if(self.kaifa){
+  if (self.kaifa) {
     let array = [{
       f_user_id: self.row.f_userfiles_id,
       f_alias: self.row.f_alias,
@@ -119,6 +119,10 @@ let meterEnable = async function (self, model, row) {
             inputtor: self.$login.f.name
           }
         }
+      }).then(res => {
+        console.log(res)
+        let sql = `update t_userfiles set f_network_valve = 0  where f_userfiles_id = '${self.row.f_userfiles_id}'`
+        self.$resetpost('rs/logic/runSQL', {sql: sql}, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
       })
   }
   self.$dispatch('success')
@@ -137,17 +141,17 @@ export default {
       },
       reason: this.$appdata.getParam('启用原因'),
       disable: {},
-      kaifa:false
+      kaifa: false
     }
   },
   ready () {
     this.deactivatedReason()
   },
   methods: {
-    changeisuse(val){
-      if(val){
+    changeisuse (val) {
+      if (val) {
         this.kaifa = true
-      }else{
+      } else {
         this.kaifa = false
       }
     },

package/src/filiale/alashan/eticket/EticketPrint.vue

@@ -52,10 +52,21 @@ export default {
     async rushRedInvoice (data) {
       try {
         // 否则正常打票
-        let result = await axios.post('/invoice/rs/logic/getInvoice', Object.assign(data, {invoice_type: 1}), {
-          resolveMsg: null,
-          rejectMsg: '发票冲红失败!!'
-        })
+        await axios.post('/invoice/rs/logic/getInvoice',
+          Object.assign(data, {
+            invoice_type: 1,
+            loginInfo: {
+              operator: Vue.$login.f.name,
+              operator_id: Vue.$login.f.id,
+              org_id: Vue.$login.f.orgid,
+              orgname: Vue.$login.f.orgs,
+              dep_id: Vue.$login.f.depids,
+              depname: Vue.$login.f.deps
+            }
+          }), {
+            resolveMsg: null,
+            rejectMsg: '发票冲红失败!!'
+          })
         this.return_msg = '冲红成功请前往发票管理页面查看'
       } catch (error) {
         this.return_msg = '冲红失败请前往发票管理页面重试'

package/src/filiale/lixianV3/MachineCharge.vue

@@ -0,0 +1,180 @@
+<template>
+  <div class="flex" style="overflow-y: auto!important;">
+    <div  class="auto" style="height: 50%; overflow: auto">
+      <div  v-for="owe of list" >
+        <owe-list :row='owe' :floor="config.floor" :charge="config.charge" @refresh-center="refreshCenter"></owe-list>
+      </div>
+    </div>
+    <div class="span" v-if="chargeView">
+      <p v-if="row.f_totalsplit_type === '总表'"><strong>分表承担总量 (单位: 方): {{splitAllgas}}</strong></p>
+      <machine-meter-center :data='model' :owelist="list[0].rows" :charge="config.charge" :row='row' :floor="config.floor" :ceil="config.ceil" v-ref:mainche></machine-meter-center>
+    </div>
+    <div class="span" v-if="!chargeView">
+      <work-busy-small :is-busy="!chargeView"></work-busy-small>
+    </div>
+  </div>
+  <upload :blodid="blodid" v-if="config.showupload" isremark="true" fusetype="机表收费"></upload>
+</template>
+<script>
+  import OweList from './OweList'
+  import WorkBusySmall from '../../components/charge/business/machine/WorkBusySmall'
+  import {HttpResetClass} from 'vue-client'
+
+  let loadGen = async function (self) {
+    await self.$getConfig(self, 'MachineCharge')
+    let http = new HttpResetClass()
+    let res = await http.load('POST', 'rs/logic/sale_getOwe', {data: {f_userinfo_id: self.row.f_userinfo_id}}, {resolveMsg: null, rejectMsg: '获取欠费出错！！', newly: true})
+    self.list = res.data
+
+    let owes = []
+    for (let i = 0; i < res.data.length; i++) {
+      for (let j = 0; j < res.data[i].rows.length; j++) {
+        owes.push(res.data[i].rows[j])
+      }
+    }
+    self.refreshCenter(owes)
+    // let res = await self.$refs.pv.load('rs/sql/getOverdue', {data: {f_user_id: self.row.f_user_id}})
+    // if (res.data) {
+    //   for (let i = 0; i < res.data.length; i++) {
+    //     res.data[i].f_totalsplit_type = self.row.f_totalsplit_type
+    //     res.data[i].f_user_id = res.data[i].f_user_id + ''
+    //     let getSplit = await self.$resetpost('rs/logic/splitInfo', {data: {totalInfo: res.data[i]}}, {resolveMsg: null, rejectMsg: '获取分表抄表信息出错!!!'})
+    //     if (getSplit.data.length > 0) {
+    //       for (let j = 0; j < getSplit.data.length; j++) {
+    //         self.splitAllgas = self.splitAllgas + (getSplit.data[j].f_oughtamount - 0)
+    //       }
+    //     }
+    //   }
+    //   self.list.metertitle = self.row.f_user_id
+    //   self.list.rows = self.model.rows = [...self.model.rows, ...res.data]
+    //   // 控制欠费列表承担量的显示
+    //   self.model.f_totalsplit_type = self.row.f_totalsplit_type
+    // }
+    self.chargeView = true
+  }
+
+  /**
+   *售气收费
+   *机表收费组合组件，包括抄表列表以及机表收费主组件
+   */
+  export default {
+    title: '收费',
+    components: {OweList,WorkBusySmall},
+    data () {
+      return {
+        config: {
+          showupload: false, // 控制附件显示
+          floor: false, // 向下取整
+          ceil: false, // 向上取整
+          charge: true  // 是否需要缴清欠费
+        },
+        blodid: '',
+
+        model: {},
+        list: [],
+        oweArr: {},
+        splitAllgas: 0,
+        chargeView: false
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.blodid = this.row.f_userinfo_id
+      loadGen(this)
+    },
+    methods: {
+      refreshCenter (val, rows, f_userfiles_id) {
+        console.log(f_userfiles_id)
+        if (f_userfiles_id) {
+          console.log(f_userfiles_id)
+          this.oweArr[f_userfiles_id] = val
+        }
+        this.initData(this.row)
+        let arr = Object.values(this.oweArr).flat()
+        this.getRows(arr)
+      },
+      initData (row) {
+        let temp = {
+          f_payment: ['现金缴费'],
+          f_user_id: row.f_user_id,
+          f_userinfo_id: row.f_userinfo_id,
+          f_userfiles_id: row.f_userfiles_id,
+          f_balance: row.f_balance,
+          otherprice: '',
+          f_pregas: 0,
+          f_preamount: 0,
+          f_totalcost: 0,
+          f_curbalance: 0,
+          f_collection: '',
+          f_garbage_fee: 0,
+          f_overdue: 0,
+          f_lowest: 0,
+          f_print: ['普通收据'],
+          f_privilege_id: 0,
+          f_privilege_money: 0,
+          f_privilege_gas: 0,
+          f_after_discount: 0
+        }
+        this.model = Object.assign({}, this.model, temp)
+      },
+      getRows (val) {
+        this.model.selectedids = []
+        for (let i = 0; i < val.length; i++) {
+          if (val[i]) {
+            this.model.f_pregas = this.model.f_pregas + val[i].f_oughtamount
+            this.model.f_preamount = this.model.f_preamount + val[i].f_oughtfee
+            this.model.f_overdue = this.model.f_overdue + val[i].overdue
+            this.model.f_garbage_fee = this.model.f_garbage_fee + val[i].f_garbage_fee
+            this.model.selectedids.push({id: val[i].handplan_id})
+          }
+        }
+        if (val.length == 0) {
+          this.model.f_overdue = 0
+          this.model.f_totalcost = 0
+          this.model.f_collection = 0
+          this.model.f_pregas = 0
+          this.model.f_preamount = 0
+          this.model.f_garbage_fee = 0
+        }
+        this.model.f_overdue = this.model.f_overdue.toFixed(2)
+        this.model.f_totalcost = (this.model.f_preamount - 0) + (this.model.f_overdue - 0)
+        /* if (this.model.f_totalcost === 0) {
+          this.model.f_totalcost = this.row.f_balance < 0 ? (0 - this.row.f_balance) : 0
+        } */
+        this.model.f_totalcost += this.model.f_garbage_fee
+        if (this.config.floor) {
+          this.model.f_collection = Math.floor((this.model.f_totalcost - 0) - (this.model.f_balance - 0))
+        } else if (this.config.ceil) {
+          this.model.f_collection = Math.ceil((this.model.f_totalcost - 0) - (this.model.f_balance - 0))
+        } else {
+          this.model.f_collection = (this.model.f_totalcost - 0) - (this.model.f_balance - 0)
+        }
+        this.model.f_collection = this.model.f_collection < 0 ? 0 : this.model.f_collection
+      },
+      // 获取欠费里面有违约金的最大的一笔欠费的角标
+      getMaxIndex (val) {
+        if (val.findIndex((item) => { return item.f_oughtfee < 0 }) !== -1) {
+          return val.findIndex((item) => { return item.f_oughtfee < 0 })
+        } else {
+          let firstOverdue = val.findIndex((item) => { return item.overdue > 0 })
+          if (firstOverdue === -1) {
+            return 0
+          } else {
+            let lastOverdue = val.slice(firstOverdue).findIndex((item) => { return item.overdue === 0 }) - 1
+            return lastOverdue < 0 ? val.length - 1 : firstOverdue + lastOverdue
+          }
+        }
+      }
+    },
+    watch: {
+      chargeView () {
+        // this.$refs.mainche && this.$refs.mainche.checkOverdue()
+      }
+    }
+  }
+</script>
+<style lang="less">
+  #tooltip div {
+    height: auto;
+  }
+</style>

package/src/filiale/lixianV3/OweList.vue

@@ -150,7 +150,7 @@
       'selecteds' () {
         // 获取选中的行数
         this.selectedRows = this.selecteds.length
-        this.$dispatch('refresh-center', this.selecteds, this.selectedRows)
+        this.$dispatch('refresh-center', this.selecteds, this.selectedRows,this.row.f_userfiles_id)
       }
     }
   }

package/src/filiale/lixianV3/meterinfodetail.vue

@@ -150,8 +150,8 @@
           <span class = "col-sm-7">{{data?data.f_gas_date.substring(0,7):dafault.f_hand_date}}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >抄表员</label>
-          <span class = "col-sm-7">{{data?data.f_inputtor:dafault.f_inputtor}}</span>
+          <label class = "col-sm-5 " >片区</label>
+          <span class = "col-sm-7">{{data?data.f_slice_area:dafault.f_slice_area}}</span>
         </div>
         <div class="row">
           <label class = "col-sm-5 " >上次抄表日</label>

package/src/filiale/lixianV3/sale.js

@@ -22,4 +22,6 @@ export default function () {
   Vue.component('user-meterinfodetail', (resolve) => { require(['./meterinfodetail'], resolve) })
   // 保险收费明细
   Vue.component('insurance-harges-details', (resolve) => { require(['./InsuranceChargesDetails'], resolve) })
+  // 机表收费引导
+  Vue.component('machine-charge', (resolve) => { require(['./MachineCharge'], resolve) })
 }

package/src/plugins/LogicService.js

@@ -70,6 +70,7 @@ let LogicService = {
       f_userfile_id: row.f_userfiles_id,
       f_user_id: row.f_user_id,
       f_userinfo_id: row.f_userinfo_id,
+      f_user_phone: row.f_user_phone,
       f_user_name: row.f_user_name,
       f_comments: model.f_reason[0],
       f_othereason: model.f_othereason,