sale-client 4.2.113 → 4.2.115

package/.project

@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
@@ -12,6 +17,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 	<filteredResources>

package/build/dev-server.js

@@ -1,7 +1,7 @@
 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/']
+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 = {
@@ -50,12 +50,12 @@ var devConfig = {
       '/rs/pay': {
         target: 'http://localhost:8080'
       },
-      // '/api/af-revenue': {
-      //   pathRewrite: {
-      //     '/api/af-revenue': '/af-revenue'
-      //   },
-      //   target: "http://localhost:8080"
-      // },
+      '/api/af-revenue': {
+        pathRewrite: {
+          '/api/af-revenue': '/af-revenue'
+        },
+        target: "http://localhost:8080"
+      },
       '/api': {
         target: serverRul
       },

package/package.json

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

package/src/components/charge/business/ServiceEvaluation.vue

@@ -0,0 +1,498 @@
+<template>
+  <div class="evaluation-panel">
+    <div class="status-bar">
+      <div class="error" v-if="error">
+        <h4>错误信息:</h4>
+        <pre>{{ error }}</pre>
+      </div>
+      <div class="status-item">
+        <span>员工: {{ signInParams.name }} (工号: {{ signInParams.num }})</span>
+      </div>
+      <div class="status-item">
+        <span>评价状态: {{ evaluationStatus }}</span>
+      </div>
+    </div>
+
+    <div class="section">
+      <button class="btn-gn" @click="openSubScreen" :disabled="loading || subScreenState.isOpen">评价</button>
+      <button class="btn-gn" @click="closeSubScreen" :disabled="!subScreenState.isOpen">关闭副屏</button>
+      <button class="button_clear btn-gn" @click="clean">取消</button>
+    </div>
+  </div>
+</template>
+
+<script>
+import QXClient from '../../../plugins/QXClient'
+
+export default {
+  title: 'ServiceEvaluation',
+  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,
+      },
+      loading: false,
+      error: null,
+      response: null,
+      evaluationStatus: '未发起',
+      isComponentDestroyed: false,
+
+      // 副屏相关状态
+      broadcastChannel: null,
+      myWindow: null,
+      isWindows: navigator.platform.indexOf('Win') !== -1,
+
+      subScreenState: {
+        isOpen: false
+      }
+    }
+  },
+
+  props: {
+    row: {
+      type: Object,
+      default: undefined
+    }
+  },
+
+  ready() {
+    console.log('ServiceEvaluation 组件已加载')
+
+    // 监听页面卸载
+    window.addEventListener('beforeunload', this.cleanup)
+  },
+
+  beforeDestroy() {
+    this.cleanup()
+  },
+
+  destroyed() {
+    this.cleanup()
+  },
+
+  methods: {
+    cleanup() {
+      console.log('开始清理组件资源')
+      this.isComponentDestroyed = true
+
+      // 重置状态
+      this.loading = false
+
+      // 关闭广播通道
+      if (this.broadcastChannel) {
+        try {
+          this.broadcastChannel.close()
+        } catch (e) {
+          console.warn('关闭广播通道时出错:', e)
+        }
+        this.broadcastChannel = null
+      }
+
+      // 关闭窗口
+      if (this.myWindow && !this.myWindow.closed) {
+        try {
+          this.myWindow.close()
+        } catch (e) {
+          console.warn('关闭窗口时出错:', e)
+        }
+        this.myWindow = null
+      }
+
+      // 移除事件监听
+      window.removeEventListener('beforeunload', this.cleanup)
+
+      this.subScreenState.isOpen = false
+    },
+
+    safeExecute() {
+      if (this.isComponentDestroyed) {
+        console.log('组件已销毁，停止执行')
+        return false
+      }
+      return true
+    },
+
+    clean() {
+      this.$info('取消操作')
+      this.$dispatch('refresh', this.row)
+    },
+
+    // 打开副屏进行评价
+    openSubScreen() {
+      const url = './evaluation/evaluation.html'
+
+      console.log('正在打开副屏...')
+
+      // 清理旧的广播通道
+      if (this.broadcastChannel) {
+        try {
+          this.broadcastChannel.close()
+        } catch (e) {
+          console.warn('关闭旧通道时出错:', e)
+        }
+        this.broadcastChannel = null
+      }
+
+      // 创建新的广播通道
+      try {
+        this.broadcastChannel = new BroadcastChannel('QX-demo')
+
+        this.broadcastChannel.onmessage = (event) => {
+          console.log('收到副屏消息:', event.data)
+          this.handleSubScreenMessage(event.data)
+        }
+
+        this.broadcastChannel.onmessageerror = (event) => {
+          console.error('广播通道消息错误:', event)
+        }
+
+      } catch (error) {
+        console.error('创建广播通道失败:', error)
+        this.error = '创建通信通道失败: ' + error.message
+        return
+      }
+
+      // 更新状态
+      this.subScreenState.isOpen = true
+      this.loading = true
+      this.evaluationStatus = '等待用户评价'
+      this.error = null
+
+      // Windows系统手动打开窗口
+      if (this.isWindows) {
+        if (this.myWindow && !this.myWindow.closed) {
+          try {
+            this.myWindow.close()
+          } catch (e) {
+            console.warn('关闭旧窗口时出错:', e)
+          }
+        }
+
+        this.myWindow = window.open(
+          url,
+          '_blank',
+          'height=800px, width=1280px, top=0, left=0, toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=no, copyhistory=no'
+        )
+
+        if (this.myWindow) {
+          this.myWindow.focus()
+        } else {
+          this.error = '无法打开新窗口，请检查浏览器弹窗设置'
+          this.loading = false
+          this.subScreenState.isOpen = false
+          return
+        }
+      }
+
+      // 调用客户端API打开副屏
+      QXClient.openwebontablet({
+        data: { url: url },
+        successCallback: (data) => {
+          console.log('打开副屏成功:', data)
+
+          // 发送准备消息给副屏
+          setTimeout(() => {
+            if (this.broadcastChannel) {
+              this.broadcastChannel.postMessage({
+                type: 'mainscreen_ready',
+                timestamp: new Date().toISOString(),
+                message: '主屏已准备就绪'
+              })
+            }
+          }, 500)
+        },
+        errorCallback: (error) => {
+          console.error('打开副屏失败:', error)
+          this.error = '打开副屏失败: ' + JSON.stringify(error)
+          this.showCeAlert(this.error, 'error')
+
+          // 清理资源
+          if (this.broadcastChannel) {
+            this.broadcastChannel.close()
+            this.broadcastChannel = null
+          }
+
+          this.loading = false
+          this.subScreenState.isOpen = false
+          this.evaluationStatus = '未发起'
+        }
+      })
+    },
+
+    // 处理副屏消息
+    handleSubScreenMessage(data) {
+      try {
+        let parsedData = data
+        if (typeof data === 'string') {
+          try {
+            parsedData = JSON.parse(data)
+          } catch (e) {
+            // 如果不是JSON，保持原样
+          }
+        }
+
+        // 处理不同类型的消息
+        if (typeof parsedData === 'object' && parsedData.type) {
+          switch (parsedData.type) {
+            case 'evaluation_result':
+              this.processEvaluationResult(parsedData.result || parsedData)
+              break
+
+            case 'evaluation_canceled':
+              this.showCeAlert('用户取消了评价', 'warning')
+              this.evaluationStatus = '用户取消了评价'
+
+              // 延迟关闭副屏
+              setTimeout(() => {
+                this.closeSubScreen()
+              }, 1000)
+              break
+
+            case 'subscreen_ready':
+              break
+          }
+        } else if (parsedData && parsedData.eva_value !== undefined) {
+          // 兼容旧格式的评价结果
+          this.processEvaluationResult(parsedData)
+        }
+      } catch (error) {
+        console.error('处理副屏消息时出错:', error)
+      }
+    },
+
+    // 处理评价结果
+    async processEvaluationResult(result) {
+      console.log('处理评价结果:', result)
+      // 保存评价结果
+      this.evaluationStatus = '用户已评价'
+      // 提交评价到服务器
+      await this.submitEvaluation(result.eva_value)
+
+      // 延迟关闭副屏
+      setTimeout(() => {
+        this.closeSubScreen()
+      }, 2000)
+    },
+
+    // 提交评价到服务器
+    async submitEvaluation(value) {
+      if (!this.safeExecute()) return
+
+      this.evaluationStatus = '正在提交评价...'
+      console.log('用户评价值：', value)
+
+      try {
+        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.showCeAlert('评价提交成功', 'success')
+        this.evaluationStatus = '评价已提交'
+        this.$dispatch('success', '评价')
+      } catch (error) {
+        console.error('提交评价失败:', error)
+        this.showCeAlert('提交评价失败: ' + (error.message || '未知错误'), 'error')
+        this.evaluationStatus = '提交失败'
+      }
+
+      this.loading = false
+    },
+
+    // 关闭副屏
+    closeSubScreen() {
+
+      // 发送关闭消息给副屏
+      if (this.broadcastChannel) {
+        try {
+          this.broadcastChannel.postMessage({
+            type: 'close_subscreen',
+            message: '主屏要求关闭副屏',
+            timestamp: new Date().toISOString()
+          })
+        } catch (e) {
+          console.warn('发送关闭消息时出错:', e)
+        }
+
+        // 延迟关闭通道
+        setTimeout(() => {
+          try {
+            this.broadcastChannel.close()
+          } catch (e) {
+            console.warn('关闭广播通道时出错:', e)
+          }
+          this.broadcastChannel = null
+        }, 300)
+      }
+
+      // 调用客户端API关闭副屏
+      QXClient.closewebontablet({
+        successCallback: (data) => {
+          console.log('关闭副屏成功:', data)
+          this.subScreenState.isOpen = false
+        },
+        errorCallback: (error) => {
+          console.error('关闭副屏失败:', error)
+          this.subScreenState.isOpen = false
+        }
+      })
+
+      // 关闭Windows窗口
+      if (this.myWindow && !this.myWindow.closed) {
+        try {
+          this.myWindow.close()
+        } catch (e) {
+          console.warn('关闭Windows窗口时出错:', e)
+        }
+        this.myWindow = null
+      }
+
+      this.subScreenState.isOpen = false
+    },
+
+    showCeAlert(message, type) {
+      if (!this.safeExecute()) return
+      if (type === 'error') {
+        console.error(message)
+        this.$showAlert(message, 'danger', 2000)
+      } else if (type === 'warning') {
+        this.$showAlert(message, 'warning', 2000)
+      } else {
+        console.log(message)
+        this.$showAlert(message, 'success', 2000)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.evaluation-panel {
+  padding: 20px;
+}
+
+.status-bar {
+  background-color: #f8f9fa;
+  border: 1px solid #dee2e6;
+  border-radius: 5px;
+  padding: 15px;
+  margin-bottom: 20px;
+}
+
+.status-item {
+  display: flex;
+  align-items: center;
+  margin: 8px 0;
+}
+
+.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;
+}
+
+.button_search, .button_clear, .btn-gn {
+  padding: 10px 20px;
+  margin-right: 10px;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 14px;
+}
+
+.button_search {
+  background-color: #007bff;
+  color: white;
+}
+
+.button_clear {
+  background-color: #6c757d;
+  color: white;
+}
+
+.btn-gn {
+  background-color: #28a745;
+  color: white;
+}
+
+button:disabled {
+  background-color: #cccccc;
+  cursor: not-allowed;
+}
+
+.log-container {
+  max-height: 150px;
+  overflow-y: auto;
+  padding: 10px;
+  background-color: #f8f9fa;
+  border-radius: 4px;
+  font-size: 12px;
+}
+
+.log-entry {
+  padding: 5px;
+  margin-bottom: 3px;
+  border-left: 3px solid #ccc;
+}
+
+.log-entry.info {
+  border-left-color: #6c757d;
+}
+
+.log-entry.received {
+  border-left-color: #28a745;
+}
+
+.log-entry.sent {
+  border-left-color: #007bff;
+}
+
+.log-entry.error {
+  border-left-color: #dc3545;
+}
+
+.log-time {
+  color: #6c757d;
+  margin-right: 10px;
+}
+
+.log-message {
+  word-break: break-word;
+}
+
+.error {
+  background-color: #fef0f0;
+  border-left: 4px solid #f56c6c;
+  padding: 15px;
+  margin-top: 20px;
+  border-radius: 4px;
+}
+
+.error h4 {
+  margin-top: 0;
+  color: #f56c6c;
+}
+
+pre {
+  white-space: pre-wrap;
+  word-wrap: break-word;
+  margin: 0;
+  font-family: 'Courier New', monospace;
+  font-size: 13px;
+}
+</style>

package/src/components/revenue/base/leftview/ServiceRepair.vue

@@ -79,6 +79,7 @@
     data () {
       return {
         model: {},
+        repairList: [], // 所有维修记录列表
         pared: 0,
         repairImages: [] // 维修照片列表
       }
@@ -95,25 +96,27 @@
           }
           let http = new HttpResetClass()
           let res = await http.load('POST', 'api/af-revenue/sql/getServiceRepair', {data: data}, {resolveMsg: null, rejectMsg: null})
-          this.model = res.data[0]
-          console.log('看看维修情况', res, this.model)
-          if (this.model) {
+          console.log('看看维修情况', res, res.data)
+          if (res.data && res.data.length > 0) {
+            this.repairList = res.data
+            this.model = res.data[0]
             this.pared = 1
-            await this.getRepairImages(this.model.id)
+            await this.getAllRepairImages(res.data)
           } else {
             this.pared = 0
+            this.repairList = []
             this.repairImages = []
           }
         } else {
           this.pared = 0
+          this.repairList = []
           this.repairImages = []
         }
       },
-      // 获取维修照片
+      // 获取单个维修记录的照片
       async getRepairImages (workorderId) {
         if (!workorderId) {
-          this.repairImages = []
-          return
+          return []
         }
         try {
           let http = new HttpResetClass()
@@ -132,16 +135,33 @@
               }
             }, {resolveMsg: null, rejectMsg: null})
             if (repairImgRes.data && repairImgRes.data.length > 0) {
-              this.repairImages = repairImgRes.data
-              console.log('this.repairImages', this.repairImages)
-            } else {
-              this.repairImages = []
+              return repairImgRes.data
             }
-          } else {
-            this.repairImages = []
           }
+          return []
         } catch (error) {
           console.error('获取维修照片失败:', error)
+          return []
+        }
+      },
+      // 获取所有维修记录的照片
+      async getAllRepairImages (repairList) {
+        if (!repairList || repairList.length === 0) {
+          this.repairImages = []
+          return
+        }
+        try {
+          let allImages = []
+          for (let repair of repairList) {
+            if (repair.id) {
+              let images = await this.getRepairImages(repair.id)
+              allImages = allImages.concat(images)
+            }
+          }
+          this.repairImages = allImages
+          console.log('所有维修照片', this.repairImages)
+        } catch (error) {
+          console.error('获取所有维修照片失败:', error)
           this.repairImages = []
         }
       }

package/src/components/revenue/batchDeduction/batchDeductionList.vue

@@ -63,6 +63,7 @@
           <th>收费时间</th>
           <th>记录状态</th>
           <th>生成记录人员</th>
+          <th>备注</th>
           <th>所属分公司</th>
           <th>操作</th>
         </tr>
@@ -79,6 +80,7 @@
         <td>{{ row.f_operate_date }}</td>
         <td>{{ row.f_state }}</td>
         <td>{{ row.f_operator }}</td>
+        <td>{{ row.f_comment }}</td>
         <td>{{ row.f_orgname }}</td>
         <td style="text-align: center"> <button v-if="row.f_state === '待生成'" type="button" class="btn btn-danger" @click.stop="$parent.$parent.$parent.cancel(row)">作废</button>&nbsp;&nbsp;&nbsp;
         </td>