sale-client 4.2.8 → 4.2.10

package/src/filiale/jinhong/plugins/LoadParams.js

@@ -1,124 +1,124 @@
-import Vue from 'vue'
-import {HttpResetClass} from 'vue-client'
-import GetSaleParam from './GetSaleParams'
-
-let loadParamGen = async function (f_filialeid) {
-  let http = new HttpResetClass()
-  if (GetSaleParam.gasbrands.length === 0 && GetSaleParam.prices.length === 0 && GetSaleParam.adjustables.length === 0) {
-    let getParams = await http.load('POST', 'api/af-revenue/logic/getSaleInitData', {data: {f_orgid: f_filialeid || Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
-    if (getParams.data) {
-      LoadParams.organizeData(getParams.data)
-    }
-  } else {
-    let validate = LoadParams.isReset(f_filialeid)
-    console.log('验证是否需要重新加载', validate)
-    if (validate) {
-      GetSaleParam.gasbrands = []
-      GetSaleParam.prices = []
-      GetSaleParam.adjustables = []
-      let getParams = await http.load('POST', 'api/af-revenue/logic/getSaleInitData', {data: {f_orgid: f_filialeid || Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
-      if (getParams.data) {
-        LoadParams.organizeData(getParams.data)
-      }
-    }
-  }
-}
-
-let loadMeterBookGen = async function (f_filialeid) {
-  let http = new HttpResetClass()
-  if (GetSaleParam.meterbooks.length === 0) {
-    let getMeterBooks = await http.load('POST', 'api/af-revenue/logic/sale_getMeterBooksData', {data: {f_orgid: f_filialeid || Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
-    if (getMeterBooks.data) {
-      LoadParams.organizeBooksData(getMeterBooks.data)
-    }
-  }
-}
-
-let LoadParams = {
-
-  install (Vue, options) {
-    // 给vue增添对话框显示方法
-    Vue.LoadParams = Vue.prototype.$LoadParams = LoadParams
-  },
-
-  async loadParam () {
-    await loadParamGen(null)
-  },
-  async loadParam (f_filialeid) {
-    await loadParamGen(f_filialeid)
-  },
-
-  // 加载抄表册
-  async loadMeterBook (f_filialeid) {
-    await loadMeterBookGen(f_filialeid)
-  },
-
-  // 开启卡监听
-  organizeData (fromSystem) {
-    console.log('接受System中返回的参数进行组织', fromSystem)
-    fromSystem.gasbrands.forEach((item, index) => {
-      GetSaleParam.gasbrands[index] = {}
-      GetSaleParam.gasbrands[index].label = item.f_meter_brand
-      let gasmodel = []
-      item.gasmodel.forEach((item, index) => {
-        gasmodel[index] = {}
-        gasmodel[index].label = item.f_meter_style + item.f_type
-        gasmodel[index].value = item
-      })
-      item.gasmodel = gasmodel
-      GetSaleParam.gasbrands[index].value = item
-    })
-
-    fromSystem.adjustable.forEach((item, index) => {
-      GetSaleParam.adjustables[index] = {}
-      GetSaleParam.adjustables[index].label = item.f_adjustable_name
-      GetSaleParam.adjustables[index].value = item
-    })
-    GetSaleParam.prices = [...[], ...fromSystem.price]
-  },
-
-  organizeBooksData (fromSystem) {
-    // 对抄表册按名称进行字母排序
-    const sortedMeterbooks = fromSystem.meterbooks.sort((a, b) => {
-      return a.f_book_name.localeCompare(b.f_book_name, 'zh-CN')
-    })
-    sortedMeterbooks.forEach((item, index) => {
-      GetSaleParam.meterbooks[index] = {}
-      GetSaleParam.meterbooks[index].label = item.f_book_name
-      GetSaleParam.meterbooks[index].value = item.id
-    })
-
-    // 对抄表册编号单独进行字母排序
-    const bookCodesData = fromSystem.meterbooks.filter(item => item.f_book_code)
-    const sortedBookCodes = bookCodesData.sort((a, b) => {
-      return a.f_book_code.localeCompare(b.f_book_code, 'zh-CN')
-    })
-
-    sortedBookCodes.forEach((item, index) => {
-      GetSaleParam.bookcodes[index] = {}
-      GetSaleParam.bookcodes[index].label = item.f_book_code
-      GetSaleParam.bookcodes[index].value = item.id
-    })
-  },
-
-  isReset (val) {
-    if (GetSaleParam.gasbrands.length > 0) {
-      if (GetSaleParam.gasbrands[0].value.f_using_orgid !== val) {
-        return true
-      }
-    }
-    if (GetSaleParam.prices.length > 0) {
-      if (GetSaleParam.prices[0].f_filialeid !== val) {
-        return true
-      }
-    }
-    if (GetSaleParam.adjustables.length > 0) {
-      if (GetSaleParam.adjustables[0].value.f_filialeid !== val) {
-        return true
-      }
-    }
-  }
-
-}
-
-export default LoadParams
+import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+import GetSaleParam from './GetSaleParams'
+
+let loadParamGen = async function (f_filialeid) {
+  let http = new HttpResetClass()
+  if (GetSaleParam.gasbrands.length === 0 && GetSaleParam.prices.length === 0 && GetSaleParam.adjustables.length === 0) {
+    let getParams = await http.load('POST', 'api/af-revenue/logic/getSaleInitData', {data: {f_orgid: f_filialeid || Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
+    if (getParams.data) {
+      LoadParams.organizeData(getParams.data)
+    }
+  } else {
+    let validate = LoadParams.isReset(f_filialeid)
+    console.log('验证是否需要重新加载', validate)
+    if (validate) {
+      GetSaleParam.gasbrands = []
+      GetSaleParam.prices = []
+      GetSaleParam.adjustables = []
+      let getParams = await http.load('POST', 'api/af-revenue/logic/getSaleInitData', {data: {f_orgid: f_filialeid || Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
+      if (getParams.data) {
+        LoadParams.organizeData(getParams.data)
+      }
+    }
+  }
+}
+
+let loadMeterBookGen = async function (f_filialeid) {
+  let http = new HttpResetClass()
+  if (GetSaleParam.meterbooks.length === 0) {
+    let getMeterBooks = await http.load('POST', 'api/af-revenue/logic/sale_getMeterBooksData', {data: {f_orgid: f_filialeid || Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
+    if (getMeterBooks.data) {
+      LoadParams.organizeBooksData(getMeterBooks.data)
+    }
+  }
+}
+
+let LoadParams = {
+
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.LoadParams = Vue.prototype.$LoadParams = LoadParams
+  },
+
+  async loadParam () {
+    await loadParamGen(null)
+  },
+  async loadParam (f_filialeid) {
+    await loadParamGen(f_filialeid)
+  },
+
+  // 加载抄表册
+  async loadMeterBook (f_filialeid) {
+    await loadMeterBookGen(f_filialeid)
+  },
+
+  // 开启卡监听
+  organizeData (fromSystem) {
+    console.log('接受System中返回的参数进行组织', fromSystem)
+    fromSystem.gasbrands.forEach((item, index) => {
+      GetSaleParam.gasbrands[index] = {}
+      GetSaleParam.gasbrands[index].label = item.f_meter_brand
+      let gasmodel = []
+      item.gasmodel.forEach((item, index) => {
+        gasmodel[index] = {}
+        gasmodel[index].label = item.f_meter_style + item.f_type
+        gasmodel[index].value = item
+      })
+      item.gasmodel = gasmodel
+      GetSaleParam.gasbrands[index].value = item
+    })
+
+    fromSystem.adjustable.forEach((item, index) => {
+      GetSaleParam.adjustables[index] = {}
+      GetSaleParam.adjustables[index].label = item.f_adjustable_name
+      GetSaleParam.adjustables[index].value = item
+    })
+    GetSaleParam.prices = [...[], ...fromSystem.price]
+  },
+
+  organizeBooksData (fromSystem) {
+    // 对抄表册按名称进行字母排序
+    const sortedMeterbooks = fromSystem.meterbooks.sort((a, b) => {
+      return a.f_book_name.localeCompare(b.f_book_name, 'zh-CN')
+    })
+    sortedMeterbooks.forEach((item, index) => {
+      GetSaleParam.meterbooks[index] = {}
+      GetSaleParam.meterbooks[index].label = item.f_book_name
+      GetSaleParam.meterbooks[index].value = item.id
+    })
+
+    // 对抄表册编号单独进行字母排序
+    const bookCodesData = fromSystem.meterbooks.filter(item => item.f_book_code)
+    const sortedBookCodes = bookCodesData.sort((a, b) => {
+      return a.f_book_code.localeCompare(b.f_book_code, 'zh-CN')
+    })
+
+    sortedBookCodes.forEach((item, index) => {
+      GetSaleParam.bookcodes[index] = {}
+      GetSaleParam.bookcodes[index].label = item.f_book_code
+      GetSaleParam.bookcodes[index].value = item.id
+    })
+  },
+
+  isReset (val) {
+    if (GetSaleParam.gasbrands.length > 0) {
+      if (GetSaleParam.gasbrands[0].value.f_using_orgid !== val) {
+        return true
+      }
+    }
+    if (GetSaleParam.prices.length > 0) {
+      if (GetSaleParam.prices[0].f_filialeid !== val) {
+        return true
+      }
+    }
+    if (GetSaleParam.adjustables.length > 0) {
+      if (GetSaleParam.adjustables[0].value.f_filialeid !== val) {
+        return true
+      }
+    }
+  }
+
+}
+
+export default LoadParams

package/src/filiale/yuncheng/IndustryCommerceHandAudit.vue

@@ -743,8 +743,6 @@
         let reviewReason = reason !== undefined ? reason : this.reasonText
         let handplan = {
           id: id,
-          f_oughtamount: 0,
-          f_tablebase: 0,
           f_input_date: null,
           f_meter_state: '未抄表',
           f_audit_state: '审核不通过',

package/src/filiale/yuncheng/UploadIdCard.vue

@@ -60,16 +60,16 @@
 </template>
 <script>
 import { HttpResetClass } from 'vue-client'
-import Vue from "vue";
+import Vue from 'vue'
 
 export default {
-  title: "附件",
-  props: ['blodid', 'isremark', 'isusetype','takeimg','defname','isupload','fusetype','cols'],
-  data() {
+  title: '附件',
+  props: ['blodid', 'isremark', 'isusetype', 'takeimg', 'defname', 'isupload', 'fusetype', 'cols'],
+  data () {
     return {
       isDelete: '1', // 删除按钮，可以进行控制（权限等）
       fileInfoData: [], // 数据库存储的文件记录对象数组
-      headers: {'username': this.$login.f.name, 'blodid': '', 'fremarks': '','defname':'','fusetype':this.fusetype?this.fusetype:''}, // 调用rs/file/uploadFile 的参数
+      headers: {'username': this.$login.f.name, 'blodid': '', 'fremarks': '', 'defname': '', 'fusetype': this.fusetype ? this.fusetype : ''}, // 调用rs/file/uploadFile 的参数
       showUpload: false, // 上传模态框控制
       showhighmeter: false, // 高拍仪组件控制
       useType: '', // 使用类型
@@ -78,49 +78,47 @@ export default {
   },
   methods: {
     // 查询按钮事件
-    delet(index, row) {
+    delet (index, row) {
       this.$resetdelete('api/af-revenue/entity/t_files', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
         this.fileInfoData.splice(index, 1)
       })
     },
-    GetRequest() {
-      var url = location.search;
-      var theRequest = new Object();
-      if (url.indexOf("?") != -1) {
-        var str = url.substr(1);
-        let strs = str.split("&");
+    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]);
+          theRequest[strs[i].split('=')[0]] = decodeURIComponent(strs[i].split('=')[1])
         }
       }
-      return theRequest;
+      return theRequest
     },
-    downloadfile(filepath){
-
-      var link = document.createElement('a');
+    downloadfile (filepath) {
+      var link = document.createElement('a')
       // let pathName = "http://" + location.host + filepath;
-      link.href = filepath;
-      link.target='_blank'
-      link.dispatchEvent(new MouseEvent('click'));
+      link.href = filepath
+      link.target = '_blank'
+      link.dispatchEvent(new MouseEvent('click'))
     },
-    upload() {
-
-      if(this.showhighmeter){
-        console.log(this,'测试')
+    upload () {
+      if (this.showhighmeter) {
+        console.log(this, '测试')
         this.$refs.ltgao.closeVideo()
       }
       console.log('测试1')
       this.showhighmeter = !this.showhighmeter
     },
-    async load(self) {
+    async load (self) {
       let condition = `f_blobid= '${self.headers.blodid}' `
-      if(this.fusetype){
+      if (this.fusetype) {
         condition += ` and fusetype='${this.fusetype}'`
       }
       var http = new HttpResetClass()
       let data = {
         tablename: 't_files',
-        condition: condition+` order by f_uploaddate desc `
+        condition: condition + ` order by f_uploaddate desc `
       }
       let getFile = await http.load('POST', 'api/af-revenue/sql/saleSingleTable', {data: data}, {
         warnMsg: null,
@@ -129,23 +127,22 @@ export default {
 
       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)
+        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)
-        getFile.data[i].f_downloadURL = location.protocol + "//" + location.host + "/" + URL
+        let URL = temp.substring(temp.lastIndexOf(':\\') + 2)
+        getFile.data[i].f_downloadURL = location.protocol + '//' + location.host + '/' + URL
       }
       self.fileInfoData = []
       self.fileInfoData = getFile.data
     },
     // 数据库时间格式化
-    formatdate(val) {
-      //20180914151603   :    2018-09-14 15:16:03
-      if (val.length != 14)
-        return
+    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)
@@ -155,60 +152,60 @@ export default {
       return year + '-' + month + '-' + day + ' ' + hour + ':' + min + ':' + second
     },
     // 打开文件上传对话框
-    fileUpload() {
+    fileUpload () {
       this.showUpload = true
     },
     // 关闭文件上传对话框
-    close() {
+    close () {
       this.showUpload = false
       // 将选的文件清空
       this.$refs.file.$el.querySelector('input').value = ''
       this.load(this)
     },
-    convertBase64ToBlob(base64String) {
+    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);
+        byteArray[i] = bytes.charCodeAt(i)
       }
       // 生成Blob对象（文件对象）
-      return new Blob([bytesCode], {type: 'image/jpeg'});
+      return new Blob([bytesCode], {type: 'image/jpeg'})
     },
-    newPhoto(Imgbase64) {
+    newPhoto (Imgbase64) {
       let form = new FormData()
       let xhr = new XMLHttpRequest()
-      let formDataBoundary = "----WebkitFormBoundary" + "GaoPaiYi";
+      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")
+      form.append('file', this.convertBase64ToBlob(Imgbase64), 'GaoPaiYi.jpg')
+      xhr.open('POST', 'api/af-revenue/file/uploadFile')
 
       if (this.headers) {
         for (var header in this.headers) {
           xhr.setRequestHeader(header, encodeURIComponent(this.headers[header]))
         }
       }
-      xhr.send(form)
       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)
     },
-    confirmIdCard (IdCardInfo){
-      let param=IdCardInfo
-      this.showhighmeter=false
-      this.$dispatch('getidinfo',param)
+    confirmIdCard (IdCardInfo) {
+      let param = IdCardInfo
+      this.showhighmeter = false
+      this.$dispatch('getidinfo', param)
     }
   },
-  ready() {
+  ready () {
     this.headers.blodid = this.blodid
     console.log('123222', this.blobid)
     if (this.blodid) {
@@ -216,29 +213,29 @@ export default {
     }
   },
   watch: {
-    'blodid'(val) {
+    'blodid' (val) {
       if (val) {
         console.log('观察blodid', val)
         this.headers.blodid = this.blodid
         this.load(this)
       }
     },
-    'useType'() {
+    'useType' () {
       this.headers.fusetype = this.useType[0] ? this.useType[0] : ''
     },
-    'defname'() {
-      this.headers.defname=this.defname
+    'defname' () {
+      this.headers.defname = this.defname
     }
   },
   computed: {
-    foptions() {
+    foptions () {
       return this.$appdata.getParam('使用类型')
-    },
+    }
   },
   events: {
     onFileUpload: function (file, res) {
-      console.log("上传完毕")
-      this.headers.fremarks=''
+      console.log('上传完毕')
+      this.headers.fremarks = ''
       this.close()
     }
   }

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/ronghao/sale'
+import FilialeSale from './filiale/yuncheng/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'