sale-client 4.1.3 → 4.1.5

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Thu Feb 27 12:01:45 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://218.93.226.210:31467/', 'http://218.93.226.210:31467/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31467/', 'http://localhost:9026/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -19,16 +19,16 @@ var devConfig = {
       children: false // 不输出子模块构建信息
     },
     proxy: {
-      // '/api/af-revenue/logic/depositCharge': {
-      //   // pathRewrite: {ca'h
-      //   //   '/api/af-revenue/logic': '/logic'
-      //   // },
-      //   target: 'http://127.0.0.1:9026'
-      // },
+    '/api/af-revenue/batchdeduction/all': {
+      pathRewrite: {
+        '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
+      },
+      target: localUrl
+    },
       '/api/af-revenue/logic': {
-        // pathRewrite: {
-        //   '/api/af-revenue/logic': '/logic'
-        // },
+        pathRewrite: {
+          '/api/af-revenue/logic': '/logic'
+        },
         target: localUrl
       },
       '/api/af-revenue/file': {
@@ -37,39 +37,22 @@ var devConfig = {
         // },
         target: localUrl
       },
-      'api/af-revenue/entity/save': {
-        // pathRewrite: {
-        //   '/api/af-revenue/entity/save': '/entity/save'
-        // },
-        target: localUrl
+      '/weixin2/rs':{
+
+        target: 'http://410663id1ia4.vicp.fun'
       },
-      '/singlepage': {
-        // pathRewrite: {
-        //   '/weixin2/rs': '/rs'
-        // },
-        target: localUrl
-      },
-      '/weixin2/rs': {
+      '/api/af-revenue/sql': {
         pathRewrite: {
-          '/weixin2/rs': '/singlepage/weixin2/rs'
+          '/api/af-revenue/sql': '/sql'
         },
         target: localUrl
       },
-      '/api/af-revenue/sql': {
-        // pathRewrite: {
-        //   '/api/af-revenue/sql': '/sql'
-        // },
-        target: localUrl
-      },
       '/rs/pay': {
         target: 'http://localhost:8080'
       },
       '/api': {
         target: serverRul
       },
-      '/resource': {
-        target: serverRul
-      },
       '/rs': {
         target: serverRul
       }

package/package.json

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

package/src/components/common/userinfo_detail/UserInfoDetailManage.vue

@@ -118,9 +118,6 @@ export default {
       },
       async search () {
         let http = new HttpResetClass()
-
-        let condition = `f_userinfo_id = '${this.f_userinfo_id}'`
-
         let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
           {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
         this.row = getBaseInfo.data

package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -212,20 +212,18 @@ export default {
       },
       async search () {
         let http = new HttpResetClass()
-        let condition = ' 1 = 1'
-        if (this.f_userfiles_id) {
-          condition = `f_userfiles_id = '${this.f_userfiles_id}'`
-        } else if (this.f_userinfo_id) {
-          condition = `f_userinfo_id = '${this.f_userinfo_id}'`
-        } else if (this.f_userinfo_code) {
-          condition = `f_userinfo_code = '${this.f_userinfo_code}'`
-        }else{
+        if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
           this.$showMessage('用户信息缺失，查询详情信息失败')
           return
         }
-
         let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
-          {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+          {
+            data: {
+              f_userfiles_id: this.f_userfiles_id,
+              f_userinfo_id: this.f_userinfo_id,
+              f_userinfo_code: this.f_userinfo_code
+            }
+          }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
         this.row = getBaseInfo.data
         this.row.parentname = this.parentname || ''
       },

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

@@ -1,242 +1,242 @@
-<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 :options='$parent.$parent.changeType' :value.sync="model.f_type"
-                          close-on-select
-                          condition="f_type='{}'"
-                          placeholder='换表类型'
-                          style="width:60%"
-                          v-model="model.f_type"
-                ></v-select>
-              </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>
-              <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;"><nobr>{{row.f_type}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_using_base_old}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_remanent_gas}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_meter_brand_old}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_meternumber_old}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_changemeter_fee}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_state}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_change_operator}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_changetables_reason}}/{{row.f_reason}}/{{row.f_othereason}}</nobr></td>
-            </tr>
-          </template>
-          <template partial='foot'></template>
-        </data-grid>
-      </criteria-paged>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {HttpResetClass, PagedList} from 'vue-client'
-
-  export default {
-    title: '收费',
-    data () {
-      return {
-        condition: '1=1',
-        model: new PagedList('api/af-revenue/sql/sale_ChangeMeterQuery', 20),
-        // 控制单选
-        radio: [],
-        // 选中的页
-        all: [],
-        isstates: this.$appdata.getParam('是否有效') ? [{
-          label: '全部',
-          value: ''
-        }, ...this.$appdata.getParam('是否有效')] : [],
-        // row数据
-        rowsdata: [],
-        fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_type': '换表类型', 'f_meter_base': '旧表底数', 'f_newmeter_base': '新表底数', 'f_changemeter_fee': '换表费', 'f_operator': '操作员', 'f_changemeter_date': '换表日期'},
-        defaultfield: [
-          'f_userinfo_code', 'f_user_name', 'f_type', 'f_meter_base', 'f_newmeter_base', 'f_changemeter_fee', 'f_operator', 'f_changemeter_date'
-        ],
-        printModel: {
-          rows: []
-        }
-      }
-    },
-    props: ['row'],
-    ready () {
-      this.$refs.paged.$refs.criteria.search()
-    },
-    methods: {
-      async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}'`
-        this.model.search(this.condition, this.model)
-        let http = new HttpResetClass()
-        let res = await http.load('POST', 'api/af-revenue/sql/sale_ChangeMeterQuery', {
-          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]
-        }
-      },
-      changeType () {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('换表类型')]
-      }
-    }
-  }
-</script>
+<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 :options='$parent.$parent.changeType' :value.sync="model.f_type"
+                          close-on-select
+                          condition="f_type='{}'"
+                          placeholder='换表类型'
+                          style="width:60%"
+                          v-model="model.f_type"
+                ></v-select>
+              </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>
+              <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;"><nobr>{{row.f_type}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_using_base_old}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_remanent_gas}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_meter_brand_old}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_meternumber_old}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_changemeter_fee}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_state}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_change_operator}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_changetables_reason}}/{{row.f_reason}}/{{row.f_othereason}}</nobr></td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+
+  export default {
+    title: '收费',
+    data () {
+      return {
+        condition: '1=1',
+        model: new PagedList('api/af-revenue/sql/sale_ChangeMeterQuery', 20),
+        // 控制单选
+        radio: [],
+        // 选中的页
+        all: [],
+        isstates: this.$appdata.getParam('是否有效') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('是否有效')] : [],
+        // row数据
+        rowsdata: [],
+        fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_type': '换表类型', 'f_meter_base': '旧表底数', 'f_newmeter_base': '新表底数', 'f_changemeter_fee': '换表费', 'f_operator': '操作员', 'f_changemeter_date': '换表日期'},
+        defaultfield: [
+          'f_userinfo_code', 'f_user_name', 'f_type', 'f_meter_base', 'f_newmeter_base', 'f_changemeter_fee', 'f_operator', 'f_changemeter_date'
+        ],
+        printModel: {
+          rows: []
+        }
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      async search () {
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}'`
+        this.model.search(this.condition, this.model)
+        let http = new HttpResetClass()
+        let res = await http.load('POST', 'api/af-revenue/sql/sale_ChangeMeterQuery', {
+          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]
+        }
+      },
+      changeType () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('换表类型')]
+      }
+    }
+  }
+</script>