From 5086f6503ca71546ebc73fd2b6033c9a221dd5dd Mon Sep 17 00:00:00 2001
From: weitingdong <2480899115@qq.com>
Date: Wed, 10 Jul 2024 13:27:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E5=8F=B0=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/leger/inspectionstandards.js | 4 +-
src/api/leger/inventorydocument.js | 12 ++++-
src/api/leger/techparameters.js | 11 +++++
src/api/leger/toolinventoryrecord.js | 4 +-
src/views/leger/toolinventoryrecord.vue | 2 +-
src/views/leger/toolinventoryrecordDetail.vue | 44 +++++++++++--------
6 files changed, 53 insertions(+), 24 deletions(-)
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/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 @@
<!-- https://avuejs.com/form/form-rules.html#%E5%A4%96%E7%BD%AE%E9%AA%8C%E8%AF%81-->
</template>
<script>
-import {getList, getDetail, add, update, remove} from "@/api/leger/equipmentledger";
+import {getList, getDetail, add, update, remove} from "@/api/leger/toolinventoryrecord";
import {
inspection_add,
inspection_update,
@@ -113,14 +113,14 @@ import {
parameters_add,
parameters_update,
parameters_remove,
- parameters_getListBylegerId,
+ parameters_tools_getListBylegerId,
parameters_Del
} from "@/api/leger/techparameters";
import {
document_add,
document_update,
document_remove,
- document_getListBylegerId,
+ document_tools_getListBylegerId,
document_Del
} from "@/api/leger/inventorydocument";
import {mapGetters} from "vuex";
@@ -235,16 +235,25 @@ export default {
{
label: "是否检验周期内",
prop: "isInspectionPeriod",
+ type: "select",
+ search: true,
+ dicUrl: "/api/daf-system/dict/dictionary?code=yes_no",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
span: 8,
},
{
label: "场站",
prop: "stations",
- rules: [{
- required: true,
- message: "请输入场站",
- trigger: "blur"
- }],
+ type: "select",
+ search: true,
+ dicUrl: "/api/daf-system/dict/dictionary?code=station",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
span: 8,
},
]
@@ -436,9 +445,8 @@ export default {
},
created () {
this.type = this.option.column[0];
- this.option.column.push({ label: '检验标准', prop: 'inspection' },{ label: '技术参数', prop: 'parameters' },{ label: '文档清册', prop: 'document' });
if(this.$route.query.frameMode == "search"){
- this.option.column.push({ label: '检验标准', prop: 'Inspection' },{ label: '技术参数', prop: 'parameters' },{ label: '文档清册', prop: 'document' });
+ this.option.column.push({ label: '检验标准', prop: 'inspection' },{ label: '技术参数', prop: 'parameters' },{ label: '文档清册', prop: 'document' });
this.readonlyForm=true;
this.shouldShowButton=true;
this.addUpdateShowButton=false;
@@ -545,10 +553,10 @@ export default {
this.inspection_onLoad();
}
},
- // 技术参数 新增按钮处理
+ // 检验标准 新增按钮处理
inspection_rowSave (form, done, loading) {
loading();
- form.toolsCodeId = '111';
+ form.toolsCodeId = this.$route.query.id;
inspection_add(form).then(() => {
done(form);
this.inspection_onLoad(this.page);
@@ -561,7 +569,7 @@ export default {
loading();
});
},
- // 技术参数 编辑按钮处理
+ // 检验标准 编辑按钮处理
inspection_rowUpdate(form, index, done, loading) {
inspection_update(form).then(() => {
done(form);
@@ -575,7 +583,7 @@ export default {
});
},
- // 技术参数 删除按钮处理
+ // 检验标准 删除按钮处理
inspection_rowDel(form, index, done) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
@@ -596,7 +604,7 @@ export default {
// 技术参数 新增按钮处理
parameters_rowSave (form, done, loading) {
loading();
- form.eqLedgerId = this.$route.query.id;
+ form.toolsCodeId = this.$route.query.id;
parameters_add(form).then(() => {
done(form);
this.parameters_onLoad(this.page);
@@ -644,7 +652,7 @@ export default {
// 文档清册 新增按钮处理
document_rowSave(form, done, loading) {
loading();
- form.eqLedgerId = this.$route.query.id;
+ form.toolsCodeId = this.$route.query.id;
document_add(form).then(() => {
done(form);
this.document_onLoad(this.page);
@@ -768,14 +776,14 @@ export default {
},
parameters_onLoad(row, params = {}) {
this.loading = true;
- parameters_getListBylegerId(this.$route.query.id).then(res => {
+ parameters_tools_getListBylegerId(this.$route.query.id).then(res => {
this.parameters_data = res.data.data;
this.loading = false;
});
},
document_onLoad(row, params = {}) {
this.loading = true;
- document_getListBylegerId(this.$route.query.id).then(res => {
+ document_tools_getListBylegerId(this.$route.query.id).then(res => {
this.document_data = res.data.data;
this.loading = false;
});