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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-08-12 14:45:11 +08:00
parent 6c2ed1093e e30ee046db
commit b637fc41f1
7 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+1 -1
View File
@@ -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",
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+15 -7
View File
@@ -304,11 +304,14 @@
label="能源类型">
</el-table-column>
<el-table-column
prop="putTime"
prop="ssrq"
sortable
align="center"
width="210px"
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -458,7 +461,7 @@
</el-form-item>
<el-form-item label="标准实施日期" prop="putTime">
<el-date-picker
v-model.trim="editRowData.putTime"
v-model.trim="editRowData.ssrq"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
@@ -582,7 +585,7 @@ export default {
standEnName: '',
typeApplicable: '',
nylx: '',
putTime: '',
ssrq: '',
zccssrqgj: '',
xcxssrqgj: '',
zrbm: '',
@@ -1245,10 +1248,10 @@ export default {
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null) {
rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
if (this.sarAccessInfoList[i].ssrq === null) {
rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
@@ -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
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+7 -12
View File
@@ -150,11 +150,17 @@
label="能源类型">
</el-table-column>
<el-table-column
prop="putTime"
prop="ssrq"
sortable
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
@@ -757,11 +763,6 @@ export default {
setMap(data){
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
this.$set(this.typeApplicableMap, item.value, item.label)
this.$set(this.nylxMap, item.value, item.label)
this.$set(this.zrbmMap, item.value, item.label)
this.$set(this.sycpxMap, item.value, item.label)
this.$set(this.countryAreaMap, item.value, item.label)
})
}
},
@@ -797,12 +798,6 @@ export default {
this.textStatusOptions = res.data.WBZTCLASS
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.setMap(this.textStatusOptions)
this.setMap(this.zrbmOptions)
this.setMap(this.categoryOptions)
this.setMap(this.sycpxOptions)
this.setMap(this.energyKindOptions)
this.setMap(this.drawerCountryOptions)
this.setMap(this.applyArcticOptions)
this.getGzzOption();
}, e => {
});
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+16 -7
View File
@@ -288,11 +288,14 @@
label="能源类型">
</el-table-column>
<el-table-column
prop="putTime"
prop="ssrq"
sortable
align="center"
width="210px"
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -440,9 +443,9 @@
<el-form-item label="能源类型" prop="nylx">
<el-input v-model.trim="editRowData.nylx" :disabled="true"/>
</el-form-item>
<el-form-item label="标准实施日期" prop="putTime">
<el-form-item label="标准实施日期" prop="ssrq">
<el-date-picker
v-model.trim="editRowData.putTime"
v-model.trim="editRowData.ssrq"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
@@ -566,7 +569,7 @@ export default {
standEnName: '',
typeApplicable: '',
nylx: '',
putTime: '',
ssrq: '',
zccssrqgj: '',
xcxssrqgj: '',
zrbm: '',
@@ -1214,10 +1217,10 @@ export default {
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null) {
rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
if (this.sarAccessInfoList[i].ssrq === null) {
rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
@@ -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)
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+16 -7
View File
@@ -288,11 +288,14 @@
label="能源类型">
</el-table-column>
<el-table-column
prop="putTime"
prop="ssrq"
sortable
align="center"
width="210px"
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -439,9 +442,9 @@
<el-form-item label="能源类型" prop="nylx">
<el-input v-model.trim="editRowData.nylx" :disabled="true"/>
</el-form-item>
<el-form-item label="标准实施日期" prop="putTime">
<el-form-item label="标准实施日期" prop="ssrq">
<el-date-picker
v-model.trim="editRowData.putTime"
v-model.trim="editRowData.ssrq"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
@@ -580,7 +583,7 @@ export default {
standEnName: '',
typeApplicable: '',
nylx: '',
putTime: '',
ssrq: '',
zccssrqgj: '',
xcxssrqgj: '',
zrbm: '',
@@ -1213,10 +1216,10 @@ export default {
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null) {
rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
if (this.sarAccessInfoList[i].ssrq === null) {
rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
@@ -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)
src/pages/regulatoryRepository/standardForComments/index.vue
+1 -1
View File
@@ -55,7 +55,7 @@
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="category"
label="标准"
label="标准/政策"
align="center">
<template slot-scope="scope">
<a class="table-jump" @click.stop="handlePreview(scope.row)">{{ scope.row.category }}</a>
src/pages/searchCenter/pages/standardSearch.vue
+1 -1
View File
@@ -233,7 +233,7 @@
</div>
<div class="AllBoxContent" v-html="item.textContent"></div>
<div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime">
<div style="margin-right: 15px;">发布日期11: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }} </div>
<div style="margin-right: 15px;">发布日期: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }} </div>
<!-- <div>{{$t('m.putTime')}}: {{ item.issue_time !== null && item.issue_time !== '' ? $dateFormat(new Date(item.put_time), 'yyyy-MM-dd') : '&#45;&#45;' }} </div>-->
</div>
</div>