sale-client 4.2.73 → 4.2.75

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Apr 02 14:48:19 CST 2025
+#Mon Oct 27 16:31:04 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.92.217:8900/', 'http://123.57.92.217:8900/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -51,10 +51,10 @@ var devConfig = {
         target: 'http://localhost:8080'
       },
       '/api/af-revenue': {
-        pathRewrite: {
-          '/api/af-revenue': '/af-revenue'
-        },
-        target: "http://localhost:8080"
+        // pathRewrite: {
+        //   '/api/af-revenue': '/af-revenue'
+        // },
+        target: serverRul
       },
       '/api': {
         target: serverRul

package/package.json

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

package/src/components/common/userinfo_detail/ic_detail/OtherChargeQueryUser.vue

@@ -115,7 +115,7 @@ export default {
         }, ...this.$appdata.getParam('是否有效')] : [],
         // 控制单选
         radio: [],
-        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userinfo_id',
         showdetail: false,
         otherchargeid: '',
         // 选中的页

package/src/filiale/jinhuang/OtherChargeQueryUser.vue

@@ -0,0 +1,251 @@
+<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 class="col-sm-2 form-group">
+                <label class="font_normal_body">是否有效</label>
+                <v-select :value.sync="model.f_state" v-model='model.f_state'
+                          style="width:60%"
+                          :options='$parent.$parent.isstates' placeholder='是否有效'
+                          close-on-select
+                          condition="f_state = '{}'"></v-select>
+              </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" 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>
+              <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 >
+              <th style="text-align:center">{{row.f_brand_spec}}</th>
+              <th style="text-align:center">{{row.f_typename}}</th>
+              <th style="text-align:center">{{row.f_typenumber}}</th>
+              <th style="text-align:center">{{row.f_number}}</th>
+              <th style="text-align:center">{{row.f_unitprice}}</th>
+              <th style="text-align:center">{{row.f_unitprice*row.f_number}}</th>
+              <th style="text-align:center">{{row.f_operator}}</th>
+              <th style="text-align:center">{{row.f_operate_date}}</th>
+              <td style="text-align: center;">{{row.f_state}}</td>
+              <th style="text-align:center">{{row.f_comments}}</th>
+            </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_collection}}
+        </td>
+      </tr>
+    </table>
+  </div>
+  <other-charge-query-user-detail v-if="showdetail" :otherchargeid="otherchargeid" :showdetail.sync="showdetail"></other-charge-query-user-detail>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import OtherChargeQueryUserDetail from './OtherChargeQueryUserDetail'
+
+export default {
+    title: '其他收费查询',
+    components: {
+      OtherChargeQueryUserDetail
+    },
+    data () {
+      return {
+        condition: '1=1',
+        model: new PagedList('api/af-revenue/sql/sale_OtherChargeQuery', 20, {}, {
+          f_collection: 0
+        }),
+        isstates: this.$appdata.getParam('是否有效') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('是否有效')] : [],
+        // 控制单选
+        radio: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userinfo_id',
+        showdetail: false,
+        otherchargeid: '',
+        // 选中的页
+        all: [],
+        // row数据
+        rowsdata: [],
+        // fields:{'f_brand_spec': '品牌','f_number': '数量','f_unitprice': '单价','f_collection':'收款','f_operator':'操作员', 'f_operate_date':'操作日期'},
+        fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_brand_spec': '品牌', 'f_collection': '收款', 'f_operator': '操作员', 'f_operate_date': '操作日期'},
+        defaultfield: [
+          // "f_brand_spec","f_number","f_unitprice",'f_collection','f_operator',"f_operate_date"
+          'f_userinfo_code', 'f_user_name', 'f_brand_spec', 'f_collection', 'f_operator', 'f_operate_date'
+        ],
+        printModel: {
+          rows: []
+        }
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.$refs.paged.$refs.criteria.model.f_state = ['有效']
+      this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      async search () {
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
+        this.model.search(this.condition, this.model)
+        let http = new HttpResetClass()
+        let res = await http.load('POST', 'api/af-revenue/sql/sale_OtherChargeQuery', {
+          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]
+            }
+          }
+        }
+      },
+      showchargedetail (row) {
+        this.showdetail = true
+        this.otherchargeid = row.id
+      }
+    },
+    computed: {
+      ischecked () {
+        return function (index, i) {
+          if (!this.radio[index]) {
+            return false
+          }
+          return this.radio[index][i]
+        }
+      }
+    }
+  }
+</script>

package/src/filiale/jinhuang/OtherChargeQueryUserDetail.vue

@@ -0,0 +1,81 @@
+
+<template >
+  <div class="auto">
+    <modal :show.sync="showdetail" title="详细记录" v-ref:modal large backdrop="false">
+      <article slot="modal-body" class="modal-body">
+          <data-grid :model="model" 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>
+                <th><nobr>型号</nobr></th>
+              </tr>
+            </template>
+            <template partial='body' partial='list' v-ref:grid>
+              <tr >
+                <td style="text-align:center;">{{$index+1}}</td>
+                <th style="text-align:center">{{row.f_brand_spec}}</th>
+                <th style="text-align:center">{{row.f_number}}</th>
+                <th style="text-align:center">{{row.f_unitprice}}</th>
+                <th style="text-align:center">{{(row.f_number-0)*(row.f_unitprice-0)}}</th>
+                <th style="text-align:center">{{row.f_typename}}</th>
+                <th style="text-align:center">{{row.f_typenumber}}</th>
+
+              </tr>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '抄表',
+    data () {
+      return {
+        model: {
+          rows: []
+        }
+
+      }
+    },
+    props: ['otherchargeid', 'showdetail'],
+    ready () {
+      this.search()
+    },
+    methods: {
+      async search () {
+        // 获取这个气价的所有记录
+        this.model.rows = []
+        let data = {
+          tablename: `t_othercharge_detail`,
+          items: '*',
+          condition: '1=1',
+          orderitem: 'id'
+        }
+        if (this.otherchargeid) {
+          data.condition = `f_othercharge_id = '${this.otherchargeid}'`
+        }
+
+        let res = await this.$resetpost('api/af-revenue/sql/singleTable_OrderBy', {data: data}, {rejectMsg: '获取气价记录出错', resolveMsg: null})
+        this.model.rows = res.data
+      }
+
+    },
+    watch: {
+      'showdetail' (val) {
+        if (val) {
+          this.search()
+        }
+      }
+    }
+  }
+</script>

package/src/filiale/jinhuang/UserInfoDetailManageNew.vue

@@ -129,7 +129,7 @@
   import ChargeRecordQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeRecordQuery'
   import FillCardQueryUser from '../../components/common/userinfo_detail/ic_detail/FillCardQueryUser'
   import HandQueryUser from '../../components/common/userinfo_detail/ic_detail/HandQueryUser'
-  import OtherChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/OtherChargeQueryUser'
+  import OtherChargeQueryUser from './OtherChargeQueryUser'
   import RecordQueryUser from '../../components/common/userinfo_detail/ic_detail/RecordQueryUser'
   import TransferQueryUser from '../../components/common/userinfo_detail/ic_detail/TransferQueryUser'
   import CardHandRecord from '../../components/common/userinfo_detail/ic_detail/CardHandRecord'

package/src/filiale/jinhuang/WebHand.vue

@@ -164,6 +164,12 @@
                               :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </nobr>
               </th>
+              <th>
+                <nobr>纳税人识别号</nobr>
+              </th>
+              <th>
+                <nobr>开票名称</nobr>
+              </th>
               <th>
                 <nobr>所属年月</nobr>
               </th>
@@ -225,6 +231,8 @@
             <td style="text-align: center;">{{ $index + 1 }}</td>
             <td style="text-align: center;">{{ row.f_userinfo_code }}</td>
             <td style="text-align: center;">{{ row.f_user_name }}&nbsp;&nbsp;{{ row.f_address }}</td>
+            <td>{{ row.f_taxpayer_id }}</td>
+            <td>{{ row.f_paper_name }}</td>
             <td style="text-align: center;">{{ row.belongmonth }}</td>
             <td style="text-align: center;">{{ row.f_meternumber }}</td>
             <td style="text-align: center;">{{ row.f_user_phone }}</td>
@@ -419,7 +427,9 @@ export default {
           'f_meter_classify': '气表分类',
           'f_meter_style': '气表型号',
           'f_user_phone': '客户电话',
-          'f_comments': '备注'
+          'f_comments': '备注',
+          'f_taxpayer_id': '纳税人识别号',
+          'f_paper_name': '开票名称'
         },
         examine: true,
         customCal: false

package/src/filiale/jinhuang/cardsHand.vue

@@ -226,6 +226,12 @@
               <th>
                 <nobr>用户等级</nobr>
               </th>
+              <th>
+                <nobr>纳税人识别号</nobr>
+              </th>
+              <th>
+                <nobr>开票名称</nobr>
+              </th>
               <th>
                 <nobr>小区</nobr>
               </th>
@@ -306,6 +312,8 @@
               }}&nbsp;&nbsp;{{ row.f_address }}
             </td>
             <td>{{ row.f_user_level }}</td>
+            <td>{{ row.f_taxpayer_id }}</td>
+            <td>{{ row.f_paper_name }}</td>
             <td style="text-align: center;">{{ row.f_residential_area }}</td>
             <td style="text-align: center;">{{ row.f_meternumber }}</td>
             <td style="text-align: center;">{{ row.f_user_phone }}</td>
@@ -523,7 +531,9 @@ export default {
         'f_img_path': '附件查看',
         'f_sign_img': '签章图片',
         'f_meter_state': '状态',
-        'f_usetype': '使用类型'
+        'f_usetype': '使用类型',
+        'f_taxpayer_id': '纳税人识别号',
+        'f_paper_name': '开票名称'
       },
       meterbrands: [{label: '全部', value: ''}],
       upshow: false,

package/src/filiale/ruihua/FilesManageNew/UserEssentialInfoTest.vue

@@ -3,7 +3,7 @@
     <validator name='v' @valid="$emit('valid')" @invalid="$emit('invalid')">
       <form class="form-horizontal select-overspread ">
         <div class="row">
-          <div class="col-sm-4 form-group " :class="[$v.f_user_name.required ? 'has-error' : '']"
+          <div class="col-sm-4 form-group " :class="[!baseinfo.base.f_user_name ? 'has-error' : '']"
                v-if="getConfigShowItem('f_user_name')">
             <label for="f_user_name" class="font_normal_body">*{{getConfigLabelName('f_user_name','用户姓名')}}</label>
             <input type="text" v-model="baseinfo.base.f_user_name"
@@ -391,6 +391,12 @@
         doNothing () {
            // console.log('啥也不做')
         },
+        resetValidation () {
+          this.baseinfo = Object.assign({}, this.baseinfo)
+          this.$nextTick(() => {
+            this.$resetValidation()
+          })
+        },
         readIDCardCallback (compoent, msg) {
            // console.log('进入高拍仪',msg)
           if (msg.err !== 0) {
@@ -423,6 +429,11 @@
               }
             })
           }
+        },
+        'baseinfo.base.f_user_name'(val) {
+          console.log('f_user_name变化:', val);
+          // 手动触发验证状态检查
+          this.$resetValidation()
         }
       },
       computed: {

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/jinhong/sale'
+import FilialeSale from './filiale/ruihua/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'

package/businessNew.json

@@ -1,201 +0,0 @@
-{
-  "机表收费":
-  {
-    "weight": 1,
-    "routeName": "machine-charge"
-  },
-  "物联网表收费": {
-    "weight": 1,
-    "routeName": "iot-meter-center"
-  },
-  "复拆表":
-  {
-    "weight": 9,
-    "routeName": "remove-table-cancel"
-  },
-  "转气":
-  {
-    "weight": 9,
-    "routeName": "gas-move"
-  },
-  "启用":
-  {
-    "weight": 7,
-    "routeName": "enable-manage"
-  },
-  "其他欠费":
-  {
-    "weight": 4,
-    "routeName": "other-charge-bypay"
-  },
-  "其他收费":
-  {
-    "weight": 4,
-    "routeName": "other-charge-new"
-  },
-  "过户":
-  {
-    "weight": 10,
-    "routeName": "transfer-manage"
-  },
-  "预存收费":
-  {
-    "weight": 9,
-    "routeName": "deposit-charge"
-  },
-  "发折":
-  {
-    "weight": 5,
-    "routeName": "send-book"
-  },
-  "停用":
-  {
-    "weight": 7,
-    "routeName": "disable-manage"
-  },
-  "迁表":
-  {
-    "weight": 9,
-    "routeName": "move-meter"
-  },
-  "其他退款":
-  {
-    "weight": 9,
-    "routeName": "bzj-cancel"
-  },
-  "清表退款": {
-    "weight": 7,
-    "routeName": "drop-table-refund"
-  },
-  "换表&清零":
-  {
-    "weight": 5,
-    "routeName": "change-meter"
-  },
-  "数码表收费":
-  {
-    "weight": 1,
-    "routeName": "digital-charge"
-  },
-  "气费（其他）":
-  {
-    "weight": 9,
-    "routeName": "over-use-charge"
-  },
-  "机表发卡":
-  {
-    "weight": 8,
-    "routeName": "show-card-sell-gas-jb"
-  },
-  "补气购气":
-  {
-    "weight": 0,
-    "routeName": "change_fill_sendcard"
-  },
-  "调价补差":
-  {
-    "weight": -1,
-    "routeName": "compensation-manage"
-  },
-  "气费退款":
-  {
-    "weight": 6,
-    "routeName": "refund-manage"
-  },
-  "补费扣费":
-  {
-    "weight": 8,
-    "routeName": "deduction-manage"
-  },
-  "拆表":
-  {
-    "weight": 9,
-    "routeName": "remove-table"
-  },
-  "卡表收费":
-  {
-    "weight": 1,
-    "routeName": "card-meter-center"
-  },
-  "换表补气":
-  {
-    "weight": 3,
-    "routeName": "change-meter-add-gas"
-  },
-  "其他补气":
-  {
-    "weight": 3,
-    "routeName": "other-gas"
-  },
-  "掉气补气":
-  {
-    "weight": 3,
-    "routeName": "off-gas-add-gas"
-  },
-  "补卡":
-  {
-    "weight": 2,
-    "routeName": "replace-card-manage"
-  },
-  "发卡售气":
-  {
-    "weight": 1,
-    "routeName": "show-card-sell-gas"
-  },
-  "物联网表发卡":
-  {
-    "weight": 8,
-    "routeName": "send-card-web"
-  },
-  "无卡收费": {
-    "weight": 2,
-    "routeName": "no-card-meter-center"
-  },
-  "赠气":
-  {
-    "weight": 9,
-    "routeName": "iotTable"
-  },
-  "卡表赠气":
-  {
-    "weight": 9,
-    "routeName": "icTable"
-  },
-  "物联网抄表冲正":
-  {
-    "weight": 9,
-    "routeName": "iot_read_correction"
-  },
-  "初始化卡": {
-    "weight": 9,
-    "routeName": "reset-show-card-gas"
-  },
-  "增值服务管理": {
-    "weight": 9,
-    "routeName": "value-addser-show"
-  },
-  "壁挂炉信息变更": {
-    "weight": 9,
-    "routeName": "wallheating-info-add"
-  },
-  "保险": {
-    "weight": 9,
-    "routeName": "insurance-add"
-  },
-  "档案完善": {
-    "weight": 9,
-    "routeName": "files_complete"
-  },
-  "封堵": {
-    "weight": 10,
-    "routeName": "user-plugging"
-  },
-  "余量补差": {
-    "weight": 10,
-    "routeName": "margin-compensation"
-  },
-  "解除封堵": {
-    "weight": 10,
-    "routeName": "secure-plugging"
-  }
-}