sale-client 4.2.12 → 4.2.13

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Apr 14 10:14:01 CST 2025
+#Wed Jun 25 17:54:33 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 ] = ['https://yc.aofengcloud.com:31468/', 'https://yc.aofengcloud.com:31468/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -52,9 +52,9 @@ var devConfig = {
       },
       '/api/af-revenue': {
         pathRewrite: {
-          '/api/af-revenue': '/singlepage/api/af-revenue'
+          '/api/af-revenue': '/af-revenue'
         },
-        target: serverRul
+        target: "http://localhost:8080"
       },
       '/api': {
         target: serverRul

package/package.json

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

package/src/filiale/ruihua/newchangemeter/ChangeMeter.vue

@@ -473,7 +473,7 @@ export default {
       replacewatchtype: this.$appdata.getParam('换表类型'),
       reason: this.$appdata.getParam('换表原因') ? this.$appdata.getParam('换表原因') : [],
       paytype: this.$appdata.getParam('付款方式'),
-      change_operator:this.$appdata.getParam('换表人'),
+      change_operator:[],
       printstyle: this.$appdata.getParam('打印格式'),
       gasproperties: [],
       addgasnum: 0,
@@ -548,8 +548,10 @@ export default {
   methods: {
     async getAuditor () {
       await this.$GetSaleParam.initinputtor()
-      this.auditor = this.$GetSaleParam.getAudit(this.$login.f.orgid)
+      this.auditor = this.$GetSaleParam.getRole(this.$login.f.orgid, '审核人员')
+      this.change_operator = this.$GetSaleParam.getRole(this.$login.f.orgid, '换表员')
     },
+
     getRandomId () {
       this.model.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
         let res = Math.random() * 16 | 0

package/src/plugins/GetSaleParams.js

@@ -80,6 +80,22 @@ let GetSaleParam = {
     }
     return auditor
   },
+  getRole (orgid,role) {
+    console.log('11111111111-------,', orgid)
+    let operator = []
+    console.log('1GetSaleParam.inputtors-------,', GetSaleParam.inputtors)
+    if (GetSaleParam.inputtors.length > 0) {
+      let arr = GetSaleParam.inputtors.filter((res) => {
+        if (res.rolestr != null && res.rolestr != '') {
+          return res.rolestr.indexOf(role) > -1 && res.f_orgid == orgid
+        }
+      })
+      arr.forEach((res) => {
+        operator.push({label: res.name, value: res.name})
+      })
+    }
+    return operator
+  },
   getSaleMan (orgid) {
     let saleMan = []
     if (GetSaleParam.inputtors.length > 0) {