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/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 3f01fc084..008854ce6 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -12,10 +12,10 @@
{{ item.label }}
@@ -57,7 +57,7 @@

{{ sarStandardsInfoEO.standName || '-' }}

-

{{ +

{{ sarStandardsInfoEO.standEnName || '-' }}

@@ -84,19 +84,19 @@

{{ !child.value || child.value === 'null' ? '-' : child.value }} {{ child.value || '-' }}

@@ -274,55 +274,55 @@ || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'"> {{ file.oldFileName }} - + 上传时间:{{ dateFormat(file.modifyTime) }}

- - - - - - + + + + + +
{{ !child.value || child.value === 'null' ? '-' : child.value }} {{ child.value || '-' }}

@@ -372,20 +372,20 @@ || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'"> {{ file.oldFileName }} - + - + 上传时间:{{ dateFormat(file.modifyTime) }} @@ -393,26 +393,27 @@

标准分解单 @@ -434,12 +435,12 @@
@@ -448,10 +449,10 @@ @@ -465,10 +466,10 @@
+ v-model="standItemSearch.XCXSSRQ" + type="date" + value-format="yyyy-MM-dd" + placeholder="新车实施日期">
@@ -476,29 +477,29 @@
+ v-model="standItemSearch.ZCCSSRQ" + type="date" + value-format="yyyy-MM-dd" + placeholder="在产车实施日期">
+ :loading="searching" + icon="el-icon-search" + type="primary" + size="mini" + class="common-button-primary" + @click="searchSarStandItems"> + class="common-button-default" + icon="el-icon-refresh-left" + @click="clearAllSearch" + size="mini"> @@ -511,53 +512,53 @@ 导出 关联条款
+ @selection-change="selectAllStand"> + show-overflow-tooltip + align="center" + prop="comparedWithPrevious" + label="基于上一版本差异" + width="150"> + prop="xccssrq" + label="新车型实施日期(文本)" + width="180"> + prop="zccssrq" + label="在产车实施日期(文本)" + width="170"> + prop="responsibleUnit" + label="责任部门"> + prop="dutyEngineer" + label="责任工程师" + width="100"> + show-overflow-tooltip + label="符合性状态" + width="100"> + show-overflow-tooltip + prop="complianceState" + label="合规性分析" + width="100"> 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/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index fe724dbf5..a23a5d758 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -78,35 +78,17 @@
- - - - - - - - - - - - - - - - - + + - + > - - - + - + - +
- +
- + - +
- +
- + - + - + - + - + - + - + {{'手动查找'}} - + @@ -788,7 +770,7 @@ @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'" >{{'手动查找'}} - + { if (valid) { this.$refs['userForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.form.country=this.countryArr; var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId json.jlUserId = this.form.jlUserId @@ -2395,7 +2454,7 @@ this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { - this.countryOptions=res.data.COUNTRY//国家地区 + this.countryOptions=res.data.COUNTRY//国家地区 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.WBZTCLASS // 文本状态 @@ -2417,6 +2476,7 @@ this.busVsFunc() this.modelFunc() } + } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index c38f276c2..1626963b2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -48,6 +48,7 @@
{{ item.fileName }} + 下载
@@ -287,6 +288,9 @@ export default { ProcessTitle }, methods: { + downloadFile (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 6d8361871..00767eaed 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -48,6 +48,7 @@
{{ item.fileName }} + 下载
@@ -266,6 +267,9 @@ export default { ProcessTitle }, methods: { + downloadFile (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 75e5877e6..b57526027 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -48,6 +48,7 @@
{{ item.fileName }} + 下载
@@ -306,6 +307,9 @@ export default { ProcessTitle }, methods: { + downloadFile (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index d644b0050..54bebf7ab 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -48,6 +48,7 @@
{{ item.fileName }} + 下载
@@ -290,6 +291,9 @@ export default { ProcessTitle }, methods: { + downloadFile (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 1c4e90e8d..ca9b26a70 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -48,6 +48,7 @@
{{ item.fileName }} + 下载
@@ -287,6 +288,9 @@ export default { ProcessTitle }, methods: { + downloadFile (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 121eab04b..7df9e4741 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -48,6 +48,7 @@
{{ item.fileName }} + 下载
@@ -287,6 +288,9 @@ export default { ProcessTitle }, methods: { + downloadFile (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 581a7d366..1b6a68ca8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -48,6 +48,7 @@
{{ item.fileName }} + 下载
@@ -287,6 +288,9 @@ export default { ProcessTitle }, methods: { + downloadFile (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue index 5b2b323fb..1503278e3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue @@ -15,7 +15,7 @@ 隐藏基础信息 展开基础信息