diff --git a/src/api/leger/inspectionstandards.js b/src/api/leger/inspectionstandards.js
index 7ebb892..3f7d0ed 100644
--- a/src/api/leger/inspectionstandards.js
+++ b/src/api/leger/inspectionstandards.js
@@ -42,7 +42,7 @@ export const inspection_add = (row) => {
export const inspection_update = (row) => {
return request({
- url: '/api/inspectionstandards/submit',
+ url: '/api/inspectionstandards/update',
method: 'post',
data: row
})
@@ -57,7 +57,7 @@ export const inspection_getListBylegerId = (toolsCodeId) => {
})
}
-export const inspection__Del = (toolsCodeId) => {
+export const inspection_Del = (toolsCodeId) => {
return request({
url: '/api/inspectionstandards/del',
method: 'post',
diff --git a/src/api/leger/inventorydocument.js b/src/api/leger/inventorydocument.js
index 3305394..59b2d13 100644
--- a/src/api/leger/inventorydocument.js
+++ b/src/api/leger/inventorydocument.js
@@ -48,7 +48,17 @@ export const document_update = (row) => {
})
}
-export const document_getListBylegerId = (eqLedgerId) => {
+export const document_getListBylegerId = (toolsCodeId) => {
+ return request({
+ url: '/api/inventorydocument/getList',
+ method: 'get',
+ params: {
+ toolsCodeId: toolsCodeId
+ }
+ })
+}
+
+export const document_tools_getListBylegerId = (eqLedgerId) => {
return request({
url: '/api/inventorydocument/getList',
method: 'get',
diff --git a/src/api/leger/techparameters.js b/src/api/leger/techparameters.js
index 4da10d2..86fe70a 100644
--- a/src/api/leger/techparameters.js
+++ b/src/api/leger/techparameters.js
@@ -58,6 +58,16 @@ export const parameters_getListBylegerId = (eqLedgerId) => {
})
}
+export const parameters_tools_getListBylegerId = (toolsCodeId) => {
+ return request({
+ url: '/api/techparameters/getList',
+ method: 'get',
+ params: {
+ toolsCodeId: toolsCodeId
+ }
+ })
+}
+
export const parameters_Del = (eqLedgerId) => {
return request({
url: '/api/techparameters/del',
@@ -68,3 +78,4 @@ export const parameters_Del = (eqLedgerId) => {
})
}
+
diff --git a/src/api/leger/toolinventoryrecord.js b/src/api/leger/toolinventoryrecord.js
index 6931de1..257a44c 100644
--- a/src/api/leger/toolinventoryrecord.js
+++ b/src/api/leger/toolinventoryrecord.js
@@ -49,7 +49,7 @@ export const update = (row) => {
}
export const auditing = (ids) => {
return request({
- url: '/api/toolinventoryrecord/auditing',
+ url: '/api/leger/toolinventoryrecord/auditing',
method: 'post',
params: {
ids,
@@ -59,7 +59,7 @@ export const auditing = (ids) => {
export const reject = (ids) => {
return request({
- url: '/api/toolinventoryrecord/reject',
+ url: '/api/leger/toolinventoryrecord/reject',
method: 'post',
params: {
ids,
diff --git a/src/util/exportUtil.js b/src/util/exportUtil.js
new file mode 100644
index 0000000..c99e746
--- /dev/null
+++ b/src/util/exportUtil.js
@@ -0,0 +1,20 @@
+export default {
+ excelExport : function (url, search, colArr) {
+ var filteredSearch = Object.keys(search)
+ .filter(key => !key.startsWith('$'))
+ .reduce((obj, key) => {
+ obj[key] = search[key];
+ return obj;
+ }, {});
+
+ var formStr = Object.keys(filteredSearch).map(key => {
+ let value = filteredSearch[key];
+ if (colArr.includes(key)) {
+ return `${encodeURIComponent(key)}_equal=${encodeURIComponent(value)}`;
+ } else {
+ return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
+ }
+ }).join('&');
+ window.open(`${url}&${formStr}`);
+ }
+}
diff --git a/src/views/leger/equipmentledger.vue b/src/views/leger/equipmentledger.vue
index 33c5b26..aa8bace 100644
--- a/src/views/leger/equipmentledger.vue
+++ b/src/views/leger/equipmentledger.vue
@@ -47,7 +47,7 @@
导出
+ @click="handleExport()">导出
@@ -63,6 +63,7 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l
import {mapGetters} from "vuex";
import website from "@/config/website";
import {getToken} from "@/util/auth";
+ import expUtil from "@/util/exportUtil";
export default {
data() {
@@ -633,8 +634,7 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l
cancelButtonText: "取消",
type: "warning"
}).then(() => {
- var formStr = Object.keys(this.search).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(this.search[key])}`).join('&');
- window.open(`/api/equipmentledger/export?daf-auth=${getToken()}&${formStr}`);
+ expUtil.excelExport(`/api/equipmentledger/export?daf-auth=${getToken()}`, this.search, ['station', 'userStatus']);
});
},
beforeOpen(done, type) {
diff --git a/src/views/leger/toolinventoryrecord.vue b/src/views/leger/toolinventoryrecord.vue
index 9e1ea81..aaacf1d 100644
--- a/src/views/leger/toolinventoryrecord.vue
+++ b/src/views/leger/toolinventoryrecord.vue
@@ -61,6 +61,7 @@
import {getList, getDetail, add, remove, reject, auditing} from "@/api/leger/toolinventoryrecord";
import {mapGetters} from "vuex";
import {getToken} from "@/util/auth";
+ import {Alert} from "element-ui";
export default {
data() {
return {
@@ -241,7 +242,6 @@
},
// 查看操作处理
handleDetailSearch(row) {
- debugger
this.$router.push({
path: "/leger/toolinventoryrecordDetail",
query: {
diff --git a/src/views/leger/toolinventoryrecordDetail.vue b/src/views/leger/toolinventoryrecordDetail.vue
index d308917..6c68547 100644
--- a/src/views/leger/toolinventoryrecordDetail.vue
+++ b/src/views/leger/toolinventoryrecordDetail.vue
@@ -101,7 +101,7 @@