sale-client 4.3.21 → 4.3.23

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Oct 13 17:27:02 CST 2025
+#Mon Jan 05 11:37:36 CST 2026
 gradle.version=5.2.1

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 所有关于本产品的变化都在该文档里。
+##4.3.22 2023-03-31 @张科科
+- 提交 洪雅 综合收费界面 点火状态 改为 通气状态 左侧表具信息 增加通气状态的显示
+
 ##1.8.0 2019-09-19 @郭伟
 - 切分支，SQLchange分支准备改f_filaleids
 

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://116.204.64.92:31467/', 'http://116.204.64.92: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 = {

package/package.json

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

package/src/components/common/searchuploadfile/uploadFilesHistory.vue

@@ -1,188 +1,315 @@
 <template>
-  <div class="row" style="height:8%">
-    <div class="col-sm-2 form-group" >
-      <label for="f_hand_date" class="font_normal_body">上传日期</label>
-      <datepicker style="width:60%" id="f_hand_date" placeholder="上传日期"
-                  :value.sync="upload_date"
-                  :format="'yyyy-MM-dd'"
-                  class="datepicker"
-                  :show-reset-button="true">
-      </datepicker>
-    </div>
-    <div class="col-sm-2 form-group" >
-      <label  class="font_normal_body">分类</label>
-      <v-select :value.sync="fusetype" :options='fusetypes'  placeholder='分类' close-on-select></v-select>
-    </div>
-    <div style="float: right">
-      <button class="button_search"  @click="selfSearch()" style="float:right;margin-right: 5px" v-el:cba>查询</button>
+  <div>
+    <div class="row" style="height:8%">
+      <div class="col-sm-2 form-group">
+        <label class="font_normal_body">上传日期</label>
+        <datepicker style="width:60%"
+                    :value.sync="upload_date"
+                    :format="'yyyy-MM-dd'"
+                    class="datepicker"
+                    :show-reset-button="true">
+        </datepicker>
+      </div>
+
+      <div class="col-sm-2 form-group">
+        <label class="font_normal_body">分类</label>
+        <v-select :value.sync="fusetype"
+                  :options='fusetypes'
+                  placeholder='分类'
+                  close-on-select>
+        </v-select>
+      </div>
+
+      <div style="float: right">
+        <button class="button_search"
+                @click="selfSearch()"
+                style="float:right;margin-right: 5px">
+          查询
+        </button>
+      </div>
     </div>
-  </div>
-  <div class="panel panel-info auto" style="overflow-y: auto;height:100%" id="apps">
-    <!--        <div class="panel-heading auto">-->
-    <!--          上传附件记录-->
-    <!--        </div>-->
 
-    <div class="tab-content span" style="min-height:300px" id="app">
-      <div style="padding:0px 0px 10px 0px;margin-left: 20px;overflow: auto;">
+    <div class="panel panel-info auto" style="overflow-y: auto;height:100%">
+      <div class="tab-content span" style="min-height:300px">
+        <div style="padding:0 0 10px 0;margin-left: 20px;overflow: auto;">
 
-        <!-- 时间轴显示 -->
-        <!-- 工单的基本信息 -->
+          <timeline>
+            <timeline-item v-for="item in files"
+                           :color="$index === files.length - 1 ? 'blue' : 'default'">
 
+              <div class="row">
+                <p>{{item.days}}</p>
 
-        <!--            <div class="flex-row" v-for="item in files" ><span >-&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;</span></div>-->
-        <timeline >
-          <timeline-item v-for="item in files"
-                         :color="$index === files.length - 1 ? 'blue' : 'default'">
-            <div class="row" >
+                <div v-for="file in item.arrays" class="col-sm-6">
 
+                  <div style="height:180px;">
+                    <img style="height:100%;cursor:pointer"
+                         :src="file.f_downloadURL"
+                         @click="preview(file)"/>
+                  </div>
 
-              <p> {{item.days}}</p>
+                  <div style="height:190px;">
+                    <div class="showtext">上传时间: {{file.f_uploaddate}}</div>
+                    <div class="showtext">操作员: {{file.f_operator}}</div>
+                    <div class="showtext">分类: {{file.fusetype}}</div>
+                    <div class="showtext">文件说明: {{file.fremarks}}</div>
 
-              <!-- 派单 -->
-              <div v-for="file in item.arrays" class="col-sm-6">
+                    <div class="flex-row showtext">
+                      <a href="javascript:;" @click="preview(file)">预览</a>
 
-                <div style="height:180px;">
-                  <img style="height:100%" :src="file.f_downloadURL"/>
-                </div>
+                      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
-                <div style="height:190px;">
-                  <div class="showtext">上传时间:&nbsp;<span>{{file.f_uploaddate}}</span></div>
-                  <div class="showtext">操作员:&nbsp;<span>{{file.f_operator}}</span></div>
-                  <div class="showtext">分类:&nbsp;<span>{{file.fusetype}}</span></div>
-                  <div class="showtext">文件说明:&nbsp;{{file.fremarks}}</div>
-                  <div class="flex-row showtext">
-                    <a   target="_blank" :href="file.f_downloadURL">预览</a>
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    <a   v-show="isDelete == '1'" @click="delet($index,file)">删除</a>
+                      <a v-show="isDelete == '1'"
+                         @click="delet($index,file)">
+                        删除
+                      </a>
+                    </div>
                   </div>
+
                 </div>
               </div>
-            </div>
 
-          </timeline-item>
-        </timeline>
+            </timeline-item>
+          </timeline>
+
+        </div>
+      </div>
+    </div>
+
+    <!-- 预览弹框 -->
+    <div v-if="previewVisible" class="preview-mask" @click="closePreview">
+      <div class="preview-box" @click.stop>
+
+        <!-- 图片 -->
+        <img v-if="isImage(previewUrl)"
+             :src="previewUrl"
+             class="preview-img"
+             :style="{ transform: 'scale(' + scale + ')' }"
+             @wheel.prevent="handleWheel"/>
+
+        <!-- 其他文件 -->
+        <iframe v-else
+                :src="previewUrl"
+                class="preview-iframe">
+        </iframe>
+
+        <span class="preview-close" @click="closePreview">×</span>
       </div>
     </div>
+
   </div>
 </template>
+
 <script>
-  import {HttpResetClass} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
 
 export default {
-    title: '附件上传记录',
-    props: {
-      row: ''
+  title: '附件上传记录',
+  props: {
+    row: ''
+  },
+  data () {
+    return {
+      upload_date: '',
+      fusetype: [],
+      files: [],
+      fusetypes: [],
+      isDelete: '0',
+      userinfo_id: '',
+
+      previewVisible: false,
+      previewUrl: '',
+      scale: 1
+    }
+  },
+
+  methods: {
+
+    selfSearch () {
+      this.getFiles()
+    },
+
+    preview(file) {
+      this.previewUrl = file.f_downloadURL
+      this.previewVisible = true
+      this.scale = 1
+    },
+
+    closePreview() {
+      this.previewVisible = false
+      this.previewUrl = ''
+    },
+    handleKeydown(e) {
+      if (e.key === 'Escape' || e.keyCode === 27) {
+        if (this.previewVisible) {
+          this.closePreview()
+        }
+      }
+    },
+
+    isImage(url) {
+      return /\.(jpg|jpeg|png|gif)$/i.test(url)
     },
-    data () {
-      return {
-
-        upload_date: '',
-        fusetype: [],
-        files: [],
-        fusetypes: [],
-        isDelete: '0', // 删除按钮，可以进行控制（权限等）
-        userinfo_id: '',
-        images: ''
+
+    handleWheel(e) {
+      if (e.deltaY > 0) {
+        this.scale -= 0.1
+      } else {
+        this.scale += 0.1
       }
+
+      if (this.scale < 0.2) this.scale = 0.2
+      if (this.scale > 5) this.scale = 5
     },
-    methods: {
-
-      selfSearch () {
-        this.getFiles()
-      },
-      async getfusetypes () {
-        this.fusetypes.push({label: '全部', value: ''})
-        let http = new HttpResetClass()
-        let res = await http.load('POST', 'api/af-revenue/sql/singleTable_OrderBy',
-          {data: {items: 'fusetype',
-            tablename: 't_files',
-            condition: `fusetype is not null GROUP BY fusetype`,
-            orderitem: 'fusetype'}},
-          {resolveMsg: null, rejectMsg: '获取图片分类失败'})
-        res.data.forEach((item) => {
-          this.fusetypes.push({
-            label: item.fusetype, value: item.fusetype
-          })
+
+    async getfusetypes () {
+      this.fusetypes.push({label: '全部', value: ''})
+      let http = new HttpResetClass()
+      let res = await http.load('POST', 'api/af-revenue/sql/singleTable_OrderBy', {
+        data: {
+          items: 'fusetype',
+          tablename: 't_files',
+          condition: `fusetype is not null GROUP BY fusetype`,
+          orderitem: 'fusetype'
+        }
+      })
+
+      res.data.forEach((item) => {
+        this.fusetypes.push({
+          label: item.fusetype,
+          value: item.fusetype
         })
-      },
-      delet (index, row) {
-        this.$resetdelete('api/af-revenue/entity/t_files', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-          // this.files.splice(index, 1)
+      })
+    },
+
+    delet (index, row) {
+      this.$resetdelete('api/af-revenue/entity/t_files',
+        {id: row.id},
+        {resolveMsg: '删除成功', rejectMsg: '删除失败'})
+        .then(() => {
           this.selfSearch()
         })
-      },
-      getFiles () {
-        this.files = []
-        this.userinfo_id = this.row.f_userinfo_id
-        let condition = `CONVERT(varchar(200),f_blobid) = '${this.userinfo_id}'  and f_state!='删除'`
-        if (this.upload_date !== '') {
-          condition += `and CONVERT( VARCHAR ( 100 ), f_uploaddate, 23 )='${this.upload_date}' `
-        }
-        if (this.fusetype.length == 1) {
-          if (this.fusetype[0] !== '') {
-            condition += `and fusetype='${this.fusetype}' `
-          }
-        }
-        let http = new HttpResetClass()
+    },
 
-        if (this.userinfo_id) {
-          http.load('POST', 'api/af-revenue/logic/getAllFiles', {
-            data: {
-              condition: condition
-            }
-          }, {resolveMsg: null, rejectMsg: '获取附件出错！！！'}).then((res) => {
-            for (var i = 0; i < res.data.days.length; i++) {
-              // 循环日期。将files组织成[{day:'',array:''},{day:'',array:''}...]格式
-              this.files.push({
-                days: null,
-                arrays: []
-              })
-              this.files[i].days = res.data.days[i].uploadday
-              for (var j = 0; j < res.data.array.length; j++) {
-                // 循环查出来的所有附件
-
-                if (res.data.array[j].uploadday == this.files[i].days) {
-                  // 如果使用类型包含导入字样,则是execl文件导入的,不做显示
-                  if (res.data.array[j].fusetype && res.data.array[j].f_filetype.includes('xls')) {
-                    res.data.array[j].splice(i, 1)
-                    i--
-                    continue
-                  }
-                  if ((res.data.array[j].fusetype == '安检照片' && res.data.array[j].f_filename.includes('amr'))) {
-                    continue
-                  }
-                  let temp = res.data.array[j].f_downloadpath
-                  let URL = temp.substring(temp.lastIndexOf(':\\') + 2)
-                  if (res.data.array[j].fusetype == '安检照片') {
-                    res.data.array[j].f_downloadURL = location.protocol + '//' + location.host + '/rs/image/file/' + res.data.array[j].f_filename
-                  } else {
-                    res.data.array[j].f_downloadURL = location.protocol + '//' + location.host + '/' + URL
-                  }
-                  console.log('res.data.array[j].f_downloadURL', res.data.array[j].f_downloadURL)
-                  this.files[i].arrays.push(res.data.array[j])
+    getFiles () {
+      this.files = []
+      this.userinfo_id = this.row.f_userinfo_id
+
+      let condition = `CONVERT(varchar(200),f_blobid) = '${this.userinfo_id}' and f_state!='删除'`
+
+      if (this.upload_date) {
+        condition += ` and CONVERT(VARCHAR(100), f_uploaddate, 23)='${this.upload_date}'`
+      }
+
+      if (this.fusetype.length === 1 && this.fusetype[0] !== '') {
+        condition += ` and fusetype='${this.fusetype}'`
+      }
+
+      let http = new HttpResetClass()
+
+      if (this.userinfo_id) {
+        http.load('POST', 'api/af-revenue/logic/getAllFiles', {
+          data: { condition }
+        }).then((res) => {
+
+          for (let i = 0; i < res.data.days.length; i++) {
+            this.files.push({
+              days: res.data.days[i].uploadday,
+              arrays: []
+            })
+
+            for (let j = 0; j < res.data.array.length; j++) {
+
+              let item = res.data.array[j]
+
+              if (item.uploadday === this.files[i].days) {
+
+                if (item.fusetype && item.f_filetype.includes('xls')) {
+                  continue
+                }
+
+                if (item.fusetype === '安检照片' && item.f_filename.includes('amr')) {
+                  continue
+                }
+
+                let temp = item.f_downloadpath
+                let URL = temp.substring(temp.lastIndexOf(':\\') + 2)
+
+                if (item.fusetype === '安检照片') {
+                  item.f_downloadURL = location.protocol + '//' + location.host + '/rs/image/file/' + item.f_filename
+                } else {
+                  item.f_downloadURL = location.protocol + '//' + location.host + '/' + URL
                 }
+
+                this.files[i].arrays.push(item)
               }
             }
-          })
-        }
-      }
+          }
 
-    },
-    ready () {
-      if (this.$login.r.find(value => value == '上传附件删除')) {
-        // 有删除权限
-        this.isDelete = '1'
+        })
       }
-      this.getFiles()
-      this.getfusetypes()
     }
+  },
+  ready () {
+    if (this.$login.r.find(v => v === '上传附件删除')) {
+      this.isDelete = '1'
+    }
+    this.getFiles()
+    this.getfusetypes()
+
+    // 绑定 ESC
+    window.addEventListener('keydown', this.handleKeydown)
+  },
+
+  beforeDestroy () {
+    // 解绑 ESC（防止内存泄漏）
+    window.removeEventListener('keydown', this.handleKeydown)
   }
+}
 </script>
-<style media="screen">
-  #work-history ul {
-    padding: 0px;
-  }
-  .showtext{
-    height:20px;
-  }
+
+<style>
+.showtext {
+  height: 20px;
+}
+
+.preview-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0,0,0,0.7);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999;
+}
+
+.preview-box {
+  position: relative;
+  max-width: 90%;
+  max-height: 90%;
+}
+
+.preview-img {
+  max-width: 100%;
+  max-height: 100%;
+  transition: transform 0.1s ease;
+}
+
+.preview-iframe {
+  width: 80vw;
+  height: 80vh;
+  background: #fff;
+}
+
+.preview-close {
+  position: absolute;
+  top: -10px;
+  right: -10px;
+  font-size: 28px;
+  color: #fff;
+  cursor: pointer;
+}
 </style>