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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
396572590@qq.com
2022-08-16 11:20:19 +08:00
parent 58cffb5708 b80e43feee
commit e3f70a84f1
17 changed files with 90 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/phone/domesticStand.vue
+3 -3
View File
@@ -45,7 +45,7 @@
{{ lawsMap[item.lawsTextState] }}
</span>
<span v-else-if="lawsMap[item.lawsTextState] === '参考' || lawsMap[item.lawsTextState] === '现行有效'"
style="color: #98E165; padding-left: 5px;">
style="color: #35720B; padding-left: 5px;">
{{ lawsMap[item.lawsTextState] }}
</span>
<span v-else style=" padding-left: 5px;">
@@ -58,7 +58,7 @@
{{ textStatusMap[item.textStatus] }}
</span>
<span v-else-if="textStatusMap[item.textStatus] === '参考'"
style="color: #98E165; padding-left: 5px;">
style="color: #35720B; padding-left: 5px;">
{{ textStatusMap[item.textStatus] }}
</span>
<span v-else style=" padding-left: 5px;">
@@ -69,7 +69,7 @@
<!-- {{item.textStatusName}}-->
<!-- </span>-->
<!-- <span v-else-if="item.textStatusName === '参考' || item.textStatusName === '现行有效'"-->
<!-- style="color: #98E165; padding-left: 5px;">-->
<!-- style="color: #35720B; padding-left: 5px;">-->
<!-- {{item.textStatusName }}-->
<!-- </span>-->
<!-- <span v-else style=" padding-left: 5px;">-->
src/pages/phone/standDynamics.vue
+2 -2
View File
@@ -18,7 +18,7 @@
</div>
<div class="standContent">
<div class="standState">标准状态:
<span style="color: #98E165; padding-left: 5px;">
<span style="color: #35720B; padding-left: 5px;">
{{ textStatusMap[item.textState] }}
</span></div>
<div class="standSubTime">发布日期:
@@ -49,7 +49,7 @@
</div>
<div class="standContent">
<div class="standState">标准状态:
<span style="color: #98E165; padding-left: 5px;">
<span style="color: #35720B; padding-left: 5px;">
{{ textStatusMap[item.textState] }}
</span></div>
<div class="standSubTime">发布日期:
src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+3 -1
View File
@@ -520,7 +520,9 @@ export default {
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.projectGroup = item.dataList[0].projectGroup;
if(item.dataList && item.dataList.length > 0){
this.projectGroup = item.dataList.map(item => item.projectGroup).join(",")
}
this.$http.get('SarStandItems/sar-stand-items/findAllItems', {
ids: item.standId,
type: item.fileType
src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue
+2 -2
View File
@@ -1,10 +1,10 @@
<template>
<div class="ZQYJAddFileDetails" style="overflow: auto">
<div class="left" style="overflow: auto">
<div class="left">
<loading :loading="iframeLoading">正在加载文档</loading>
<iframe name = "iframeMap" id="iframeMapViewComponent" v-bind:src="iframeUrl"
width="100%" height="100%"
frameborder="0" scrolling="no" ref="iframeDom"
wframeborder="0" ref="iframeDom"
></iframe>
</div>
<div class="rightDiv">
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+3
View File
@@ -433,6 +433,9 @@ export default {
//展示的数据只能是未开始的
res.data.list.forEach(item => {
if(item.planStatus === '0'){
if(item.isRelate && item.isRelate === 'null'){
item.isRelate = ""
}
this.standinfoList.push(item)
}
})
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+4
View File
@@ -809,8 +809,12 @@ export default {
clearQYBZ () {
this.QYBZform = {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
validFlag: '0',
userId: this.$store.getters.userInfo.userId,
standCode: '',
standName: '',
total: 0,
}
this.QYBZget()
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+4 -2
View File
@@ -510,8 +510,10 @@ export default {
this.isSubmit = true
this.qbfsForm.bzfgbzFlag = '0'
this.qbfsForm.planStatus = '计划已确认'
if(this.qbfsForm.area && this.qbfsForm.length > 0){
this.qbfsForm.area = this.qbfsForm.area.join(',')
if(this.qbfsForm.area){
if(this.qbfsForm.area.indexOf(",") !== -1){
this.qbfsForm.area = this.qbfsForm.area.join(',')
}
}else {
this.qbfsForm.area = ""
}
src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+1
View File
@@ -24,6 +24,7 @@
<el-select
v-model="searchForm.prcType"
placeholder="按流程类型查找"
filterable
clearable
>
<el-option
src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+1
View File
@@ -24,6 +24,7 @@
<el-select
v-model="searchForm.prcType"
placeholder="按流程类型查找"
filterable
clearable
>
<el-option
src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
+1
View File
@@ -24,6 +24,7 @@
<el-select
v-model="searchForm.prcType"
placeholder="按流程类型查找"
filterable
clearable
>
<el-option
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+1
View File
@@ -24,6 +24,7 @@
<el-select
v-model="searchForm.prcType"
placeholder="按流程类型查找"
filterable
clearable
>
<el-option
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+1
View File
@@ -24,6 +24,7 @@
<el-select
v-model="searchForm.prcType"
placeholder="按流程类型查找"
filterable
clearable
>
<el-option
src/pages/regulatoryRepository/dataCenter/index.vue
+36 -9
View File
@@ -314,9 +314,9 @@
<el-upload
class="upload-demo"
action="/api/att/attFile/uploadNew"
:before-upload="beginImportFile"
:on-preview="handlePreview"
:on-remove="handleRemove"
:before-remove="beforeRemove"
multiple
:limit="50"
:on-exceed="handleExceed"
@@ -644,15 +644,42 @@ export default {
}
});
},
beginImportFile (file) {
var filename = file.name
var index1 = filename.lastIndexOf('.')
var index2 = filename.length
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PDF/PPT/PPTX/DOC/DOCX或XLS文件')
return false
}
// 判断文件上传大小
// eslint-disable-next-line no-unreachable
if (file.size / 1024 / 1024 <= 200) {
return true
} else {
this.$message.error('文件' + file.name + '大小不超过200M')
return false
}
return true
},
uploadSuccess(response, file, fileList) {
const fileIdList = fileList.map(item => {
if (item.response){
return item.response.data.attId
}else {
return item.id
}
})
this.attributeEO.attachFileId = fileIdList.join(',')
if(response.ok){
const fileIdList = fileList.map(item => {
if (item.response){
return item.response.data.attId
}else {
return item.id
}
})
this.attributeEO.attachFileId = fileIdList.join(',')
}
},
handleRemove(file, fileList) {
const fileIdList = fileList.map(item => {
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+9 -9
View File
@@ -215,7 +215,7 @@
scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '参考' "
class="table-jump" style="color: #98E165"
class="table-jump" style="color: #35720B"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
@@ -240,7 +240,7 @@
scope.row.standName
}}</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
@click="handlePreview(scope.row)" class="table-jump" style="color: #98E165">{{
@click="handlePreview(scope.row)" class="table-jump" style="color: #35720B">{{
scope.row.standName
}}</a>
<a v-else @click="handlePreview(scope.row)" style="color: #333333"
@@ -258,7 +258,7 @@
style="color: #F56C6C">{{ scope.row.issueTime }}</span>
<span
v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
style="color: #98E165">{{ scope.row.issueTime }}</span>
style="color: #35720B">{{ scope.row.issueTime }}</span>
<span v-else>{{ scope.row.issueTime }}</span>
</template>
</el-table-column>
@@ -273,7 +273,7 @@
style="color: #F56C6C">{{ scope.row.SSRQ }}</span>
<span
v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
style="color: #98E165">{{ scope.row.SSRQ }}</span>
style="color: #35720B">{{ scope.row.SSRQ }}</span>
<span v-else>{{ scope.row.SSRQ }}</span>
</template>
@@ -289,7 +289,7 @@
style="color: #F56C6C">{{ scope.row.XCXSSRQ }}</span>
<span
v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
style="color: #98E165">{{ scope.row.XCXSSRQ }}</span>
style="color: #35720B">{{ scope.row.XCXSSRQ }}</span>
<span v-else>{{ scope.row.XCXSSRQ }}</span>
</template>
</el-table-column>
@@ -303,7 +303,7 @@
style="color: #F56C6C">{{ scope.row.ZCCSSRQ }}</span>
<span
v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
style="color: #98E165">{{ scope.row.ZCCSSRQ }}</span>
style="color: #35720B">{{ scope.row.ZCCSSRQ }}</span>
<span v-else>{{ scope.row.ZCCSSRQ }}</span>
</template>
</el-table-column>
@@ -317,7 +317,7 @@
style="color: #F56C6C">{{ scope.row.dtbzh }}</span>
<span
v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
style="color: #98E165">{{ scope.row.dtbzh }}</span>
style="color: #35720B">{{ scope.row.dtbzh }}</span>
<span v-else>{{ scope.row.dtbzh }}</span>
</template>
</el-table-column>
@@ -337,7 +337,7 @@
}}</span>
<span
v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
style="color: #98E165">{{ textStatusMap[scope.row.textStatus] }}</span>
style="color: #35720B">{{ textStatusMap[scope.row.textStatus] }}</span>
<span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
@@ -1201,7 +1201,7 @@
tag.standNumber
}}-{{ tag.standYear }}</a>
<a v-else-if="tag.standYear && textStatusMap[tag.textStatus] === '参考' "
class="table-jump" style="color: #98E165"
class="table-jump" style="color: #35720B"
@click="handlePreview(tag)">{{ tag.standSortShow }} {{
tag.standNumber
}}-{{ tag.standYear }}</a>
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+7 -7
View File
@@ -326,7 +326,7 @@
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standCode
}}</a>
<a v-if="scope.row.standStatusShow === '参考'" style="color: #98E165" @click="handlePreview(scope.row)" class="table-jump">{{
<a v-if="scope.row.standStatusShow === '参考'" style="color: #35720B" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standCode
}}</a>
<a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -344,7 +344,7 @@
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standName
}}</a>
<a v-if="scope.row.standStatusShow === '参考' " style="color: #98E165" @click="handlePreview(scope.row)" class="table-jump">{{
<a v-if="scope.row.standStatusShow === '参考' " style="color: #35720B" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standName
}}</a>
<a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -360,7 +360,7 @@
>
<template slot-scope="scope">
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" >{{scope.row.dtqbbhbuss}}</span>
<span v-if="scope.row.standStatusShow === '参考' " style="color: #98E165" class="table-jump">{{scope.row.dtqbbhbuss}}</span>
<span v-if="scope.row.standStatusShow === '参考' " style="color: #35720B" class="table-jump">{{scope.row.dtqbbhbuss}}</span>
<span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" class="table-jump">{{
scope.row.dtqbbhbuss
}}</span>
@@ -376,7 +376,7 @@
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{
scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''
}}</span>
<span v-if="scope.row.standStatusShow === '参考' " style="color: #98E165">{{
<span v-if="scope.row.standStatusShow === '参考' " style="color: #35720B">{{
scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''
}}</span>
<span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{
@@ -393,7 +393,7 @@
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{
scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''
}}</span>
<span v-if="scope.row.standStatusShow === '参考'" style="color: #98E165">{{
<span v-if="scope.row.standStatusShow === '参考'" style="color: #35720B">{{
scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''
}}</span>
<span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{
@@ -412,7 +412,7 @@
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
{{ scope.row.standStatusShow }}
</span>
<span v-if="scope.row.standStatusShow === '参考'" style="color: #98E165">
<span v-if="scope.row.standStatusShow === '参考'" style="color: #35720B">
{{ scope.row.standStatusShow }}
</span>
<span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
@@ -431,7 +431,7 @@
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
{{ filterReviseStatus(scope.row.revisionStatus) }}
</span>
<span v-if="scope.row.standStatusShow === '参考'" style="color: #98E165">
<span v-if="scope.row.standStatusShow === '参考'" style="color: #35720B">
{{ filterReviseStatus(scope.row.revisionStatus) }}
</span>
<span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+10 -10
View File
@@ -203,7 +203,7 @@
<a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
</a>
<a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165" class="table-jump" @click="handlePreview(scope.row)">
<a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
</a>
<a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">
@@ -215,7 +215,7 @@
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}
</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165" class="table-jump" @click="handlePreview(scope.row)">
<a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}
</a>
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">
@@ -236,7 +236,7 @@
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standName
}}</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165" @click="handlePreview(scope.row)" class="table-jump">{{
<a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standName
}}</a>
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -257,7 +257,7 @@
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standEnName
}}</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165" @click="handlePreview(scope.row)" class="table-jump">{{
<a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standEnName
}}</a>
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -277,7 +277,7 @@
<div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
{{ formatIssueDate(scope.row.issueTime) }}
</div>
<div v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">
<div v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B">
{{ formatIssueDate(scope.row.issueTime) }}
</div>
<div v-else style="color: #333333">
@@ -297,7 +297,7 @@
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
scope.row.SSRQ
}}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">{{
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B">{{
scope.row.SSRQ
}}</span>
<span v-else style="color: #333333">{{ scope.row.SSRQ }}</span>
@@ -315,7 +315,7 @@
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
scope.row.XCXSSRQ
}}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">{{
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B">{{
scope.row.XCXSSRQ
}}</span>
<span v-else style="color: #333333">{{
@@ -334,7 +334,7 @@
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
scope.row.ZCCSSRQ
}}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">{{
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B">{{
scope.row.ZCCSSRQ
}}</span>
<span v-else style="color: #333333">{{
@@ -358,7 +358,7 @@
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
textStatusMap[scope.row.textStatus]
}}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">{{
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B">{{
textStatusMap[scope.row.textStatus]
}}</span>
<span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -1581,7 +1581,7 @@
tag.standNumber
}}-{{ tag.standYear }}</a>
<a v-else-if="tag.standYear && textStatusMap[tag.textStatus] === '参考' "
class="table-jump" style="color: #98E165"
class="table-jump" style="color: #35720B"
@click="handlePreview(tag)">{{ tag.standSortShow }} {{
tag.standNumber
}}-{{ tag.standYear }}</a>
src/pages/searchCenter/pages/standardSearch.vue
+2 -2
View File
@@ -2766,7 +2766,7 @@
}
/deep/ .greenEsClass{
background-color: #98E165 !important;
background-color: #35720B !important;
}
/deep/ .redEsClass{
@@ -2774,7 +2774,7 @@
}
/deep/ .greenClass{
color: #98E165 !important;
color: #35720B !important;
}
/deep/ .yellowClass{