diff --git a/src/api/ManufacturingCenter/MaterialAllocation.js b/src/api/ManufacturingCenter/MaterialAllocation.js
index 80a40d46..8b424a2b 100644
--- a/src/api/ManufacturingCenter/MaterialAllocation.js
+++ b/src/api/ManufacturingCenter/MaterialAllocation.js
@@ -40,7 +40,7 @@ export function groupSelect(machineValue) {
})
}
-export function basicPartsData(machine_check, machine, group_check, group, Model_check, ModelValue, pageSize, pageCurrent) {
+export function basicPartsData(machine_check, machine, group_check, group, Model_check, ModelValue, orderName, order) {
return request({
url: '',
method: 'post',
@@ -49,8 +49,8 @@ export function basicPartsData(machine_check, machine, group_check, group, Model
ModularID: router.currentRoute.path,
type: '1',
name: '零件分配查询_查询',
- param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&规格_check=${Model_check}&规格=${ModelValue}`,
- Pagination: pageCurrent + '&' + pageSize
+ param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&规格_check=${Model_check}&规格=${ModelValue}&排序名称=${orderName}&排序顺序=${order}`
+ // Pagination: pageCurrent + '&' + pageSize
}
})
}
diff --git a/src/main.js b/src/main.js
index 5591690f..c3796311 100644
--- a/src/main.js
+++ b/src/main.js
@@ -136,3 +136,8 @@ export function HashTable() {
entry = new Object()
}
}
+import Router from 'vue-router'
+const originalReplace = Router.prototype.replace
+Router.prototype.replace = function replace(location) {
+ return originalReplace.call(this, location).catch(err => err)
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index b77aa112..ac0a42f1 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -38,9 +38,10 @@ const service = axios.create({
service.interceptors.request.use(config => {
if (config.data.name !== '菜单系统模块_用户名密码_查询数据_new2' && config.data.name !== '菜单系统模块_获取角色模块_查询数据') {
const id = Cookies.get('id')
- if (id) {
+ if (id !== 'undefined') {
console.log(id, 123)
} else {
+ console.log(123)
store.dispatch('FedLogOut').then(() => {
location.reload() // 为了重新实例化vue-router对象 避免bug
alert('此账号登录失效，请重新登录')
diff --git a/src/views/Inventory/PickingListApproval/index.vue b/src/views/Inventory/PickingListApproval/index.vue
index a389813d..fe6e0707 100644
--- a/src/views/Inventory/PickingListApproval/index.vue
+++ b/src/views/Inventory/PickingListApproval/index.vue
@@ -37,6 +37,7 @@
已审批
未审批
审批
+ 未通过
@@ -97,11 +98,30 @@
@current-change="handleCurrentChange3"/>
+
+
+
+
+
+
+
+
+
+
+
+
+