sale-client 3.5.191 → 3.5.192

package/build/dev-server.js

@@ -6,16 +6,10 @@ const app = express()
 const compiler = webpack(config)
 
 // 自己改了这里不要提交 来回覆盖挺麻烦的
-const [local, server] = ['http://192.168.50.4:8400', 'http://192.168.50.4:8400']
+const [local, server] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
 const port = 8089
 
 const proxyTable = {
-  '/rs/report/hand_bill': {
-    target: 'http://127.0.0.1:8084'
-  },
-  '/rs/sql/open_eticket_JBquery': {
-    target: local
-  },
   '/text': {
     target: local
   },

package/package.json

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

package/src/filiale/gehua/FileManageNew/FileUserFiles.vue

@@ -681,7 +681,7 @@ let loadParamGem = async function (self) {
             this.search()
           })
         },
-        'onFileUpload': function (file, res) {
+        'onFileUpload': async function (file, res) {
           if (this.batchmoneyShow) {
             let param = {
               filepath: res.f_downloadpath,
@@ -700,7 +700,9 @@ let loadParamGem = async function (self) {
           }
 
           if (this.batchMeterShow) {
-            this.iswork = true
+            // this.iswork = true
+            this.$showMessage(`本次预备户批量建档任务已在后台执行请勿重复导入，具体进度稍后可在我的任务中查看！！`)
+            this.batchMeterShow = false
             // 当前上传的是批量导入的档案
             let batchParam = {
               filepath: res.f_downloadpath,
@@ -714,7 +716,7 @@ let loadParamGem = async function (self) {
             let jobParam = {
               f_operatorid: this.$login.f.id,
               total: 0,
-              operator: this.$login.f.orgs +":"+ this.$login.f.deps +":"+  Vue.$login.f.name,
+              operator: this.$login.f.orgs + ":" + this.$login.f.deps + ":" + Vue.$login.f.name,
               jobType: "预备户批量建档"
             }
             let param = {
@@ -723,14 +725,14 @@ let loadParamGem = async function (self) {
             }
             let self = this
             try {
-              axios.post('rs/business/batchRunExcelProgress/filemanage_fileSave_gehua/newPrepareSettleFileImport',
-                    {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
-                      if (res.data) {
-                        self.$showMessage(`本次批量建档共上传${res.data.totalCount}条数据,符合条件的共${res.data.totalsum}条,不符合条件的共${res.data.totalCount -res.data.totalsum}条, 建档成功${res.data.successsum}条,建档失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)
-                        self.iswork = false
+              await axios.post('rs/business/batchRunExcelProgress/filemanage_fileSave_gehua/newPrepareSettleFileImport',
+                {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
+                if (res.data) {
+                  self.$showMessage(`本次批量建档共上传${res.data.totalCount}条数据,符合条件的共${res.data.totalsum}条,不符合条件的共${res.data.totalCount - res.data.totalsum}条, 建档成功${res.data.successsum}条,建档失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)
+                  self.iswork = false
                   // this.$showAlert('导入成功','success',2000)
-                      }
-                    })
+                }
+              })
             } catch (error) {
               if (error.response) {
                 if (error.response.status == 500) {
@@ -746,6 +748,8 @@ let loadParamGem = async function (self) {
                 this.$showAlert(error.message, 'danger', 2000)
               }
               this.iswork = false
+            }finally {
+              this.iswork = false
             }
             this.$refs.file.$el.querySelector('input').value = ''
             this.batchMeterShow = false

package/src/main.js

@@ -11,7 +11,7 @@ Vue.config.silent = true
 
 all()
 system(false)
-sale()
+sale('wuhai')
 address()
 ldap()
 require('system-clients/src/styles/less/bootstrap.less')