sale-client 4.2.48 → 4.2.50

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Sep 04 10:25:06 CST 2024
+#Sat Sep 13 14:19:54 CST 2025
 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 ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
+const [ serverRul, localUrl ] = ['http://123.57.3.66:31467/', 'http://123.57.3.66:31467/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -50,14 +50,23 @@ var devConfig = {
       '/rs/pay': {
         target: 'http://localhost:8080'
       },
-      '/api/af-revenue': {
+      // '/api/af-revenue': {
+      //   pathRewrite: {
+      //     '/api/af-revenue': '/af-revenue'
+      //   },
+      //   target: "http://localhost:8080"
+      // },
+      '/api/af-revenue/logic/getOperBtns': {
         pathRewrite: {
-          '/api/af-revenue': '/af-revenue'
+          '/api/af-revenue': '/rs'
         },
-        target: "http://localhost:8080"
+        target: 'http://127.0.0.1:8080'
       },
       '/api': {
-        target: serverRul
+        target: serverRul,
+        pathRewrite: {
+          '/api/af-revenue': '/singlepage/rs'
+        }
       },
       '/rs': {
         target: serverRul

package/package.json

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

package/src/filiale/fugou/components/FileUserAddress.vue

@@ -707,9 +707,9 @@ export default {
       })
       this.communitylist=redata
     },
-    async  communityChange(val){
+    async  communityChange (val) {
       console.log(val)
-      if(val){
+      if (val && val !== '[object Event]') {
         await this.initareas(` f_filialeid = '${this.f_filialeids}' and f_community_id ='${val}' `)
         if(this.model.f_residential_area_id){
           // if (this.findbyid(this.areaslist,this.model.f_residential_area_id)) {
@@ -722,11 +722,6 @@ export default {
           // }
 
         }
-        // if(this.model.f_pcd_id.length==0){
-        // if (this.findbyid(this.streetslist,this.model.f_street_id)) {
-        //   this.model.f_pcd_id=this.findbyid(this.streetslist,this.model.f_street_id).f_pcd_id
-        // }
-        // }
       }
       this.$resetValidation()
     },

package/src/filiale/fugou/components/revenue/HandManager/MbpeopleList.vue

@@ -700,9 +700,9 @@ let loadParamGem = async function (self) {
           await this.initcommunity(` f_filialeid = '${this.f_filialeids}' and f_street_id ='${val}' `)
         }
       },
-      async  communityChange(val){
+      async  communityChange (val) {
         console.log(val)
-        if(val){
+        if (val && val !== '[object Event]') {
           await this.initareas(` f_filialeid = '${this.f_filialeids}' and f_community_id ='${val}' `)
         }
       }

package/src/filiale/qingjian/ChargeModal.vue

@@ -0,0 +1,110 @@
+<template>
+  <modal :show.sync="modalShow" backdrop="false" width="50%" title="提示信息">
+    <article slot="modal-body">
+      <div style="width:98%;margin: auto" v-show="showInformation">
+        <p>{{warninginfo.data.msgData}}</p>
+        <div  style="font-size: 15px;padding: 10px">
+          <span style="float: right">
+            <button class="button_search" v-show="!warninginfo.data.state.info"  @click="operational('files_complete')" style="width: max-content;">完善信息</button>
+            <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao" @click="operational('basic-living')" style="width: max-content;">低保续保</button>
+            <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao && warninginfo.data.state.dibaoend" @click="operational('stop-basic-living')" style="width: max-content;">停止续保</button>
+            <button class="button_search" v-show="!(!warninginfo.data.state.dibao&&warninginfo.data.state.dibaoend) && warninginfo.data.canCharge" @click="success()">确认</button>
+            <button class="button_search" v-show="warninginfo.data.state.hasOwnProperty('chargeAccount') && warninginfo.data.state.chargeAccount === false" @click="goToAccount()">去挂账管理</button>
+          </span>
+        </div>
+        <p>{{authorityInformation}}</p>
+      </div>
+      <div style="width:98%;margin: auto" v-show="!showInformation" >
+        <route v-ref:route @close="close" @success="success" v-show="!showInformation" :data="row"></route>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer" style="text-align: center;border: 0">
+      <!--如果想忽略到期信息，modal的值设为null-->
+      <!--      <button class="button_clear" @click="ignore" v-if="basicLiving">忽略</button>-->
+    </footer>
+  </modal>
+</template>
+<script>
+  let initGen = async function (self) {
+    if(self.warninginfo){
+      if (!self.warninginfo.data.state.info && !self.warninginfo.data.state.blacklist && !self.warninginfo.data.state.dibao) {
+        self.authorityInformation = '您没有相关的业务操作权限, 请联系管理员！！'
+      }
+    }
+
+  }
+
+  export default {
+    title: '收费弹出框',
+    props: {
+      // 动态属性表数据
+      warninginfo:{
+        type:Object
+      },
+      // 双击用户的数据
+      row: {
+        type: Object
+      },
+      modalShow: {
+        type: Boolean
+      }
+    },
+    data () {
+      return {
+        showInformation: true,
+        informationtype: '',
+
+        // 终止低保户 必选低保户到期
+        stopBasicLiving: false,
+
+        // 低保户到期提醒时间
+        dibao_remind: this.$appdata.getSingleValue('低保快到期提醒') ? this.$appdata.getSingleValue('低保快到期提醒') : 0,
+        // 低保户权限
+        basicLivingAuthority: false,
+        // 档案完善权限
+        filesCompleteAuthority: true
+      }
+    },
+    methods: {
+      goToAccount () {
+        console.log('点击了去挂帐管理')
+        if (window.parent !== window) {
+          window.parent.postMessage({type: 'route', path:'/duizhang/credit'}, '*')
+          this.close()
+        }
+      },
+      close () {
+        this.$emit('close')
+      },
+      async success (val) {
+
+        // 如果所有提示信息均处理，获取改户数据，进入收费操作
+        if (!this.warninginfo.data.info && !this.warninginfo.data.blacklist && !this.warninginfo.data.dibao) {
+          this.showInformation = false
+          let data = await this.$resetpost('api/af-revenue/sql/sale_getUser', {data: {condition: `1=1 and f_userinfo_code = '${this.row.f_userinfo_code}' and u.f_filialeid = '${this.$login.f.orgid}'`}}, {resolveMsg: '', rejectMsg: ''})
+          this.$emit('modalsuccess', data.data[0])
+        } else { // 没有处理完，显示提示信息
+          this.showInformation = true
+        }
+      },
+      operational (val) {
+        this.showInformation = false
+        this.$refs.route.init(val, {data: this.row})
+      }
+    },
+    ready () {
+      initGen(this)
+      console.log('charge-modal', this.warninginfo.data.state)
+    }
+    // watch: {
+    //   'modalShow' (val) {
+    //     this.modal = val
+    //   }
+    // }
+  }
+</script>
+<style>
+  .basic-main {
+    width: 79%;
+  }
+</style>

package/src/filiale/qingjian/sale.js

@@ -17,4 +17,6 @@ export default function () {
   Vue.component('iot-refund', (resolve) => { require(['./IOTRefund'], resolve) })
   // 用户基本信息test
   Vue.component('file-user-essential-info', (resolve) => { require(['./UserEssentialInfoTest'], resolve) })
+  // 售气收费 --弹出框
+  Vue.component('charge-modal', (resolve) => { require(['./ChargeModal'], resolve) })
 }

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/yuncheng/sale'
+import FilialeSale from './filiale/qingjian/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'