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-12-27 10:52:42 +08:00
parent bbd14fc5cb
commit 95badff27b
5 changed files with 53 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+10 -2
View File
@@ -1057,7 +1057,7 @@ export default {
this.listForm.commentText = this.commentText
this.listForm.fileName = this.fileInfoList
this.listForm.dataList = this.dataList
var json = Object.assign(this.listForm, this.roleForm);
let json = Object.assign(this.listForm, this.roleForm);
this.$refs["qdfbForm"].validate((valid) => {
if (valid) {
this.$refs["Form"].validate((valid) => {
@@ -1237,7 +1237,7 @@ export default {
this.standList.map(item => {
let newStand = false;
for (let itemKey of this.dataList) {
if (item.id == itemKey.id) {
if (item.id === itemKey.id) {
newStand = true;
break;
}
@@ -1246,6 +1246,14 @@ export default {
this.$message.warning("请勿重复添加数据");
} else {
this.dataList.push(item);
this.dataList.forEach(item => {
if(item.XCXSSRQ === null){
item.XCXSSRQ = ''
}
if(item.ZCCSSRQ === null){
item.ZCCSSRQ = ''
}
})
exits.push(item.id);
}
});
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+8
View File
@@ -616,6 +616,14 @@ export default {
_this.$message.warning("请勿重复添加数据");
} else {
_this.dataList.push(item);
_this.dataList.forEach(item => {
if(item.XCXSSRQ === null){
item.XCXSSRQ = ''
}
if(item.ZCCSSRQ === null){
item.ZCCSSRQ = ''
}
})
}
});
this.standardData = []
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+1
View File
@@ -445,6 +445,7 @@
</el-form-item>
<el-form-item label="标准实施日期" prop="putTime">
<el-date-picker
clearable
v-model.trim="editRowData.ssrq"
type="dates"
value-format="yyyy-MM-dd"
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+24 -14
View File
@@ -172,12 +172,6 @@
align="center"
width="210px"
label="标准实施日期">
<template slot-scope="scope">
<span v-if="scope.row.ssrq === null">
{{ scope.row.ssrq }}
</span>
<span v-else>{{ scope.row.ssrq.slice(0, 10) }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -610,18 +604,34 @@ export default {
// 导出确定功能
//确认导出
exportTestItem() {
if (this.saveExportType === "apart") {
if (this.selectedList != null && this.selectedList != "") {
if(this.sarAccessEO.sortKey === '1'){
if (this.saveExportType === "apart") {
if (this.selectedList != null && this.selectedList != "") {
const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + "type=" + 1 +
"exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
window.open(exportURL);
this.$message.success("导出信息成功");
}
} else if (this.saveExportType === "all") {
const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + "type=" + 1 +
"exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
window.open(exportURL);
this.$message.success("导出信息成功");
}
}else{
if (this.saveExportType === "apart") {
if (this.selectedList != null && this.selectedList != "") {
const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
"exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
window.open(exportURL);
this.$message.success("导出信息成功");
}
} else if (this.saveExportType === "all") {
const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
"exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
"exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
window.open(exportURL);
this.$message.success("导出信息成功");
}
} else if (this.saveExportType === "all") {
const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
"exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
window.open(exportURL);
this.$message.success("导出信息成功");
}
this.exportModelFlag = false;
this.selectedList = [];