Merge remote-tracking branch 'origin/main'

main
zhen 1 year ago
commit f96a7374d2
  1. 64
      src/api/spares/materialclasscode.js
  2. 5
      src/views/inspection/inspectionobject.vue
  3. 3
      src/views/inspection/inspectionplan.vue
  4. 3
      src/views/inspection/inspectionroute.vue
  5. 1
      src/views/inspection/inspectiontasks.vue
  6. 5
      src/views/spares/manufacturerinfo.vue
  7. 3
      src/views/spares/material.vue
  8. 225
      src/views/spares/materialclasscode.vue
  9. 5
      src/views/spares/materialclassification.vue
  10. 5
      src/views/spares/supplierinfo.vue
  11. 5
      src/views/spares/warehouse.vue
  12. 14
      src/views/wel/index.vue

@ -1,64 +0,0 @@
import request from '@/router/axios';
export const getList = (current, size, params) => {
return request({
url: '/api/spares/materialclasscode/list',
method: 'get',
params: {
...params,
current,
size,
}
})
}
export const getDetail = (id) => {
return request({
url: '/api/spares/materialclasscode/detail',
method: 'get',
params: {
id
}
})
}
export const remove = (ids) => {
return request({
url: '/api/spares/materialclasscode/remove',
method: 'post',
params: {
ids,
}
})
}
export const add = (row) => {
return request({
url: '/api/spares/materialclasscode/submit',
method: 'post',
data: row
})
}
export const update = (row) => {
return request({
url: '/api/spares/materialclasscode/submit',
method: 'post',
data: row
})
}
export const materialClassCodeAdd = (row) => {
return request({
url: '/api/spares/materialclasscode/submit',
method: 'post',
data: row
})
}
export const getMaterialClassCode = () => {
return request({
url: '/api/spares/materialclasscode/getMaterialClassCodeList',
method: 'get'
})
}

@ -103,7 +103,10 @@
height: 'auto',
calcHeight: 210,
searchShow: true,
searchMenuSpan: 6,
searchMenuSpan: 18,
searchBtnText: '查询',
emptyBtnText: '重置',
searchMenuPosition:'right',
tip: false,
border: true,
index: false,

@ -103,7 +103,7 @@
align: 'center',
calcHeight: 210,
searchShow: true,
searchMenuSpan: 6,
searchMenuSpan: 24,
tip: false,
border: true,
index: false,
@ -111,6 +111,7 @@
selection: true,
searchBtnText: '查询',
emptyBtnText: '重置',
searchMenuPosition:'right',
column: [
{
label: "计划编号",

@ -103,7 +103,7 @@
align: 'center',
calcHeight: 210,
searchShow: true,
searchMenuSpan: 6,
searchMenuSpan: 24,
tip: false,
border: true,
index: false,
@ -111,6 +111,7 @@
selection: true,
searchBtnText: '查询',
emptyBtnText: '重置',
searchMenuPosition:'right',
column: [
{
label: "路线编号",

@ -154,6 +154,7 @@
selection: true,
searchBtnText: '查询',
emptyBtnText: '重置',
searchMenuPosition:'right',
column: [
{
label: "任务编号",

@ -56,7 +56,10 @@
height: 'auto',
calcHeight: 210,
searchShow: true,
searchMenuSpan: 6,
searchMenuSpan: 12,
searchBtnText: '查询',
emptyBtnText: '重置',
searchMenuPosition:'right',
tip: false,
border: true,
index: true,

@ -148,9 +148,10 @@
height: 'auto',
calcHeight: 210,
searchShow: true,
searchMenuSpan: 6,
searchMenuSpan: 18,
searchBtnText: '查询',
emptyBtnText: '重置',
searchMenuPosition:'right',
tip: false,
border: true,
index: false,

@ -1,225 +0,0 @@
<template>
<basic-container>
<avue-crud :option="option"
:table-loading="loading"
:data="data"
:page="page"
:permission="permissionList"
:before-open="beforeOpen"
v-model="form"
ref="crud"
@row-update="rowUpdate"
@row-save="rowSave"
@row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@on-load="onLoad">
<template slot="menuLeft">
<el-button type="danger"
size="small"
icon="el-icon-delete"
plain
v-if="permission.materialclasscode_delete"
@click="handleDelete">
</el-button>
</template>
</avue-crud>
</basic-container>
</template>
<script>
import {getList, getDetail, add, update, remove} from "@/api/spares/materialclasscode";
import {mapGetters} from "vuex";
export default {
data() {
return {
form: {},
query: {},
loading: true,
page: {
pageSize: 10,
currentPage: 1,
total: 0
},
selectionList: [],
option: {
height: 'auto',
calcHeight: 210,
searchShow: true,
searchMenuSpan: 6,
tip: false,
border: true,
index: true,
viewBtn: true,
selection: true,
column: [
{
label: "分类码编号",
prop: "id",
rules: [{
required: true,
message: "请输入分类码编号",
trigger: "blur"
}]
},
{
label: "物资类型",
prop: "materialType",
rules: [{
required: true,
message: "请输入物资类型",
trigger: "blur"
}]
},
{
label: "物资分类码",
prop: "materialClassCode",
rules: [{
required: true,
message: "请输入物资分类码",
trigger: "blur"
}]
},
]
},
data: []
};
},
computed: {
...mapGetters(["permission"]),
permissionList() {
// this.option.column = this.option.column.filter(v => {
// return this.permission['materialclasscode_col_' + v.prop]
// })
return {
addBtn: this.vaildData(this.permission.materialclasscode_add, false),
viewBtn: this.vaildData(this.permission.materialclasscode_view, false),
delBtn: this.vaildData(this.permission.materialclasscode_delete, false),
editBtn: this.vaildData(this.permission.materialclasscode_edit, false)
};
},
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
}
},
methods: {
rowSave(row, done, loading) {
add(row).then(() => {
done();
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
}, error => {
window.console.log(error);
loading();
});
},
rowUpdate(row, index, done, loading) {
update(row).then(() => {
done();
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
}, error => {
window.console.log(error);
loading();
});
},
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(this.ids);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
done();
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
},
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
currentChange(currentPage){
this.page.currentPage = currentPage;
},
sizeChange(pageSize){
this.page.pageSize = pageSize;
},
onLoad(page, params = {}) {
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
});
}
}
};
</script>
<style>
</style>

@ -54,7 +54,10 @@
height: 'auto',
calcHeight: 210,
searchShow: true,
searchMenuSpan: 6,
searchMenuSpan: 12,
searchBtnText: '查询',
emptyBtnText: '重置',
searchMenuPosition:'right',
tip: false,
border: true,
index: true,

@ -56,7 +56,10 @@
height: 'auto',
calcHeight: 210,
searchShow: true,
searchMenuSpan: 6,
searchMenuSpan: 12,
searchBtnText: '查询',
emptyBtnText: '重置',
searchMenuPosition:'right',
tip: false,
border: true,
index: true,

@ -56,7 +56,10 @@
height: 'auto',
calcHeight: 210,
searchShow: true,
searchMenuSpan: 6,
searchMenuSpan: 24,
searchBtnText: '查询',
emptyBtnText: '重置',
searchMenuPosition:'right',
refreshBtn: false,
searchShowBtn: false,
tip: false,

@ -21,7 +21,7 @@
<div class="overflowList">
<el-skeleton :rows="3" animated v-show="skeleton"/>
<div class="el-collapse-item" v-for="(item, index) in homePageData.inspectionTasksAudit" :key="index">
<div class="el-collapse-item__header" @click="skip('/inspection/inspectiontasksDetail', item.id)"><span class="el-collapse-span">巡检任务{{item.taskName}}</span></div>
<div class="el-collapse-item__header" @click="skip3('/inspection/inspectiontasksDetail', item.id, item.taskNo)"><span class="el-collapse-span">巡检任务{{item.taskName}}</span></div>
</div>
</div>
</div>
@ -148,6 +148,7 @@
},
});
},
//
skip2(path, materialNo, mode){
this.$router.push({
path: path,
@ -157,6 +158,17 @@
mode: mode
},
});
},
//
skip3(path, id, taskNo){
this.$router.push({
path: path,
query: {
frameMode:"search",
id: id,
taskNo: taskNo
},
});
}
}
};

Loading…
Cancel
Save