diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index 0c16493f5..508ea9ca5 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -44,8 +44,7 @@ + label="链接名称"> diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index 07bfb775a..39572377a 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -394,22 +394,29 @@ export default { } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 8a64d736d..612ba7e67 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -49,24 +49,21 @@ > -
-

- {{ listForm.fileName }} - - - 点击上传 - - -

+
+ + + 点击上传 + +
@@ -129,6 +126,9 @@ prop="issueTime" align="center" label="发布日期"> + - - - -

会签人

-
- - - -
- - - + :color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'">

标准/政策法规工程师

@@ -305,7 +291,7 @@ @row-click="rowClick" @select="select" @selection-change="selectListChange" - ref="selection" + ref="detailedSelection" > @@ -376,7 +362,7 @@ @row-click="rowClick" @select="select" @selection-change="selectListChange" - ref="selection" + ref="detailedSelection" > { 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(); }, diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index ef2978bae..afe271d7d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -209,20 +209,6 @@ - - - - - - - - - - - - - - @@ -305,7 +291,7 @@ @row-click="rowClick" @select="select" @selection-change="selectListChange" - ref="selection" + ref="detailedSelection" > { 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("请选择一条数据进行带入"); } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 9a78bbfad..9abd10346 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -779,6 +779,7 @@ export default { * @description: 动态表单读取 */ getFormFieldList (item) { + console.log(item.commentText); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)) if(item.form === undefined){ @@ -791,9 +792,11 @@ export default { this.listForm.jlUserId = item.jlUserId this.listForm.zrUserId = item.zrUserId this.fileInfoList = item.fileName + this.commentText = item.commentText } else { this.listForm = item.form this.dataList = item.form.dataList + this.commentText = item.commentText this.listForm.dataList = item.form.dataList this.fileInfoList = item.form.fileName } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index dbe4ba403..8a2829bbf 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -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(","); diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index e7402b426..8182ef42f 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -202,7 +202,6 @@ show-overflow-tooltip prop="standName" label="标准名称" - width="300" >