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

commit

Browse Source
This commit is contained in:
宋伟佳
2021-09-24 13:42:16 +08:00
parent ae678ca3ab
commit 7568a62949
3 changed files with 95 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+78 -39
View File
@@ -49,24 +49,21 @@
></el-input>
</el-form-item>
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<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 class="file-box">
<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">
@@ -129,6 +126,9 @@
prop="issueTime"
align="center"
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
@@ -209,22 +209,8 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"
:color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">
<el-card>
<el-form-item prop="dockUserName2" style="margin-bottom: 0">
<h4>会签人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"
@click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="根据会签意见修订" placement="top"
:color="roleForm.ministerUser ? '#66b1ff' : ''">
:color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
<el-card>
<el-form-item prop="ministerUserName" style="margin-bottom: 0">
<h4>标准/政策法规工程师</h4>
@@ -305,7 +291,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -313,7 +299,7 @@
align="center">
</el-table-column>
<el-table-column
prop="countryArea"
prop="countryAreaShow"
label="国家/地区"
align="center">
</el-table-column>
@@ -376,7 +362,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -462,7 +448,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -815,6 +801,7 @@ export default {
uploadFileListPath: "api/att/attFile/upload", // 上传的地址
fileInfoList: [], // 上传的附件
fileIds: [], // 上传的附件
fileList: [],
fileListName: [], //上传的附件名称
standardData: [], //添加标准数据
standardData1: [], //添加标准数据
@@ -885,12 +872,38 @@ export default {
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes);
mes.form.fileName.forEach(itemId => {
this.fileIds = itemId.id
this.fileInfoList.push(itemId)
this.getFileInfo();
});
this.listForm = mes.form;
this.dataList = mes.form.dataList;
this.roleForm = mes.roleForm;
this.commentText = mes.commentText;
});
},
// 请求上传的文件信息
getFileInfo() {
this.$http.get("att/attFile/getMultiFileInfos", {
fileIds: this.fileIds
}, {
_this: this
}, res => {
this.$nextTick(() => {
res.data.map(item => {
// 赋值要回显的上传文件内容
this.fileList.push({
name: item.oldFileName,
uid: item.uid,
status: item.status,
id: item.id
});
});
});
}, e => {
});
},
checkedRole(data) {
if (this.type === "dockUser") {
this.roleForm.dockUser = this.roleRow.id;
@@ -998,7 +1011,22 @@ export default {
}, {
_this: this
}, res => {
this.sarAccessListDatas = res.data.records;
let arr = res.data.records;
//国家地区字段转换
arr.map(item => {
if (item.countryArea !== null || item.countryArea !== "") {
let k = (item.countryArea || "").split(',')
for (let i in this.countryOptions) {
for (let m = 0; m < k.length; m++) {
if (this.countryOptions[i].value === k[m]) {
k[m] = this.countryOptions[i].label
}
item.countryAreaShow = k.join(',')
}
}
}
})
this.sarAccessListDatas = arr;
this.total = res.data.total;
}, e => {
});
@@ -1256,6 +1284,17 @@ export default {
cancelStand() {
this.standModel = false;
},
// 点击清单名称跳转事件
showTable(item) {
sessionStorage.setItem("accessRow", JSON.stringify(item));
this.$store.commit("setDetailMap", this.$route.path);
this.$router.push({
name: "AccessStandardDetails",
params: {
id: item.id
}
});
},
//添加标准确定事件
okStand() {
if (this.standList.length < 1) {
@@ -1344,6 +1383,7 @@ export default {
this.listForm.inforlist = formId.join(",");
}, e => {
});
this.$refs.detailedSelection.clearSelection()
} else {
this.$message.warning("请选择一条数据进行带入");
}
@@ -1413,7 +1453,6 @@ export default {
});
},
pageChange(page) {
console.log(page);
this.page = page;
this.selectionList();
},
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+16 -18
View File
@@ -209,20 +209,6 @@
</el-form-item>
</el-card>
</el-timeline-item>
<!-- <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"-->
<!-- :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">-->
<!-- <el-card>-->
<!-- <el-form-item prop="dockUserName2" style="margin-bottom: 0">-->
<!-- <h4>会签人</h4>-->
<!-- <div style="margin-top: 10px;width: 300px;">-->
<!-- <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>-->
<!-- <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"-->
<!-- @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-card>-->
<!-- </el-timeline-item>-->
<el-timeline-item timestamp="根据会签意见修订" placement="top"
:color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
<el-card>
@@ -305,7 +291,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -376,7 +362,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -447,7 +433,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -959,7 +945,7 @@ export default {
}, res => {
let arr = res.data.records;
//国家地区字段转换
arr.forEach(item => {
arr.map(item => {
if (item.countryArea !== null || item.countryArea !== "") {
let k = (item.countryArea || "").split(',')
for (let i in this.countryOptions) {
@@ -1235,6 +1221,17 @@ export default {
cancelStand() {
this.standModel = false;
},
// 点击清单名称跳转事件
showTable(item) {
sessionStorage.setItem("accessRow", JSON.stringify(item));
this.$store.commit("setDetailMap", this.$route.path);
this.$router.push({
name: "AccessStandardDetails",
params: {
id: item.id
}
});
},
//添加标准确定事件
okStand() {
this.getStandData();
@@ -1324,6 +1321,7 @@ export default {
this.listForm.inforlist = formId.join(",");
}, e => {
});
this.$refs.detailedSelection.clearSelection()
} else {
this.$message.warning("请选择一条数据进行带入");
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+1 -1
View File
@@ -272,7 +272,7 @@ export default {
this.countryOptions.forEach(item => {
map.set(item.value, item.label);
});
arr.forEach(item => {
arr.map(item => {
// 国家地区转换
if (item.countryArea !== null || item.countryArea !== "") {
let k = (item.countryArea || "").split(",");