sale-client 4.2.98 → 4.2.99

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://116.204.36.215:8301/', 'http://116.204.36.215:8301/']
+const [ serverRul, localUrl ] = ['http://121.36.106.17:31467/', 'http://121.36.106.17:31467/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -47,9 +47,9 @@ var devConfig = {
       //   },
       //   target: localUrl
       // },
-      // '/rs/pay': {
-      //   target: 'http://localhost:8080'
-      // },
+      '/rs/pay': {
+        target: 'http://localhost:8080'
+      },
       // '/api/af-revenue': {
       //   pathRewrite: {
       //     '/api/af-revenue': '/af-revenue'

package/package.json

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

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

@@ -199,7 +199,7 @@
         all: [],
         // row数据
         rowsdata: [],
-        sqlname: `${this.row.f_meter_type === '物联网表'?'sale_WebHandplanQuery':'sale_HandplanQuery'}`,
+        sqlname: `${this.row.f_meter_type === '物联网表' ? 'sale_WebHandplanQuery' : 'sale_HandplanQuery'}`,
         searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         starthead: '',
         fields: {
@@ -277,7 +277,7 @@
       //   this.model.search(this.condition, this.model)
       // },
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}'`
+        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', `${this.row.f_meter_type === '物联网表'?'api/af-revenue/sql/sale_WebHandplanQuery':'api/af-revenue/sql/sale_HandplanQuery'}`, {

package/src/components/revenue/machineHandManage/machineDown.vue

@@ -33,6 +33,12 @@
                        condition="f_userinfo_code='{}'" placeholder='客户编号'>
               </div>
 
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">旧客户编号</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
+                       condition="f_olduserinfo_code='{}'" placeholder='客户编号'>
+              </div>
+
               <div class="span" style="float:right;">
                 <button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
                 <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
@@ -189,6 +195,9 @@
                               :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                 </nobr>
               </th>
+              <th>
+                <nobr>旧用户编号</nobr>
+              </th>
               <!--              <th>-->
               <!--                <nobr>表编号</nobr>-->
               <!--              </th>-->
@@ -249,6 +258,7 @@
             <!--</td>-->
             <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_olduserinfo_code}}</td>
 <!--            <td style="text-align: center;">{{row.f_olduserinfo_code}}</td>-->
             <!--            <td>{{row.f_user_id}}</td>-->
             <td style="text-align: center;">{{row.f_user_name}}&nbsp;&nbsp;{{row.f_address}}</td>

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

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Thu Oct 30 09:31:24 CST 2025
-gradle.version=5.2.1

package/.npmignore

@@ -1,12 +0,0 @@
-src/bootstrap
-.idea/
-.DS_Store
-node_modules/
-dist/
-examples/
-gradle/
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-lib/**/lib

package/src/.npmignore

@@ -1 +0,0 @@
-