Home Explore Help
Register Sign In
zhangqi
/
yos_web
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

修复销售预测选日期bug

zhangqiOMG 2 years ago
parent
05dbfa2488
commit
e8caf6db01
8 changed files with 23 additions and 7 deletions
Split View Show Diff Stats
  1. 2 2
      src/HManagement/salesForecastTemplate/modules/add.vue
  2. 2 2
      src/HManagement/salesForecastTemplate/modules/edit.vue
  3. 2 0
      src/main.js
  4. 5 0
      src/public-path.js
  5. 1 1
      src/router/index.js
  6. 4 0
      src/views/login/login.vue
  7. 6 1
      vue.config.js
  8. 1 1
      yos/index.html

+ 2 - 2
src/HManagement/salesForecastTemplate/modules/add.vue
View File 

@@ -15,7 +15,7 @@
 
               style="width:100%"
 
               v-model="form.begdate"
 
               type="date"
 
-              value-format="yyyy-mm-dd"
 
+              value-format="yyyy-MM-dd"
 
               placeholder="选择日期">
 
             </el-date-picker>
 
           </el-form-item>
 
@@ -26,7 +26,7 @@
 
                 style="width:100%"
 
                 v-model="form.enddate"
 
                 type="date"
 
-                value-format="yyyy-mm-dd"
 
+                value-format="yyyy-MM-dd"
 
                 placeholder="选择日期">
 
               </el-date-picker>
 
             </el-form-item>

+ 2 - 2
src/HManagement/salesForecastTemplate/modules/edit.vue
View File 

@@ -15,7 +15,7 @@
 
               style="width:100%"
 
               v-model="form.begdate"
 
               type="date"
 
-              value-format="yyyy-mm-dd"
 
+              value-format="yyyy-MM-dd"
 
               placeholder="选择日期">
 
             </el-date-picker>
 
           </el-form-item>
 
@@ -26,7 +26,7 @@
 
                 style="width:100%"
 
                 v-model="form.enddate"
 
                 type="date"
 
-                value-format="yyyy-mm-dd"
 
+                value-format="yyyy-MM-dd"
 
                 placeholder="选择日期">
 
               </el-date-picker>
 
             </el-form-item>

+ 2 - 0
src/main.js
View File 

@@ -1,3 +1,5 @@
 
+import './public-path'
 
+
 
 import Vue from 'vue';
 
 import axios from "axios";

+ 5 - 0
src/public-path.js
View File 

@@ -0,0 +1,5 @@
 
+// __MICRO_APP_ENVIRONMENT__和__MICRO_APP_PUBLIC_PATH__是由micro-app注入的全局变量
 
+if (window.__MICRO_APP_ENVIRONMENT__) {
 
+  // eslint-disable-next-line
 
+  __webpack_public_path__ = window.__MICRO_APP_PUBLIC_PATH__
 
+}

+ 1 - 1
src/router/index.js
View File 

@@ -63,7 +63,7 @@ let routes = [
 
 routes[2].children = [...routes[2].children,...HManagement,...SManagement]
 
 
 const router = new VueRouter({
 
-  // mode: 'hhistory',
 
+  mode: 'hash',
 
   base: process.env.BASE_URL,
 
   routes,
 
 });

+ 4 - 0
src/views/login/login.vue
View File 

@@ -98,6 +98,10 @@ export default {
 
       this.loginForm.phonenumber = localStorage.getItem('phonenumber')
 
       this.checked = true
 
     }
 
+    // const data = window.microApp.getData()
 
+    // if (data) {
 
+    //   sessionStorage.setItem('account_list',JSON.stringify(data))
 
+    // }
 
   },
 
   methods:{
 
     //验证码请求

+ 6 - 1
vue.config.js
View File 

@@ -5,6 +5,9 @@ module.exports = {
 
     productionSourceMap:false,
 
     publicPath: './',
 
     devServer: {
 
+      headers: {
 
+        'Access-Control-Allow-Origin': '*',
 
+      },
 
       open: true,
 
       // host: '192.168.4.170',
 
       host: 'localhost',
 
@@ -12,11 +15,13 @@ module.exports = {
 
       proxy: {
 
         '/apis': {
 
           target: 'http://121.37.152.76:8080',  // target host
 
+          // target: 'localhost:8080',  // target host
 
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites
 
           pathRewrite: {
 
               '^/apis': ''  // rewrite path
 
-          }
 
+          },
 
+
 
         },
 
       }
 
     }

+ 1 - 1
yos/index.html
View File 

@@ -1 +1 @@
 
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.0b479049.js"></script><link href="css/app.09f1a246.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.d9087565.js" nomodule></script><script defer="defer" src="js/app-legacy.1b7194d6.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
 
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.2f561cef.js"></script><link href="css/app.09f1a246.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.d9087565.js" nomodule></script><script defer="defer" src="js/app-legacy.0888e071.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>