Skip to content

肖康 / cloudSystem

Go to a project
Commit 3209df9b by 肖康
Options

x

parent 3c135a39
Expand all
Inline Side-by-side
Showing with 45 additions and 9 deletions
src/main.js
...@@ -78,6 +78,12 @@ axios.interceptors.request.use((config) => { ...@@ -78,6 +78,12 @@ axios.interceptors.request.use((config) => {
axios.interceptors.response.use(res => { axios.interceptors.response.use(res => {
hideLoading(); hideLoading();
if(res.data.err_code==101){
//token验证失败
var path_=window.location.hash
path_=path_.substr(1)
window.location.href = '/#/login?referer=' + encodeURI(path_);
}
return res.data; return res.data;
}, error => { }, error => {
// Message('网络出现问题,请检查网络'); // Message('网络出现问题,请检查网络');
...@@ -95,7 +101,9 @@ router.beforeEach((to, from, next) => { ...@@ -95,7 +101,9 @@ router.beforeEach((to, from, next) => {
} else { } else {
let token = Util.getCookie('token') || ''; let token = Util.getCookie('token') || '';
if (!token) { if (!token) {
window.location.href = '/#/login?referer=' + encodeURI(to.path); var path_=window.location.hash
path_=path_.substr(1)
window.location.href = '/#/login?referer=' + encodeURI(path_);
history.go(0); history.go(0);
} else { } else {
next(); next();
......
src/views/List/inquireDetail.vue
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange"> <el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed label="操作" width="108" align="center" v-if="'show'"> <el-table-column fixed label="操作" width="108" align="center" v-if="'show'">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="dcg" @click="handle(scope.$index, scope.row)">确认</span> <span class="dcg" :class="{'disabled':scope.row.disabled}" @click="handle(scope.$index, scope.row)">确认</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed prop="goods_name" label="型号" width="180"></el-table-column> <el-table-column fixed prop="goods_name" label="型号" width="180"></el-table-column>
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
<el-table-column fixed label="操作" width="108" align="center" v-if="'show'"> <el-table-column fixed label="操作" width="108" align="center" v-if="'show'">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <span class="dcg disabled" @click="handle(scope.$index, scope.row)">确认</span> --> <!-- <span class="dcg disabled" @click="handle(scope.$index, scope.row)">确认</span> -->
<span class="dcg " @click="handle(scope.$index, scope.row)">确认</span> <span class="dcg " :class="{'disabled':scope.row.disabled}" @click="handle(scope.$index, scope.row)">确认</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goods_name" label="报价型号" width="200"></el-table-column> <el-table-column prop="goods_name" label="报价型号" width="200"></el-table-column>
...@@ -419,6 +419,11 @@ ...@@ -419,6 +419,11 @@
if (res.err_code === 0) { if (res.err_code === 0) {
this.tableData = res.data.list || []; this.tableData = res.data.list || [];
this.total = Number(res.data.count) || 0; this.total = Number(res.data.count) || 0;
var arr_=this.tableData,id_arr=[]
for(var i=0;i<arr_.length;i++){
id_arr.push(arr_[i].id)
}
this.checkBind(id_arr.join(","))
} else { } else {
Message(res.err_msg); Message(res.err_msg);
} }
...@@ -431,7 +436,27 @@ ...@@ -431,7 +436,27 @@
pin_obj_ids:ids pin_obj_ids:ids
}).then(res => { }).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
console.log(res.data.bind_ids) if(res.data&&res.data.bind_ids&&res.data.bind_ids.length>0){
var arr_=this.active == 1?this.historyList:this.tableData
for(var i=0;i<arr_.length;i++){
if(res.data.bind_ids.indexOf(String(arr_[i].id))!=-1){
if(this.active == 1){
this.historyList[i].disabled=true
}else{
this.tableData[i].disabled=true
}
}else{
if(this.active == 1){
this.historyList[i].disabled=false
}else{
this.tableData[i].disabled=false
}
}
}
}
} }
}) })
}, },
...@@ -689,7 +714,10 @@ ...@@ -689,7 +714,10 @@
}) })
}, },
handle(index, row) { handle(index, row) {
if(row.disabled){
Message('已绑定,不能重复操作')
return
}
this.currentDataId=row.id this.currentDataId=row.id
this.title = this.active == 1 ? '确认-历史报价' : '确认-匹配库存'; this.title = this.active == 1 ? '确认-历史报价' : '确认-匹配库存';
this.dialogVisible = true; this.dialogVisible = true;
......
src/views/User/login.vue
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</div> </div>
<p class="text"> <p class="text">
<span class="error">{{errror_text}}</span> <span class="error">{{errror_text}}</span>
<a href="javascript:;">忘记密码</a> <a href="javascript:;" style="visibility:hidden;">忘记密码</a>
</p> </p>
<a href="javascript:;" class="btn-submit" :class="active ? 'active':''" @click="submit()" :loading="true">登录</a> <a href="javascript:;" class="btn-submit" :class="active ? 'active':''" @click="submit()" :loading="true">登录</a>
</form> </form>
......
view/app.2f73f4b9cacc6cf18ff0.js → view/app.53edfb7dbd69dc18b64f.js
...@@ -1197,7 +1197,7 @@ eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n ...@@ -1197,7 +1197,7 @@ eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
eval("\n\nvar _interopRequireDefault = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/interopRequireDefault */ \"./node_modules/@babel/runtime/helpers/interopRequireDefault.js\").default;\n\nvar _vue = _interopRequireDefault(__webpack_require__(/*! vue */ \"./node_modules/vue/dist/vue.runtime.esm.js\"));\n\nvar _App = _interopRequireDefault(__webpack_require__(/*! ./App.vue */ \"./src/App.vue\"));\n\nvar _router = _interopRequireDefault(__webpack_require__(/*! ./router */ \"./src/router/index.js\"));\n\nvar _filters = _interopRequireDefault(__webpack_require__(/*! ./filters */ \"./src/filters/index.js\"));\n\nvar _directive = _interopRequireDefault(__webpack_require__(/*! ./directive */ \"./src/directive/index.js\"));\n\nvar _index = __webpack_require__(/*! ./ajax/index.js */ \"./src/ajax/index.js\");\n\nvar _axios = _interopRequireDefault(__webpack_require__(/*! axios */ \"./node_modules/axios/index.js\"));\n\nvar _loading = __webpack_require__(/*! ./ajax/loading */ \"./src/ajax/loading.js\");\n\nvar _tool = _interopRequireDefault(__webpack_require__(/*! ./tool */ \"./src/tool/index.js\"));\n\n__webpack_require__(/*! @/assets/css/public/common.min.css */ \"./src/assets/css/public/common.min.css\");\n\n__webpack_require__(/*! @/assets/css/font/iconfont.css */ \"./src/assets/css/font/iconfont.css\");\n\n//本地环境开启提示信息\n_vue.default.config.productionTip = false; //加载全局样式\n\n//加载过滤器\nObject.keys(_filters.default).forEach(key => _vue.default.filter(key, _filters.default[key])); //加载自定义指令\n\n_vue.default.use(_directive.default); //处理顶部导航TAB\n\n\n_router.default.afterEach((to, from, next) => {\n if (to.path == \"/\" || to.path == \"/login\" || to.path == '/notfound') {\n return;\n }\n\n let tabOldArr = sessionStorage.getItem('tabs');\n let tabOldJson;\n let tabNewJson = [];\n\n if (tabOldArr) {\n tabOldJson = JSON.parse(tabOldArr);\n\n for (var i = 0; i < tabOldJson.length; i++) {\n tabNewJson.push(JSON.stringify(tabOldJson[i]));\n }\n\n if (tabNewJson.indexOf(JSON.stringify({\n path: to.path,\n title: to.meta.title,\n query: to.query\n })) == -1) {\n tabOldJson.push({\n path: to.path,\n title: to.meta.title,\n query: to.query\n });\n }\n } else {\n tabOldJson = [{\n path: to.path,\n title: to.meta.title,\n query: to.query\n }];\n }\n\n if (tabOldJson) {\n sessionStorage.setItem('tabs', JSON.stringify(tabOldJson));\n }\n});\n\n_axios.default.interceptors.request.use(config => {\n if (config.loading) {\n (0, _loading.showLoading)();\n }\n\n return config;\n}, err => {\n return Promise.reject(err);\n});\n\n_axios.default.interceptors.response.use(res => {\n (0, _loading.hideLoading)();\n return res.data;\n}, error => {\n // Message('网络出现问题,请检查网络');\n (0, _loading.hideLoading)();\n return Promise.reject(new Error(error));\n}); //挂载到VUE原型上封装后的http请求\n\n\n_vue.default.prototype.$http = _index.http; //路由页面回跳处理 mate里面参数 back：true 开启登录态回跳\n\n_router.default.beforeEach((to, from, next) => {\n if (to.path == \"/login\" || to.path == '/notfound') {\n next();\n } else {\n let token = _tool.default.getCookie('token') || '';\n\n if (!token) {\n window.location.href = '/#/login?referer=' + encodeURI(to.path);\n history.go(0);\n } else {\n next();\n }\n }\n});\n\nnew _vue.default({\n router: _router.default,\n render: h => h(_App.default)\n}).$mount(\"#app\");\n\n//# sourceURL=webpack:///./src/main.js?"); eval("\n\nvar _interopRequireDefault = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/interopRequireDefault */ \"./node_modules/@babel/runtime/helpers/interopRequireDefault.js\").default;\n\nvar _vue = _interopRequireDefault(__webpack_require__(/*! vue */ \"./node_modules/vue/dist/vue.runtime.esm.js\"));\n\nvar _App = _interopRequireDefault(__webpack_require__(/*! ./App.vue */ \"./src/App.vue\"));\n\nvar _router = _interopRequireDefault(__webpack_require__(/*! ./router */ \"./src/router/index.js\"));\n\nvar _filters = _interopRequireDefault(__webpack_require__(/*! ./filters */ \"./src/filters/index.js\"));\n\nvar _directive = _interopRequireDefault(__webpack_require__(/*! ./directive */ \"./src/directive/index.js\"));\n\nvar _index = __webpack_require__(/*! ./ajax/index.js */ \"./src/ajax/index.js\");\n\nvar _axios = _interopRequireDefault(__webpack_require__(/*! axios */ \"./node_modules/axios/index.js\"));\n\nvar _loading = __webpack_require__(/*! ./ajax/loading */ \"./src/ajax/loading.js\");\n\nvar _tool = _interopRequireDefault(__webpack_require__(/*! ./tool */ \"./src/tool/index.js\"));\n\n__webpack_require__(/*! @/assets/css/public/common.min.css */ \"./src/assets/css/public/common.min.css\");\n\n__webpack_require__(/*! @/assets/css/font/iconfont.css */ \"./src/assets/css/font/iconfont.css\");\n\n//本地环境开启提示信息\n_vue.default.config.productionTip = false; //加载全局样式\n\n//加载过滤器\nObject.keys(_filters.default).forEach(key => _vue.default.filter(key, _filters.default[key])); //加载自定义指令\n\n_vue.default.use(_directive.default); //处理顶部导航TAB\n\n\n_router.default.afterEach((to, from, next) => {\n if (to.path == \"/\" || to.path == \"/login\" || to.path == '/notfound') {\n return;\n }\n\n let tabOldArr = sessionStorage.getItem('tabs');\n let tabOldJson;\n let tabNewJson = [];\n\n if (tabOldArr) {\n tabOldJson = JSON.parse(tabOldArr);\n\n for (var i = 0; i < tabOldJson.length; i++) {\n tabNewJson.push(JSON.stringify(tabOldJson[i]));\n }\n\n if (tabNewJson.indexOf(JSON.stringify({\n path: to.path,\n title: to.meta.title,\n query: to.query\n })) == -1) {\n tabOldJson.push({\n path: to.path,\n title: to.meta.title,\n query: to.query\n });\n }\n } else {\n tabOldJson = [{\n path: to.path,\n title: to.meta.title,\n query: to.query\n }];\n }\n\n if (tabOldJson) {\n sessionStorage.setItem('tabs', JSON.stringify(tabOldJson));\n }\n});\n\n_axios.default.interceptors.request.use(config => {\n if (config.loading) {\n (0, _loading.showLoading)();\n }\n\n return config;\n}, err => {\n return Promise.reject(err);\n});\n\n_axios.default.interceptors.response.use(res => {\n (0, _loading.hideLoading)();\n\n if (res.data.err_code == 101) {\n //token验证失败\n var path_ = window.location.hash;\n path_ = path_.substr(1);\n window.location.href = '/#/login?referer=' + encodeURI(path_);\n }\n\n return res.data;\n}, error => {\n // Message('网络出现问题,请检查网络');\n (0, _loading.hideLoading)();\n return Promise.reject(new Error(error));\n}); //挂载到VUE原型上封装后的http请求\n\n\n_vue.default.prototype.$http = _index.http; //路由页面回跳处理 mate里面参数 back：true 开启登录态回跳\n\n_router.default.beforeEach((to, from, next) => {\n if (to.path == \"/login\" || to.path == '/notfound') {\n next();\n } else {\n let token = _tool.default.getCookie('token') || '';\n\n if (!token) {\n var path_ = window.location.hash;\n path_ = path_.substr(1);\n window.location.href = '/#/login?referer=' + encodeURI(path_);\n history.go(0);\n } else {\n next();\n }\n }\n});\n\nnew _vue.default({\n router: _router.default,\n render: h => h(_App.default)\n}).$mount(\"#app\");\n\n//# sourceURL=webpack:///./src/main.js?");
/***/ }), /***/ }),
......
view/index.html
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="http://yunxin.liexindev.net/favicon.ico"> <link rel="icon" href="http://yunxin.liexindev.net/favicon.ico">
<title>cloudsystem</title> <title>cloudsystem</title>
<link href="http://yunxin.liexindev.net/js/0.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/1.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/10.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/11.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/12.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/13.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/14.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/15.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/16.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/17.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/18.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/19.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/2.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/20.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/21.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/22.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/23.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/24.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/25.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/3.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/4.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/5.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/6.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/7.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/8.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/9.js" rel="prefetch"><link href="http://yunxin.liexindev.net/app.2f73f4b9cacc6cf18ff0.js" rel="preload" as="script"></head> <link href="http://yunxin.liexindev.net/js/0.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/1.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/10.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/11.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/12.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/13.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/14.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/15.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/16.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/17.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/18.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/19.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/2.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/20.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/21.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/22.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/23.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/24.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/25.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/3.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/4.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/5.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/6.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/7.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/8.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/9.js" rel="prefetch"><link href="http://yunxin.liexindev.net/app.53edfb7dbd69dc18b64f.js" rel="preload" as="script"></head>
<body> <body>
<noscript> <noscript>
<strong>网络异常,请稍后加载</strong> <strong>网络异常,请稍后加载</strong>
</noscript> </noscript>
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
<script type="text/javascript" src="http://yunxin.liexindev.net/app.2f73f4b9cacc6cf18ff0.js"></script></body> <script type="text/javascript" src="http://yunxin.liexindev.net/app.53edfb7dbd69dc18b64f.js"></script></body>
</html> </html>
view/js/12.js
This diff could not be displayed because it is too large.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment