sale-client 4.4.2 → 4.4.4

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Thu Jun 11 15:18:23 CST 2026
+#Tue Jun 30 11:38:07 CST 2026
 gradle.version=5.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.4.2",
+  "version": "4.4.4",
   "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/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

package/src/filiale/kelai/ChargeManage.vue

@@ -6,16 +6,16 @@
     <div class="binary-right" style="width:68%;overflow-y: scroll" >
       <div :style="{height:(row?'auto':'100%')}">
         <!--<div class="auto" v-if="sustainMoney != null">-->
-          <!--<h2 style="margin-top: 10px">当前连续收款金额: {{sustainMoney}}</h2>-->
+        <!--<h2 style="margin-top: 10px">当前连续收款金额: {{sustainMoney}}</h2>-->
         <!--</div>-->
         <div>
           <charge-list :row="row" @select-oper="showWork" @dblclick="toBusiness" @deal-msg="dealMsg"
                        v-ref:list></charge-list>
 
           <div class="auto" style="margin-top: 1%;" v-if="row">
-            <charge-oper :data.sync="row" :card-info="cardInfo"></charge-oper>
+            <charge-oper :data.sync="row" :card-info="cardInfo" v-ref:oper></charge-oper>
           </div>
-      </div>
+        </div>
       </div>
     </div>
     <div class="binary-right" style="width:22%" >
@@ -46,195 +46,288 @@
   import {HttpResetClass} from 'vue-client'
 
 export default {
-    title: '收费(综合)',
-    components: { ChargeOper },
-    data () {
-      return {
-        sustainMoney: null,
-        // 页面开关
-        listpage: true,
-        f_orgid: '',
-        row: null,
-        cardInfo: null,
-        warningInfo: null,
-        modalrow: null,
-        showModal: false,
-        rowData: {},
-        dibao_remind: this.$appdata.getSingleValue('低保快到期提醒') ? this.$appdata.getSingleValue('低保快到期提醒') : 0,
-        show: [true],
-        selectFiled: '其他信息',
-        worktype: '其他信息'
-      }
+  title: '收费(综合)',
+  components: {ChargeOper},
+  data() {
+    return {
+      sustainMoney: null,
+      // 页面开关
+      listpage: true,
+      f_orgid: '',
+      row: null,
+      cardInfo: null,
+      warningInfo: null,
+      modalrow: null,
+      showModal: false,
+      rowData: {},
+      dibao_remind: this.$appdata.getSingleValue('低保快到期提醒') ? this.$appdata.getSingleValue('低保快到期提醒') : 0,
+      clear_state: this.$appdata.getSingleValue('业务完成是否自动清条件') ? this.$appdata.getSingleValue('业务完成是否自动清条件') : '是',
+      reSearchShowMsy: !!this.$appdata.getSingleValue('收费后验证'),
+      reSearchShowBusiness: !!this.$appdata.getSingleValue('业务完成重新加载'),
+      shouldNavigateToEvaluation: false, // 标记是否应该导航到评价页面
+      activeBusiness: null, // 当前激活的业务
+      show: [true],
+      selectFiled: '其他信息',
+      worktype: '其他信息',
+      searchTime: 1000,
+      interval: null
+    }
+  },
+  ready() {
+    this.setsustainMoney()
+  },
+  methods: {
+    setsustainMoney() {
+      this.sustainMoney = window.localStorage.getItem('sustainMoney')
     },
-    ready () {
-      this.setsustainMoney()
+    setField(type) {
+      this.selectFiled = type
+      this.worktype = type
     },
-    methods: {
-      setsustainMoney () {
-        this.sustainMoney = window.localStorage.getItem('sustainMoney')
-      },
-      setField (type) {
-        this.selectFiled = type
-        this.worktype = type
-      },
-      async toBusiness (obj) {
-        console.log('双击列表的时候传进来的数据：', obj)
-        if (!(obj instanceof Event)) {
+    async toBusiness(obj) {
+      console.log('双击列表的时候传进来的数据：', obj)
+      if (!(obj instanceof Event)) {
         // 对此数据进行验证
-          if (await this.validateRow(obj)) {
+        if (await this.validateRow(obj)) {
+          this.shouldNavigateToEvaluation = false
           // 获取未写卡或者写卡失败记录
-            let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and (f_write_card = '未写卡' or (f_write_card = '写卡失败' and f_operate_date >= DATEADD(HOUR, -3, GETDATE()))) and f_userfiles_id = '${obj.f_userfiles_id}'`)
-            console.log('获取未写卡记录', getUnWriteSell)
-            if (getUnWriteSell.data.length > 1) {
-              this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
-            } else {
-              this.row = obj
-              this.row.unWriteSell = getUnWriteSell.data
-              this.cardInfo = this.$refs.list.cardInfo
-              this.$refs.list.criteriaShow = false
+          let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and (f_write_card = '未写卡' or (f_write_card = '写卡失败' and f_operate_date >= DATEADD(HOUR, -3, GETDATE()))) and f_userfiles_id = '${obj.f_userfiles_id}'`)
+          console.log('获取未写卡记录', getUnWriteSell)
+          if (getUnWriteSell.data.length > 1) {
+            this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
+          } else {
+            this.row = obj
+            this.shouldNavigateToEvaluation = false
+            this.row.unWriteSell = getUnWriteSell.data
+            this.cardInfo = this.$refs.list.cardInfo
+            this.$refs.list.criteriaShow = false
             // 将列表只显示该条数据
-              this.$refs.list.refreshRow(obj)
-            }
+            this.$refs.list.refreshRow(obj)
           }
         }
-      },
-      close () {
-        this.showModal = false
-        this.warningInfo = null
-        this.clean()
-        this.$refs.list.search()
-        // this.$refs.card.search()
-      },
-      async validateRow (obj) {
-        console.log('查看传进来的参数:', obj)
-        this.warningInfo = await this.$resetpost('api/af-revenue/logic/getWarningMsg',
-          {data: {
+      }
+    },
+    close() {
+      this.showModal = false
+      this.warningInfo = null
+      this.clean()
+      this.$refs.list.search()
+      // this.$refs.card.search()
+    },
+    async validateRow(obj) {
+      console.log('查看传进来的参数:', obj)
+      this.warningInfo = await this.$resetpost('api/af-revenue/logic/getWarningMsg',
+        {
+          data: {
             f_userfiles_id: obj.f_userfiles_id,
             f_userinfo_code: obj.f_userinfo_code,
             f_userinfo_id: obj.f_userinfo_id
           }
-          }
-          , {resolveMsg: '', rejectMsg: '获取提示失败'})
-        if (this.warningInfo.data.warningNum > 0 && obj.f_user_state !== '预备') {
-          this.modalrow = obj
-          this.showModal = true
-          return false
-        } else {
-          return true
         }
-      },
-      clean () {
-        this.row = null
-        this.cardInfo = null
-      },
-      clearCondition () {
-        Object.keys(this.$refs.list.$refs.paged.$refs.cri.model).forEach((key) => {
-          this.$refs.list.$refs.paged.$refs.cri.model[key] = ''
-        })
-        // console.log('清数据。。。', this.$refs.list.$refs.paged.$refs.grid.model.rows)
-        // this.$set('$refs.list.$refs.paged.$refs.grid.model.rows', [])
-      },
-      dealMsg (obj) {
-        console.log('==================obj', obj)
-        this.listpage = false
-        this.rowData = obj
-      },
-      cancel (obj) {
-        this.listpage = true
-      },
-      modalsuccess (obj) {
-        this.showModal = false
-        this.$refs.list.criteriaShow = false
-        this.row = obj
-        this.cardInfo = this.$refs.list.cardInfo
-        // 将列表只显示该条数据
-        this.$refs.list.refreshRow(obj)
-      },
-      async serRow (obj) {
-        let newdata = await this.$resetpost('api/af-revenue/sql/sale_getUser', {
-          data: {condition: `i.f_userinfo_code='${obj.f_userinfo_code}' and u.f_filialeid = '${obj.f_filialeid}'`, orderitem: `f_userinfo_id Desc`}
-        }, {resolveMsg: null, rejectMsg: '获取用户信息失败'})
-        this.toBusiness(newdata.data[0])
-        // this.$refs.list.search()
+        , {resolveMsg: '', rejectMsg: '获取提示失败'})
+      if (this.warningInfo.data.warningNum > 0 && obj.f_user_state !== '预备') {
+        this.modalrow = obj
+        this.showModal = true
+        return false
+      } else {
+        return true
       }
     },
-    events: {
-      'error' (name, row, res) {
-        this.clean()
-      },
-      'row' (val) {
+    clean() {
+      this.row = null
+      this.cardInfo = null
+    },
+    clearCondition() {
+      Object.keys(this.$refs.list.$refs.paged.$refs.cri.model).forEach((key) => {
+        console.log('key', key)
+        console.log('对应啥数据', this.$refs.list.$refs.paged.$refs.cri.model[key])
+        this.$refs.list.$refs.paged.$refs.cri.model[key] = []
+      })
+      // console.log('清数据。。。', this.$refs.list.$refs.paged.$refs.grid.model.rows)
+      // this.$set('$refs.list.$refs.paged.$refs.grid.model.rows', [])
+    },
+    dealMsg(obj) {
+      console.log('==================obj', obj)
+      this.listpage = false
+      this.rowData = obj
+    },
+    cancel(obj) {
+      this.listpage = true
+    },
+    cancelAndRefresh(obj) {
+      this.listpage = true
+      this.clean()
+      this.clearCondition()
+      this.$refs.list.searchNoData()
+      this.$refs.card.search()
+    },
+    async modalsuccess(obj) {
+      this.showModal = false
+      this.$refs.list.criteriaShow = false
+      this.row = obj
+      this.cardInfo = this.$refs.list.cardInfo
+      // 将列表只显示该条数据
+      await this.$refs.list.refreshRow(obj)
+      // 如果应该导航到评价页面，则执行评价业务
+      if (this.shouldNavigateToEvaluation && this.$refs.oper) {
+        this.activeBusiness = '评价'
+        this.$nextTick(() => {
+          this.$refs.oper.business({name: '评价', value: {routeName: 'service-evaluation'}})
+          // 执行完后清除标志
+          this.shouldNavigateToEvaluation = false;
+        }, 100)
+      } else {
+        // 清除标志（普通业务场景）
+        this.shouldNavigateToEvaluation = false;
+      }
+      console.log('this.row', this.row)
+  },
+  // 监听业务切换
+  onBusinessChange(businessName) {
+    this.activeBusiness = businessName
+  },
+  async serRow(obj, evaluationFlag = false) {
+    // 设置标志
+    this.shouldNavigateToEvaluation = evaluationFlag;
 
-      },
-      'success' (name, row, res) {
-        this.setsustainMoney()
-        // name === '发卡售气' ? this.$refs.list.toNext(this.index) : null
-        if (name === '机表收费确认') {
-          this.serRow(row)
-          return
-        }
-        console.log('成功事件')
-        this.clean()
-        this.$refs.list.search()
-        // this.clearCondition()
-        // this.$refs.card.search()
-        // this.$refs.info.$refs.recordstoryinfo.getdata()
-      },
-      'clean' (row) {
-        // this.$refs.list.singleRefresh(row)
-        this.clean()
-      },
-      'refresh' () {
-        this.setsustainMoney()
-        this.clean()
-        this.clearCondition()
-        this.$refs.list.searchNoData()
-        this.$refs.card.search()
-      },
-      'resflushvalue' () {
-        this.$refs.info.$refs.valueaddinfo.reflush()
-      },
-      'refreshrow' (val) {
-        console.log(val)
-        this.row = val
-        this.$refs.list.refreshRow(val)
-        // this.$refs.card.search()
-      },
-      'cancelclean' (row) {
-        this.clean()
-        this.$refs.list.searchNoData()
-        // this.$refs.card.search()
+    let newdata = await this.$resetpost('api/af-revenue/sql/sale_getUser', {
+      data: {
+        condition: `i.f_userinfo_code='${obj.f_userinfo_code}' and u.f_filialeid = '${obj.f_filialeid}'`,
+        orderitem: `f_userinfo_id Desc`
       }
+    }, {resolveMsg: null, rejectMsg: '获取用户信息失败'})
+    await this.toBusiness(newdata.data[0])
+    if (evaluationFlag) {
+      this.$refs.oper.business({name: '评价', value: {routeName: 'service-evaluation'}})
+    }
+  },
+  hasEvaluatePermission(name) {
+    if (!this.$login.r || !Array.isArray(this.$login.r)) {
+      console.warn('权限列表不存在或不是数组')
+      return false
+    }
+    const permissionName = `${name}评价权限`
+    return this.$login.r.includes(permissionName)
+  }
+  },
+  events: {
+    'error' (name, row, res) {
+      this.clean()
     },
-    watch: {
-      'row' () {
-        // this.$refs.tab.$el.click()
+    'row' (val) {
+
+    },
+
+    'success' (name, row, res) {
+      this.setsustainMoney()
+      // name === '发卡售气' ? this.$refs.list.toNext(this.index) : null
+      if (name === '机表收费确认') {
+        this.serRow(row)
+        return
+      }
+      if (name === '卡表收费' && this.reSearchShowMsy) {
+        this.$refs.list.$refs.paged.$refs.cri.$refs.readcard.readCard()
+        this.$refs.oper.noButton = false
+        return
+      }
+      if (name === '物联网收费' && this.reSearchShowMsy) {
+        this.serRow(row)
+        return
+      }
+      if (this.hasEvaluatePermission(name) && this.reSearchShowBusiness) {
+        console.log('row', row)
+        this.$refs.oper.noButton = false
+        this.$showMessage('要进行业务评价吗？', ['confirm', 'cancel']).then((res) => {
+          if(res !== 'confirm') {
+            if (row) {
+              this.serRow(row)
+              this.activeBusiness = null
+            } else {
+              this.serRow(this.row)
+            }
+            return
+          } else {
+            if (row) {
+              this.serRow(row,true)
+            } else {
+              this.serRow(this.row,true)
+            }
+          }
+        })
+        return
+      }
+      console.log('成功事件')
+      this.clean()
+      if (this.clear_state === '是') {
+        this.clearCondition()
       }
+      this.$refs.list.search()
+      // this.clearCondition()
+      // this.$refs.card.search()
+      // this.$refs.info.$refs.recordstoryinfo.getdata()
+    },
+    'clean' (row) {
+      // this.$refs.list.singleRefresh(row)
+      this.clean()
+    },
+    'refresh' () {
+      this.setsustainMoney()
+      this.clean()
+      this.clearCondition()
+      this.$refs.list.searchNoData()
+      this.$refs.card.search()
+    },
+    'resflushvalue' () {
+      this.$refs.info.$refs.valueaddinfo.reflush()
+    },
+    'resflushrowdata' () {
+      this.toBusiness(this.row)
+    },
+    'resflushdata' (data) {
+      this.toBusiness(data)
+    },
+    'refreshrow' (val) {
+      console.log(val)
+      this.row = val
+      this.$refs.list.refreshRow(val)
+      // this.$refs.card.search()
+    },
+    'cancelclean' (row) {
+      this.clean()
+      this.$refs.list.searchNoData()
+      // this.$refs.card.search()
+    }
+  },
+  watch: {
+    'row' () {
+      // this.$refs.tab.$el.click()
     }
   }
+}
 </script>
 <style>
-  .basic-main {
-    width: 79%;
-  }
-  .tel_voiceActive{
-    font-family: PingFang-SC-Bold;
-    font-size: 16px;
-    font-weight: normal!important;
-    font-stretch: normal!important;
-    line-height: 18px;
-    letter-spacing: 0px;
-    color: #333333!important;
-    border-bottom: 3px solid #599fe5;
-    padding:10px 10px!important;
-  }
-  .tel_f_size{
-    font-family: PingFang-SC-Medium;
-    font-size: 16px;
-    font-weight: normal;
-    font-stretch: normal;
-    line-height: 18px;
-    letter-spacing: 0px;
-    color: #666666!important;
-    padding:10px 10px!important;
-  }
+.basic-main {
+  width: 79%;
+}
+.tel_voiceActive{
+  font-family: PingFang-SC-Bold;
+  font-size: 16px;
+  font-weight: normal!important;
+  font-stretch: normal!important;
+  line-height: 18px;
+  letter-spacing: 0px;
+  color: #333333!important;
+  border-bottom: 3px solid #599fe5;
+  padding:10px 10px!important;
+}
+.tel_f_size{
+  font-family: PingFang-SC-Medium;
+  font-size: 16px;
+  font-weight: normal;
+  font-stretch: normal;
+  line-height: 18px;
+  letter-spacing: 0px;
+  color: #666666!important;
+  padding:10px 10px!important;
+}
 </style>

package/src/filiale/kelai/ChargeOper.vue

@@ -44,7 +44,7 @@
     })
     let getBtns = res.data
     console.log('获取的业务按钮', getBtns)
-    console.log('有没有用户信息', self.data)
+    console.log('有没有用户信息', self.$login.r)
     if (self.$login.r.length === 0) {
       self.$showAlert('您没有相关的业务操作权限, 请联系管理员！！', 'warning', 2000)
     } else {
@@ -175,6 +175,7 @@
     },
     methods: {
       business (btn) {
+        this.$dispatch('business-changed', btn.name)
         // // 处理按钮样式
         // this.styleChange(btn.name)
         // this.isBusiness = true
@@ -218,7 +219,16 @@
     },
     watch: {
       'data' () {
-        getBtnsGen(this)
+        getBtnsGen(this).then(() => {
+          if (this.$parent.activeBusiness) {
+            const targetBtn = this.operBtns.find(btn => btn.name === this.$parent.activeBusiness)
+            if (targetBtn) {
+              this.$nextTick(() => {
+                this.business(targetBtn)
+              })
+            }
+          }
+        })
       }
     },
     events: {

package/src/filiale/kelai/GarbageCharge.vue

@@ -167,20 +167,20 @@ export default {
           }
         } else if (this.config.printType === '国税发票') {
           // TODO
-          this.$dispatch('success')
+          this.$dispatch('success','垃圾费收费')
         } else if (this.config.printType === '电子发票') {
           // TODO
-          this.$dispatch('success')
+          this.$dispatch('success','垃圾费收费')
         }
       } else {
-        this.$dispatch('success')
+        this.$dispatch('success','垃圾费收费')
       }
     },
     clean () {
       this.$dispatch('refresh')
     },
     printok () {
-      this.$dispatch('success')
+      this.$dispatch('success','垃圾费收费')
     },
     validateBill (val) {
       this.validateOk = !val.isOk

package/src/filiale/kelai/IOTMeterCenter.vue

@@ -371,7 +371,7 @@
           // self.$dispatch('success')
         }
       } else {
-        self.$dispatch('success')
+        self.$dispatch('success','物联网表收费')
       }
     } catch (error) {
       if (error.status === 301) {
@@ -652,7 +652,7 @@
       },
       eticket_toggle () {
         this.eticket_show = false
-        this.$dispatch('success')
+        this.$dispatch('success','物联网表收费')
       },
       async confirm () {
         let res = await this.$showMessage(`确定对客户${this.row.f_user_name}进行物联网表缴费吗？`, ['confirm', 'cancel'])
@@ -697,7 +697,7 @@
             this.$CommonService.openEticket(this.row.id, '售气收费')
           }
         }
-        this.$dispatch('success')
+        this.$dispatch('success','物联网表收费')
       },
       pregas () {
         this.dymoney = 0

package/src/filiale/kelai/MachineMeterCenter.vue

@@ -557,7 +557,7 @@ export default {
       this.billData.bill = val.bill
     },
     printok () {
-      this.$dispatch('success')
+      this.$dispatch('success', '机表收费')
     },
     checkOverdue () {
       this.$nextTick(() => {
@@ -597,7 +597,7 @@ export default {
     },
     eticket_toggle () {
       this.eticket_show = false
-      this.$dispatch('success')
+      this.$dispatch('success','机表收费')
     },
     // 优惠计算
     async privilegeCalculate () {

package/src/filiale/kelai/ShowCardSellGas.vue

@@ -426,7 +426,7 @@ let initCardGen = async function (self) {
       }
     } else {
       self.$showAlert('发卡售气成功', 'success', 2000)
-      self.$dispatch('success')
+      self.$dispatch('success','发卡售气')
     }
     self.clickConfirm = false
   } catch (error) {
@@ -716,7 +716,7 @@ export default {
     },
     eticket_toggle() {
       this.eticket_show = false
-      this.$dispatch('success')
+      this.$dispatch('success','发卡售气')
     },
     async confirm() {
       this.eticket_msg = false
@@ -814,7 +814,7 @@ export default {
           this.$CommonService.openEticket(this.row.id, '售气收费')
         }
       }
-      this.$dispatch('success')
+      this.$dispatch('success','发卡售气')
     },
     calText(val) {
       let str = ''

package/src/filiale/kelai/sale.js

@@ -52,4 +52,5 @@ export default function () {
   Vue.component('sale-userinfo', (resolve) => { require(['./Userinfo'], resolve) })
   // 高拍仪
   Vue.component('high-meter', (resolve) => { require(['../../components/UserFiles/HighMeterCard.vue'], resolve) })
+  Vue.component('service-evaluation', (resolve) => { require(['../../components/charge/ServiceEvaluation'], resolve) })
 }

package/src/filiale/meihekou/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -6,6 +6,9 @@
         <saletab header="流水查询" v-if="permission('流水查询')">
           <record-query-user :row="row" v-if="show == '流水查询'"></record-query-user>
         </saletab>
+        <saletab header="机表流水查询" v-if="permission('机表流水查询')&&row.f_meter_type.includes('机表')">
+          <machine-record-query :row="row" v-if="show == '机表流水查询'" @deal-msg="dealMsg"></machine-record-query>
+        </saletab>
         <saletab header="收费查询" v-if="permission('收费查询')">
           <charge-query-users  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-users>
         </saletab>

package/src/plugins/CevEvaluatorPlugin.js

@@ -0,0 +1,143 @@
+import {HttpResetClass} from 'vue-client'
+let CEVEvaluatorService = {
+  install(Vue, options) {
+    const baseURL = 'http://127.0.0.1:10791/inf/'
+
+    // 编码参数方法
+    function encodeParams(params, encodeFields) {
+      if (encodeFields === void 0) { encodeFields = []; }
+      var encoded = Object.assign({}, params);
+      encodeFields.forEach(function(field) {
+        if (encoded[field] !== undefined && encoded[field] !== null) {
+          encoded[field] = encodeURIComponent(encoded[field]);
+        }
+      });
+      return encoded;
+    }
+
+    // 验证IP地址格式
+    function validateIP(ip) {
+      return /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(ip);
+    }
+
+    // 服务方法
+    const serviceMethods = {
+      // 签到
+      signIn: async function (params) {
+        const encodedParams = encodeParams(params, ['name', 'pos', 'org', 'equ', 'inf', 'photo']);
+        let http = new HttpResetClass()
+        return await http.load('POST',`${baseURL}SS`, encodedParams, {resolveMsg: null, rejectMsg: null});
+      },
+
+      // 获取耗时操作进度
+      getProgress: async function () {
+        let http = new HttpResetClass()
+        return await http.load('POST',`${baseURL}PR`,{}, {resolveMsg: null, rejectMsg: null});
+      },
+
+      // 签退
+      signOut: async function () {
+        let http = new HttpResetClass()
+        return await http.load('POST',`${baseURL}SO`, {}, {resolveMsg: null, rejectMsg: null});
+      },
+
+      // 启动评价(直接模式)
+      startEvaluateDirect: async function () {
+        let http = new HttpResetClass()
+        return await http.load('POST',`${baseURL}ES`,{}, {resolveMsg: null, rejectMsg: null});
+      },
+
+      // 启动评价(对接模式)
+      startEvaluate: async function (params) {
+        // 验证IP格式
+        if (params.ip && !validateIP(params.ip)) {
+          return Promise.reject(new Error('IP地址格式不正确'));
+        }
+        let http = new HttpResetClass()
+        return await http.load('POST',`${baseURL}EK`, params, {resolveMsg: null, rejectMsg: null});
+      },
+
+      // 获取评价结果
+      getEvaluateResult: async function () {
+        let http = new HttpResetClass()
+        return await http.load('POST',`${baseURL}GE`, {}, {resolveMsg: null, rejectMsg: null});
+      },
+
+      // 暂停服务
+      pauseService: async function () {
+        let http = new HttpResetClass()
+        return await http.load('POST',`${baseURL}PS`, {}, {resolveMsg: null, rejectMsg: null});
+      },
+
+      // 播放欢迎词
+      playWelcome: async function () {
+        let http = new HttpResetClass()
+        return await http.load('POST',`${baseURL}WL`, {}, {resolveMsg: null, rejectMsg: null});
+      },
+
+      // 播放等待提醒
+      playWaitTip: async function () {
+        let http = new HttpResetClass()
+        return await http.load('POST',`${baseURL}WT`, {}, {resolveMsg: null, rejectMsg: null});
+      },
+
+      // 检查设备在线状态
+      checkOnline: async function () {
+        let http = new HttpResetClass()
+        return await http.load('POST',`${baseURL}OL`, {}, {resolveMsg: null, rejectMsg: null});
+      },
+
+      // 获取登录信息
+      getLoginInfo: async function () {
+        let http = new HttpResetClass()
+        return await http.load('POST',`${baseURL}LS`,{}, {resolveMsg: null, rejectMsg: null});
+      },
+
+      // 下载广告文件
+      downloadAd: async function (params) {
+        let http = new HttpResetClass()
+        return await http.load('POST',`${baseURL}AF`, params, {resolveMsg: null, rejectMsg: null});
+      },
+
+      // 获取广告内容
+      getAdInfo: async function () {
+        let http = new HttpResetClass()
+        return await http.load('POST',`${baseURL}AI`, {}, {resolveMsg: null, rejectMsg: null});
+      },
+
+      // 下载配置文件
+      downloadConfig: async function (params) {
+        let http = new HttpResetClass()
+        return await http.load('POST',`${baseURL}DL`, params, {resolveMsg: null, rejectMsg: null});
+      },
+
+      // 清除下载内容
+      clearDownloads: async function () {
+        let http = new HttpResetClass()
+        return await http.load('POST',`${baseURL}CL`,{}, {resolveMsg: null, rejectMsg: null});
+      },
+
+      // 设置服务器IP
+      setServerIP: async function (params) {
+        let http = new HttpResetClass()
+        return await http.load('POST',`${baseURL}SEVIP`, params, {resolveMsg: null, rejectMsg: null});
+      },
+
+      // 获取版本信息
+      getVersion: async function () {
+        let http = new HttpResetClass()
+        return await http.load('POST',`${baseURL}VR`, {}, {resolveMsg: null, rejectMsg: null});
+      },
+
+      // 验证IP地址（工具方法）
+      validateIP: function (ip) {
+        return validateIP(ip);
+      }
+    };
+
+    // 注册到Vue
+    Vue.CEVEvaluator = Vue.prototype.$CEVEvaluator = serviceMethods;
+  }
+};
+
+export default CEVEvaluatorService;

package/src/sale.js

@@ -19,6 +19,7 @@ import LoadParams from './plugins/LoadParams'
 import FileManageService from './plugins/FileManageService'
 import InvoiceService from './plugins/InvoiceService'
 import FileDownload from './plugins/FileDownload'
+import CevEvaluatorPlugin from './plugins/CevEvaluatorPlugin'
 // import { all } from 'vue-client'
 
 /* 异步注册组件 */
@@ -44,6 +45,7 @@ export default function () {
   Vue.use(LoadParams)
   Vue.use(InvoiceService)
   Vue.use(FileDownload)
+  Vue.use(CevEvaluatorPlugin)
   // 团体缴费
   Vue.component('charge-manage-group', (resolve) => { require(['./components/chargeBatch/ChargeManageGroup'], resolve) })
   // 团体缴费查询列表

package/src/saleRes.json

@@ -522,5 +522,6 @@
   "json-parse": "./components/revenue/comprehen/common/JSONParse",
   "transfer-audit-center": "./components/revenue/third/transferAuditCenter",
   "transfer-audit": "./components/revenue/third/transferAudit",
-  "transfer-audit-dispose-basics": "./components/revenue/third/transferAuditDisposeBasics"
+  "transfer-audit-dispose-basics": "./components/revenue/third/transferAuditDisposeBasics",
+  "service-evaluation": "./components/charge/business/ServiceEvaluation"
 }