sale-client 4.2.52 → 4.2.54

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Sep 04 10:25:06 CST 2024
+#Sat Sep 13 14:19:54 CST 2025
 gradle.version=5.2.1

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://111.229.34.22:31467/', 'http://127.0.0.1:9026/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -25,12 +25,12 @@ var devConfig = {
     //   },
     //   target: localUrl
     // },
-    //   '/api/af-revenue/logic': {
-    //     pathRewrite: {
-    //       '/api/af-revenue/logic': '/logic'
-    //     },
-    //     target: localUrl
-    //   },
+      '/api/af-revenue/logic': {
+        pathRewrite: {
+          '/api': '/singlepage/api'
+        },
+        target: serverRul
+      },
       // '/api/af-revenue/file': {
       //   // pathRewrite: {
       //   //   '/api/af-revenue/file': '/file'
@@ -41,23 +41,32 @@ 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': '/singlepage/api'
+        },
+        target: serverRul
+      },
       '/rs/pay': {
         target: 'http://localhost:8080'
       },
-      '/api/af-revenue': {
+      // '/api/af-revenue': {
+      //   pathRewrite: {
+      //     '/api/af-revenue': '/af-revenue'
+      //   },
+      //   target: "http://localhost:8080"
+      // },
+      '/api/af-revenue/logic/getOperBtns': {
         pathRewrite: {
-          '/api/af-revenue': '/af-revenue'
+          '/api/af-revenue': '/rs'
         },
-        target: "http://localhost:8080"
+        target: 'http://127.0.0.1:8080'
       },
       '/api': {
-        target: serverRul
+        target: serverRul,
+        pathRewrite: {
+          '/api/af-revenue': '/singlepage/rs'
+        }
       },
       '/rs': {
         target: serverRul

package/package.json

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

package/src/.npmignore

@@ -0,0 +1 @@
+

package/src/filiale/beifangshiye/ChargeList.vue

@@ -107,6 +107,15 @@
                             style="width: 60%">
                 </res-select>
               </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">部&emsp;&emsp;门</label>
+                <v-select v-model="model.f_depid"
+                          placeholder='部门'
+                          :value.sync="model.f_depid"
+                          :options='$parent.$parent.curdeptid'
+                          condition="u.f_depid = '{}'"
+                          close-on-select style="width: 60%"></v-select>
+              </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">卡&emsp;&emsp;号</label>
                 <input type="text" class="input_search" style="width:60%" v-model="model.f_card_id" placeholder='卡号'
@@ -633,6 +642,7 @@ let cardBtnGen = async function (self, val) {
     // 获取营收参数
     await self.searchNoData()
     await self.$LoadParams.loadParam()
+    await self.getDep()
     await self.initQueryParam()
     await self.clear()
     if (!self.authArr.includes('读卡限定')) {
@@ -645,7 +655,9 @@ let cardBtnGen = async function (self, val) {
     data () {
       return {
         // 公司下拉
-        curorgid: [this.$login.f.orgid],
+        curorgid: [],
+        curdeptid: [this.$login.f.orgid],
+        department: [],
         f_orgid: '',
         showCardError2: false,
         model: new PagedList('api/af-revenue/sql/sale_getUser', 30, {orderitem: '"' + this.orderitem + ' DESC"'}),
@@ -742,8 +754,34 @@ let cardBtnGen = async function (self, val) {
       }
     },
     methods: {
+      getDep () {
+         this.$resetpost('api/af-revenue/sql/getDepAndOrgName', {},
+           {resolveMsg: null, rejectMsg: null}).then(res =>{
+              console.log('部门数据', res)
+              this.department = res.data
+              this.splitDep(this.$login.f.orgid)
+         })
+      },
+      splitDep (orgid) {
+        this.model.f_depid = ''
+        console.log('组织id', orgid)
+        this.curdeptid = [{label: '全部', value: ''}]
+        let orgIds = []
+        if (orgid && orgid.length > 0) {
+          // 去掉括号并按逗号分割
+          orgIds = orgid.replace(/[()]/g, '').replace(/'/g, '').split(',')
+          // 去除空格
+          orgIds = orgIds.map(id => id.trim())
+        }
+        for(let i = 0; i < this.department.length; i++){
+          if(orgIds.includes(this.department[i].parentid)){
+            this.curdeptid.push({label: this.department[i].orgname +'-'+ this.department[i].name, value: this.department[i].id})
+          }
+        }
+      },
       getorg (val) {
         this.f_orgid = this.$login.convertToIn(val)
+        this.splitDep(this.f_orgid)
         this.$parent.f_orgid = this.f_orgid
       },
       recordClick () {