|
@@ -3,19 +3,8 @@
|
|
<!--工具条-->
|
|
<!--工具条-->
|
|
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
|
|
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
|
|
<el-form :inline="true" :model="filters">
|
|
<el-form :inline="true" :model="filters">
|
|
- <el-col :span="2">
|
|
|
|
- <el-form-item>
|
|
|
|
- <el-select v-model="filters.value" clearable placeholder="文档类型">
|
|
|
|
- <el-option label="模具3D图档" value="0"></el-option>
|
|
|
|
- <el-option label="模具2D图档" value="1"></el-option>
|
|
|
|
- <el-option label="零件3D图档" value="2"></el-option>
|
|
|
|
- <el-option label="零件2D图档" value="3"></el-option>
|
|
|
|
- <el-option label="模具保养方案" value="4"></el-option>
|
|
|
|
- </el-select>
|
|
|
|
- </el-form-item>
|
|
|
|
- </el-col>
|
|
|
|
<el-form-item>
|
|
<el-form-item>
|
|
- <el-input v-model="filters.name" placeholder="请输入名称进行搜索"></el-input>
|
|
|
|
|
|
+ <el-input v-model="filters.name" placeholder="请输入模具名称进行搜索"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item>
|
|
<el-form-item>
|
|
<el-button type="primary">查询</el-button>
|
|
<el-button type="primary">查询</el-button>
|
|
@@ -41,7 +30,7 @@
|
|
|
|
|
|
<!--列表-->
|
|
<!--列表-->
|
|
<el-table
|
|
<el-table
|
|
- :data="moulds"
|
|
|
|
|
|
+ :data="documents"
|
|
:height="tableHeight"
|
|
:height="tableHeight"
|
|
highlight-current-row
|
|
highlight-current-row
|
|
v-loading="listLoading"
|
|
v-loading="listLoading"
|
|
@@ -50,40 +39,40 @@
|
|
>
|
|
>
|
|
<el-table-column type="selection" width="40"></el-table-column>
|
|
<el-table-column type="selection" width="40"></el-table-column>
|
|
<el-table-column type="index" width="60"></el-table-column>
|
|
<el-table-column type="index" width="60"></el-table-column>
|
|
- <el-table-column width="200" label="模具名称" prop="name"></el-table-column>
|
|
|
|
|
|
+ <el-table-column width="200" label="模具名称" prop="modelName"></el-table-column>
|
|
<el-table-column width="200" label="模具3D图档">
|
|
<el-table-column width="200" label="模具3D图档">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <span v-if="scope.row.states[0] == 0">未上传</span>
|
|
|
|
- <span v-else-if="scope.row.states[0] == 1">审批中</span>
|
|
|
|
- <span v-else>已通过</span>
|
|
|
|
|
|
+ <span v-if="scope.row.mould3DFiles.length == 0">未上传</span>
|
|
|
|
+ <span v-else-if="scope.row.mould3DFiles.state == 3">已通过</span>
|
|
|
|
+ <span v-else>未通过</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column width="200" label="模具2D图档">
|
|
<el-table-column width="200" label="模具2D图档">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <span v-if="scope.row.states[1] == 0">未上传</span>
|
|
|
|
- <span v-else-if="scope.row.states[1] == 1">审批中</span>
|
|
|
|
- <span v-else>已通过</span>
|
|
|
|
|
|
+ <span v-if="scope.row.mould2DFiles.length == 0">未上传</span>
|
|
|
|
+ <span v-else-if="scope.row.mould2DFiles.state == 3">已通过</span>
|
|
|
|
+ <span v-else>未通过</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column width="200" label="零件3D图档">
|
|
<el-table-column width="200" label="零件3D图档">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <span v-if="scope.row.states[2] == 0">未上传</span>
|
|
|
|
- <span v-else-if="scope.row.states[2] == 1">审批中</span>
|
|
|
|
- <span v-else>已通过</span>
|
|
|
|
|
|
+ <span v-if="scope.row.sparepart3DFiles.length == 0">未上传</span>
|
|
|
|
+ <span v-else-if="scope.row.sparepart3DFiles.state == 3">已通过</span>
|
|
|
|
+ <span v-else>未通过</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column width="200" label="零件2D图档">
|
|
<el-table-column width="200" label="零件2D图档">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <span v-if="scope.row.states[3] == 0">未上传</span>
|
|
|
|
- <span v-else-if="scope.row.states[3] == 1">审批中</span>
|
|
|
|
- <span v-else>已通过</span>
|
|
|
|
|
|
+ <span v-if="scope.row.sparepart2DFiles.length == 0">未上传</span>
|
|
|
|
+ <span v-else-if="scope.row.sparepart2DFiles.state == 3">已通过</span>
|
|
|
|
+ <span v-else>未通过</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column width="200" label="保养方案">
|
|
<el-table-column width="200" label="保养方案">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <span v-if="scope.row.states[4] == 0">未上传</span>
|
|
|
|
- <span v-else-if="scope.row.states[4] == 1">审批中</span>
|
|
|
|
- <span v-else>已通过</span>
|
|
|
|
|
|
+ <span v-if="scope.row.maintainFiles.length == 0">未上传</span>
|
|
|
|
+ <span v-else-if="scope.row.maintainFiles.state == 3">已通过</span>
|
|
|
|
+ <span v-else>未通过</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
@@ -108,20 +97,14 @@ import util from "../../common/js/util";
|
|
export default {
|
|
export default {
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
- moulds: [
|
|
|
|
- //临时数据
|
|
|
|
- { id: 1, name: "墨盒类型1", states: [0, 1, 2, 0, 1] },
|
|
|
|
- { id: 2, name: "墨盒类型2", states: [2, 0, 1, 2, 0] },
|
|
|
|
- { id: 3, name: "墨盒类型3", states: [1, 2, 0, 1, 2] },
|
|
|
|
- { id: 4, name: "墨盒类型4", states: [0, 1, 2, 0, 1] },
|
|
|
|
- { id: 5, name: "墨盒类型5", states: [2, 0, 1, 2, 0] },
|
|
|
|
- { id: 6, name: "墨盒类型6", states: [2, 2, 2, 2, 2] }
|
|
|
|
- ],
|
|
|
|
|
|
+ documents: [],
|
|
filters: {
|
|
filters: {
|
|
name: "",
|
|
name: "",
|
|
value: ""
|
|
value: ""
|
|
},
|
|
},
|
|
listLoading: false,
|
|
listLoading: false,
|
|
|
|
+ page: 1,
|
|
|
|
+ size: 20,
|
|
total: 0,
|
|
total: 0,
|
|
tableHeight: 0,
|
|
tableHeight: 0,
|
|
selectedArray: []
|
|
selectedArray: []
|
|
@@ -131,23 +114,69 @@ export default {
|
|
//分页
|
|
//分页
|
|
handleCurrentChange(val) {
|
|
handleCurrentChange(val) {
|
|
this.page = val;
|
|
this.page = val;
|
|
- // this.getUsers();
|
|
|
|
|
|
+ this.getFileList();
|
|
},
|
|
},
|
|
handleSizeChange(val) {
|
|
handleSizeChange(val) {
|
|
this.size = val;
|
|
this.size = val;
|
|
- // this.getUsers();
|
|
|
|
|
|
+ this.getFileList();
|
|
},
|
|
},
|
|
- getFileList() {
|
|
|
|
|
|
+ //获取列表
|
|
|
|
+ getFileList(keyword) {
|
|
this.http.post(
|
|
this.http.post(
|
|
- this.port.mold.moldFileListAll,
|
|
|
|
- {},
|
|
|
|
|
|
+ this.port.mold.moldFileDowloadList,
|
|
|
|
+ {
|
|
|
|
+ keyName: keyword,
|
|
|
|
+ pageSize: this.size,
|
|
|
|
+ pageNum: this.page
|
|
|
|
+ },
|
|
res => {
|
|
res => {
|
|
if (res.code == "ok") {
|
|
if (res.code == "ok") {
|
|
this.$message({
|
|
this.$message({
|
|
message: "安排上了",
|
|
message: "安排上了",
|
|
type: "success"
|
|
type: "success"
|
|
});
|
|
});
|
|
- console.log(res);
|
|
|
|
|
|
+ this.documents = res.data.list;
|
|
|
|
+ //对于拿到的所有数据
|
|
|
|
+ this.documents.forEach(file => {
|
|
|
|
+ var mould2DFilesState = true;
|
|
|
|
+ var mould3DFilesState = true;
|
|
|
|
+ var sparepart2DFilesState = true;
|
|
|
|
+ var sparepart3DFilesState = true;
|
|
|
|
+ var maintainFilesState = true;
|
|
|
|
+ //看看每种文档中的所有文件
|
|
|
|
+ file.mould2DFiles.forEach(item => {
|
|
|
|
+ if (item.state != 3) {
|
|
|
|
+ mould2DFilesState = false;
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ file.mould3DFiles.forEach(item => {
|
|
|
|
+ if (item.state != 3) {
|
|
|
|
+ mould3DFilesState = false;
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ file.sparepart2DFiles.forEach(item => {
|
|
|
|
+ if (item.state != 3) {
|
|
|
|
+ sparepart2DFilesState = false;
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ file.sparepart3DFiles.forEach(item => {
|
|
|
|
+ if (item.state != 3) {
|
|
|
|
+ sparepart3DFilesState = false;
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ file.maintainFiles.forEach(item => {
|
|
|
|
+ if (item.state != 3) {
|
|
|
|
+ maintainFilesState = false;
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ //把计算好的状态装进这个模具对象中
|
|
|
|
+ file.mould2DFilesState = mould2DFilesState;
|
|
|
|
+ file.mould3DFilesState = mould3DFilesState;
|
|
|
|
+ file.sparepart2DFilesState = sparepart2DFilesState;
|
|
|
|
+ file.sparepart3DFilesState = sparepart3DFilesState;
|
|
|
|
+ file.maintainFilesState = maintainFilesState;
|
|
|
|
+ });
|
|
|
|
+ // console.log(this.documents);
|
|
} else {
|
|
} else {
|
|
this.$message({
|
|
this.$message({
|
|
message: res.msg,
|
|
message: res.msg,
|
|
@@ -203,7 +232,7 @@ export default {
|
|
this.tableHeight = height - 210;
|
|
this.tableHeight = height - 210;
|
|
},
|
|
},
|
|
mounted() {
|
|
mounted() {
|
|
- // this.getFileList();
|
|
|
|
|
|
+ this.getFileList();
|
|
}
|
|
}
|
|
};
|
|
};
|
|
</script>
|
|
</script>
|