Merge remote-tracking branch 'origin/dev2.0' into dev2.0

src/App.vue

@@ -17,3 +17,11 @@ export default  {
     }
 }
 </script>
+<style>
+.width-full{
+  width: 100%;
+}
+.w90-percent{
+  width:90%;
+}
+</style>

src/main.js

@@ -106,7 +106,14 @@ DictData.install();
  */
 
 // 修改 el-dialog 默认点击遮照为不关闭
-Element.Dialog.props.closeOnClickModal.default = false;
+Element.Dialog.props.closeOnClickModal = {type: Boolean, default: false}
+Element.Dialog.props.appendToBody = {type: Boolean, default: true}
+
+Element.Table.props.border = {type: Boolean, default: true}
+Element.Table.props.minHeight = {type: String | Number, default: "250"}
+Element.Table.props.fit = {type: Boolean, default: true}
+Element.TableColumn.props.showOverflowTooltip = {type: Boolean, default: true}
+Element.DatePicker.props.firstDayOfWeek = {type: Number, default: 1}
 
 
 Vue.use(Element, {

src/store/modules/permission.js

@@ -123,11 +123,11 @@ export function filterDynamicRoutes(routes) {
 
 export const loadView = (view) => {
   if (process.env.NODE_ENV === 'development') {
-    return (resolve) => require([`@/views/${view}`], resolve)
+    return (resolve) => require([`@/views/${view}.vue`], resolve)
   } else {
     // 使用 import 实现生产环境的路由懒加载
 //    return () => import(`@/views/${view}`)
-    return (resolve) => require([`@/views/${view}`], resolve)
+    return (resolve) => require([`@/views/${view}.vue`], resolve)
   }
 }
 

src/utils/data.js

@@ -2,3 +2,14 @@ export const mainActionMap = {
   WareHouseIn: '入库',
   WareHouseOut: '出库'
 }
+
+
+/**
+ * 库存对比状态
+ */
+export const stockCompareStatusEnum = {
+  DRAFT: {key: 'DRAFT', value: -1, desc: "草稿"},
+  EXECUTING: {key: 'EXECUTING', value: 1, desc: "对比中"},
+  FINISHED: {key: 'FINISHED', value: 3, desc: "对比完成"},
+  ERROR: {key: 'ERROR', value: 9, desc: "异常"},
+}

src/utils/request.js

@@ -6,6 +6,7 @@ import errorCode from '@/utils/errorCode'
 import {tansParams, blobValidate} from "@/utils/ruoyi";
 import cache from '@/plugins/cache'
 import {saveAs} from 'file-saver'
+import router from "@/router";
 
 let downloadLoadingInstance;
 // 是否显示重新登录
@@ -96,7 +97,11 @@ service.interceptors.response.use((res) => {
         ).then(() => {
           isRelogin.show = false;
           store.dispatch('LogOut').then(() => {
-            location.href = process.env.VUE_APP_CONTEXT_PATH;
+            router.push({
+              path: "/login",
+              query: { redirect: router.currentRoute.fullPath } // 从哪个页面跳转过来
+            });
+            // location.href = process.env.VUE_APP_CONTEXT_PATH;
           })
         }).catch(() => {
           isRelogin.show = false;