sale-client 4.2.29 → 4.2.30

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Thu Sep 04 15:35:12 CST 2025
-gradle.version=5.2.1
+#Mon Sep 01 09:14:45 CST 2025
+gradle.version=8.10

package/.npmignore

@@ -0,0 +1,12 @@
+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/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://127.0.0.1:9026/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -25,12 +25,18 @@ var devConfig = {
     //   },
     //   target: localUrl
     // },
-    //   '/api/af-revenue/logic': {
-    //     pathRewrite: {
-    //       '/api/af-revenue/logic': '/logic'
-    //     },
-    //     target: localUrl
-    //   },
+      '/api/af-revenue/logic/batchModifyAdjustables': {
+        pathRewrite: {
+          '/api/af-revenue/logic': '/singlepage/rs/logic'
+        },
+        target: localUrl
+      },
+      '/api/af-revenue/logic': {
+        pathRewrite: {
+          '/api/af-revenue/logic': '/singlepage/rs/logic'
+        },
+        target: serverRul
+      },
       // '/api/af-revenue/file': {
       //   // pathRewrite: {
       //   //   '/api/af-revenue/file': '/file'
@@ -41,18 +47,18 @@ var devConfig = {
       //
       //   target: 'http://410663id1ia4.vicp.fun'
       // },
-      // '/api/af-revenue/sql': {
-      //   pathRewrite: {
-      //     '/api/af-revenue/sql': '/sql'
-      //   },
-      //   target: localUrl
-      // },
+      '/api/af-revenue/sql': {
+        pathRewrite: {
+          '/api/af-revenue/sql': '/singlepage/rs/sql'
+        },
+        target: serverRul
+      },
       '/rs/pay': {
         target: 'http://localhost:8080'
       },
       '/api/af-revenue': {
         pathRewrite: {
-          '/api/af-revenue': '/af-revenue'
+          '/api/af-revenue': '/singlepage/rs'
         },
         target: "http://localhost:8080"
       },

package/package.json

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

package/src/.npmignore

@@ -0,0 +1 @@
+

package/src/filiale/qingjian/FileUserFiles.vue

@@ -87,6 +87,9 @@
                             v-if="$parent.$parent.rows && $parent.$parent.rows.length === 1 && $parent.$parent.rows[0].f_user_state === '销户'">
                       启用
                     </button>
+                    <button @click="$parent.$parent.openBatchModal()" class="button_clear button_spacing"
+                            style="float: right">批量修改调压箱
+                    </button>
                     <div
                             :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                             @click="$parent.$parent.hidden()"
@@ -302,7 +305,7 @@
                 </div>
               </div>
             </criteria>
-            <data-grid :model="model" class="list_area table_sy" @dblclick="$parent.modifyUser" v-ref:grid partial='list'>
+            <data-grid :model="model" class="list_area table_sy" @dblclick="$parent.modifyUser" v-ref:grid partial='list' optional>
               <template partial='head'>
                 <tr>
                   <th>
@@ -475,6 +478,20 @@
         <button class="button_search button_spacing" type="button" @click="close2()">取消</button>
       </footer>
     </modal>
+    <modal :show.sync="showModifyAdjustables" width="500px" title="批量修改调压箱"  large backdrop="false">
+      <article slot="modal-body" class="modal-body" style="height: 70px">
+        <label class="font_normal_body">调&ensp;压&ensp;箱</label>
+        <v-select :options='adjustablesNew' :search='true'
+                  :value.sync="f_adjustable_id"
+                  close-on-select
+                  placeholder='调压箱'
+                  v-model='f_adjustable_id'></v-select>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button class="button_search button_spacing" :disabled="!f_adjustable_id || f_adjustable_id.length < 1 " type="button" @click="batchModifyAdjustables()">确认</button>
+        <button class="button_search button_spacing" type="button" @click="closeBatchAdjustables()">取消</button>
+      </footer>
+    </modal>
     <!--<user-flow-sheet :show="printflag" :bill-config='configs' :bill-data='billData' :data='newdata' v-on:toggle="close" @printok="printok" v-ref:printbill></user-flow-sheet>-->
 
     <work-busy :is-busy="iswork" v-show="iswork"></work-busy>
@@ -570,7 +587,8 @@ let loadParamGem = async function (self) {
         xiaohushow: false,
         inputtores: this.$appdata.getParam('抄表员'),
         adjustables: [],
-
+        adjustablesNew: [],
+        f_adjustable_id: '',
         // 导入组件
         show: false,
 
@@ -602,6 +620,7 @@ let loadParamGem = async function (self) {
         showselectaddress: false,
         isedit: false,
         clientWidth: document.body.clientWidth,
+        showModifyAdjustables: false,
         batchMeterShow: false,
         billData: {
           url: 'api/af-revenue/report/userignition',
@@ -635,6 +654,35 @@ let loadParamGem = async function (self) {
       }
   },
     methods: {
+      openBatchModal () {
+        let rowdata = this.$refs.paged.$refs.grid.getRowData()
+        if (rowdata.length <= 0) {
+          this.$showMessage('请至少选择一个表具!')
+          return
+        }
+        this.showModifyAdjustables = true
+      },
+      async batchModifyAdjustables() {
+        let rowdata = this.$refs.paged.$refs.grid.getRowData()
+        let userfilesIds = rowdata.map(item => item.f_userfiles_id);
+        console.log('已选择的数据', userfilesIds)
+        console.log('已选择的调压箱', this.f_adjustable_id)
+        let model = {
+          f_adjustable_id: this.f_adjustable_id,
+          f_userfiles_ids: userfilesIds
+        }
+        await this.$resetpost('api/af-revenue/logic/batchModifyAdjustables', model, {
+          resolveMsg: null,
+          rejectMsg: '批量修改调压箱失败'
+        }).then((res) => {
+          if (res && res.data) {
+            this.$showMessage(`本次批量修改:  ${res.data}户`);
+          }
+          this.closeBatchAdjustables()
+          this.selfSearch()
+        })
+
+      },
       getAuthority () {
         if (this.$login.r.find(value => value == '销户导入')) {
           this.bacthPin = '销户导入'
@@ -760,6 +808,9 @@ let loadParamGem = async function (self) {
       closexiaohu () {
         this.xiaohushow = false
       },
+      closeBatchAdjustables () {
+        this.showModifyAdjustables = false
+      },
       xiaohu () {
         this.xiaohushow = true
       },
@@ -821,6 +872,7 @@ let loadParamGem = async function (self) {
         this.model.rows.unshift(data)
       },
       selfSearch (args) {
+        this.$refs.paged.$refs.grid.selectInit()
         args.condition = `${args.condition} ` + this.orgcondition
         this.criteriaShow = false
         this.$refs.paged.$refs.grid.$el.scrollTop = 0
@@ -874,6 +926,7 @@ let loadParamGem = async function (self) {
           arr.push(temp)
         })
         this.adjustables = [{label: '全部', value: ''}, ...arr]
+        this.adjustablesNew = arr
           // 初始化气表品牌
         let brandArr = []
         this.$GetSaleParam.getGasbrand().forEach((item) => {

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'