修复bug
This commit is contained in:
宋伟佳
File diff suppressed because it is too large
Load Diff
@@ -49,26 +49,25 @@
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
|
||||
<div class="file-box" v-if="listForm.fileName">
|
||||
<p>{{listForm.fileName}}
|
||||
<div>
|
||||
<p>
|
||||
{{ listForm.fileName }}
|
||||
<el-upload
|
||||
:action="uploadFileListPath"
|
||||
show-file-list
|
||||
:file-list="fileInfoList"
|
||||
name="file"
|
||||
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
|
||||
:on-remove="delFileInfo"
|
||||
:on-success="uploadBackSuccess"
|
||||
:before-upload="beforeUpload"
|
||||
>
|
||||
<el-button class="common-button-default" size="mini">
|
||||
点击上传
|
||||
</el-button>
|
||||
</el-upload>
|
||||
</p>
|
||||
</div>
|
||||
<div v-else>
|
||||
<el-upload
|
||||
:action="uploadFileListPath"
|
||||
show-file-list
|
||||
:file-list="fileInfoList"
|
||||
name="file"
|
||||
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
|
||||
:on-remove="delFileInfo"
|
||||
:on-success="uploadBackSuccess"
|
||||
:before-upload="beforeUpload"
|
||||
>
|
||||
<el-button class="common-button-default" size="mini">
|
||||
点击上传
|
||||
</el-button>
|
||||
</el-upload>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
|
||||
<el-radio-group v-model="signFlag" @change="selectSign">
|
||||
@@ -741,17 +740,13 @@ export default {
|
||||
},
|
||||
roleForm: {
|
||||
startUserName: this.$store.getters.userInfo.userName,
|
||||
startUser: this.$store.getters.userInfo.id,
|
||||
startUser: this.$store.getters.userInfo.userId,
|
||||
dockUser: "",
|
||||
responUserList: "",
|
||||
ministerUser: "",
|
||||
directorUser: "",
|
||||
presidentUser: "",
|
||||
dockUserName: "",
|
||||
responUserListName: "",
|
||||
ministerUserName: "",
|
||||
directorUserName: "",
|
||||
presidentUserName: ""
|
||||
},
|
||||
formRules: {
|
||||
listType: [
|
||||
@@ -806,7 +801,7 @@ export default {
|
||||
modelName: "",
|
||||
standId: "", //选择的清单的id
|
||||
signFlag: "1", //是否会签 1为会签 2为不会签
|
||||
inforlist: "", //用来存放标准列表的标准id
|
||||
inforlist: " ", //用来存放标准列表的标准id
|
||||
dataList: [{
|
||||
code: "", //标准号
|
||||
standName: "", //标准名称
|
||||
@@ -850,9 +845,6 @@ export default {
|
||||
} else if (this.type === "directorUser") {
|
||||
this.roleForm.directorUser = data[0].id;
|
||||
this.roleForm.directorUserName = data[0].name;
|
||||
} else if (this.type === "presidentUser") {
|
||||
this.roleForm.presidentUser = data[0].id;
|
||||
this.roleForm.presidentUserName = data[0].name;
|
||||
}
|
||||
this.modalshowflag = false;
|
||||
},
|
||||
@@ -1032,19 +1024,8 @@ export default {
|
||||
if (this.dataList.length < 1) {
|
||||
this.$message.warning("标准不能为空");
|
||||
} else {
|
||||
let json = this.listForm;
|
||||
this.listForm.fileId = this.fileIds.join(",");
|
||||
this.listForm.fileName = this.fileListName.join(",");
|
||||
this.listForm.model = this.listForm.fileId;
|
||||
this.listForm.modelName = this.listForm.fileName;
|
||||
json.zrUserId = this.roleForm.dockUser; //会签人
|
||||
json.jlUserId = this.roleForm.directorUser; //业务经理
|
||||
json.applyUpdUserId = this.roleForm.ministerUser; // 修订人
|
||||
json.approvalOpinion = "";
|
||||
json.prcCreateUser = this.$store.getters.userInfo.userId;
|
||||
json.prcCreateUserName = this.$store.getters.userInfo.uName;
|
||||
json.standName = this.listForm.listName;
|
||||
json.standId = this.listForm.standId;
|
||||
var json = Object.assign(this.listForm, this.roleForm)
|
||||
console.log(json);
|
||||
this.$refs["qdfbForm"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.$refs["Form"].validate((valid) => {
|
||||
@@ -1100,6 +1081,12 @@ export default {
|
||||
});
|
||||
this.fileListName = middle;
|
||||
this.fileIds.push(file.response.data.id);
|
||||
if(this.listForm.fileName === null ){
|
||||
this.listForm.fileName = this.fileListName.join(',')
|
||||
}else {
|
||||
this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(',');
|
||||
}
|
||||
this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',')
|
||||
this.$message.success("上传成功");
|
||||
} else {
|
||||
this.$message.error(res.message);
|
||||
@@ -1202,6 +1189,7 @@ export default {
|
||||
if (this.standList.length < 1) {
|
||||
this.$message.warning("请选择需要添加进清单的数据");
|
||||
} else {
|
||||
let exits = []
|
||||
this.standList.map(item => {
|
||||
let newStand = false;
|
||||
for (let itemKey of this.dataList) {
|
||||
@@ -1214,8 +1202,10 @@ export default {
|
||||
this.$message.warning("请勿重复添加数据");
|
||||
} else {
|
||||
this.dataList.push(item);
|
||||
exits.push(item.id)
|
||||
}
|
||||
});
|
||||
this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
|
||||
this.standardData = [];
|
||||
this.standModel = false;
|
||||
}
|
||||
|
||||
@@ -78,8 +78,13 @@
|
||||
width="180px"
|
||||
label="标准号">
|
||||
<template slot-scope="scope">
|
||||
<p v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
|
||||
<p v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
|
||||
<a v-if="scope.row.standYear" class="table-jump"
|
||||
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
|
||||
scope.row.standNumber
|
||||
}}-{{ scope.row.standYear }}</a>
|
||||
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{
|
||||
scope.row.standSortShow }}
|
||||
{{ scope.row.standNumber }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -407,6 +412,17 @@ export default {
|
||||
},
|
||||
selectThree() {
|
||||
|
||||
},
|
||||
// 点击查看
|
||||
handlePreview(item) {
|
||||
let routeUrl = this.$router.resolve({
|
||||
name: "OtherStandardDetails",
|
||||
params: {
|
||||
id: item.id,
|
||||
pageType: "INLAND_STAND"
|
||||
}
|
||||
});
|
||||
window.open(routeUrl.href, "_blank");
|
||||
},
|
||||
pageChange(page) {
|
||||
this.page = page;
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
<el-table-column label="责任人" prop="workPeople" align="center">
|
||||
<template slot-scope="scope">
|
||||
<div :class="{'fileClass': !scope.row.workPeople}">
|
||||
{{ scope.row.workPeople ? scope.row.workPeople: '请选择责任人' }}</div>
|
||||
{{ scope.row.workPeople ? scope.row.workPeople: '' }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
@@ -600,6 +600,72 @@ export default {
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '分发负责人审批') {
|
||||
this.$router.push({
|
||||
name: 'xmpg2Step7',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '架构经理审批') {
|
||||
this.$router.push({
|
||||
name: 'xmpg2Step8',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '工程经理审批') {
|
||||
this.$router.push({
|
||||
name: 'xmpg2Step9',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '标准法规部经理审批') {
|
||||
this.$router.push({
|
||||
name: 'xmpg2Step10',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '汇总审批') {
|
||||
this.$router.push({
|
||||
name: 'xmpg2Step11',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '标准法规部部长审批') {
|
||||
this.$router.push({
|
||||
name: 'xmpg2Step12',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}
|
||||
break
|
||||
//未符合项整改流程
|
||||
|
||||
Reference in New Issue
Block a user