浏览代码

11/13 18:00 订单修改提测

mo 4 年之前
父节点
当前提交
4800a0dbf8

+ 18 - 2
src/views/businessManager/orderManager/financeManager.vue

@@ -556,7 +556,6 @@ export default {
     }
   },
   mounted () {
-    console.log(this.orderServerList)
     getEmployeeOrgan().then(res => {
       if (res.code == 200) {
         this.organList = res.data;
@@ -932,7 +931,16 @@ export default {
       load.endLoading()
       if (response.code == 200) {
         this.$message.success('导入成功')
-        this.getList()
+        // this.getList()
+      } else if (response.code == 0) {
+        let str = this.fomatStr(response.msg)
+        this.$alert(str, '导入结果', {
+          confirmButtonText: '确定',
+          dangerouslyUseHTMLString: true,
+          callback: action => {
+            // this.getList()
+          }
+        });
       } else {
         this.$message.error(response.msg)
       }
@@ -941,6 +949,14 @@ export default {
       load.endLoading()
       console.log(err, file, fileList)
     },
+    fomatStr (str) {
+      let arr = str.split(';')
+      let newStr = ''
+      arr.forEach(item => {
+        newStr += `<p>${item}</p>`
+      })
+      return newStr
+    }
   }
 };
 </script>

+ 3 - 3
src/views/businessManager/orderManager/orderAudit/index.vue

@@ -211,9 +211,9 @@ export default {
 
     this.init();
   },
-  // activated () {
-  //   this.init();
-  // },
+  activated () {
+    this.init();
+  },
   methods: {
     init () {
       this.getList()

+ 2 - 2
vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://dyme.utools.club' //test环境
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.30:8080' //邹璇
-let target = 'http://192.168.3.204:8000' //勇哥
-// let target = 'http://dev.dayaedu.com' // 测试服
+// let target = 'http://192.168.3.204:8000' //勇哥
+let target = 'http://dev.dayaedu.com' // 测试服
 // let target = 'http://192.168.3.196' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {