|
|
@@ -134,7 +134,7 @@
|
|
|
|
|
|
<!-- 更新4 -->
|
|
|
<el-button
|
|
|
- v-show="activeTab == 4 && user.id == moldDetail.managerId && canInitiate"
|
|
|
+ v-show="activeTab == 4 && user.id == moldDetail.managerId && canInitiate && updateAble"
|
|
|
size="mini"
|
|
|
type="primary"
|
|
|
style="float: right;"
|
|
|
@@ -211,7 +211,6 @@
|
|
|
<el-table-column prop="part3dFile.fileName" label="3D图档" width="200" sortable>
|
|
|
<template slot-scope="scope" v-if="scope.row.part3dFile != null">
|
|
|
<a class="download" :href="scope.row.part3dFile.fileUrl" target="_blank">{{scope.row.part3dFile.fileName}}</a>
|
|
|
- <!-- :download="scope.row.part3dFile.fileName" -->
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="part2dFile.fileName" label="2D图档" width="200" sortable>
|
|
|
@@ -364,8 +363,10 @@
|
|
|
<el-tab-pane label="模具报废" name="5">
|
|
|
<el-table :data="documents.abandon" highlight-current-row v-loading="listLoading" style="width: 100%;">
|
|
|
<el-table-column type="index" width="40"></el-table-column>
|
|
|
- <el-table-column prop="fileName" label="名称" sortable></el-table-column>
|
|
|
- <el-table-column prop="fileSize" label="大小" width="200" sortable></el-table-column>
|
|
|
+ <el-table-column prop="fileName" label="申请单名称" sortable></el-table-column>
|
|
|
+ <el-table-column prop="fileSize" label="申请单大小" width="200" sortable></el-table-column>
|
|
|
+ <el-table-column prop="fileName2" label="报废单名称" sortable></el-table-column>
|
|
|
+ <el-table-column prop="fileSize2" label="报废单大小" width="200" sortable></el-table-column>
|
|
|
<el-table-column prop="uploadtor" label="上传者" width="200" sortable></el-table-column>
|
|
|
<el-table-column prop="indate" label="上传时间" width="200" sortable></el-table-column>
|
|
|
<el-table-column label="状态" width="120" sortable>
|
|
|
@@ -436,18 +437,18 @@
|
|
|
<el-dialog title="模具报废上传" :visible.sync="centerDialog2Visible" width="450px" :before-close="clearFileRecord">
|
|
|
<p style="height:60px;">
|
|
|
<span style="float:left;margin-right:30px;">申请单</span>
|
|
|
- <el-upload ref="upload1" action="customize" :http-request="uploadFile" :limit="1" :auto-upload="false" style="float:left">
|
|
|
+ <el-upload ref="upload1" action="customize" :http-request="uploadDiscardFile1" :limit="1" :before-remove="beforeRemove1" style="float:left">
|
|
|
<el-button size="small" type="primary">上传</el-button>
|
|
|
</el-upload>
|
|
|
</p>
|
|
|
<p style="height:60px;">
|
|
|
<span style="float:left;margin-right:30px;">报废单</span>
|
|
|
- <el-upload ref="upload2" action="customize" :http-request="uploadFile" :limit="1" :auto-upload="false" style="float:left">
|
|
|
+ <el-upload ref="upload2" action="customize" :http-request="uploadDiscardFile2" :limit="1" :before-remove="beforeRemove2" style="float:left">
|
|
|
<el-button size="small" type="primary">上传</el-button>
|
|
|
</el-upload>
|
|
|
</p>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="confirmUpload" :loading="uploading[3]">确定</el-button>
|
|
|
+ <el-button @click="discardUpload" :loading="uploading[3]">确定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
|
|
|
@@ -606,6 +607,8 @@
|
|
|
approve: 0,
|
|
|
|
|
|
canInitiate: true,
|
|
|
+ //根据状态判断能否更新
|
|
|
+ updateAble: true,
|
|
|
|
|
|
//6种文档
|
|
|
documents: {
|
|
|
@@ -633,6 +636,7 @@
|
|
|
centerDialog5Visible: false, //批量导出操作界面
|
|
|
editPortVisible: false,//编辑零件界面
|
|
|
|
|
|
+ editLoading: false,
|
|
|
listLoading: false,
|
|
|
activeTab: 0,
|
|
|
activePage: 0,
|
|
|
@@ -655,7 +659,10 @@
|
|
|
holes: "",
|
|
|
},
|
|
|
|
|
|
+ //零件文件
|
|
|
files: [],
|
|
|
+ //报废文件
|
|
|
+ files2: [null, null],
|
|
|
|
|
|
twoId: null,
|
|
|
threeId: null,
|
|
|
@@ -819,6 +826,8 @@
|
|
|
}
|
|
|
//顺便再把下面操作记录读取一下
|
|
|
this.getOperationRecord(this.activeTab);
|
|
|
+ //顺便再看看可不可以申请更新
|
|
|
+ this.checkUpdateState();
|
|
|
} else {
|
|
|
this.$message({
|
|
|
message: res.msg,
|
|
|
@@ -834,6 +843,17 @@
|
|
|
});
|
|
|
},
|
|
|
|
|
|
+ //查看有无审核中或者审核成功的更新申请
|
|
|
+ checkUpdateState(){
|
|
|
+ this.updateAble = true;
|
|
|
+ this.documents.update.forEach(item => {
|
|
|
+ if(item.state != "-1" || item.state != "-2"){
|
|
|
+ //有进行中的更新申请 现在不能再申请更新了
|
|
|
+ this.updateAble = false;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+
|
|
|
//将list中对应的文件传入相应的document下
|
|
|
setList(list, num) {
|
|
|
var array = [];
|
|
|
@@ -894,13 +914,6 @@
|
|
|
this.centerDialogVisible = true;
|
|
|
},
|
|
|
|
|
|
- //清理报废文档上传窗口中的文件
|
|
|
- clearFileRecord() {
|
|
|
- this.centerDialog2Visible = false;
|
|
|
- this.$refs.upload1.clearFiles();
|
|
|
- this.$refs.upload2.clearFiles();
|
|
|
- },
|
|
|
-
|
|
|
//清理零件文档上传窗口中的文件
|
|
|
clearFileRecord2() {
|
|
|
this.centerDialog4Visible = false;
|
|
|
@@ -992,21 +1005,6 @@
|
|
|
})
|
|
|
},
|
|
|
|
|
|
- //报废文件上传
|
|
|
- confirmUpload() {
|
|
|
- if (this.$refs.upload1.uploadFiles.length == 1 && this.$refs.upload2.uploadFiles.length == 1) {
|
|
|
- this.$refs.upload1.submit();
|
|
|
- this.$refs.upload2.submit();
|
|
|
- this.centerDialog2Visible = false;
|
|
|
- this.clearFileRecord();
|
|
|
- } else {
|
|
|
- this.$message({
|
|
|
- message: "必须各上传一个文件",
|
|
|
- type: "error"
|
|
|
- });
|
|
|
- }
|
|
|
- },
|
|
|
-
|
|
|
//文件上传
|
|
|
uploadFile(params) {
|
|
|
var fileObj = params.file;
|
|
|
@@ -1144,7 +1142,8 @@
|
|
|
partNo: this.editParts.number,
|
|
|
partName: this.editParts.name,
|
|
|
partLife: this.editParts.life,
|
|
|
- mouldId: this.detailId
|
|
|
+ mouldId: this.detailId,
|
|
|
+ id: this.editParts.id
|
|
|
},
|
|
|
res => {
|
|
|
this.editLoading = false;
|
|
|
@@ -1243,7 +1242,7 @@
|
|
|
},
|
|
|
|
|
|
uploadPartFile(params) {
|
|
|
- this.files.push(params.file)
|
|
|
+ this.files.push(params.file);
|
|
|
return false;
|
|
|
},
|
|
|
|
|
|
@@ -1280,6 +1279,80 @@
|
|
|
});
|
|
|
},
|
|
|
|
|
|
+ //报废文件上传
|
|
|
+ discardUpload() {
|
|
|
+ if (this.files2[0] != null && this.files2[1] != null) {
|
|
|
+ var form = new FormData();
|
|
|
+ form.append("file", this.files2[0]);
|
|
|
+ form.append("file2", this.files2[1]);
|
|
|
+ form.append("belongType", this.activeTab);
|
|
|
+ form.append("mouldId", this.detailId);
|
|
|
+ if (this.activeTab == 0 || this.activeTab == 1) {
|
|
|
+ form.append("dwgType", this.fileType);
|
|
|
+ }
|
|
|
+ this.http.uploadFile( this.port.mold.moldFileUpload, form,
|
|
|
+ res => {
|
|
|
+ if (res.code == "ok") {
|
|
|
+ this.$message({
|
|
|
+ message: "上传成功",
|
|
|
+ type: "success"
|
|
|
+ });
|
|
|
+ this.centerDialog2Visible = false;
|
|
|
+ this.clearFileRecord();
|
|
|
+ this.getDocument();
|
|
|
+ } else {
|
|
|
+ this.$message({
|
|
|
+ message: res.msg,
|
|
|
+ type: "error"
|
|
|
+ });
|
|
|
+ }
|
|
|
+ },
|
|
|
+ error => {
|
|
|
+ this.$message({
|
|
|
+ message: error,
|
|
|
+ type: "error"
|
|
|
+ });
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ console.log(this.files2);
|
|
|
+ this.$message({
|
|
|
+ message: "必须各上传一个文件",
|
|
|
+ type: "error"
|
|
|
+ });
|
|
|
+ }
|
|
|
+ },
|
|
|
+
|
|
|
+ //清理报废文档上传窗口中的文件
|
|
|
+ clearFileRecord() {
|
|
|
+ this.centerDialog2Visible = false;
|
|
|
+ this.$refs.upload1.clearFiles();
|
|
|
+ this.$refs.upload2.clearFiles();
|
|
|
+ this.files2[0] = null;
|
|
|
+ this.files2[1] = null;
|
|
|
+ },
|
|
|
+
|
|
|
+ //报废的申请单上传
|
|
|
+ uploadDiscardFile1(params){
|
|
|
+ this.files2[0] = params.file;
|
|
|
+ return false;
|
|
|
+ },
|
|
|
+
|
|
|
+ //报废的报废单上传
|
|
|
+ uploadDiscardFile2(params){
|
|
|
+ this.files2[1] = params.file;
|
|
|
+ return false;
|
|
|
+ },
|
|
|
+
|
|
|
+ //报废的申请单移除
|
|
|
+ beforeRemove1(params) {
|
|
|
+ this.files2[0] = null;
|
|
|
+ },
|
|
|
+
|
|
|
+ //报废的报废单移除
|
|
|
+ beforeRemove2(params) {
|
|
|
+ this.files2[0] = null;
|
|
|
+ },
|
|
|
+
|
|
|
//获取操作记录
|
|
|
getOperationRecord(type) {
|
|
|
this.http.post( this.port.mold.moldOperationList, {
|
