sale-client 3.6.471 → 3.6.473

package/package.json

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

package/src/components/revenue/comprehen/ComprehenOperation/MeterDisable/DisableManage.vue

@@ -26,7 +26,7 @@
       </div>
     </validator>
   </div>
-  <upload :blodid="blodid" v-if="false" isremark="true" fusetype="表具停用"></upload>
+  <upload :blodid="blodid"  :businessid="randomBusinessId" isremark="true" :deleteimg="true" fusetype="停用"></upload>
 </template>
 <script>
   /**
@@ -41,13 +41,22 @@
         blodid: '',
         showupload: true,
         model: {},
+        randomBusinessId: '',
         reason: this.$appdata.getParam('停用原因')
       }
     },
     ready () {
       this.blodid = this.row.f_userinfo_id
+      this.getRandomId()
     },
     methods: {
+      getRandomId () {
+        this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+          let res = Math.random() * 16 | 0
+          let v = c == 'x' ? res : (res & 0x3 | 0x8)
+          return v.toString(16)
+        })
+      },
       async confirm () {
         await this.$LogicService.meterDisable(this.model, this.row)
         let array = [{

package/src/filiale/bayan/Upload.vue

@@ -48,7 +48,7 @@
         </div>
       </div>
     </div>
-    <modal :show.sync="showUpload" styles="border-radius:20px;margin-top:300px" v-ref:modal backdrop="false" :width="700" >
+    <modal :show.sync="showUpload" styles="border-radius:5px;margin-top:300px" v-ref:modal backdrop="false" :width="600" >
       <header slot="modal-header" class="modal-header">
         <button type="button" class="close" @click="close"><span class="glyphicon glyphicon-remove"></span></button>
         <h4 class="modal-title" style="text-align: center">文件上传</h4>
@@ -66,227 +66,224 @@
 </template>
 <script>
 import { HttpResetClass } from 'vue-client'
-//import HttpResetClass from '../plugins/HttpResetClass'
-  import Vue from "vue";
-
-  export default {
-    title: "附件",
-    props: ['blodid','businessid','isremark', 'isusetype','takeimg','defname','isupload','fusetype','cols','width','height','deleteimg'],
-    data() {
-      return {
-        isDelete: '0', // 删除按钮，可以进行控制（权限等）
-        delimg: true, // 删除按钮，可以进行控制（权限等）
-        fileInfoData: [], // 数据库存储的文件记录对象数组
-        headers: {'username': this.$login.f.name, 'blodid': '','businessid':'', 'fremarks': '','defname':'','fusetype':this.fusetype?this.fusetype:''}, // 调用rs/file/uploadFile 的参数
-        showUpload: false, // 上传模态框控制
-        showhighmeter: false, // 高拍仪组件控制
-        useType: '', // 使用类型
-        fileRemark: '', // 文件说明
-        rotating: this.$appdata.getSingleValue('图片附加功能') // 文件是否旋转
+// import HttpResetClass from '../plugins/HttpResetClass'
+import Vue from 'vue'
+
+export default {
+  title: '附件',
+  props: ['blodid', 'businessid', 'isremark', 'isusetype', 'takeimg', 'defname', 'isupload', 'fusetype', 'cols', 'width', 'height', 'deleteimg'],
+  data () {
+    return {
+      isDelete: '0', // 删除按钮，可以进行控制（权限等）
+      delimg: true, // 删除按钮，可以进行控制（权限等）
+      fileInfoData: [], // 数据库存储的文件记录对象数组
+      headers: {'username': this.$login.f.name, 'blodid': '', 'businessid': '', 'fremarks': '', 'defname': '', 'fusetype': this.fusetype ? this.fusetype : ''}, // 调用rs/file/uploadFile 的参数
+      showUpload: false, // 上传模态框控制
+      showhighmeter: false, // 高拍仪组件控制
+      useType: '', // 使用类型
+      fileRemark: '', // 文件说明
+      rotating: this.$appdata.getSingleValue('图片附加功能') // 文件是否旋转
+    }
+  },
+  methods: {
+    confirmIdCard (IdCardInfo) {
+      this.showhighmeter = !this.showhighmeter
+      console.log(IdCardInfo)
+      if (IdCardInfo && IdCardInfo.strID) {
+        this.$emit('confirminfo', IdCardInfo)
       }
     },
-    methods: {
-      confirmIdCard (IdCardInfo) {
-        this.showhighmeter = !this.showhighmeter
-        console.log(IdCardInfo)
-        if(IdCardInfo && IdCardInfo.strID){
-          this.$emit('confirminfo', IdCardInfo)
-        }
-      },
       // 查询按钮事件
-      delet(index, row) {
-        this.$resetdelete('rs/entity/t_files', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-          this.$dispatch("delResid",row.id)
-          this.fileInfoData.splice(index, 1)
-        })
-      },
-      downloadfile(filepath){
-
-        var link = document.createElement('a');
+    delet (index, row) {
+      this.$resetdelete('rs/entity/t_files', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$dispatch('delResid', row.id)
+        this.fileInfoData.splice(index, 1)
+      })
+    },
+    downloadfile (filepath) {
+      var link = document.createElement('a')
         // let pathName = "http://" + location.host + filepath;
-        link.href = filepath;
-        link.target='_blank'
-        link.dispatchEvent(new MouseEvent('click'));
-      },
-      GetRequest() {
-        var url = location.search;
-        var theRequest = new Object();
-        if (url.indexOf("?") != -1) {
-          var str = url.substr(1);
-          let strs = str.split("&");
-          for (var i = 0; i < strs.length; i++) {
-            theRequest[strs[i].split("=")[0]] = decodeURIComponent(strs[i].split("=")[1]);
-          }
-        }
-        return theRequest;
-      },
-      upload() {
-
-        if(this.showhighmeter){
-          console.log(this,'测试')
-          this.$refs.ltgao.closeVideo()
-        }
-        console.log('测试1')
-        this.showhighmeter = !this.showhighmeter
-      },
-      async load(self) {
-        let condition=''
-        if(this.businessid){
-          condition = `f_businessid= '${self.headers.businessid}' `
-        }else{
-          condition = `f_blobid= '${self.headers.blodid}' `
-        }
-        if(this.fusetype){
-          condition += ` and fusetype like '%${this.fusetype}%'`
-        }
-        var http = new HttpResetClass()
-        let data = {
-         condition: condition
-       }
-        let getFile = []
-        try {
-          getFile = await http.load('POST', 'rs/sql/getFiles', {data: data}, {
-            warnMsg: null,
-            resolveMsg: null
-          })
-        } catch (e) {
-          console.log(e)
+      link.href = filepath
+      link.target = '_blank'
+      link.dispatchEvent(new MouseEvent('click'))
+    },
+    GetRequest () {
+      var url = location.search
+      var theRequest = new Object()
+      if (url.indexOf('?') != -1) {
+        var str = url.substr(1)
+        let strs = str.split('&')
+        for (var i = 0; i < strs.length; i++) {
+          theRequest[strs[i].split('=')[0]] = decodeURIComponent(strs[i].split('=')[1])
         }
-        for (var i = 0; i < getFile.data.length; i++) {
+      }
+      return theRequest
+    },
+    upload () {
+      if (this.showhighmeter) {
+        console.log(this, '测试')
+        this.$refs.ltgao.closeVideo()
+      }
+      console.log('测试1')
+      this.showhighmeter = !this.showhighmeter
+    },
+    async load (self) {
+      let condition = ''
+      if (this.businessid) {
+        condition = `f_businessid= '${self.headers.businessid}' `
+      } else {
+        condition = `f_blobid= '${self.headers.blodid}' `
+      }
+      if (this.fusetype) {
+        condition += ` and fusetype like '%${this.fusetype}%'`
+      }
+      var http = new HttpResetClass()
+      let data = {
+        condition: condition
+      }
+      let getFile = []
+      try {
+        getFile = await http.load('POST', 'rs/sql/getFiles', {data: data}, {
+          warnMsg: null,
+          resolveMsg: null
+        })
+      } catch (e) {
+        console.log(e)
+      }
+      for (var i = 0; i < getFile.data.length; i++) {
           // 如果使用类型包含导入字样,则是execl文件导入的,不做显示
-          if(getFile.data[i].fusetype&&(getFile.data[i].fusetype.includes('execl导入'))){
-            getFile.data.splice(i,1)
-            i--
-            continue
-          }
-          let temp = getFile.data[i].f_downloadpath
-          let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
-          var xy=this.$appdata.getSingleValue('协议')?this.$appdata.getSingleValue('协议'):"http://"
-          getFile.data[i].f_downloadURL = xy+ location.host + "/" + URL
+        if (getFile.data[i].fusetype && (getFile.data[i].fusetype.includes('execl导入'))) {
+          getFile.data.splice(i, 1)
+          i--
+          continue
         }
-        self.fileInfoData = []
-        self.fileInfoData = getFile.data
-      },
+        let temp = getFile.data[i].f_downloadpath
+        let URL = temp.substring(temp.lastIndexOf(':\\') + 2)
+        var xy = this.$appdata.getSingleValue('协议') ? this.$appdata.getSingleValue('协议') : 'http://'
+        getFile.data[i].f_downloadURL = xy + location.host + '/' + URL
+      }
+      self.fileInfoData = []
+      self.fileInfoData = getFile.data
+    },
       // 数据库时间格式化
-      formatdate(val) {
-        //20180914151603   :    2018-09-14 15:16:03
-        if (val.length != 14)
-          return
-        let year = val.substr(0, 4)
-        let month = val.substr(4, 2)
-        let day = val.substr(6, 2)
-        let hour = val.substr(8, 2)
-        let min = val.substr(10, 2)
-        let second = val.substr(12, 2)
-        return year + '-' + month + '-' + day + ' ' + hour + ':' + min + ':' + second
-      },
+    formatdate (val) {
+        // 20180914151603   :    2018-09-14 15:16:03
+      if (val.length != 14) { return }
+      let year = val.substr(0, 4)
+      let month = val.substr(4, 2)
+      let day = val.substr(6, 2)
+      let hour = val.substr(8, 2)
+      let min = val.substr(10, 2)
+      let second = val.substr(12, 2)
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + min + ':' + second
+    },
       // 打开文件上传对话框
-      fileUpload() {
-        this.showUpload = true
-      },
+    fileUpload () {
+      this.showUpload = true
+    },
       // 关闭文件上传对话框
-      close() {
-        this.showUpload = false
+    close () {
+      this.showUpload = false
         // 将选的文件清空
-        this.$refs.file.$el.querySelector('input').value = ''
-        this.load(this)
-      },
-      convertBase64ToBlob(base64String) {
+      this.$refs.file.$el.querySelector('input').value = ''
+      this.load(this)
+    },
+    convertBase64ToBlob (base64String) {
         // 将base64解码
-        var bytes = atob(base64String);
-        //var bytes = base64;
-        var bytesCode = new ArrayBuffer(bytes.length);
+      var bytes = atob(base64String)
+        // var bytes = base64;
+      var bytesCode = new ArrayBuffer(bytes.length)
         // 转换为类型化数组
-        var byteArray = new Uint8Array(bytesCode);
+      var byteArray = new Uint8Array(bytesCode)
 
         // 将base64转换为ascii码
-        for (var i = 0; i < bytes.length; i++) {
-          byteArray[i] = bytes.charCodeAt(i);
-        }
-        // 生成Blob对象（文件对象）
-        return new Blob([bytesCode], {type: 'image/jpeg'});
-      },
-      newPhoto(Imgbase64) {
-        let form = new FormData()
-        let xhr = new XMLHttpRequest()
-        let formDataBoundary = "----WebkitFormBoundary" + "GaoPaiYi";
-        form.append('Content-Type', 'multipart/form-data;boundary=' + formDataBoundary)
-        form.append('file', this.convertBase64ToBlob(Imgbase64), "GaoPaiYi.jpg")
-        xhr.open("POST", "rs/file/uploadFile")
-
-        if (this.headers) {
-          for (var header in this.headers) {
-            xhr.setRequestHeader(header, encodeURIComponent(this.headers[header]))
-          }
-        }
-        if (Vue.$login && Vue.$login.jwt) {
-          xhr.setRequestHeader('Authorization', 'Bearer ' + Vue.$login.jwtNew)
-          xhr.setRequestHeader('Token', Vue.$login.jwt)
-        }
-        xhr.send(form)
-        setTimeout(() => {
-          this.load(this)
-        }, 5000)
+      for (var i = 0; i < bytes.length; i++) {
+        byteArray[i] = bytes.charCodeAt(i)
       }
+        // 生成Blob对象（文件对象）
+      return new Blob([bytesCode], {type: 'image/jpeg'})
     },
-    ready() {
-      if (this.$login.r.find(value => value == '上传附件删除')) {
-        // 有删除权限
-        this.isDelete = '1'
+    newPhoto (Imgbase64) {
+      let form = new FormData()
+      let xhr = new XMLHttpRequest()
+      let formDataBoundary = '----WebkitFormBoundary' + 'GaoPaiYi'
+      form.append('Content-Type', 'multipart/form-data;boundary=' + formDataBoundary)
+      form.append('file', this.convertBase64ToBlob(Imgbase64), 'GaoPaiYi.jpg')
+      xhr.open('POST', 'rs/file/uploadFile')
+
+      if (this.headers) {
+        for (var header in this.headers) {
+          xhr.setRequestHeader(header, encodeURIComponent(this.headers[header]))
+        }
       }
-      if (this.deleteimg) {
-        this.delimg = false
+      if (Vue.$login && Vue.$login.jwt) {
+        xhr.setRequestHeader('Authorization', 'Bearer ' + Vue.$login.jwtNew)
+        xhr.setRequestHeader('Token', Vue.$login.jwt)
       }
-      this.headers.blodid = this.blodid
-      this.headers.businessid = this.businessid
-      console.log('123222', this.businessid)
-      if (this.blodid||this.businessid) {
+      xhr.send(form)
+      setTimeout(() => {
+        this.load(this)
+      }, 5000)
+    }
+  },
+  ready () {
+    if (this.$login.r.find(value => value == '上传附件删除')) {
+        // 有删除权限
+      this.isDelete = '1'
+    }
+    if (this.deleteimg) {
+      this.delimg = false
+    }
+    this.headers.blodid = this.blodid
+    this.headers.businessid = this.businessid
+    console.log('123222', this.businessid)
+    if (this.blodid || this.businessid) {
+      this.load(this)
+    }
+  },
+  watch: {
+    'blodid' (val) {
+      if (val) {
+        console.log('观察blodid', val)
+        this.headers.blodid = this.blodid
         this.load(this)
       }
     },
-    watch: {
-      'blodid'(val) {
-        if (val) {
-          console.log('观察blodid', val)
-          this.headers.blodid = this.blodid
-          this.load(this)
-        }
-      },
-      'businessid'(val) {
-        console.log('观察businessid')
-        if (val) {
-          console.log('观察businessid', val)
-          this.headers.businessid = this.businessid
-          this.load(this)
-        }
-      },
-      'useType'() {
-        this.headers.fusetype = this.useType[0] ? this.useType[0] : ''
-      },
-      'defname'() {
-        this.headers.defname=this.defname
+    'businessid' (val) {
+      console.log('观察businessid')
+      if (val) {
+        console.log('观察businessid', val)
+        this.headers.businessid = this.businessid
+        this.load(this)
       }
     },
-    computed: {
-      foptions() {
-        let default_type = ['档案信息', '发卡售气', '卡表收费', '物联网表收费',
-          '机表收费', '表具停用', '表具启用', '换表&清零', '其他补气', '补气购气',
-          '预存收费', '调价补差', '黑名单', '补卡', '限购', '销户', '过户']
-        return !this.$appdata.getParam('附件使用类型') || !this.$appdata.getParam('附件使用类型').length ?
-          default_type.map((item) => {
+    'useType' () {
+      this.headers.fusetype = this.useType[0] ? this.useType[0] : ''
+    },
+    'defname' () {
+      this.headers.defname = this.defname
+    }
+  },
+  computed: {
+    foptions () {
+      let default_type = ['档案信息', '发卡售气', '卡表收费', '物联网表收费',
+        '机表收费', '表具停用', '表具启用', '换表&清零', '其他补气', '补气购气',
+        '预存收费', '调价补差', '黑名单', '补卡', '限购', '销户', '过户']
+      return !this.$appdata.getParam('附件使用类型') || !this.$appdata.getParam('附件使用类型').length
+          ? default_type.map((item) => {
             return {label: item, value: item}
           }) : this.$appdata.getParam('附件使用类型')
-      },
-    },
-    events: {
-      onFileUpload: function (file, res) {
-        console.log("上传完毕",res)
-        this.$dispatch("resid",res.id)
-        this.headers.fremarks=''
-        this.close()
-      }
+    }
+  },
+  events: {
+    onFileUpload: function (file, res) {
+      console.log('上传完毕', res)
+      this.$dispatch('resid', res.id)
+      this.headers.fremarks = ''
+      this.close()
     }
   }
+}
 </script>
 <style scoped>
 

package/src/filiale/bayan/UploadImg.vue

@@ -60,227 +60,224 @@
 </template>
 <script>
 import { HttpResetClass } from 'vue-client'
-//import HttpResetClass from '../plugins/HttpResetClass'
-  import Vue from "vue";
-
-  export default {
-    title: "附件",
-    props: ['blodid','businessid','isremark', 'isusetype','takeimg','defname','isupload','fusetype','cols','width','height','deleteimg'],
-    data() {
-      return {
-        isDelete: '0', // 删除按钮，可以进行控制（权限等）
-        delimg: true, // 删除按钮，可以进行控制（权限等）
-        fileInfoData: [], // 数据库存储的文件记录对象数组
-        headers: {'username': this.$login.f.name, 'blodid': '','businessid':'', 'fremarks': '','defname':'','fusetype':this.fusetype?this.fusetype:''}, // 调用rs/file/uploadFile 的参数
-        showUpload: false, // 上传模态框控制
-        showhighmeter: false, // 高拍仪组件控制
-        useType: '', // 使用类型
-        fileRemark: '', // 文件说明
-        rotating: this.$appdata.getSingleValue('图片附加功能') // 文件是否旋转
+// import HttpResetClass from '../plugins/HttpResetClass'
+import Vue from 'vue'
+
+export default {
+  title: '附件',
+  props: ['blodid', 'businessid', 'isremark', 'isusetype', 'takeimg', 'defname', 'isupload', 'fusetype', 'cols', 'width', 'height', 'deleteimg'],
+  data () {
+    return {
+      isDelete: '0', // 删除按钮，可以进行控制（权限等）
+      delimg: true, // 删除按钮，可以进行控制（权限等）
+      fileInfoData: [], // 数据库存储的文件记录对象数组
+      headers: {'username': this.$login.f.name, 'blodid': '', 'businessid': '', 'fremarks': '', 'defname': '', 'fusetype': this.fusetype ? this.fusetype : ''}, // 调用rs/file/uploadFile 的参数
+      showUpload: false, // 上传模态框控制
+      showhighmeter: false, // 高拍仪组件控制
+      useType: '', // 使用类型
+      fileRemark: '', // 文件说明
+      rotating: this.$appdata.getSingleValue('图片附加功能') // 文件是否旋转
+    }
+  },
+  methods: {
+    confirmIdCard (IdCardInfo) {
+      this.showhighmeter = !this.showhighmeter
+      console.log(IdCardInfo)
+      if (IdCardInfo && IdCardInfo.strID) {
+        this.$emit('confirminfo', IdCardInfo)
       }
     },
-    methods: {
-      confirmIdCard (IdCardInfo) {
-        this.showhighmeter = !this.showhighmeter
-        console.log(IdCardInfo)
-        if(IdCardInfo && IdCardInfo.strID){
-          this.$emit('confirminfo', IdCardInfo)
-        }
-      },
       // 查询按钮事件
-      delet(index, row) {
-        this.$resetdelete('rs/entity/t_files', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-          this.$dispatch("delResid",row.id)
-          this.fileInfoData.splice(index, 1)
-        })
-      },
-      downloadfile(filepath){
-
-        var link = document.createElement('a');
+    delet (index, row) {
+      this.$resetdelete('rs/entity/t_files', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$dispatch('delResid', row.id)
+        this.fileInfoData.splice(index, 1)
+      })
+    },
+    downloadfile (filepath) {
+      var link = document.createElement('a')
         // let pathName = "http://" + location.host + filepath;
-        link.href = filepath;
-        link.target='_blank'
-        link.dispatchEvent(new MouseEvent('click'));
-      },
-      GetRequest() {
-        var url = location.search;
-        var theRequest = new Object();
-        if (url.indexOf("?") != -1) {
-          var str = url.substr(1);
-          let strs = str.split("&");
-          for (var i = 0; i < strs.length; i++) {
-            theRequest[strs[i].split("=")[0]] = decodeURIComponent(strs[i].split("=")[1]);
-          }
-        }
-        return theRequest;
-      },
-      upload() {
-
-        if(this.showhighmeter){
-          console.log(this,'测试')
-          this.$refs.ltgao.closeVideo()
-        }
-        console.log('测试1')
-        this.showhighmeter = !this.showhighmeter
-      },
-      async load(self) {
-        let condition=''
-        if(this.businessid){
-          condition = `f_businessid= '${self.headers.businessid}' `
-        }else{
-          condition = `f_blobid= '${self.headers.blodid}' `
-        }
-        if(this.fusetype){
-          condition += ` and fusetype like '%${this.fusetype}%'`
-        }
-        var http = new HttpResetClass()
-        let data = {
-         condition: condition
-       }
-        let getFile = []
-        try {
-          getFile = await http.load('POST', 'rs/sql/getFiles', {data: data}, {
-            warnMsg: null,
-            resolveMsg: null
-          })
-        } catch (e) {
-          console.log(e)
+      link.href = filepath
+      link.target = '_blank'
+      link.dispatchEvent(new MouseEvent('click'))
+    },
+    GetRequest () {
+      var url = location.search
+      var theRequest = new Object()
+      if (url.indexOf('?') != -1) {
+        var str = url.substr(1)
+        let strs = str.split('&')
+        for (var i = 0; i < strs.length; i++) {
+          theRequest[strs[i].split('=')[0]] = decodeURIComponent(strs[i].split('=')[1])
         }
-        for (var i = 0; i < getFile.data.length; i++) {
+      }
+      return theRequest
+    },
+    upload () {
+      if (this.showhighmeter) {
+        console.log(this, '测试')
+        this.$refs.ltgao.closeVideo()
+      }
+      console.log('测试1')
+      this.showhighmeter = !this.showhighmeter
+    },
+    async load (self) {
+      let condition = ''
+      if (this.businessid) {
+        condition = `f_businessid= '${self.headers.businessid}' `
+      } else {
+        condition = `f_blobid= '${self.headers.blodid}' `
+      }
+      if (this.fusetype) {
+        condition += ` and fusetype like '%${this.fusetype}%'`
+      }
+      var http = new HttpResetClass()
+      let data = {
+        condition: condition
+      }
+      let getFile = []
+      try {
+        getFile = await http.load('POST', 'rs/sql/getFiles', {data: data}, {
+          warnMsg: null,
+          resolveMsg: null
+        })
+      } catch (e) {
+        console.log(e)
+      }
+      for (var i = 0; i < getFile.data.length; i++) {
           // 如果使用类型包含导入字样,则是execl文件导入的,不做显示
-          if(getFile.data[i].fusetype&&(getFile.data[i].fusetype.includes('execl导入'))){
-            getFile.data.splice(i,1)
-            i--
-            continue
-          }
-          let temp = getFile.data[i].f_downloadpath
-          let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
-          var xy=this.$appdata.getSingleValue('协议')?this.$appdata.getSingleValue('协议'):"http://"
-          getFile.data[i].f_downloadURL = xy+ location.host + "/" + URL
+        if (getFile.data[i].fusetype && (getFile.data[i].fusetype.includes('execl导入'))) {
+          getFile.data.splice(i, 1)
+          i--
+          continue
         }
-        self.fileInfoData = []
-        self.fileInfoData = getFile.data
-      },
+        let temp = getFile.data[i].f_downloadpath
+        let URL = temp.substring(temp.lastIndexOf(':\\') + 2)
+        var xy = this.$appdata.getSingleValue('协议') ? this.$appdata.getSingleValue('协议') : 'http://'
+        getFile.data[i].f_downloadURL = xy + location.host + '/' + URL
+      }
+      self.fileInfoData = []
+      self.fileInfoData = getFile.data
+    },
       // 数据库时间格式化
-      formatdate(val) {
-        //20180914151603   :    2018-09-14 15:16:03
-        if (val.length != 14)
-          return
-        let year = val.substr(0, 4)
-        let month = val.substr(4, 2)
-        let day = val.substr(6, 2)
-        let hour = val.substr(8, 2)
-        let min = val.substr(10, 2)
-        let second = val.substr(12, 2)
-        return year + '-' + month + '-' + day + ' ' + hour + ':' + min + ':' + second
-      },
+    formatdate (val) {
+        // 20180914151603   :    2018-09-14 15:16:03
+      if (val.length != 14) { return }
+      let year = val.substr(0, 4)
+      let month = val.substr(4, 2)
+      let day = val.substr(6, 2)
+      let hour = val.substr(8, 2)
+      let min = val.substr(10, 2)
+      let second = val.substr(12, 2)
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + min + ':' + second
+    },
       // 打开文件上传对话框
-      fileUpload() {
-        this.showUpload = true
-      },
+    fileUpload () {
+      this.showUpload = true
+    },
       // 关闭文件上传对话框
-      close() {
-        this.showUpload = false
+    close () {
+      this.showUpload = false
         // 将选的文件清空
-        this.$refs.file.$el.querySelector('input').value = ''
-        this.load(this)
-      },
-      convertBase64ToBlob(base64String) {
+      this.$refs.file.$el.querySelector('input').value = ''
+      this.load(this)
+    },
+    convertBase64ToBlob (base64String) {
         // 将base64解码
-        var bytes = atob(base64String);
-        //var bytes = base64;
-        var bytesCode = new ArrayBuffer(bytes.length);
+      var bytes = atob(base64String)
+        // var bytes = base64;
+      var bytesCode = new ArrayBuffer(bytes.length)
         // 转换为类型化数组
-        var byteArray = new Uint8Array(bytesCode);
+      var byteArray = new Uint8Array(bytesCode)
 
         // 将base64转换为ascii码
-        for (var i = 0; i < bytes.length; i++) {
-          byteArray[i] = bytes.charCodeAt(i);
-        }
-        // 生成Blob对象（文件对象）
-        return new Blob([bytesCode], {type: 'image/jpeg'});
-      },
-      newPhoto(Imgbase64) {
-        let form = new FormData()
-        let xhr = new XMLHttpRequest()
-        let formDataBoundary = "----WebkitFormBoundary" + "GaoPaiYi";
-        form.append('Content-Type', 'multipart/form-data;boundary=' + formDataBoundary)
-        form.append('file', this.convertBase64ToBlob(Imgbase64), "GaoPaiYi.jpg")
-        xhr.open("POST", "rs/file/uploadFile")
-
-        if (this.headers) {
-          for (var header in this.headers) {
-            xhr.setRequestHeader(header, encodeURIComponent(this.headers[header]))
-          }
-        }
-        if (Vue.$login && Vue.$login.jwt) {
-          xhr.setRequestHeader('Authorization', 'Bearer ' + Vue.$login.jwtNew)
-          xhr.setRequestHeader('Token', Vue.$login.jwt)
-        }
-        xhr.send(form)
-        setTimeout(() => {
-          this.load(this)
-        }, 5000)
+      for (var i = 0; i < bytes.length; i++) {
+        byteArray[i] = bytes.charCodeAt(i)
       }
+        // 生成Blob对象（文件对象）
+      return new Blob([bytesCode], {type: 'image/jpeg'})
     },
-    ready() {
-      if (this.$login.r.find(value => value == '上传附件删除')) {
-        // 有删除权限
-        this.isDelete = '1'
+    newPhoto (Imgbase64) {
+      let form = new FormData()
+      let xhr = new XMLHttpRequest()
+      let formDataBoundary = '----WebkitFormBoundary' + 'GaoPaiYi'
+      form.append('Content-Type', 'multipart/form-data;boundary=' + formDataBoundary)
+      form.append('file', this.convertBase64ToBlob(Imgbase64), 'GaoPaiYi.jpg')
+      xhr.open('POST', 'rs/file/uploadFile')
+
+      if (this.headers) {
+        for (var header in this.headers) {
+          xhr.setRequestHeader(header, encodeURIComponent(this.headers[header]))
+        }
       }
-      if (this.deleteimg) {
-        this.delimg = false
+      if (Vue.$login && Vue.$login.jwt) {
+        xhr.setRequestHeader('Authorization', 'Bearer ' + Vue.$login.jwtNew)
+        xhr.setRequestHeader('Token', Vue.$login.jwt)
       }
-      this.headers.blodid = this.blodid
-      this.headers.businessid = this.businessid
-      console.log('123222', this.businessid)
-      if (this.blodid||this.businessid) {
+      xhr.send(form)
+      setTimeout(() => {
+        this.load(this)
+      }, 5000)
+    }
+  },
+  ready () {
+    if (this.$login.r.find(value => value == '上传附件删除')) {
+        // 有删除权限
+      this.isDelete = '1'
+    }
+    if (this.deleteimg) {
+      this.delimg = false
+    }
+    this.headers.blodid = this.blodid
+    this.headers.businessid = this.businessid
+    console.log('123222', this.businessid)
+    if (this.blodid || this.businessid) {
+      this.load(this)
+    }
+  },
+  watch: {
+    'blodid' (val) {
+      if (val) {
+        console.log('观察blodid', val)
+        this.headers.blodid = this.blodid
         this.load(this)
       }
     },
-    watch: {
-      'blodid'(val) {
-        if (val) {
-          console.log('观察blodid', val)
-          this.headers.blodid = this.blodid
-          this.load(this)
-        }
-      },
-      'businessid'(val) {
-        console.log('观察businessid')
-        if (val) {
-          console.log('观察businessid', val)
-          this.headers.businessid = this.businessid
-          this.load(this)
-        }
-      },
-      'useType'() {
-        this.headers.fusetype = this.useType[0] ? this.useType[0] : ''
-      },
-      'defname'() {
-        this.headers.defname=this.defname
+    'businessid' (val) {
+      console.log('观察businessid')
+      if (val) {
+        console.log('观察businessid', val)
+        this.headers.businessid = this.businessid
+        this.load(this)
       }
     },
-    computed: {
-      foptions() {
-        let default_type = ['档案信息', '发卡售气', '卡表收费', '物联网表收费',
-          '机表收费', '表具停用', '表具启用', '换表&清零', '其他补气', '补气购气',
-          '预存收费', '调价补差', '黑名单', '补卡', '限购', '销户', '过户']
-        return !this.$appdata.getParam('附件使用类型') || !this.$appdata.getParam('附件使用类型').length ?
-          default_type.map((item) => {
+    'useType' () {
+      this.headers.fusetype = this.useType[0] ? this.useType[0] : ''
+    },
+    'defname' () {
+      this.headers.defname = this.defname
+    }
+  },
+  computed: {
+    foptions () {
+      let default_type = ['档案信息', '发卡售气', '卡表收费', '物联网表收费',
+        '机表收费', '表具停用', '表具启用', '换表&清零', '其他补气', '补气购气',
+        '预存收费', '调价补差', '黑名单', '补卡', '限购', '销户', '过户']
+      return !this.$appdata.getParam('附件使用类型') || !this.$appdata.getParam('附件使用类型').length
+          ? default_type.map((item) => {
             return {label: item, value: item}
           }) : this.$appdata.getParam('附件使用类型')
-      },
-    },
-    events: {
-      onFileUpload: function (file, res) {
-        console.log("上传完毕",res)
-        this.$dispatch("resid",res.id)
-        this.headers.fremarks=''
-        this.close()
-      }
+    }
+  },
+  events: {
+    onFileUpload: function (file, res) {
+      console.log('上传完毕', res)
+      this.$dispatch('resid', res.id)
+      this.headers.fremarks = ''
+      this.close()
     }
   }
+}
 </script>
 <style scoped>
 

package/src/plugins/CardService.js

@@ -694,7 +694,7 @@ let sendCardSaleGasGenremanent = async function (model, row) {
       let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
         resolveMsg: null,
         rejectMsg: '开户卡服务错误'
-      },80000)
+      }, 80000)
       if (!cardParams || ((model.f_pregas > model.f_remanent_gas) && !result) || cardRes.data.Err || cardRes.data.Exception) {
         // 写卡异常
         // 数据回滚操作
@@ -801,7 +801,7 @@ let resetsendCardSaleGasGen = async function (model, row) {
       let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
         resolveMsg: null,
         rejectMsg: '重开户卡服务错误'
-      },80000)
+      }, 80000)
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
         // 写卡异常
         // 数据回滚操作
@@ -910,7 +910,7 @@ let sendCardSaleGasGen = async function (model, row) {
       let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
         resolveMsg: null,
         rejectMsg: '开户卡服务错误'
-      },80000)
+      }, 80000)
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
         // 写卡异常
         // 数据回滚操作
@@ -1119,7 +1119,7 @@ let replaceCardGenJB = function * (model, row) {
       let cardRes = yield co(Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
         resolveMsg: null,
         rejectMsg: '补卡卡服务错误'
-      },80000))
+      }, 80000))
       // 卡服务写卡异常，业务逻辑回滚
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
         Vue.$showAlert('机表补卡失败!!', 'danger', 0)
@@ -1207,7 +1207,7 @@ let replaceXq = function * (model, row) {
     let cardRes = yield co(Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
       resolveMsg: null,
       rejectMsg: '擦虚气服务错误'
-    },80000))
+    }, 80000))
     if (cardRes.data.Err || cardRes.data.Exception) {
       return {status: 1}
     } else {
@@ -1293,7 +1293,7 @@ let replaceCardGen = function * (model, row, allot) {
       let cardRes = yield co(Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
         resolveMsg: null,
         rejectMsg: '补卡卡服务错误'
-      },80000))
+      }, 80000))
       // 卡服务写卡异常，业务逻辑回滚
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
         Vue.$showAlert('补卡失败!!', 'danger', 0)
@@ -1427,14 +1427,14 @@ let offlineWriteGen = async function (row) {
         param.kzt = result.data.ispick === '未过表' && result.data.lastsell_oper === '发卡售气' ? '0' : '1'
         param.cs = row.cardInfo.Times + 1
         param.bkcs = param.bkcs + 1
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', param, {resolveMsg: null, rejectMsg: '写卡失败'},80000)
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', param, {resolveMsg: null, rejectMsg: '写卡失败'}, 80000)
       } else if (row.states === '换表') {
         param.kzt = '0'
         param.bkcs = param.bkcs + 1
         param.cs = 1
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', param, {resolveMsg: null, rejectMsg: '写卡失败'},80000)
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', param, {resolveMsg: null, rejectMsg: '写卡失败'}, 80000)
       } else {
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', param, {resolveMsg: null, rejectMsg: '写卡失败'},80000)
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', param, {resolveMsg: null, rejectMsg: '写卡失败'}, 80000)
       }
       if (!cardParams || cardRes.data.Err || cardRes.data.Exception) {
         let sql = `update t_sellinggas set
@@ -1710,23 +1710,23 @@ let marginGen = async function (model, row) {
         params2.kzt = result.data.ispick === '未过表' && result.data.lastsell_oper === '发卡售气' ? '0' : '1'
         cardparam = JSON.stringify(params2)
         cardpost = 'WriteNewCard'
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params2, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params2, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
       } else if (result.data.last_oper === '换表') {
         console.log('我走的是写新卡换表')
         cardparam = JSON.stringify(params3)
         cardpost = 'WriteNewCard'
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params3, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params3, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
       } else if (result.data.last_oper === '换表补气') {
         // 累购金额需要将上次购气金额加上
         console.log('我走的是正常的收费', params)
         cardparam = JSON.stringify(params)
         cardpost = 'WriteGasCard'
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
       } else {
         console.log('我走的是正常的收费', params)
         cardparam = JSON.stringify(params)
         cardpost = 'WriteGasCard'
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
       }
       console.log('卡表收费返回写卡参数值', cardRes)
       // 卡服务写卡异常，业务逻辑回滚
@@ -1801,7 +1801,7 @@ let sellgasGen = async function (model, row) {
     if (JSON.parse(cardState.data).state === 1) {
       // 将卡上次数写入数据库
       if (!(row.f_hascard == null) && !(row.f_share_times == null) && row.f_hascard === '是' && row.f_share_times === '是') {
-        row.cardInfo.Times = row.cardInfo.Times ? row.cardInfo.Times : row.f_times
+        row.cardInfo.Times = row.f_times
         model.f_times = row.f_times + 1
       } else {
         model.f_times = row.cardInfo.Times + 1
@@ -1907,23 +1907,23 @@ let sellgasGen = async function (model, row) {
         params2.kzt = result.data.ispick === '未过表' && result.data.lastsell_oper === '发卡售气' ? '0' : '1'
         cardparam = JSON.stringify(params2)
         cardpost = 'WriteNewCard'
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params2, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params2, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
       } else if (result.data.last_oper === '换表') {
         console.log('我走的是写新卡换表')
         cardparam = JSON.stringify(params3)
         cardpost = 'WriteNewCard'
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params3, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params3, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
       } else if (result.data.last_oper === '换表补气') {
         // 累购金额需要将上次购气金额加上
         console.log('我走的是正常的收费', params)
         cardparam = JSON.stringify(params)
         cardpost = 'WriteGasCard'
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
       } else {
         console.log('我走的是正常的收费', params)
         cardparam = JSON.stringify(params)
         cardpost = 'WriteGasCard'
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
       }
       console.log('卡表收费返回写卡参数值', cardRes)
       // 卡服务写卡异常，业务逻辑回滚

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Mon Dec 30 14:38:17 CST 2024
-gradle.version=5.2.1