From 8e29a8ac1d0740c8ad65af6fd0c3826f8f1cb51f Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 10 Aug 2021 20:20:09 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 3514f3266..b472b7646 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -546,12 +546,13 @@ From 2e58223f8aa2141652b09e29915ba3cfe494ed60 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 11 Aug 2021 09:20:34 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E9=A6=96=E9=A1=B5--=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9Ftab=E9=A1=B5=E4=B8=8B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E6=97=A5=E6=9C=9F=E6=B2=A1=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home1/components/release/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue index 1e38acb4f..ec017fa9b 100644 --- a/src/pages/home1/components/release/index.vue +++ b/src/pages/home1/components/release/index.vue @@ -4,7 +4,7 @@ From e7064218ab0ac4da2e839dcb44da4c95c3dd485c Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Wed, 11 Aug 2021 10:40:15 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 88 ++++-------------- .../pages/otherAddEit.vue | 89 ++++--------------- .../pages/projectAddEit.vue | 87 ++++-------------- 3 files changed, 53 insertions(+), 211 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 2d70086ad..b1bbd0aed 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1108,66 +1108,6 @@ export default { } ] // 国内外政策可查字段 - }else if (val === 'FOREIGN_LAWS'){ - this.twoOptions=[ - { - label: '适用车辆类型', - value: 'SYCLLX', - type: 'SEL_OPTION', - disabled: false - }, { - label: '政策编号', - value: 'LAWS_NUMBER', - type: 'INPUT', - disabled: false - }, { - label: '中文名称', - value: 'LAWS_NAME', - type: 'INPUT', - disabled: false - }, { - label: '英文名称', - value: 'LAWS_EN_NAME', - type: 'INPUT', - disabled: false - }, { - label: '个性化标签', - value: 'GXHBQXX', - type: 'SEL_OPTION', - disabled: false - }, { - label: '新车型实施日期(文本)', - value: 'XCXSSRQ', - type: 'DATE_PIC_OPTS', - disabled: false - }, { - label: '在产车实施日期(文本)', - value: 'ZCCSSRQ', - type: 'DATE_PIC_OPTS', - disabled: false - }, { - label: '维护工程师', - value: 'ZCGCS', - type: 'SEL_OPTION', - selVal: "USERLIST", - disabled: false - } - ] - // 标准法规清单可查字段 - }else { - this.twoOptions=[ - { - label: '清单名称', - value: 'ACCESS_CONTENT', - type: 'INPUT', - disabled: false - }, { - label: '国家地区', - value: 'COUNTRY', - type: 'SEL_OPTION', - disabled: false - } - ] } }, /** @@ -1382,14 +1322,7 @@ export default { } }) }, - // 查询数据搜索 table 数据 - selectLawsStands () { - if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { - this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' - this.sarAccessInfoSearch.standType = '' - } else { - this.sarAccessInfoSearch.standType = 'FOREIGN' - } + pageInfo() { StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { @@ -1426,12 +1359,18 @@ export default { }, e => { }) }, - selectBtn() { + // 查询数据搜索 table 数据 + selectLawsStands () { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { - this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + this.sarAccessInfoSearch.standType = 'INLAND' + this.pageInfo() } else { this.sarAccessInfoSearch.standType = 'FOREIGN' + this.pageInfo() } + + }, + selectPage() { StandardsInfoPage(this.sarAccessInfo).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { @@ -1468,6 +1407,15 @@ export default { }, e => { }) }, + selectBtn() { + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.standType = 'INLAND' + this.selectPage() + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + this.selectPage() + } + }, // 数据搜索table判断checked状态 selectable (row) { return row.isRelateAccess === '1' diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index cb8e18827..5a1df3685 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -1076,66 +1076,6 @@ export default { } ] // 国内外政策可查字段 - }else if (val === 'FOREIGN_LAWS'){ - this.twoOptions=[ - { - label: '适用车辆类型', - value: 'SYCLLX', - type: 'SEL_OPTION', - disabled: false - }, { - label: '政策编号', - value: 'LAWS_NUMBER', - type: 'INPUT', - disabled: false - }, { - label: '中文名称', - value: 'LAWS_NAME', - type: 'INPUT', - disabled: false - }, { - label: '英文名称', - value: 'LAWS_EN_NAME', - type: 'INPUT', - disabled: false - }, { - label: '个性化标签', - value: 'GXHBQXX', - type: 'SEL_OPTION', - disabled: false - }, { - label: '新车型实施日期(文本)', - value: 'XCXSSRQ', - type: 'DATE_PIC_OPTS', - disabled: false - }, { - label: '在产车实施日期(文本)', - value: 'ZCCSSRQ', - type: 'DATE_PIC_OPTS', - disabled: false - }, { - label: '维护工程师', - value: 'ZCGCS', - type: 'SEL_OPTION', - selVal: "USERLIST", - disabled: false - } - ] - // 标准法规清单可查字段 - }else { - this.twoOptions=[ - { - label: '清单名称', - value: 'ACCESS_CONTENT', - type: 'INPUT', - disabled: false - }, { - label: '国家地区', - value: 'COUNTRY', - type: 'SEL_OPTION', - disabled: false - } - ] } }, /** @@ -1350,14 +1290,7 @@ export default { } }) }, - // 查询数据搜索 table 数据 - selectLawsStands () { - if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { - this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' - this.sarAccessInfoSearch.standType = '' - } else { - this.sarAccessInfoSearch.standType = 'FOREIGN' - } + pageInfo() { StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { @@ -1394,13 +1327,17 @@ export default { }, e => { }) }, - // 高级检索查询按钮 - selectBtn() { + // 查询数据搜索 table 数据 + selectLawsStands () { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { - this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + this.sarAccessInfoSearch.standType = 'INLAND' + this.pageInfo() } else { this.sarAccessInfoSearch.standType = 'FOREIGN' + this.pageInfo() } + }, + selectPage() { StandardsInfoPage(this.sarAccessInfo).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { @@ -1437,6 +1374,16 @@ export default { }, e => { }) }, + // 高级检索查询按钮 + selectBtn() { + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.standType = 'INLAND' + this.selectPage() + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + this.selectPage() + } + }, // 数据搜索table判断checked状态 selectable (row) { return row.isRelateAccess === '1' diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index ab1d9d8b1..f75c5adfc 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1076,66 +1076,6 @@ export default { } ] // 国内外政策可查字段 - }else if (val === 'FOREIGN_LAWS'){ - this.twoOptions=[ - { - label: '适用车辆类型', - value: 'SYCLLX', - type: 'SEL_OPTION', - disabled: false - }, { - label: '政策编号', - value: 'LAWS_NUMBER', - type: 'INPUT', - disabled: false - }, { - label: '中文名称', - value: 'LAWS_NAME', - type: 'INPUT', - disabled: false - }, { - label: '英文名称', - value: 'LAWS_EN_NAME', - type: 'INPUT', - disabled: false - }, { - label: '个性化标签', - value: 'GXHBQXX', - type: 'SEL_OPTION', - disabled: false - }, { - label: '新车型实施日期(文本)', - value: 'XCXSSRQ', - type: 'DATE_PIC_OPTS', - disabled: false - }, { - label: '在产车实施日期(文本)', - value: 'ZCCSSRQ', - type: 'DATE_PIC_OPTS', - disabled: false - }, { - label: '维护工程师', - value: 'ZCGCS', - type: 'SEL_OPTION', - selVal: "USERLIST", - disabled: false - } - ] - // 标准法规清单可查字段 - }else { - this.twoOptions=[ - { - label: '清单名称', - value: 'ACCESS_CONTENT', - type: 'INPUT', - disabled: false - }, { - label: '国家地区', - value: 'COUNTRY', - type: 'SEL_OPTION', - disabled: false - } - ] } }, /** @@ -1350,13 +1290,7 @@ export default { }) }, // 查询数据搜索 table 数据 - selectLawsStands () { - if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { - this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' - this.sarAccessInfoSearch.standType = '' - } else { - this.sarAccessInfoSearch.standType = 'FOREIGN' - } + pageInfo() { StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { @@ -1393,13 +1327,17 @@ export default { }, e => { }) }, - /** 高级查询查询按钮*/ - selectBtn() { + selectLawsStands () { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { - this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + this.sarAccessInfoSearch.standType = 'INLAND' + this.pageInfo() } else { this.sarAccessInfoSearch.standType = 'FOREIGN' + this.pageInfo() } + }, + /** 高级查询查询按钮*/ + selectPage() { StandardsInfoPage(this.sarAccessInfo).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { @@ -1436,6 +1374,15 @@ export default { }, e => { }) }, + selectBtn() { + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.standType = 'INLAND' + this.selectPage() + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + this.selectPage() + } + }, // 数据搜索table判断checked状态 selectable (row) { return row.isRelateAccess === '1' From 0c7a655ab2ac630d0950e1d3290a18b8ae35eafa Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Wed, 11 Aug 2021 13:30:47 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 1580 +++++++++-------- src/pages/localTool/standAutoSplit/index.vue | 9 + 2 files changed, 808 insertions(+), 781 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index b472b7646..0129cca4a 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3,7 +3,7 @@
- {{sarStandardsInfoEO.standSortShow || ''}} {{sarStandardsInfoEO.standNumber}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 标准详情 + {{ sarStandardsInfoEO.standSortShow || '' }} {{ sarStandardsInfoEO.standNumber }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》 标准详情
@@ -16,10 +16,10 @@ v-if="item.isShowImp === '0'" >
-
{{ item.label }}
+
{{ item.label }}
-
{{ item.label }}
+
{{ item.label }}
@@ -35,28 +35,42 @@
- - - - - - + + + + +

@@ -211,7 +225,7 @@ @@ -220,15 +234,15 @@ >

- {{item}} + {{ item }}

- {{ !child.value || child.value === 'null' ? '-' : child.value }} @@ -245,147 +259,148 @@ v-for="(file, fileIndex) in child.value" :key="fileIndex" > - +

- - - - - - + + + + + +
- +
{{ item.showAll ? '收起' : '更多' }} @@ -395,8 +410,9 @@
-
更多
- +
更多 +
+ - - - - - - - - -
- - - - - - - - -
- - - +
+ v-model="standItemSearch.XCXSSRQ" + type="date" + placeholder="新车实施日期">
- +
+ v-model="standItemSearch.ZCCSSRQ" + type="date" + placeholder="在产车实施日期">
- - -
- 导出 + + 导出 + 关联条款 + >关联条款 +
+ > + prop="XCXSSRQ" + label="新车型实施日期(文本)" + width="180"> + prop="ZCCSSRQ" + label="在产车实施日期(文本)" + width="180">
- + - 查看 + 查看 + @@ -621,14 +619,14 @@ :rules="sarStandardItemRules" label-width="150px" > - + - +
- 保存 + + 保存 + 取消
@@ -769,11 +769,15 @@
- {{ standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : '' }} + {{ + standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : '' + }}
- {{ standShowItemEO.responsibleUnit }} + {{ + standShowItemEO.responsibleUnit + }}
@@ -781,7 +785,9 @@
- {{ standShowItemEO.dutyEngineerShow }} + {{ + standShowItemEO.dutyEngineerShow + }}
@@ -797,7 +803,9 @@
- {{ standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover) }} + {{ + standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover) + }}
@@ -814,7 +822,7 @@ v-if="relateNowList" style="margin-bottom: 10px;line-height: 20px;max-height: 300px" > - {{index+1}}. {{item.creationUserName}} {{item.creationTime}} {{item.content}} + {{ index + 1 }}. {{ item.creationUserName }} {{ item.creationTime }} {{ item.content }}
@@ -834,11 +842,13 @@ class="common-button-primary add-button" size="mini" :v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'PVBSWCJQ9X4RVBM9RK7L' : 'NJ3YL4SVEJADWH7ESHDX'" - @click="addknowledge(1)">新增 + @click="addknowledge(1)">新增 + 批量删除 + @click="deleteknowledge(2)">批量删除 +
查看 - 编辑 - 删除 + + 编辑 + + + 删除 +
@@ -928,7 +942,9 @@
- 确定 + + 确定 + 取消
@@ -949,7 +965,9 @@ @click="downloadFile(item.id)" :key="index">{{ item.oldFileName }}

-

{{ knowSee.creationTime ? $moment(knowSee.creationTime).format('YYYY-MM-DD') : '' }}

+

{{ + knowSee.creationTime ? $moment(knowSee.creationTime).format('YYYY-MM-DD') : '' + }}

@@ -965,18 +983,20 @@ + icon="el-icon-search" + type="primary" + class="common-button-primary" + size="mini" + @click="getComparison()"> - 新增 + class="common-button-default" + icon="el-icon-refresh-left" + size="mini" + @click="clearComparison()"> + + 新增 + @@ -990,7 +1010,9 @@
- 确定 + + 确定 + 取消
@@ -1022,8 +1044,11 @@ @@ -1035,32 +1060,38 @@

- 确认 + + 确认 +
数据获取中
- {{$t('m.submit')}} - {{$t('m.cancel')}} + + {{ $t('m.submit') }} + + + {{ $t('m.cancel') }} +
@@ -1087,7 +1118,7 @@ export default { CustomOrg, RelatedTermsSelect }, - data () { + data() { return { relatedTermsDrawerVisible: false, btnLoading: false, @@ -1272,11 +1303,11 @@ export default { modalStandItemflag: false, tableLoading: false, standItemSearch: { - XCXSSRQ:'', - ZCCSSRQ:'', + XCXSSRQ: '', + ZCCSSRQ: '', standId: '', fileType: '', - itemsName:'', + itemsName: '', pageSize: this.$store.getters.userInfo.configContent, page: 1, }, @@ -1373,23 +1404,20 @@ export default { standMap: {} } }, - props: { - }, + props: {}, watch: {}, methods: { - FormatDate(date){ - return moment(date).format('YYYY-MM-DD'); + FormatDate(date) { + return moment(date).format('YYYY-MM-DD'); }, // 将文本状态的id与name对应 - setMap(data){ + setMap(data) { data.forEach(item => { this.$set(this.textStatusMap, item.value, item.label) this.$set(this.standMap, item.value, item.label) }) - console.log(this.textStatusMap, '文本状态的值') - console.log(this.standMap, '标准性质') }, - statusClick () { + statusClick() { let routeUrl = this.$router.resolve({ name: 'standInvolveProjectTwo', query: { @@ -1398,88 +1426,15 @@ export default { }) window.open(routeUrl.href, '_blank') }, - closeDrawer () { + closeDrawer() { this.modalStandItemflag = false - // svpps变化 - // Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then((values) => { - // const [displayLocation, standEO, formFieldList] = values - // const dynamicFormField = standEO ? standEO.attrInfoMap : {} - // formFieldList.forEach((field) => { - // displayLocation.forEach((location) => { - // location.isShowImp = '1' - // if (dynamicFormField) { - // let value = dynamicFormField[field.attrField] - // if (field.attrField === 'SVPPS') { - // let tips = dynamicFormField.SVPPSTips - // field['tips'] = tips - // } - // if (value && typeof value === 'number') { - // value = this.$dateFormat(value, 'yyyy-MM-dd') - // } - // field['value'] = value - // if (field.showRegionId === location.value) { - // if (!location.child) { - // location['child'] = [] - // } - // location['child'].push(field) - // if (field.isShowImp === '0') { - // location.isShowImp = '0' - // } - // } - // } - // }) - // }) - // displayLocation.forEach(location => { - // const child = location.child || [] - // const one = [] - // const half = [] - // child.map(field => { - // if (['DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM'].includes(field.attrType)) { - // half.push(field) - // } else { - // one.push(field) - // } - // }) - // const fieldsIsTextAreaOrFile = child.filter(field => { - // return field.attrType === 'TEXTAREA' || field.attrType === 'FILE' - // }) - // const fieldOthers = child.filter(field => { - // return field.attrType !== 'TEXTAREA' && field.attrType !== 'FILE' - // }) - // location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile] - // location.one = one - // location.half = half - // location.showAll = false - // }) - // this.$http.get('lawss/sarSarAccessInfo/selectProTimeInfoByStandId', { - // standId: this.$route.params.id - // }, { - // _this: this - // }, res => { - // displayLocation.map(item => { - // if (item.value === '2URVBGR2Y4UG77KZ5YPL') { - // for (let key in res.data) { - // item.one.push({ - // attrName: key, - // value: res.data[key].join(','), - // isShowImp: '0', - // id: key - // }) - // } - // } - // }) - // this.dynamicFormField = displayLocation - // }) - // sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) - // this.loading = false - // }) }, - clearComparison () { + clearComparison() { this.comparisonTitle = '' this.getComparison() }, // 验证条款号是否唯一 - validCode (rule, value, callback) { + validCode(rule, value, callback) { let find = 0 this.standItemList.map(item => { if (item.itemsNum === value) { @@ -1494,7 +1449,7 @@ export default { callback() }, // 新增清单 - submitDrawerForm (name) { + submitDrawerForm(name) { this.$refs[name].validate((valid) => { if (valid) { const formData = { @@ -1517,7 +1472,7 @@ export default { }) }, // 比对提交 - comparisonSub () { + comparisonSub() { if (this.comparisonId === '') { this.$message.error('请选择比对清单') } else { @@ -1553,13 +1508,13 @@ export default { } }, // 比对关闭 - comparisonClose () { + comparisonClose() { this.comparisonTitle = '' this.comparisonId = '' this.comparisonDialog = false }, // 获取清单 - getComparison () { + getComparison() { this.$http.get('lawss/sarStandCompareBase/page', { listName: this.comparisonTitle, page: '1', @@ -1574,22 +1529,22 @@ export default { }) }, // 打开比对模态框 - comparisonDialogOpen () { + comparisonDialogOpen() { this.comparisonDialog = true this.getComparison() }, // 比对新增 - addComparison () { + addComparison() { this.AddcomparisonDrawer = true this.listVO.name = '' this.listVO.public = false }, - beforeUpload1 (file) { + beforeUpload1(file) { var filename = file.name var index1 = filename.lastIndexOf('.') var index2 = filename.length var fileSuffix = filename.substring(index1, index2) - if (fileSuffix === '.pdf' || fileSuffix === '.doc' || fileSuffix === '.docx' || fileSuffix === '.PDF'|| fileSuffix === '.ppt' || fileSuffix === '.pptx') { + if (fileSuffix === '.pdf' || fileSuffix === '.doc' || fileSuffix === '.docx' || fileSuffix === '.PDF' || fileSuffix === '.ppt' || fileSuffix === '.pptx') { return true } else { this.$message.error('文件' + file.name + '格式不正确，请上传doc、docx、ppt、pptx、pdf、或PDF文件') @@ -1602,7 +1557,7 @@ export default { } return true }, - uploadSuccess1 (res, file, fileList) { + uploadSuccess1(res, file, fileList) { if (res.ok) { this.addForm.fileId += res.data.id + ',' this.$message({ @@ -1614,7 +1569,7 @@ export default { this.importForm.content = res.message } }, - removeOneFile1 (file, fileList) { + removeOneFile1(file, fileList) { let ids = this.addForm.fileId.split(',') if (file.response) { let fileIds = file.response.data.id @@ -1623,7 +1578,7 @@ export default { } }, // 删除数组中的某个对象 - removeAaary (_arr, _obj) { + removeAaary(_arr, _obj) { var length = _arr.length for (var i = 0; i < length; i++) { if (_arr[i] === _obj) { @@ -1640,7 +1595,7 @@ export default { } } }, - handleSelectionKnow (val) { + handleSelectionKnow(val) { this.knowIdList = '' val.map((item, index) => { if (val.length === 1) { @@ -1653,7 +1608,7 @@ export default { }) }, // 确定新增 - AddKnowSub () { + AddKnowSub() { this.$refs['addForm'].validate((valid) => { if (valid) { this.AddKnowSubLoading = true @@ -1699,7 +1654,7 @@ export default { }) }, // 关闭知识点新增 - AddKnowClose () { + AddKnowClose() { this.defaultFileList = [] this.addForm.title = '' this.addForm.content = '' @@ -1708,19 +1663,19 @@ export default { this.AddKnowledgDialog = false }, // 知识点分页 - pageChange1 (page) { + pageChange1(page) { this.pageNo = page this.getKnowList() }, - pageSizeChange1 () { + pageSizeChange1() { this.getKnowList() }, - knowledgeSharing () { + knowledgeSharing() { this.knowledgeSharingDialog = true this.getKnowList() }, // 获取知识点列表数据 - getKnowList () { + getKnowList() { this.$http.get('lawss/sarKnowledgeShare/page', { sarId: this.$route.params.id, sarType: this.$route.params.pageType, @@ -1735,7 +1690,7 @@ export default { } }) }, - handleCommand2 (command) { + handleCommand2(command) { switch (command[1]) { case '查看': this.handleKnow(command[0]) @@ -1749,12 +1704,12 @@ export default { } }, // 查看知识点 - handleKnow (row) { + handleKnow(row) { this.AddKnowledgDialogItem = true this.knowSee = row }, // 点击新增知识点 - addknowledge (type, row) { + addknowledge(type, row) { this.knowType = type if (type === 1) { this.KnowTitle = '新增知识点' @@ -1778,7 +1733,7 @@ export default { } }, // 删除知识点 - deleteknowledge (type, row) { + deleteknowledge(type, row) { // type = 2为批量删除 1为单条删除 var ids = '' if (type === 2) { @@ -1825,7 +1780,7 @@ export default { }) }, // 代替标准编号 - showReplaceStandInfo (item) { + showReplaceStandInfo(item) { this.replaceStandInfoEO.standNumber = item // this.replaceStandInfoEO.standType = this.sarStandardsInfoEO.standType this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', this.replaceStandInfoEO, { @@ -1846,7 +1801,7 @@ export default { }, e => { }) }, - clickButtonToUpload (current) { + clickButtonToUpload(current) { this.currentFileList = current this.currentFile = JSON.parse(JSON.stringify(current).replace('List', '')) // this.importModalshowflagtemp = true @@ -1881,7 +1836,7 @@ export default { } }, // 新增、编辑上传文件之前的钩子 - beforeUpload (file) { + beforeUpload(file) { var filename = file.name var index1 = filename.lastIndexOf('.') var index2 = filename.length @@ -1897,7 +1852,7 @@ export default { return false } // 判断文件上传大小 - if (file.size / 1024 / 1024 <= 200) {// eslint-disable-line + if (file.size / 1024 / 1024 <= 200) {// eslint-disable-line return true } else { this.$message.error('文件' + file.name + '大小不超过200M') @@ -1906,7 +1861,7 @@ export default { return true }, // 导入标准数据成功后执行 - importFileSuccess (res, file, fileList) { + importFileSuccess(res, file, fileList) { if (res.ok) { // 使用字条款是否展示模态框判断导入的文件是标准，还是条款modalStandItemflag // this.selectSarStandItems(this.standItemSearch.standId) @@ -1923,7 +1878,7 @@ export default { this.showUploadlist = false } }, - removeOneFile (file, fileList) { + removeOneFile(file, fileList) { // this.sarStandardsInfoEO[this.currentFileList] = this.removeAaary(this.sarStandardsInfoEO[this.currentFileList], file.response.data) let ids = this.sarStandardsInfoEO[this.currentFile].split(',') if (file.response) { @@ -1943,32 +1898,32 @@ export default { } }, // 导入文件大小超出范围 - handleSizeError (file) { + handleSizeError(file) { this.$message.error('文件' + file.name + '大小不超过200M') }, // 导入标准文件格式错误执行 - handleFormatError (file) { + handleFormatError(file) { this.$message.error('文件' + file.name + '格式不正确，请上传以.xlsx结尾的excel文件') }, // 子条款部门名称改变后 - itemOrgNameChange () { + itemOrgNameChange() { if (this.standItemEO.orgName === '') { this.standItemEO.responsibleUnit = '' } this.getOrgTreeSource() }, - treeDblClickEngin (treeId, treeNode) { + treeDblClickEngin(treeId, treeNode) { this.standItemEO.dutyEngineer = treeNode.id this.standItemEO.dutyEngineerShow = treeNode.name $('#enginBtnS').click() }, - treeDblClickFO (treeId, treeNode) { + treeDblClickFO(treeId, treeNode) { this.standItemEO.fo = treeNode.id this.standItemEO.foShow = treeNode.name $('#foBtnS').click() }, // 标准条款新增 - saveOrUpdateStandItem () { + saveOrUpdateStandItem() { this.$refs['sarStandardsItemForm'].validate((valid) => { if (valid) { let nowstandItem = JSON.parse(JSON.stringify(this.standItemEO)) @@ -2004,31 +1959,31 @@ export default { }) }, // 表单清空 - resetForm () { + resetForm() { this.$nextTick(() => { // this.$refs['sarStandardsItemForm'].resetFields() this.$refs['sarStandardsItemForm'].clearValidate() }) this.modalItemaddShowflag = false }, - selectAllStand (alldata) { + selectAllStand(alldata) { this.selectedItemList = [] for (let i = 0; i < alldata.length; i++) { this.selectedItemList.push(alldata[i].id) } }, // 分页点击后方法 - pageChange (page) { + pageChange(page) { this.standItemSearch.page = page this.selectSarStandItems() }, // 分页每页显示数改变后方法 - pageSizeChange (pageSize) { + pageSizeChange(pageSize) { this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent this.selectSarStandItems() // 此处需要调用接口，修改个人配置 }, - selectStandMessage () { + selectStandMessage() { return new Promise((resolve, reject) => { this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoById', {id: this.sarStandardsInfoEO.id}, { _this: this @@ -2062,7 +2017,7 @@ export default { }) }, // 新增浏览记录 - addPersonCookie () { + addPersonCookie() { this.personCookieEO.cookieType = this.$route.params.pageType if (this.sarStandardsInfoEO.standYear != null && this.sarStandardsInfoEO.standYear !== '') { this.personCookieEO.resTitle = this.sarStandardsInfoEO.standName + '(编号：' + this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear + ')' @@ -2077,7 +2032,7 @@ export default { }) }, // 获取组织机构数据 - getOrgTreeSource () { + getOrgTreeSource() { this.$http.get('sys/org/getTree', {}, {_this: this}, res => { if (res.ok) { @@ -2096,9 +2051,10 @@ export default { this.zNodesSItem = treeNode this.searchInlandNodes = treeNode } - }, e => {}) + }, e => { + }) }, - getUserTreeSource () { + getUserTreeSource() { this.$http.get('sys/org/getTree', {}, {_this: this}, res => { if (res.ok) { @@ -2116,10 +2072,11 @@ export default { }) this.zNodesSItemEngin = treeNode } - }, e => {}) + }, e => { + }) }, // 查询相近标准 - selectCloseStand (id) { + selectCloseStand(id) { let obj = {} obj.id = id let url = '' @@ -2133,17 +2090,17 @@ export default { }, e => { }) }, - openFileInPdf (attId, oldFileName) { + openFileInPdf(attId, oldFileName) { // 判断是否是图片格式，图片格式不预览，直接下载 let index1 = oldFileName.lastIndexOf('.') let index2 = oldFileName.length let fileSuffix = oldFileName.substring(index1, index2) //把后缀转大写 - if(fileSuffix !== undefined && fileSuffix !== null){ + if (fileSuffix !== undefined && fileSuffix !== null) { fileSuffix = fileSuffix.toUpperCase() } // 判断上传文件格式 - if (fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') { + if (fileSuffix === '.PNG' || fileSuffix === '.JPG' || fileSuffix === '.JPEG') { this.downloadFile(attId) return true } @@ -2237,7 +2194,7 @@ export default { } } }, - showItemsModel (attField) { + showItemsModel(attField) { this.fileType = attField this.getOrgTreeSource() this.selectedItemList = [] @@ -2251,37 +2208,27 @@ export default { }) }, // 分解单----查看标准条款相关 - selectSarStandItems (id, flag) { + selectSarStandItems(id, flag) { this.standItemSearch.standId = this.sarStandardsInfoEO.id this.standItemSearch.fileType = this.fileType this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => { this.selectedItemList = [] if (res.ok) { this.standItemList = res.data; - console.log("hello"+this.standItemList+res.data); + console.log("hello" + this.standItemList + res.data); this.standitemTotal = res.data.count // 分页需要 } - - // if (this.standItemList != null && this.standItemList.length > 0) { - // for (let ind = 0; ind < this.standItemList.length; ind++) { - // // 去掉html标签 - // let itemContent = this.standItemList[ind].termsConditions - // itemContent = itemContent ? itemContent.replace(/<.*?>/ig, ' ') : '' - // this.standItemList[ind].termsConditions = itemContent - // } - // } - }, e => { }) }, - downloadFile (attId) { + downloadFile(attId) { if (attId != null && attId !== '') { window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId } else { this.$message.error('请选择要下载的文件') } }, - downloadFileByWater (attId, fileSuffix) { + downloadFileByWater(attId, fileSuffix) { if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { this.$message.error('水印下载仅支持PDF,pdf格式文件') } else { @@ -2293,9 +2240,9 @@ export default { } }, /** - * @Description: 跳转流程 - */ - processCenterClick (item) { + * @Description: 跳转流程 + */ + processCenterClick(item) { let routeUrl = this.$router.resolve({ name: 'ProcessDetail', query: { @@ -2304,12 +2251,12 @@ export default { }) window.open(routeUrl.href, '_blank') }, - searchSarStandItems () { + searchSarStandItems() { this.standItemSearch.page = 1 this.selectSarStandItems() }, // 清空搜索框 - clearAllSearch () { + clearAllSearch() { // 标准条款搜索 this.standItemSearch.responsibleUnit = '' this.standItemSearch.orgName = '' @@ -2318,17 +2265,17 @@ export default { this.standItemSearch.fileType = '' this.selectSarStandItems() }, - inputChange () { + inputChange() { this.standItemSearch.responsibleUnit = '' this.getOrgTreeSource() }, - searchInlandNodesClick (treeId, treeNode) { + searchInlandNodesClick(treeId, treeNode) { this.standItemSearch.responsibleUnit = treeNode.id this.standItemSearch.orgName = treeNode.name $('#searchInlandDeptBtn').click() }, // 点击条款表格上面的操作按钮新增 - addItemModal () { + addItemModal() { this.editAddType = 1 this.getOrgTreeSource() this.itemModalTitle = '新增标准法规条款' @@ -2342,18 +2289,18 @@ export default { this.itemFormdisableflag = false }, // 模板下载 - uploadImportModal (flag) { + uploadImportModal(flag) { window.open('/api/att/attFile/uploadModalFile?fileName=分解单导入模板.xlsx') }, // 点击导入标准 - addImportModal (flag) { + addImportModal(flag) { this.importModalshowflag = true this.importExcelUrl = '/api/lawss/sarStandItems/importSarStandItemsList?standId=' + this.standItemSearch.standId + '&fileType=' + this.fileType this.$nextTick(() => { this.$refs.importFileAboutStand.clearFiles() }) }, - exportStandardItem () { + exportStandardItem() { this.$confirm('您是否要导出数据?', '提示', { confirmButtonText: '确定', confirmButtonClass: 'common-button-primary', @@ -2369,10 +2316,11 @@ export default { } else { this.$message.warning('暂无可导出的数据') } - }).catch(() => {}) + }).catch(() => { + }) }, // 标准条款删除 - deleteStandItem (item, flag) { + deleteStandItem(item, flag) { // flag==1 删除单条 flag==2 批量删除 let ids = [] if (flag === 1) { @@ -2430,7 +2378,7 @@ export default { } }, // 分解单-查看 - handlePreview (item) { + handlePreview(item) { this.showItemInfoModal = true let fileList = [] item.defaultFileList = [] @@ -2471,7 +2419,7 @@ export default { } }, // 分解单-编辑 - selectStandardPro (item) { + selectStandardPro(item) { this.editAddType = 2 this.itemModalTitle = '编辑标准法规条款' item.orgName = '' @@ -2494,7 +2442,7 @@ export default { }) }, // 修改过程中，将resId 修改成 attid - updateResidToAttid (filetype) { + updateResidToAttid(filetype) { if (this.sarStandardsInfoEO[filetype] !== null && this.sarStandardsInfoEO[filetype] !== '') { this.$http.get('lawss/attFile/getMultiFileInfosByResid', { fileIds: this.sarStandardsInfoEO[filetype], fileType: 'stand' @@ -2509,7 +2457,7 @@ export default { /** * 展示位置 */ - queryDisplayLocation () { + queryDisplayLocation() { return new Promise((resolve, reject) => { this.$http.get('lawssBase/utArea/getAreaList', { sarType: 'INLAND_STAND' @@ -2526,13 +2474,13 @@ export default { /** * 获取新增弹框的表单 */ - getAddFormFieldList (isEdit) { + getAddFormFieldList(isEdit) { return new Promise((resolve, reject) => { this.$http.get('lawss/sarStandAttrDetails/list', {}, {_this: this}, res => { if (res.ok) { // const { data: { STAND: data } } = res - const { data = {} } = res + const {data = {}} = res this.formFieldListData = data[this.$route.params.pageType] console.log('this.formFieldListData') console.log(this.formFieldListData); @@ -2547,7 +2495,7 @@ export default { }) }, // 点击更多按钮事件 - moreClick () { + moreClick() { this.dynamicFormField.map(item => { item.isShowImp = '0' item.child.map(child => { @@ -2557,12 +2505,12 @@ export default { this.isMoreAwayBtn = true }, // 点击收起按钮事件 - putAwayClick () { + putAwayClick() { this.dynamicFormField = JSON.parse(sessionStorage.getItem('displayLocation')) this.isMoreAwayBtn = false }, // 鼠标滚轮事件 - handleScroll (e) { + handleScroll(e) { // 该语句可以用来判断滚轮是向上滑动还是向下 const direction = e.deltaY > 0 ? 'down' : 'up' if (direction === 'down') { @@ -2570,7 +2518,7 @@ export default { } }, // ... - handleCommand (command) { + handleCommand(command) { switch (command[1]) { case '查看': this.handlePreview(command[0]) @@ -2587,7 +2535,7 @@ export default { * 点击 加收藏 按钮事件 * @param collectId 有值：取消收藏 无值：加收藏 */ - collectClick (collectId) { + collectClick(collectId) { this.isSubmit = true if (collectId) { // 取消收藏 @@ -2626,7 +2574,7 @@ export default { } }, // 更新LOG - relateEvent () { + relateEvent() { this.$http.get('lawss/sarUpdLog/getLogList', { sarId: this.$route.params.id, sarType: this.$route.params.pageType @@ -2654,11 +2602,11 @@ export default { }) }, - relateDialogClose () { + relateDialogClose() { this.relateDialog = false this.relateNowList = [] }, - halfClass (data, nextData, index) { + halfClass(data, nextData, index) { const halfType = ['INPUT_STR', 'DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM'] let flag = false if (halfType.includes(data.attrType)) { // 是 50% 显示的组件时 @@ -2675,7 +2623,7 @@ export default { return flag ? '' : 'clear' }, - handleToggleShowAll (item) { + handleToggleShowAll(item) { if (!item.showAll) { item.showAll = true } else { @@ -2683,7 +2631,7 @@ export default { } }, // 根据企标覆盖关系value值获取名称 - busStandCoverName (value) { + busStandCoverName(value) { let busStandCoverName = '' this.BZFGGXOUIUJ.map(item => { if (item.value === value) { @@ -2715,22 +2663,22 @@ export default { closeRelatedTermsDrawer() { this.$refs['relatedTermsDrawer'].closeDrawer() }, - itemsTextDialog (itemsNum, text) { + itemsTextDialog(itemsNum, text) { this.itemsTextDialogs = true this.itemsText = '

' + itemsNum + '

' + text.replace(/''/g, '\'') } }, computed: { - titleShow () { + titleShow() { return (this.sarStandardsInfoEO.standSortShow || '') + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear + '《' + this.sarStandardsInfoEO.standName + '》' + '标准详情' }, - titleHidden () { + titleHidden() { return (this.sarStandardsInfoEO.standSortShow || '') + this.sarStandardsInfoEO.standNumber + '《' + this.sarStandardsInfoEO.standName + '》' + '标准详情' }, - visibleBtn () { + visibleBtn() { return this.$route.name === 'DomesticStandardDetails' }, - sarType () { + sarType() { return this.$route.params.pageType }, standNum() { @@ -2746,7 +2694,7 @@ export default { return item.id } }, - async mounted () { + async mounted() { this.sarStandardsInfoEO.id = this.$route.params.id // await this.selectStandMessage() this.standItemEO.standId = this.$route.params.id @@ -2837,7 +2785,7 @@ export default { } }) this.dynamicFormField = displayLocation - console.log(this.dynamicFormField) + console.log(this.dynamicFormField) }) sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) this.loading = false @@ -2850,7 +2798,7 @@ export default { // firefox window.addEventListener('DOMMouseScroll', this.handleScroll, false) }, - destroyed () { + destroyed() { window.removeEventListener('mousewheel', this.handleScroll, false) window.removeEventListener('DOMMouseScroll', this.handleScroll, false) sessionStorage.removeItem('displayLocation') @@ -2862,390 +2810,460 @@ export default { diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 1d6be7da5..b22f830da 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -77,6 +77,15 @@ show-overflow-tooltip align="center"> + + + Date: Wed, 11 Aug 2021 14:40:45 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=86=E8=A7=A3=E5=8D=95=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 0129cca4a..a3ae69e2f 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -527,14 +527,8 @@ - - + prop="interpretationContent" + label="解读内容" + show-overflow-tooltip + > + + + + + Date: Wed, 11 Aug 2021 14:50:15 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84-=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index d44b0a32d..28376ae89 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -239,7 +239,7 @@ 编辑 - 删除 + 删除 From 0d817f1ddb72935e78ec048b8a50473f88cc7596 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 12 Aug 2021 09:39:48 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E6=A0=87=E5=87=86=E5=AE=9E?= =?UTF-8?q?=E6=96=BD=E6=97=A5=E6=9C=9F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 16 ++++++++++++---- .../pages/otherAddEit.vue | 17 +++++++++++++---- .../pages/projectAddEit.vue | 17 +++++++++++++---- 3 files changed, 38 insertions(+), 12 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index b1bbd0aed..1a786bd70 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -304,11 +304,14 @@ label="能源类型"> + @@ -582,7 +585,7 @@ export default { standEnName: '', typeApplicable: '', nylx: '', - putTime: '', + ssrq: '', zccssrqgj: '', xcxssrqgj: '', zrbm: '', @@ -1335,6 +1338,7 @@ export default { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') this.$set(item, 'sycpx', '') + this.$set(item, 'ssrq', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') this.$set(item, 'zrbm', '') @@ -1346,6 +1350,7 @@ export default { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) @@ -1382,6 +1387,7 @@ export default { if (item.attrInfoMap === null) { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') this.$set(item, 'sycpx', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') @@ -1393,6 +1399,7 @@ export default { }else { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1427,6 +1434,7 @@ export default { if (item.attrInfoMap === null) { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') this.$set(item, 'sycpx', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') @@ -1438,6 +1446,7 @@ export default { }else { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1526,7 +1535,6 @@ export default { }, // 导出确定功能 exportTestItem () { - let exportNames = this.exportName let exportList = [] if (this.sarAccessInfoListArry.length > 0) { exportList = this.sarAccessInfoListArry diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 5a1df3685..0dfdedf9f 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -288,11 +288,14 @@ label="能源类型"> + - + @@ -566,7 +569,7 @@ export default { standEnName: '', typeApplicable: '', nylx: '', - putTime: '', + ssrq: '', zccssrqgj: '', xcxssrqgj: '', zrbm: '', @@ -1302,6 +1305,7 @@ export default { if (item.attrInfoMap === null) { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') this.$set(item, 'sycpx', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') @@ -1313,6 +1317,7 @@ export default { }else { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1349,6 +1354,7 @@ export default { if (item.attrInfoMap === null) { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') this.$set(item, 'sycpx', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') @@ -1360,6 +1366,7 @@ export default { }else { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1395,6 +1402,7 @@ export default { if (item.attrInfoMap === null) { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') this.$set(item, 'sycpx', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') @@ -1406,6 +1414,7 @@ export default { }else { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index f75c5adfc..2e73c4f2c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -288,11 +288,14 @@ label="能源类型"> + - + @@ -580,7 +583,7 @@ export default { standEnName: '', typeApplicable: '', nylx: '', - putTime: '', + ssrq: '', zccssrqgj: '', xcxssrqgj: '', zrbm: '', @@ -1302,6 +1305,7 @@ export default { if (item.attrInfoMap === null) { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') this.$set(item, 'sycpx', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') @@ -1313,6 +1317,7 @@ export default { }else { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1349,6 +1354,7 @@ export default { if (item.attrInfoMap === null) { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') this.$set(item, 'sycpx', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') @@ -1360,6 +1366,7 @@ export default { }else { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1394,6 +1401,7 @@ export default { if (item.attrInfoMap === null) { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') this.$set(item, 'sycpx', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') @@ -1405,6 +1413,7 @@ export default { }else { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) From 98ee797a428c7d42160b77217082f8c299534a10 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 12 Aug 2021 13:49:21 +0800 Subject: [PATCH 08/13] commit --- src/pages/processCenter/pages/creatProcess/bzdy/step5.vue | 2 +- src/pages/regulatoryRepository/standardForComments/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 011d29d6d..c48455049 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -208,7 +208,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail} from 'api/process' + import {inboundLiaisonDetail,saveTaskForPub} from 'api/process' export default { name: "bzdyStep5", diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue index b70d81004..21ebfe376 100644 --- a/src/pages/regulatoryRepository/standardForComments/index.vue +++ b/src/pages/regulatoryRepository/standardForComments/index.vue @@ -55,7 +55,7 @@ :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">