wilson
/
xujiecloud-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2024.7.7 产品文档收集-转量产、所有、生产文档确认进度

java8
yuejiayang 2 years ago
parent
171a61c1b8
commit
c5c7f62b34
3 changed files with 135 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/views/modules/common/uploadFileList1.vue
  2. 41
      src/views/modules/eam/com_project_proof_record.vue
  3. 166
      src/views/modules/eam/eamProjectInfo.vue

10
src/views/modules/common/uploadFileList1.vue
View File

@ -157,13 +157,19 @@ export default {
if (data && data.code === 0) {
this.$emit('update:uploadDialog', false);
this.$message.success(data.msg);
this.fileList = [];
this.fileName = '';
// this.$emit('get-document-list');
// this.$emit('get-proof-document');
} else {
this.$message.warning(data.msg);
this.fileList = [];
this.fileName = '';
}
}).catch((error) => {
this.$message.error(error);
this.fileList = [];
this.fileName = '';
});
},
changeCurrentRow1 (row, oldRow) {
@ -267,7 +273,7 @@ export default {
<template>
<div>
<el-dialog :title="title" v-drag @close="closeFileUpdate" :visible="uploadDialog" width="705px" append-to-body>
<el-dialog :title="title" v-drag @close="closeFileUpdate" :visible="uploadDialog" width="705px" append-to-body :close-on-click-modal="false">
<el-form :inline="true" label-position="top" label-width="80px" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="项目编码">
<el-input v-model="projectId" readonly style="width: 113px;" class="red-text"></el-input>
@ -375,7 +381,7 @@ export default {
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="$emit('update:uploadDialog',false);this.fileName = '';">关闭</el-button>
<el-button @click="$emit('update:uploadDialog',false);this.fileName = '';">关闭</el-button>
</span>
</el-dialog>
</div>

41
src/views/modules/eam/com_project_proof_record.vue
View File

@ -48,12 +48,12 @@
<el-col :span="12" class="right-section" >
<el-tabs style="font-size: 12px;margin-top: -10px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="打样文档" name="proofDocument">
<el-button type="primary" icon="el-icon-upload" style="margin-top: -3px;" @click="uploadOtherDocument()">上传其他文档</el-button>
<el-button type="primary" icon="el-icon-upload" v-if="isUpload" style="margin-top: -3px;" @click="uploadOtherDocument()">上传其他文档</el-button>
<el-table
:data="proofDocumentList"
border
style="width: 100%;margin-top: 5px;"
:height="height - 75"
:height="height - 47"
ref="proofDocumentTable"
@row-click="uploadDocumentClickRow"
@current-change="changeCurrentRow1"
@ -401,7 +401,7 @@
</el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveSelectionDocumentType()">确定</el-button>
<el-button type="primary" @click="addDocumentTypeFlag = false">关闭</el-button>
<el-button @click="addDocumentTypeFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
@ -474,6 +474,7 @@
proofingRecordVisible: false,
addDocumentTypeFlag: false,
isEditable: false,
isUpload: false,
height: 200,
currentRow:'',
fileContentList:[],
@ -997,7 +998,15 @@
//区分请求成功和失败的状况
if (data && data.code === 0) {
this.dataList = data.page.list
this.$refs.proofingTable.setCurrentRow(this.dataList[0])
if (this.dataList.length > 0) {
this.isUpload = true
// 设置选中行
this.$refs.proofingTable.setCurrentRow(this.dataList[0])
// 加载当前的页签的table
this.refreshCurrentTabTable()
}else {
this.isUpload = false
}
} else {
this.dataList = [];
}
@ -1086,7 +1095,15 @@
//区分请求成功和失败的状况
if (data && data.code === 0) {
this.dataList = data.page.list
this.$refs.proofingTable.setCurrentRow(this.dataList[0])
if (this.dataList.length > 0) {
this.isUpload = true
// 设置选中行
this.$refs.proofingTable.setCurrentRow(this.dataList[0])
// 加载当前的页签的table
this.refreshCurrentTabTable()
}else {
this.isUpload = false
}
} else {
this.dataList = [];
}
@ -1419,6 +1436,9 @@
return index + 1;
},
proofDocumentClickRow(row) {
if (row === null || row === undefined) {
this.proofDocumentList = []
}
this.proofDocumenCurrentRow = JSON.parse(JSON.stringify(row))
},
/**
@ -1427,6 +1447,9 @@
* @param oldRow
*/
changeCurrentRow (row, oldRow) {
if (row === null || row === undefined) {
this.proofDocumentList = []
}
// 判断是否是获取焦点的事件
if (row) {
this.proofDocumenCurrentRow = JSON.parse(JSON.stringify(row))
@ -1458,6 +1481,7 @@
proofingNo: this.documentClickRow.proofingNo,
documentTypeId: this.documentClickRow.documentTypeId
}
this.fileList = []
this.isEditable = false;
this.uploadDialog = true
//打开组件 去做新增业务
@ -1472,6 +1496,7 @@
},
uploadOtherDocument(){
this.isEditable = true;
this.fileList = []
this.documentClickRow = {
documentTypeId: '', // 清空文档类型ID
documentType: '' , // 清空文件类型
@ -1508,10 +1533,4 @@
padding: 10px;
margin-bottom: 10px;
}
/deep/ .el-table {
border: 1px solid #e0e0e0;
border-radius: 4px;
margin-bottom: 10px;
}
</style>

166
src/views/modules/eam/eamProjectInfo.vue
View File

@ -265,7 +265,7 @@
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveData()">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
<el-button @click="modalFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
@ -322,7 +322,7 @@
</el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveSelectionInfo()">确定</el-button>
<el-button type="primary" @click="projectManagerFlag = false">关闭</el-button>
<el-button @click="projectManagerFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
@ -380,7 +380,7 @@
<el-footer style="height:40px;margin-top:
10px;text-align:center">
<el-button type="primary" @click="saveSelectionInfo1()">确定</el-button>
<el-button type="primary" @click="projectOwnerFlag = false">关闭</el-button>
<el-button @click="projectOwnerFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
@ -438,7 +438,7 @@
<el-footer style="height:40px;margin-top:
10px;text-align:center">
<el-button type="primary" @click="saveSelectionInfo6()">确定</el-button>
<el-button type="primary" @click="engineer6Flag = false">关闭</el-button>
<el-button @click="engineer6Flag = false">关闭</el-button>
</el-footer>
</el-dialog>
@ -497,7 +497,7 @@
<el-footer style="height:40px;margin-top:
10px;text-align:center">
<el-button type="primary" @click="saveSelectionInfo2()">确定</el-button>
<el-button type="primary" @click="engineerFlag = false">关闭</el-button>
<el-button @click="engineerFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
@ -555,7 +555,7 @@
</el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveSelectionInfo3()">确定</el-button>
<el-button type="primary" @click="IPQCFlag = false">关闭</el-button>
<el-button @click="IPQCFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
@ -612,7 +612,7 @@
</el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveSelectionInfo4()">确定</el-button>
<el-button type="primary" @click="FQCFlag = false">关闭</el-button>
<el-button @click="FQCFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
@ -669,7 +669,7 @@
</el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveSelectionInfo5()">确定</el-button>
<el-button type="primary" @click="MFGlag = false">关闭</el-button>
<el-button @click="MFGlag = false">关闭</el-button>
</el-footer>
</el-dialog>
@ -709,7 +709,7 @@
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveFormalPartNo()">保存</el-button>
<el-button type="primary" @click="formalPartNoFlag = false">关闭</el-button>
<el-button @click="formalPartNoFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
@ -724,7 +724,7 @@
:data="projectOtherDocumentList"
border
style="width: 100%;margin-top: 5px;"
:height="height - 2"
:height="height + 128"
ref="proofDocumentTable"
@row-click="projectOtherDocumentClickRow"
@current-change="changeCurrentRow1"
@ -771,7 +771,7 @@
:data="projectAllDocumentList"
border
style="width: 100%;margin-top: 5px;"
:height="height - 2"
:height="height + 128"
ref="projectAllDocumentDocumentTable"
@row-click="projectAllDocumentClickRow"
:row-style="rowStyle"
@ -818,7 +818,7 @@
<el-table :data="confirmProgressDocumentList"
border
style="width: 100%;margin-top: -10px;"
:height="this.height + 10">
:height="this.height + 128">
<el-table-column header-align="center" align="center" width="50" prop="itemNo" label="序号"></el-table-column>
<el-table-column header-align="center" align="center" prop="documentType" label="文件类型"></el-table-column>
<el-table-column header-align="center" align="center" prop="fileName" label="文件名"></el-table-column>
@ -831,9 +831,9 @@
<el-table :data="confirmProgressPusherList"
border
style="width: 100%;margin-top: -10px;"
:height="this.height + 10">
<el-table-column header-align="center" align="center" width="50" prop="itemNo" label="序号"></el-table-column>
<el-table-column header-align="center" align="center" width="50" prop="userid" label="用户ID"></el-table-column>
:height="this.height + 128">
<el-table-column header-align="center" align="center" width="40" prop="itemNo" label="序号"></el-table-column>
<el-table-column header-align="center" align="center" width="70" prop="userDisplay" label="用户名"></el-table-column>
<el-table-column header-align="center" align="center" :formatter="formatDate" prop="wantedConfirmDate" label="要求确认日期"></el-table-column>
<el-table-column header-align="center" align="center" prop="confirmFlag" label="是否确认"></el-table-column>
<el-table-column header-align="center" align="center" prop="confirmedBy" label="确认人"></el-table-column>
@ -844,7 +844,7 @@
<el-table-column
header-align="center"
align="center"
width="110"
width="90"
fixed="left"
label="操作">
<template slot-scope="scope">
@ -978,7 +978,7 @@
</el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveSelectionProjectDocumentType()">确定</el-button>
<el-button type="primary" @click="addProjectDocumentTypeFlag = false">关闭</el-button>
<el-button @click="addProjectDocumentTypeFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
@ -1022,14 +1022,14 @@
</el-date-picker>
</el-form-item>
</el-form>
<el-tabs style="margin-top: 5px; width: 100%; height: 200px;" v-model="activeName1" class="customer-tab" type="border-card">
<el-tab-pane label="文档选择" name="selectDocument">
<el-tabs v-model="activeName1" style="margin-top: 0px; width: 100%; height: 100%;" type="border-card" @tab-click="tabClick" class="customer-tab">
<el-tab-pane label="文档选择" name="selectDocument" style="width: 104%">
<el-table
v-model="selectedDocumentItems"
:height="height - 15"
:height="height + 105"
:data="projectAllDocumentList"
border
style="width: 100%;margin-top: -13px;"
style="width: 100%;margin-top: -13px;margin-left: -14px !important; margin-right: 0 !important;"
@selection-change="handleDocumentSelectionChange">
<el-table-column
type="selection"
@ -1058,32 +1058,32 @@
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="确认人员清单" name="confirmatory">
<el-tab-pane label="确认人员清单" name="confirmatory" style="width: 104%">
<el-table
:height="height - 15"
:height="height + 105"
:data="projectAllDocumentConfirmatorList"
border
style="width: 100%;margin-top: -13px;">
style="width: 100%;margin-top: -13px;margin-left: -14px !important;">
<el-table-column
prop="userid"
prop="username"
header-align="center"
align="center"
min-width="60"
label="用户ID">
label="用户账号">
</el-table-column>
<el-table-column
prop="username"
prop="userDisplay"
header-align="center"
align="center"
min-width="80"
label="用户账号">
label="用户名">
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
<div slot="footer" class="dialog-footer" style="margin-top: 6px">
<el-button @click="saveProductionValidationDocument()">确定</el-button>
<el-button @click="projectProductionValidationDocumentVisible = false">关闭</el-button>
<el-button type="primary" @click="saveProductionValidationDocument()">确定</el-button>
<el-button @click="closeProjectProductionValidationDocumentVisibleDialog">关闭</el-button>
</div>
</el-dialog>
@ -1106,28 +1106,32 @@
<el-form-item label="要求确认日期" prop="wantedConfirmDate">
<el-input v-model="confirmData.wantedConfirmDate" readonly style="width: 170px;" class="red-text"></el-input>
</el-form-item>
<el-form-item label="用户ID" prop="userid">
<el-input v-model="confirmData.userid" readonly style="width: 110px;" class="red-text"></el-input>
<el-form-item label="用户名" prop="userDisplay">
<el-input v-model="confirmData.userDisplay" readonly style="width: 110px;"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="confirmData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="备注" prop="remark">
<el-input v-model="confirmData.remark" style="width: 417px" type="textarea" :rows="2"></el-input>
<el-input v-model="confirmData.remark" style="width: 419px" type="textarea" :rows="1"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="confirmData" style="margin-left: 7px;margin-top: -15px;">
<el-form-item label=" ">
<a href="javascript:void(0);" @click="triggerUpload" type="text" size="small">点击选择文件</a>
<el-input v-model="this.fileName" readonly placeholder="文件名称" style="width: 419px"></el-input>
<el-upload class="custom-upload" :file-list="fileList"
action="javascript:void(0);" ref="uploadFile"
:on-change="onChange" :on-close="closeFileUpdate"
multiple :auto-upload="false"
style="text-align: left;margin-top: 0px;margin-left: 6px;display: none;">
</el-upload>
</el-form-item>
</el-form>
<el-upload class="custom-upload" drag :file-list="fileList"
action="javascript:void(0);" ref="uploadFile"
:on-change="onChange"
multiple :auto-upload="false"
style="text-align: left;margin-top: 30px;margin-left: 6px;">
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
</el-upload>
<el-table
:height="height - 55"
:height="height + 50"
:data="projectConfirmatorFileList"
border
style="width: 419px;margin-top: -5px;margin-left: 6px;">
style="width: 419px;margin-top: 17px;margin-left: 6px;">
<el-table-column
prop="fileName"
header-align="center"
@ -1150,20 +1154,20 @@
label="上传人">
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer" style="margin-top: 5px">
<el-button @click="saveUploadFile()">确定</el-button>
<div slot="footer" class="dialog-footer" style="margin-top: -10px">
<el-button type="primary" @click="saveUploadFile()">确定</el-button>
<el-button @click="closeUploadFileVisible()">关闭</el-button>
</div>
</el-dialog>
<el-dialog title="查看附件" @close="closeViewDocumentFileVisible" :visible.sync="viewDocumentFileVisible" width="455px" style="margin-top: 0vh" :close-on-click-modal="false">
<el-form :inline="true" label-position="top" :model="confirmData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="用户ID" prop="userid">
<el-input v-model="confirmData.userid" readonly style="width: 110px;" class="red-text"></el-input>
<el-form-item label="用户名" prop="userDisplay">
<el-input v-model="confirmData.userDisplay" readonly style="width: 110px;"></el-input>
</el-form-item>
</el-form>
<el-table
:height="height - 55"
:height="height + 100"
:data="projectConfirmatorFileList"
border
style="width: 419px;margin-top: 0px;margin-left: 6px;">
@ -1280,6 +1284,11 @@ import {
this.getProjectOtherDocument()
}
},
projectProductionValidationDocumentVisible(newVal) {
if (newVal) {
this.activeName1 = 'selectDocument';
}
}
},
data () {
return {
@ -1293,6 +1302,7 @@ import {
exportList:[],
// 导出 end
tagNo:'',
fileName:'',
folder: 'projectConfirm',
searchData: {
site: this.$store.state.user.site,
@ -3595,8 +3605,6 @@ import {
this.projectDocumentSelection = val
},
saveSelectionProjectDocumentType() {
this.getProjectOtherDocument()
this.getProjectDocumentList()
if (this.projectDocumentSelection.length === 0) {
this.$message({
message: '请选择文档类型',
@ -3625,6 +3633,8 @@ import {
})
this.addProjectDocumentTypeFlag = false
//刷新表格
this.getProjectOtherDocument()
this.getProjectDocumentList()
this.refreshCurrentTabTable()
} else {
this.$message({
@ -3634,8 +3644,6 @@ import {
}
})
})
this.getProjectOtherDocument()
this.getProjectDocumentList()
},
getProjectDocumentList() {
getDocumentList(this.modalData).then(({data}) => {
@ -3816,6 +3824,8 @@ import {
orderRef1: row.orderRef1,
itemNo: row.itemNo,
userid: row.userid,
username: row.username,
userDisplay: row.userDisplay,
wantedConfirmDate: row.wantedConfirmDate,
confirmFlag: row.confirmFlag,
confirmedDate: new Date(),
@ -3823,7 +3833,7 @@ import {
createDate: row.createDate,
confirmedBy: this.$store.state.user.name,
documentId: row.documentId,
remark: row.remark
remark: ''
}
this.modalData = {
site: this.proofingCurrentRow.site,
@ -3841,9 +3851,18 @@ import {
this.confirmVisible = true
},
/*选择上传文件时*/
onChange(file){
onChange(file,fileList){
const newFileName = file.name;
if (this.fileName) {
this.fileName += ', ' + newFileName;
} else {
this.fileName = newFileName;
}
this.fileList.push(file);
},
triggerUpload() {
this.$refs.uploadFile.$el.querySelector('input').click()
},
saveUploadFile(){
updateProjectDocumentConfirm(this.confirmData) .then(({data}) => {
if (data.code === 0) {
@ -3877,12 +3896,20 @@ import {
this.$message.success('操作成功');
//清空文件上传记录
this.$refs.uploadFile.clearFiles();
this.closeFileUpdate();
this.projectConfirmatorFileList = [];
}else {
this.$message.warning(data.msg);
}
})
},
closeFileUpdate() {
this.fileName = '';
this.uploadDialog = false;
//this.fileRemark = ''
this.$refs.uploadFile.clearFiles()
this.fileList = []
},
getProjectConfirmatorFileList (row) {
let inData = {
orderRef1: row.site,
@ -3902,6 +3929,7 @@ import {
this.confirmVisible = false;
this.projectConfirmatorFileList = [];
this.fileList = [];
this.closeFileUpdate()
},
closeViewDocumentFileVisible(){
this.viewDocumentFileVisible = false;
@ -3914,6 +3942,8 @@ import {
orderRef1: row.orderRef1,
itemNo: row.itemNo,
userid: row.userid,
username: row.username,
userDisplay: row.userDisplay,
wantedConfirmDate: row.wantedConfirmDate,
confirmFlag: row.confirmFlag,
confirmedDate: new Date(),
@ -3980,6 +4010,10 @@ import {
})
}
},
closeProjectProductionValidationDocumentVisibleDialog() {
this.projectProductionValidationDocumentVisible = false;
this.activeName1 = 'selectDocument';
},
formatDate(row, column) {
// row 是当前行的数据对象
// column 是当前列的属性信息对象
@ -4081,25 +4115,19 @@ import {
margin-right: 5px;
}
/deep/ .table-container {
border: 1px solid #e0e0e0;
border-radius: 4px;
padding: 10px;
margin-bottom: 10px;
}
/deep/ .el-table {
border: 1px solid #e0e0e0;
border-radius: 4px;
margin-bottom: 10px;
}
/deep/ .custom-upload .el-upload-dragger {
width: 418px;
height: 180px;
width: 150px;
height: 150px;
text-align: center;
position: relative;
overflow: hidden;
/* 添加其他样式 */
}
/deep/ .table-container {
border: 1px solid #e0e0e0;
border-radius: 4px;
padding: 10px;
margin-bottom: 10px;
}
</style>
Write Preview
Loading…
Cancel
Save