sale-client 4.1.1 → 4.1.2

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Thu Feb 27 12:01:45 CST 2025
+#Mon Apr 28 13:42:54 CST 2025
 gradle.version=5.2.1

package/package.json

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

package/src/components/charge/ChargeModal.vue

@@ -8,7 +8,8 @@
             <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)" @click="success()">确认</button>
+            <button class="button_search" v-show="!(!warninginfo.data.state.dibao&&warninginfo.data.state.dibaoend) && warninginfo.data.state.chargeAccount" @click="success()">确认</button>
+            <button class="button_search" v-show="!warninginfo.data.state.chargeAccount" @click="goToAccount()">去挂账管理</button>
           </span>
         </div>
         <p>{{authorityInformation}}</p>
@@ -65,6 +66,13 @@
       }
     },
     methods: {
+      goToAccount () {
+        console.log('点击了去挂帐管理')
+        if (window.parent !== window) {
+          window.parent.postMessage({type: 'route', path:'/duizhang/credit'}, '*')
+          this.close()
+        }
+      },
       close () {
         this.$emit('close')
       },

package/src/filiale/jiaxian/ChangeRecord.vue

@@ -0,0 +1,235 @@
+<template >
+  <div class="flex" style="justify-content: space-between;">
+    <div @keyup.enter="search" style="">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
+          <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+            <div class="row">
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">开始时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
+                            class="datepicker"
+                            condition="f_operate_date >= '{} 00:00:00' "
+                            placeholder="起始时间"
+                            style="width:60%"
+                            v-model="model.f_start_date"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group" >
+                <label class="font_normal_body" >结束时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
+                            class="datepicker"
+                            condition="f_operate_date <= '{} 23:59:59' "
+                            placeholder="结束时间"
+                            style="width:60%"
+                            v-model="model.f_end_date"
+                ></datepicker>
+              </div>
+
+              <div style="float: right">
+                <button @click="search()"  class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
+                <print-data :defaultfield="$parent.$parent.defaultfield" :field="$parent.$parent.fields" :is-selected="true" :model="$parent.$parent.printModel"
+                            @print-data="$parent.$parent.print()" print-name="变更查询"></print-data>
+              </div>
+            </div>
+
+
+          </div>
+
+        </criteria>
+        <data-grid :model="model" class="list_area table_sy" class="list_area table_sy" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th><nobr>修改列</nobr></th>
+              <th><nobr>旧修改内容</nobr></th>
+              <th><nobr>新修改内容</nobr></th>
+              <th><nobr>操作状态 </nobr></th>
+              <th><nobr>操作人 </nobr></th>
+              <th><nobr>操作日期</nobr></th>
+            </tr>
+          </template>
+          <template partial='body' partial='list' v-ref:grid>
+            <tr >
+              <td style="text-align:center">{{row.f_field_name}}</td>
+              <td style="text-align:center">{{row.f_used_content}}</td>
+              <td style="text-align:center">{{row.f_new_content}}</td>
+              <td style="text-align:center">{{row.f_state}}</td>
+              <td style="text-align:center">{{row.f_operator}}</td>
+              <td style="text-align:center">{{row.f_operate_date}}</td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+<!--    <table class="table-hover">-->
+<!--      <tr class="table-bordered" style="position: relative">-->
+<!--        <td-->
+<!--          style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">-->
+<!--          汇总信息-->
+<!--        </td>-->
+<!--        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
+<!--          气量合计:&emsp;{{model.sums.f_oughtamount}}-->
+<!--        </td>-->
+<!--        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
+<!--          金额合计:&emsp;{{model.sums.f_oughtfee}}-->
+<!--        </td>-->
+<!--      </tr>-->
+<!--    </table>-->
+  </div>
+
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  export default {
+    title: '变更记录',
+    data () {
+      return {
+        condition: `f_user_id = '${this.row.f_user_id}'`,
+        model: new PagedList('api/af-revenue/sql/getChangeRecord', 20, {}),
+        // 控制单选
+        radio: [],
+        // 选中的页
+        all: [],
+        // row数据
+        rowsdata: [],
+        fields: {'f_userinfo_code': '用户编号',
+          'f_user_name': '姓名',
+          'f_used_content': '旧修改内容',
+          'f_new_content': '新修改内容',
+          'f_state': '操作状态',
+          'f_operator': '操作人',
+          'f_operate_date': '操作日期'},
+        defaultfield: [
+          'f_userinfo_code',
+          'f_user_name',
+          'f_used_content',
+          'f_new_content',
+          'f_state',
+          'f_operator',
+          'f_operate_date'
+        ],
+        printModel: {
+          rows: []
+        }
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.$refs.paged.$refs.criteria.search()
+      // this.sumgasandmoney= this.$refs.paged.$refs.grid.model.sums
+      // for(let i in this.all){
+      //   this.money+=i.f_oughtamount
+      //   this.gas+=i.f_oughtfee
+      // }
+    },
+    methods: {
+      async search () {
+        this.condition = `f_userinfo_id = '${this.row.f_userinfo_id}' and f_orgid = '${this.$login.f.orgid}' and  ${this.$refs.paged.$refs.criteria.condition}`
+        this.model.search(this.condition, this.model)
+        let http = new HttpResetClass()
+        let res = await http.load('POST', 'api/af-revenue/sql/getChangeRecord', {
+          data: {
+            condition: this.condition
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        this.printModel.rows = res.data
+      },
+
+      // 多选框初始化
+      selectInit () {
+        this.rowsdata = []
+        this.all = []
+        this.radio = []
+      },
+      print () {
+        this.selectInit()
+      },
+      select () {
+        let index = this.model.pageIndex - 1
+        if (!this.radio[index]) {
+          this.radio.$set(index, [])
+        }
+        if (this.all[index]) {
+          // 数据
+          this.rowsdata[index] = Object.assign([], this.model.rows)
+          // 勾选
+          for (var i = 0; i < this.model.rows.length; i++) {
+            this.radio[index].$set(i, true)
+          }
+        } else {
+          // 数据
+          this.rowsdata[index] = []
+          // 不勾选
+          for (var i = 0; i < this.model.rows.length; i++) {
+            this.radio[index].$set(i, false)
+          }
+        }
+        let z = 0
+        for (let i = 0; i < this.all.length; i++) {
+          for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
+            this.printModel.rows[z++] = this.rowsdata[i][j]
+          }
+        }
+      },
+      selectOne (event, row, i) {
+        let index = this.model.pageIndex - 1
+        if (!this.rowsdata[index]) {
+          this.rowsdata[index] = []
+        }
+        if (!this.radio[index]) {
+          this.radio.$set(index, [])
+        }
+        if (event.target.checked) {
+          // 数据
+          this.rowsdata[index][i] = row
+          // 勾选
+          this.radio[index].$set(i, true)
+          // 判断是否全部选中
+          var allState = true
+          if (this.model.rows.length != this.radio[index].length) {
+            allState = false
+          }
+          for (var state of this.radio[index]) {
+            if (!state) {
+              allState = false
+            }
+          }
+          if (allState) {
+            this.all.$set(index, true)
+          } else {
+            this.all.$set(index, false)
+          }
+        } else {
+          // 数据
+          this.rowsdata[index][i] = []
+          // 不勾选
+          this.radio[index].$set(i, false)
+          // 任意取消一个则全选状态设为false
+          this.all.$set(index, false)
+        }
+        let z = 0
+        this.printModel.rows = []
+        for (let i = 0; i < this.all.length; i++) {
+          for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
+            if (this.rowsdata[i][j] && this.rowsdata[i][j].f_user_id) {
+              this.printModel.rows[z++] = this.rowsdata[i][j]
+            }
+          }
+        }
+      }
+    },
+    computed: {
+      ischecked () {
+        return function (index, i) {
+          if (!this.radio[index]) {
+            return false
+          }
+          return this.radio[index][i]
+        }
+      }
+    }
+  }
+</script>
+

package/src/filiale/jiaxian/UserInfoDetailManageNew.vue

@@ -147,7 +147,7 @@
   import WatchCollection from './WatchCollection'
   import WatchWarning from './../../components/common/userinfo_detail/iot_detail/WatchWarning'
   import PriceChangeQueryUser from './../../components/common/userinfo_detail/ic_detail/PriceChangeQueryUser'
-  import ChangeRecord from './../../components/common/userinfo_detail/ic_detail/ChangeRecord'
+  import ChangeRecord from './ChangeRecord'
   import PriceAdjustmentQueryUser from './../../components/common/userinfo_detail/ic_detail/PriceAdjustmentQueryUser'
   import MeterParam from './../../components/common/userinfo_detail/ic_detail/MeterParam'
   import DeveiceRecord from './../../components/common/userinfo_detail/ic_detail/DeveiceRecord'