sale-client 4.4.1 → 4.4.3

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed May 13 15:19:48 CST 2026
+gradle.version=5.2.1

package/build/dev-server.js

@@ -1,71 +1,77 @@
-var path = require('path')
-var checkVersion = require('./versionCheck.js')
-checkVersion()
-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 = {
-  devServer: {
-    contentBase: path.join(__dirname, 'src'),
-    hot: true,
-    publicPath: baseConfig.output.publicPath,
-    historyApiFallback: true,
-    host: '127.0.0.1',
-    port: 8089,
-    open: false,
-    stats: {
-      colors: false, // 配置控制台输出彩色日志
-      chunks: false, // 不输出构建 chunk 信息
-      children: false // 不输出子模块构建信息
-    },
-    proxy: {
-    // '/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'
-    //     },
-    //     target: localUrl
-    //   },
-      // '/api/af-revenue/file': {
-      //   // pathRewrite: {
-      //   //   '/api/af-revenue/file': '/file'
-      //   // },
-      //   target: localUrl
-      // },
-      // '/weixin2/rs':{
-      //
-      //   target: 'http://410663id1ia4.vicp.fun'
-      // },
-      // '/api/af-revenue/sql': {
-      //   pathRewrite: {
-      //     '/api/af-revenue/sql': '/sql'
-      //   },
-      //   target: localUrl
-      // },
-      '/rs/pay': {
-        target: 'http://localhost:8080'
-      },
-      // '/api/af-revenue': {
-      //   pathRewrite: {
-      //     '/api/af-revenue': '/'
-      //   },
-      //   target: "http://localhost:9026"
-      // },
-      '/api': {
-        target: serverRul
-      },
-      '/resource': {
-        target: serverRul
-      },
-      '/rs': {
-        target: serverRul
-      }
-    }
-  }
-}
-module.exports = merge(baseConfig, devConfig)
+var path = require('path')
+var checkVersion = require('./versionCheck.js')
+checkVersion()
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://localhost:9026']
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.dev.conf')
+var devConfig = {
+  devServer: {
+    contentBase: path.join(__dirname, 'src'),
+    hot: true,
+    publicPath: baseConfig.output.publicPath,
+    historyApiFallback: true,
+    host: '127.0.0.1',
+    port: 8089,
+    open: false,
+    stats: {
+      colors: false, // 配置控制台输出彩色日志
+      chunks: false, // 不输出构建 chunk 信息
+      children: false // 不输出子模块构建信息
+    },
+    proxy: {
+    // '/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'
+        },
+        target: localUrl
+      },
+      // '/api/af-revenue/file': {
+      //   // pathRewrite: {
+      //   //   '/api/af-revenue/file': '/file'
+      //   // },
+      //   target: localUrl
+      // },
+      // '/weixin2/rs':{
+      //
+      //   target: 'http://410663id1ia4.vicp.fun'
+      // },
+      '/api/af-revenue/sql': {
+        pathRewrite: {
+          '/api/af-revenue/sql': '/sql'
+        },
+        target: localUrl
+      },
+      '/rs/pay': {
+        target: 'http://localhost:8080'
+      },
+      // '/api/af-revenue': {
+      //   pathRewrite: {
+      //     '/api/af-revenue': '/'
+      //   },
+      //   target: "http://localhost:9026"
+      // },
+      '/api': {
+        target: serverRul,
+        secure: false,
+        changeOrigin: true,
+      },
+      '/resource': {
+        target: serverRul,
+        secure: false,
+        changeOrigin: true
+      },
+      '/rs': {
+        target: serverRul,
+        secure: false,
+        changeOrigin: true,
+      }
+    }
+  }
+}
+module.exports = merge(baseConfig, devConfig)

package/package.json

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

package/src/components/charge/ServiceEvaluation.vue

@@ -0,0 +1,396 @@
+<template>
+  <div class="evaluation-panel">
+    <div class="status-bar">
+      <div class="status-item">
+        <span :class="['status-badge', deviceStatusClass]"></span>
+        <span>设备状态: {{ deviceStatusText }}</span>
+      </div>
+      <div class="status-item">
+        <span>评价状态: {{ evaluationStatus }}</span>
+      </div>
+    </div>
+    <div class="auto-process" v-if="autoProcessMessage">
+      <h4>评价器状态</h4>
+      <p>{{ autoProcessMessage }}</p>
+    </div>
+    <div class="section">
+      <button v-on:click="handleEvaluate" v-bind:disabled="loading">发起评价</button>
+      <button v-on:click="checkStatus" v-bind:disabled="loading">检查在线状态</button>
+    </div>
+  </div>
+</template>
+
+<script>
+import co from "co";
+
+module.exports = {
+  title: 'EvaluationPanel',
+  data () {
+    return {
+      signInParams: {
+        num: this.$login.f.id,
+        name: this.$login.f.name,
+        pos: this.$login.f.f_show_rolestr,
+        org: this.$login.f.f_show_department_name,
+        equ: this.$login.f.f_show_department_name,
+        star: '5',
+        inf: `工号：${this.$login.f.id}`,
+        photo: '127.0.0.1:8068/photo.jpg'
+      },
+      loading: false,
+      response: null,
+      error: null,
+      deviceOnline: false,
+      deviceCheckTimer: null,
+      deviceCheckInterval: 10000,
+      evaluationStatus: '未发起',
+      // 组件销毁标志和请求跟踪
+      isComponentDestroyed: false,
+      pendingRequests: new Set()
+    }
+  },
+  props: {
+    row: {
+      type: Object,
+      default: undefined
+    }
+  },
+  beforeDestroy() {
+    this.cleanup();
+  },
+  destroyed() {
+    this.cleanup();
+  },
+  async ready() {
+    console.log('row', this.row)
+    await this.initSystem()
+    this.startDeviceStatusMonitoring()
+  },
+  methods: {
+    // 统一的清理方法
+    cleanup() {
+      console.log('开始清理组件资源');
+      this.isComponentDestroyed = true;
+
+      // 清理所有定时器
+      this.stopDeviceStatusMonitoring();
+
+      // 取消所有进行中的请求
+      this.pendingRequests.clear();
+
+      // 重置状态
+      this.loading = false;
+    },
+
+    // 安全执行方法，检查组件状态
+    safeExecute(callback) {
+      if (this.isComponentDestroyed) {
+        console.log('组件已销毁，停止执行');
+        return false;
+      }
+      return true;
+    },
+
+    async initSystem () {
+      if (!this.safeExecute()) return;
+
+      console.log('检查设备状态')
+      await this.checkStatus()
+      if (!this.safeExecute()) return;
+
+      console.log('设备在线')
+      if (this.deviceOnline) {
+        console.log('设备已就绪，可以开始评价')
+      }
+    },
+
+    // 提交评价
+    async submitEvaluation(value) {
+      if (!this.safeExecute()) return;
+
+      this.evaluationStatus = '未发起'
+      console.log('用户评价值：', value)
+      let req = await this.$resetpost('api/af-revenue/logic/saveEvaluationBussiness', {
+        f_orgid: this.$login.f.orgid,
+        f_userinfo_id: this.row.f_userinfo_id,
+        f_operatorid: this.$login.f.id,
+        f_satisfaction: 5 - value,
+        f_user_type: this.row.f_user_type
+      }, {resolveMsg: '提交评价成功', rejectMsg: '提交评价失败!'})
+      this.$dispatch('success', '评价')
+    },
+
+    handleEvaluate () {
+      if (!this.safeExecute()) return;
+
+      let self = this;
+      self.loading = true;
+      self.error = null;
+      self.response = null;
+      self.evaluationStatus = '等待用户评价'
+
+      const requestId = 'evaluate_' + Date.now();
+      this.pendingRequests.add(requestId);
+
+      this.$CEVEvaluator.startEvaluateDirect()
+        .then(async function (result) {
+          if (!self.safeExecute() || !self.pendingRequests.has(requestId)) return;
+
+          self.response = JSON.stringify(result.data, null, 2);
+          if (result.data.code === '0') {
+            console.log('result.data.data', result.data.data)
+            self.evaluationStatus = '用户已评价'
+            let res = await self.$showMessage(`用户已评价，请提交`, ['confirm', 'cancel'])
+            if (res !== 'confirm') return
+            self.submitEvaluation(result.data.data)
+          }
+        })
+        .catch(function(err) {
+          if (!self.safeExecute() || !self.pendingRequests.has(requestId)) return;
+
+          self.error = err.message || '评价启动失败';
+          self.showCeAlert('用户评价失败: ' + (err.message || '未知错误'), 'error');
+          self.evaluationStatus = '未发起'
+        })
+        .finally(function() {
+          self.pendingRequests.delete(requestId);
+          if (self.safeExecute()) {
+            self.loading = false;
+          }
+        });
+    },
+
+    // 启动设备状态定时监测
+    startDeviceStatusMonitoring() {
+      if (!this.safeExecute()) return;
+
+      // 先停止可能存在的旧定时器
+      this.stopDeviceStatusMonitoring();
+
+      this.deviceCheckTimer = setInterval(async () => {
+        if (!this.safeExecute()) {
+          this.stopDeviceStatusMonitoring();
+          return;
+        }
+
+        await this.checkStatus();
+        if (!this.safeExecute()) return;
+
+        if (this.deviceOnline) {
+          console.log('设备在线，状态正常')
+        }
+      }, this.deviceCheckInterval);
+    },
+
+    // 停止设备状态监测
+    stopDeviceStatusMonitoring() {
+      if (this.deviceCheckTimer) {
+        clearInterval(this.deviceCheckTimer);
+        this.deviceCheckTimer = null;
+      }
+    },
+
+    checkStatus () {
+      if (!this.safeExecute()) return;
+
+      let self = this;
+      self.loading = true;
+      self.error = null;
+      self.response = null;
+
+      const requestId = 'checkStatus_' + Date.now();
+      this.pendingRequests.add(requestId);
+
+      return co(
+        this.$CEVEvaluator.checkOnline()
+          .then(function(result) {
+            if (!self.safeExecute() || !self.pendingRequests.has(requestId)) return;
+
+            self.response = JSON.stringify(result.data, null, 2);
+            if (result.data.code === '0' && result.data.online === '1') {
+              self.deviceOnline = true
+            } else {
+              self.deviceOnline = false
+              self.showCeAlert('状态检查完成', 'success');
+            }
+          })
+          .catch(function(err) {
+            if (!self.safeExecute() || !self.pendingRequests.has(requestId)) return;
+
+            self.error = err.message || '状态检查失败';
+            self.showCeAlert('状态检查失败', 'error');
+          })
+          .finally(function() {
+            self.pendingRequests.delete(requestId);
+            if (self.safeExecute()) {
+              self.loading = false;
+            }
+          })
+      )
+    },
+
+    showCeAlert (message, type) {
+      if (!this.safeExecute()) return;
+
+      if (type === 'error') {
+        console.error(message);
+        this.$showAlert(message, 'danger', 2000);
+      } else {
+        console.log(message);
+        this.$showAlert(message, 'success', 2000);
+      }
+    }
+  },
+  computed: {
+    deviceStatusClass() {
+      if (this.loading) return 'loading';
+      return this.deviceOnline ? 'online' : 'offline';
+    },
+    deviceStatusText() {
+      if (this.loading) return '检测中...';
+      return this.deviceOnline ? '在线' : '离线';
+    },
+    autoProcessMessage () {
+      if (!this.deviceOnline) return '系统启动中，正在检查设备状态...'
+      return this.deviceOnline ? '系统已就绪，可以开始评价' : '系统初始化失败，请检查设备连接'
+    }
+  },
+};
+</script>
+
+<style scoped>
+.section {
+  margin-bottom: 20px;
+  padding: 15px;
+  border: 1px solid #e0e0e0;
+  border-radius: 5px;
+}
+
+.section h3 {
+  margin-top: 0;
+  color: #333;
+  border-bottom: 1px solid #ddd;
+  padding-bottom: 8px;
+}
+
+.input-group {
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+}
+
+.input-group label {
+  display: inline-block;
+  width: 80px;
+  font-weight: bold;
+  margin-right: 10px;
+}
+
+.input-group input {
+  flex: 1;
+  padding: 8px;
+  border: 1px solid #ccc;
+  border-radius: 3px;
+  max-width: 300px;
+}
+
+button {
+  margin-right: 10px;
+  margin-bottom: 10px;
+  padding: 10px 15px;
+  background-color: #4CAF50;
+  color: white;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 14px;
+}
+
+button:disabled {
+  background-color: #cccccc;
+  cursor: not-allowed;
+}
+
+button:hover:not(:disabled) {
+  background-color: #45a049;
+}
+
+.response, .error {
+  margin-top: 20px;
+  padding: 15px;
+  border-radius: 5px;
+  font-size: 14px;
+}
+
+.response {
+  background-color: #f0f9f0;
+  border-left: 4px solid #4CAF50;
+}
+
+.error {
+  background-color: #fef0f0;
+  border-left: 4px solid #f56c6c;
+}
+
+pre {
+  white-space: pre-wrap;
+  word-wrap: break-word;
+  margin: 0;
+  font-family: 'Courier New', monospace;
+  font-size: 13px;
+}
+
+h2 {
+  text-align: center;
+  color: #333;
+  margin-bottom: 30px;
+}
+.auto-process {
+  background: #fff3cd;
+  border-left: 4px solid #ffc107;
+  padding: 10px 15px;
+  margin: 15px 0;
+  border-radius: 4px;
+}
+
+.auto-process h4 {
+  color: #856404;
+  margin-bottom: 5px;
+}
+.status-item {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin: 5px 0;
+}
+
+.status-badge {
+  display: inline-block;
+  width: 12px;
+  height: 12px;
+  border-radius: 50%;
+  margin-right: 5px;
+}
+
+.online {
+  background: #2ecc71;
+}
+
+.offline {
+  background: #e74c3c;
+}
+
+.loading {
+  background: #f39c12;
+  animation: pulse 1.5s infinite;
+}
+.timer-badge {
+  display: inline-block;
+  padding: 3px 8px;
+  border-radius: 12px;
+  background: #3498db;
+  color: white;
+  font-size: 12px;
+  margin-left: 8px;
+}
+</style>

package/src/components/common/userinfo_detail/iot_detail/QueryInstruct.vue

@@ -331,7 +331,7 @@ export default {
       this.cancelid = megrow.id
     },
     async confirmcenta () {
-      let sql = `update t_instruct set f_cancel_inputtor = ${this.$login.f.name}, f_cancel_inputtor_id = ${this.$login.f.id},f_comments = ${this.cancelreason},f_instruct_state = '取消发送' WHERE id = ${this.cancelid}`
+      let sql = `update t_instruct set f_cancel_inputtor = '${this.$login.f.name}', f_cancel_inputtor_id = '${this.$login.f.id}',f_comments = '${this.cancelreason}',f_instruct_state = '取消发送' WHERE id = '${this.cancelid}'`
       await this.$resetpost('api/af-revenue/logic/runSQL', {sql: sql}, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
       this.handcental = false
       this.$refs.paged.$refs.criteria.search()

package/src/components/revenue/comprehen/ComprehenOperation/OtherGas/OtherGas.vue

@@ -407,7 +407,7 @@
             this.print = true
           }
         } else {
-          this.$dispatch('success')
+          this.$dispatch('success', '其他补气')
         }
       },
       pregas () {
@@ -481,7 +481,7 @@
         this.$dispatch('cancelclean', this.row)
       },
       printok () {
-        this.$dispatch('success')
+        this.$dispatch('success', '其他补气')
       }
     },
     events: {

package/src/components/revenue/comprehen/ComprehenOperation/ReplaceCard/ReplaceCardManage.vue

@@ -298,7 +298,7 @@
       },
       eticket_toggle () {
         this.eticket_show = false
-        this.$dispatch('success')
+        this.$dispatch('success', '补卡')
       },
       confirm () {
         this.eticket_msg = false
@@ -404,7 +404,7 @@
       },
       printok () {
         // 收据打完，判断是否还有其他票据进行请求 TODO
-        this.$dispatch('success')
+        this.$dispatch('success', '补卡')
       },
       fillcardChange (val) {
         if (val === 'IC卡丢失或损坏') {

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -587,7 +587,7 @@ export default {
       if (msg == 'confirm') {
         this.$dispatch('get-new-row', this.row)
       } else {
-        this.$dispatch('success')
+        this.$dispatch('success', '换表')
       }
     },
     flowmetermodels (label) {

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ResetMeter.vue

@@ -616,7 +616,7 @@ export default {
       if (msg == 'confirm') {
         this.$dispatch('get-new-row', this.row)
       } else {
-        this.$dispatch('success')
+        this.$dispatch('success', '换表')
       }
     },
     flowmetermodels (label) {

package/src/filiale/kelai/CardMeterCenter.vue

@@ -379,7 +379,7 @@
           }
         }
       } else {
-        self.$dispatch('success')
+        self.$dispatch('success', '卡表收费')
       }
       self.clickConfirm = false
     } catch (error) {
@@ -728,7 +728,7 @@
       },
       eticket_toggle () {
         this.eticket_show = false
-        this.$dispatch('success')
+        this.$dispatch('success','卡表收费')
       },
       clean () {
         this.$info('取消操作')
@@ -745,7 +745,7 @@
             this.$CommonService.openEticket(this.row.id, '售气收费')
           }
         }
-        this.$dispatch('success')
+        this.$dispatch('success','卡表收费')
       },
       pregas () {
         this.dymoney = 0