FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
宋伟佳
2021-07-27 14:53:01 +08:00
parent d5596f764d
commit 7657b7ed6a
5 changed files with 1530 additions and 1483 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+92 -117
View File
@@ -48,9 +48,11 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div>
<p>
{{ listForm.fileName }}
<el-upload <el-upload
v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
:action="uploadFileListPath" :action="uploadFileListPath"
show-file-list show-file-list
:file-list="fileInfoList" :file-list="fileInfoList"
@@ -64,11 +66,8 @@
点击上传 点击上传
</el-button> </el-button>
</el-upload> </el-upload>
<el-input </p>
v-else </div>
v-model="listForm.fileId"
placeholder=""
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled"> <el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
<el-radio-group v-model="signFlag" @change="selectSign"> <el-radio-group v-model="signFlag" @change="selectSign">
@@ -129,15 +128,21 @@
label="发布日期"> label="发布日期">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrq" prop="xcxssrqgj"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="zccssrq" prop="zccssrqgj"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -621,15 +626,21 @@
label="发布日期"> label="发布日期">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrq" prop="xcxssrqgj"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="zccssrq" prop="zccssrqgj"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -720,7 +731,7 @@
// 查询选择清单相关参数 // 查询选择清单相关参数
sarSarAccessEOSearch: { sarSarAccessEOSearch: {
countryArea: "", countryArea: "",
detailedListName: "", detailedListName: ""
}, },
//查询添加标准相关数据 //查询添加标准相关数据
standardSearch: { standardSearch: {
@@ -741,17 +752,13 @@
}, },
roleForm: { roleForm: {
startUserName: this.$store.getters.userInfo.userName, startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.id, startUser: this.$store.getters.userInfo.userId,
dockUser: "", dockUser: "",
responUserList: "",
ministerUser: "", ministerUser: "",
directorUser: "", directorUser: "",
presidentUser: "",
dockUserName: "", dockUserName: "",
responUserListName: "",
ministerUserName: "", ministerUserName: "",
directorUserName: "", directorUserName: "",
presidentUserName: ""
}, },
formRules: { formRules: {
listType: [ listType: [
@@ -812,8 +819,8 @@
code: "", //标准号 code: "", //标准号
standName: "", //标准名称 standName: "", //标准名称
issueTime: "", //发布日期 issueTime: "", //发布日期
xcxssrq: "", //新车型实施日期 xcxssrqgj: "", //新车型实施日期
zccssrq: "", //在产车实施日期 zccssrqgj: "", //在产车实施日期
textStatus: "", //文本状态 textStatus: "", //文本状态
id: "" id: ""
}] }]
@@ -846,12 +853,12 @@
bpnId: this.$route.query.bpnId bpnId: this.$route.query.bpnId
}).then(res => { }).then(res => {
console.log(res.mes); console.log(res.mes);
let mes = JSON.parse(res.mes) let mes = JSON.parse(res.mes);
this.listForm =mes.form this.listForm = mes.form;
this.dataList = mes.form.dataList this.dataList = mes.form.dataList;
this.roleForm = mes.roleForm this.roleForm = mes.roleForm;
this.commentText = mes.commentText this.commentText = mes.commentText;
}) });
}, },
checkedRole(data) { checkedRole(data) {
if (this.type === "dockUser") { if (this.type === "dockUser") {
@@ -863,9 +870,6 @@
} else if (this.type === "directorUser") { } else if (this.type === "directorUser") {
this.roleForm.directorUser = data[0].id; this.roleForm.directorUser = data[0].id;
this.roleForm.directorUserName = data[0].name; 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; this.modalshowflag = false;
}, },
@@ -911,8 +915,8 @@
} }
}, },
queryDetailsData() { queryDetailsData() {
this.page = 1 this.page = 1;
this.selectionList() this.selectionList();
}, },
// //判断当前选中的是哪个清单 // //判断当前选中的是哪个清单
selectionList(type) { selectionList(type) {
@@ -983,6 +987,10 @@
_this: this _this: this
}, res => { }, res => {
this.standardData = res.data.list; this.standardData = res.data.list;
this.standardData.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
})
this.totalNo = res.data.count; this.totalNo = res.data.count;
}, e => { }, e => {
}); });
@@ -1017,73 +1025,62 @@
}, },
//保存事件 //保存事件
handleSave() { handleSave() {
this.saveLoading = true this.saveLoading = true;
let _formData = new FormData() let _formData = new FormData();
_formData.append('id', this.bpnId || '') _formData.append("id", this.bpnId || "");
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append('createUserName', this.$store.getters.userInfo.userName) _formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append('prcType', '4') _formData.append("prcType", "4");
_formData.append('json', JSON.stringify({ _formData.append("json", JSON.stringify({
form: this.form, form: this.form,
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.commentText commentText: this.commentText
})) }));
saveTaskFirst(_formData).then(res => { saveTaskFirst(_formData).then(res => {
this.saveLoading = false this.saveLoading = false;
this.$message.success('保存成功') this.$message.success("保存成功");
this.bpnId = res.result this.bpnId = res.result;
}).catch(e => { }).catch(e => {
this.saveLoading = false this.saveLoading = false;
}) });
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
if (this.dataList.length < 1) { if (this.dataList.length < 1) {
this.$message.warning('标准不能为空') this.$message.warning("标准不能为空");
} else { } else {
let json = this.listForm; var json = Object.assign(this.listForm, this.roleForm)
this.listForm.fileId = this.fileIds.join(","); console.log(json);
this.listForm.fileName = this.fileListName.join(","); // this.$refs["qdfbForm"].validate((valid) => {
this.listForm.model = this.listForm.fileId; // if (valid) {
this.listForm.modelName = this.listForm.fileName; // this.$refs["Form"].validate((valid) => {
json.zrUserId = this.roleForm.dockUser; //会签人 // if (valid) {
json.jlUserId = this.roleForm.directorUser; //业务经理 // this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
json.applyUpdUserId = this.roleForm.ministerUser; // 修订人 // _this: this
json.approvalOpinion = ""; // }, res => {
json.prcCreateUser = this.$store.getters.userInfo.userId; // if (res.ok) {
json.prcCreateUserName = this.$store.getters.userInfo.uName; // this.$http.post("lawss/activiti/completeTask", {
json.standName = this.listForm.listName; // taskIds: res.data,
json.standId = this.listForm.standId; // userId: this.$store.getters.userInfo.userId,
this.$refs["qdfbForm"].validate((valid) => { // json: JSON.stringify(json)
if (valid) { // }, {
this.$refs["Form"].validate((valid) => { // _this: this
if (valid) { // }, res => {
this.$http.get("lawss/activiti/startProcess", { type: "4" }, { // if (res.success) {
_this: this // this.$message.success(res.message);
}, res => { // this.$router.push("/processCenter");
if (res.ok) { // }
this.$http.post("lawss/activiti/completeTask", { // });
taskIds: res.data, // }
userId: this.$store.getters.userInfo.userId, // });
json: JSON.stringify(json) // } else {
}, { // return this.$message.warning("请完善人员信息");
_this: this // }
}, res => { // });
if (res.success) { // } else {
this.$message.success(res.message); // return this.$message.warning("请完善基础信息");
this.$router.push("/processCenter"); // }
} // });
});
}
});
} else {
return this.$message.warning("请完善人员信息");
}
});
} else {
return this.$message.warning("请完善基础信息");
}
});
} }
}, },
// 删除上传的文件 // 删除上传的文件
@@ -1104,11 +1101,14 @@
uploadBackSuccess(res, file, fileList) { uploadBackSuccess(res, file, fileList) {
if (res.ok) { if (res.ok) {
let middle = []; let middle = [];
// let fids = [];
fileList.forEach(item => { fileList.forEach(item => {
middle.push(item.name); middle.push(item.name);
// fids.push(item.response.data.attId)
}); });
this.fileListName = middle; this.fileListName = middle;
this.fileIds.push(file.response.data.id); this.fileIds.push(file.response.data.id);
// this.listForm.fileId = this.listForm.fileId + ',' + fids.join(',')
// this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
// this.$message.success('上传成功') // this.$message.success('上传成功')
} else { } else {
@@ -1119,10 +1119,10 @@
// 相关附件 上传之前钩子 // 相关附件 上传之前钩子
beforeUpload(file) { beforeUpload(file) {
var filename = file.name; var filename = file.name;
this.listForm.fileName = this.listForm.fileName + ',' + file.name
var index1 = filename.lastIndexOf("."); var index1 = filename.lastIndexOf(".");
var index2 = filename.length; var index2 = filename.length;
var fileSuffix = filename.substring(index1, index2); var fileSuffix = filename.substring(index1, index2);
// const fileSuffix = file.name.split('.')[1] // 后缀名
//把后缀转大写 //把后缀转大写
if (fileSuffix !== undefined && fileSuffix !== null) { if (fileSuffix !== undefined && fileSuffix !== null) {
fileSuffix = fileSuffix.toUpperCase(); fileSuffix = fileSuffix.toUpperCase();
@@ -1173,7 +1173,6 @@
var index1 = filename.lastIndexOf("."); var index1 = filename.lastIndexOf(".");
var index2 = filename.length; var index2 = filename.length;
var fileSuffix = filename.substring(index1, index2); var fileSuffix = filename.substring(index1, index2);
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式 // 判断上传文件格式
if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT" if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT"
|| fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX" || fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX"
@@ -1197,33 +1196,6 @@
} }
return true; return true;
}, },
// beginImportFile (file) {
// var filename = file.name
// var index1 = filename.lastIndexOf('.')
// var index2 = filename.length
// var fileSuffix = filename.substring(index1, index2)
// // const fileSuffix = file.name.split('.')[1] // 后缀名
// // 判断上传文件格式
// // 判断上传文件格式
// if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
// || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX'
// || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
// return true
// } else {
// this.spinShow = false
// this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
// return false
// }
// // 判断文件上传大小
// // eslint-disable-next-line no-unreachable
// if (file.size / 1024 / 1024 <= 200) {
// return true
// } else {
// this.$message.error('文件' + file.name + '大小不超过200M')
// return false
// }
// return true
// },
//选择清单取消事件 //选择清单取消事件
closeDrawer() { closeDrawer() {
this.ListModel = false; this.ListModel = false;
@@ -1241,6 +1213,7 @@
if (this.standList.length < 1) { if (this.standList.length < 1) {
_this.$message.warning("请选择需要添加进清单的数据"); _this.$message.warning("请选择需要添加进清单的数据");
} else { } else {
let exits = []
_this.standList.map(item => { _this.standList.map(item => {
let newStand = false; let newStand = false;
for (let itemKey of _this.dataList) { for (let itemKey of _this.dataList) {
@@ -1253,8 +1226,10 @@
_this.$message.warning("请勿重复添加数据"); _this.$message.warning("请勿重复添加数据");
} else { } else {
_this.dataList.push(item); _this.dataList.push(item);
exits.push(item.id)
} }
}); });
this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
this.standardData = []; this.standardData = [];
_this.standModel = false; _this.standModel = false;
} }
@@ -1355,7 +1330,7 @@
}, },
computed: {}, computed: {},
mounted() { mounted() {
this.getData() this.getData();
//从数据库中查询下拉框数据 //从数据库中查询下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", {}, { this.$http.get("sys/dictype/getDicTypeListCode", {}, {
_this: this _this: this
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+16 -26
View File
@@ -49,11 +49,9 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="listForm.fileName"> <div>
<p>{{listForm.fileName}} <p>
</p> {{ listForm.fileName }}
</div>
<div v-else>
<el-upload <el-upload
:action="uploadFileListPath" :action="uploadFileListPath"
show-file-list show-file-list
@@ -68,6 +66,7 @@
点击上传 点击上传
</el-button> </el-button>
</el-upload> </el-upload>
</p>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled"> <el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
@@ -741,17 +740,13 @@ export default {
}, },
roleForm: { roleForm: {
startUserName: this.$store.getters.userInfo.userName, startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.id, startUser: this.$store.getters.userInfo.userId,
dockUser: "", dockUser: "",
responUserList: "",
ministerUser: "", ministerUser: "",
directorUser: "", directorUser: "",
presidentUser: "",
dockUserName: "", dockUserName: "",
responUserListName: "",
ministerUserName: "", ministerUserName: "",
directorUserName: "", directorUserName: "",
presidentUserName: ""
}, },
formRules: { formRules: {
listType: [ listType: [
@@ -850,9 +845,6 @@ export default {
} else if (this.type === "directorUser") { } else if (this.type === "directorUser") {
this.roleForm.directorUser = data[0].id; this.roleForm.directorUser = data[0].id;
this.roleForm.directorUserName = data[0].name; 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; this.modalshowflag = false;
}, },
@@ -1032,19 +1024,8 @@ export default {
if (this.dataList.length < 1) { if (this.dataList.length < 1) {
this.$message.warning("标准不能为空"); this.$message.warning("标准不能为空");
} else { } else {
let json = this.listForm; var json = Object.assign(this.listForm, this.roleForm)
this.listForm.fileId = this.fileIds.join(","); console.log(json);
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;
this.$refs["qdfbForm"].validate((valid) => { this.$refs["qdfbForm"].validate((valid) => {
if (valid) { if (valid) {
this.$refs["Form"].validate((valid) => { this.$refs["Form"].validate((valid) => {
@@ -1100,6 +1081,12 @@ export default {
}); });
this.fileListName = middle; this.fileListName = middle;
this.fileIds.push(file.response.data.id); 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("上传成功"); this.$message.success("上传成功");
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
@@ -1202,6 +1189,7 @@ export default {
if (this.standList.length < 1) { if (this.standList.length < 1) {
this.$message.warning("请选择需要添加进清单的数据"); this.$message.warning("请选择需要添加进清单的数据");
} else { } else {
let exits = []
this.standList.map(item => { this.standList.map(item => {
let newStand = false; let newStand = false;
for (let itemKey of this.dataList) { for (let itemKey of this.dataList) {
@@ -1214,8 +1202,10 @@ export default {
this.$message.warning("请勿重复添加数据"); this.$message.warning("请勿重复添加数据");
} else { } else {
this.dataList.push(item); this.dataList.push(item);
exits.push(item.id)
} }
}); });
this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
this.standardData = []; this.standardData = [];
this.standModel = false; this.standModel = false;
} }
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+18 -2
View File
@@ -78,8 +78,13 @@
width="180px" width="180px"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p> <a v-if="scope.row.standYear" class="table-jump"
<p v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p> @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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -407,6 +412,17 @@ export default {
}, },
selectThree() { selectThree() {
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
}, },
pageChange(page) { pageChange(page) {
this.page = page; this.page = page;
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+1 -1
View File
@@ -84,7 +84,7 @@
<el-table-column label="责任人" prop="workPeople" align="center"> <el-table-column label="责任人" prop="workPeople" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div :class="{'fileClass': !scope.row.workPeople}"> <div :class="{'fileClass': !scope.row.workPeople}">
{{ scope.row.workPeople ? scope.row.workPeople: '请选择责任人' }}</div> {{ scope.row.workPeople ? scope.row.workPeople: '' }}</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+66
View File
@@ -600,6 +600,72 @@ export default {
prcType: row.prcType 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 break
//未符合项整改流程 //未符合项整改流程