WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_2nd_period' into 'feature_dev_20221010_extend'

Browse Source 
# Conflicts:
#   jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
This commit is contained in:
高嵩
2022-10-24 10:09:49 +08:00
parent 7ebbe9c130 25e44bfe7f
commit 798a3b5161
77 changed files with 3287 additions and 1500 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue
+1
View File
@@ -34,6 +34,7 @@
</div>
<a-form-model-item class="itemModel" prop="chargePersonIdName">
<PersonnelSelection
v-if="visible"
:isSingleChoice="true"
:query="{db_field_name:'chargePersonId',db_field_txt:$t('personCharge')}"
:personneQuery="formInline"
jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue
+3 -1
View File
@@ -36,7 +36,9 @@
</a-form>
</div>
<div class="box-content-right">
<div @click="managePublishingClick" class="operator-text">
<div @click="managePublishingClick"
v-has="'countryCard:managePublishing'"
class="operator-text">
<a-icon type="carry-out"/>
{{$t('managePublishing')}}
</div>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+26 -9
View File
@@ -34,9 +34,10 @@
<span class="title-text-text"
:title="$t('problemClassification')">{{$t('problemClassification')}}</span>
</div>
<a-form-model-item class="itemModel" prop="problemType">
<a-form-model-item class="itemModel itemModel-multi" prop="problemType">
<a-select :placeholder="$t('PleaseSelect')+$t('problemClassification')"
@change="problemTypeChange"
mode="multiple"
v-model="formInline.problemType">
<a-select-option v-for="(item, key) in problemTypeList"
:key="key"
@@ -94,7 +95,7 @@
<span class="Required">*</span>
<span class="title-text-text" :title="$t('authorizedUser')">{{$t('authorizedUser')}}</span>
</div>
<a-form-model-item class="itemModel" prop="studioEngineerName">
<a-form-model-item class="itemModel-multi" prop="studioEngineerName">
<PersonnelSelection :query="{db_field_name:'studioEngineer',db_field_txt:$t('authorizedUser')}"
:personneQuery="formInline"
@change="PersonnelSelectionChange"
@@ -125,9 +126,9 @@
</a-select-option>
</a-select>
<a-button class="box-button-index"
:title="$t('bringInDocumentInformation')"
:title="$t('addStandardInformation')"
type="primary" @click="bringInDocumentInformationClick">
{{$t('bringInDocumentInformation')}}
{{$t('addStandardInformation')}}
</a-button>
</a-form-model-item>
</div>
@@ -178,7 +179,10 @@
</a-row>
</a-form-model>
<div class="submit-button">
<a-button class="box-button" type="primary" @click="submit">{{$t('submit')}}</a-button>
<a-button class="box-button" type="primary" @click="submit('Draft')">
{{$t('tempSave')}}
</a-button>
<a-button class="box-button" type="primary" @click="submit('Have released')">{{$t('release')}}</a-button>
</div>
</div>
</div>
@@ -356,7 +360,7 @@
document.title = this.$t('problemKnowledgeBase') + this.$t('edit')
} else {
this.isDisplayIndex = true
this.$nextTick(()=>{
this.$nextTick(() => {
this.myQuillEditor()
})
document.title = this.$t('problemKnowledgeBase') + this.$t('newlyAdded')
@@ -476,6 +480,11 @@
} else {
this.formInline.standNumber = []
}
if (this.formInline.problemType) {
this.formInline.problemType = this.formInline.problemType.split(',')
} else {
this.formInline.problemType = []
}
this.formInline = { ...this.formInline }
} else {
this.formInline = {}
@@ -491,7 +500,7 @@
this.$router.go(-1)
},
onEditorReady(quill) {
if (this.formInlineOne.content){
if (this.formInlineOne.content) {
document.getElementsByClassName('ql-editor')[0].innerHTML = this.formInlineOne.content
}
},
@@ -595,14 +604,20 @@
this.formInline[this.uploadName] = attIdList.join(',')
this.formInline = { ...this.formInline }
},
submit() {
tempSaveClick(){
},
submit(releaseStatus) {
this.$refs.ruleForm.validate(valid => {
if (valid) {
let formInline = JSON.parse(JSON.stringify(this.formInline))
// if (formInline.standNumber && formInline.standNumber.length > 0) {
if (formInline.standNumber instanceof Array){
if (formInline.standNumber instanceof Array) {
formInline.standNumber = formInline.standNumber.join(',')
}
if (formInline.problemType instanceof Array) {
formInline.problemType = formInline.problemType.join(',')
}
// }
this.loading = true
this.confirmLoading = true
@@ -624,6 +639,7 @@
})
})
}
formInline.releaseStatus = releaseStatus
Action(url, formInline).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
@@ -775,6 +791,7 @@
.box-button {
height: 38px;
margin-top: 4px;
margin-left: 10px;
}
.box-button-index {
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+63 -18
View File
@@ -15,7 +15,9 @@
</template>
</div>
<div class="box-content-content">
<div class="box-content-content-index" :title="$t('classificationMaintenance')"
<div class="box-content-content-index"
v-has="'problemKnowledgeBase:classificationMaintenance'"
:title="$t('classificationMaintenance')"
@click="classificationClick">
<a-icon type="setting"/>
{{$t('classificationMaintenance')}}
@@ -42,11 +44,15 @@
<!-- <a-icon type="setting"/>-->
<!-- {{$t('classificationMaintenance')}}-->
<!-- </div>-->
<div @click="managePublishingClick" class="operator-text-text-index">
<div @click="managePublishingClick"
v-has="'problemKnowledgeBase:release'"
class="operator-text-text-index">
<a-icon type="carry-out"/>
{{$t('managePublishing')}}
</div>
<div @click="newlyAddedClick" class="operator-text-text-index">
<div @click="newlyAddedClick"
v-has="'problemKnowledgeBase:add'"
class="operator-text-text-index">
<a-icon type="plus"/>
{{$t('newlyAdded')}}
</div>
@@ -65,16 +71,16 @@
{{val}}
</span>
</div>
<div class="content-box-content" @click="detailClcik(item)">
<div class="content-box-content-top" v-html="item.contentOne">
<div class="content-box-content">
<div class="content-box-content-top" @click="detailClcik(item)"
v-html="item.contentOne">
</div>
<div class="content-box-content-botton">
<div class="content-box-content-botton-text"
v-if="item.accessoryFileNameList && item.accessoryFileNameList.length > 0"
:title="val.fileName"
v-for="val in item.accessoryFileNameList">
{{val.fileName}}
<span @click="fileClick(val)">{{val.fileName}}</span>
</div>
</div>
</div>
@@ -85,9 +91,13 @@
<a-icon type="user"/>
{{item.createBy}}
</div>
<div class="content-box-button-text">
<div class="content-box-button-text" v-if="item.standNumber">
<a-icon type="audit"/>
{{item.problemTypeName}}
{{item.standNumber}}
</div>
<div class="content-box-button-text" v-if="item.targetMarket_dicText">
<a-icon type="idcard"/>
{{item.targetMarket_dicText}}
</div>
<div class="content-box-button-text">
<a-icon type="history"/>
@@ -170,6 +180,7 @@
import SelectedBy from '@/components/SelectedBy/index'
import problemKnowledgeBaseListView from './problemKnowledgeBaseListView'
import { mapGetters } from 'vuex'
import { Base64 } from 'js-base64'
export default {
name: 'problemKnowledgeBaseList',
@@ -193,6 +204,7 @@
queryForm: {},
tagList: [],
downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
pageNo: 1,
url: {
getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page'
@@ -207,6 +219,17 @@
localStorage.removeItem('serial_number')
}
this.isTrue = true
let BaseQuery = localStorage.getItem('problemknowledgeBase')
if (BaseQuery) {
let content = JSON.parse(BaseQuery)
if (content.id) {
this.isTrue = false
this.$nextTick(() => {
this.$refs.problemKnowledgeBaseListViewRef.getData(JSON.parse(JSON.stringify(content)))
})
}
localStorage.removeItem('problemknowledgeBase')
}
this.getList()
this.replacePage()
},
@@ -255,6 +278,26 @@
this.getList()
})
},
fileClick(fileQuery) {
let fileName = fileQuery.fileName
let index1 = fileName.lastIndexOf('.')
let index2 = fileName.length
let fileSuffix = fileName.substring(index1, index2)
if (fileSuffix == '.pdf') {
window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username))
} else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
window.open(url, '_blank')
} else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
window.open(url, '_blank')
} else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix)
window.open(url, '_blank')
} else {
downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
}
},
problemKnowledgeBase() {
this.pageNo = 1
this.isTrue = true
@@ -309,7 +352,8 @@
},
getText(str) {
let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
return words.replace(/\s/g, '') //这里是去除空格
//.replace(/\s/g, '') //这里是去除空格
return words
},
getList() {
let selectedTags = JSON.parse(JSON.stringify(this.selectedTags))
@@ -317,7 +361,8 @@
pageNo: this.pageNo,
pageSize: this.pageSize,
searchStr: this.searchStr,
problemTypes: selectedTags.join(',')
problemTypes: selectedTags.join(','),
releaseStatus: 'Have released'
}
this.loading = true
getAction(this.url.getInfoList, query).then((res) => {
@@ -629,7 +674,7 @@
background: #DBF2F3;
border-radius: 3px;
margin-left: 6px;
max-width: 120px;
max-width: 140px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
@@ -662,22 +707,22 @@
margin-top: 10px;
.content-box-content-botton-text {
max-width: 198px;
/*max-width: 198px;*/
height: 32px;
display: inline-block;
text-align: center;
line-height: 32px;
padding: 0 10px;
background: #EFF1F3;
/*background: #EFF1F3;*/
border-radius: 4px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
font-size: 12px;
font-size: 14px;
font-weight: 400;
color: #040B29;
margin-right: 10px;
margin-right: 20px;
cursor: pointer;
text-decoration: underline;
}
}
}
@@ -789,7 +834,7 @@
background: #fff;
background: rgba(4, 11, 41, 0.06);
color: #363C54;
max-width: 150px;
max-width: 280px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue
+69 -12
View File
@@ -33,9 +33,13 @@
<a-icon type="user"/>
{{queryForm.createBy}}
</div>
<div class="content-box-button-text">
<a-icon type="audit"/>
{{queryForm.problemTypeName}}
<div class="content-box-button-text" v-if="queryForm.standNumber">
<a-icon type="file-markdown"/>
{{queryForm.standNumber}}
</div>
<div class="content-box-button-text" v-if="queryForm.targetMarket_dicText">
<a-icon type="idcard"/>
{{queryForm.targetMarket_dicText}}
</div>
<div class="content-box-button-text">
<a-icon type="history"/>
@@ -96,8 +100,16 @@
<div class="commentContent-content">
{{item.commentContent}}
</div>
<div class="answer-text" style="margin-bottom: 14px" @click="messageClick(item)">
{{$t('answer')}}
<div class="answer-text-index"
style="margin-bottom: 14px">
<span class="answer-text" @click="messageClick(item)">
{{$t('answer')}}
</span>
<span class="answer-text"
v-if="administrators || item.createBy == userInfoQuery.username"
@click="deleteClick(item)">
{{$t('delete')}}
</span>
</div>
<div class="commentContent-text-one" v-for="(val,index1) in item.problemKnowledgeBaseCommentVOList"
v-if="item.problemKnowledgeBaseCommentVOList && item.problemKnowledgeBaseCommentVOList.length > 0">
@@ -109,8 +121,15 @@
<div class="commentContent-content">
{{val.commentContent}}
</div>
<div class="answer-text" @click="messageClick(item)">
<div class="answer-text-index">
<span class="answer-text" @click="messageClick(item)">
{{$t('answer')}}
</span>
<span class="answer-text"
v-if="administrators || val.createBy == userInfoQuery.username"
@click="deleteClick(val)">
{{$t('delete')}}
</span>
</div>
</div>
</div>
@@ -158,6 +177,7 @@
import SelectedBy from '@/components/SelectedBy/index'
import { mapGetters } from 'vuex'
import { Base64 } from 'js-base64'
import { deleteAction } from '../../../../api/manage'
export default {
name: 'problemKnowledgeBaseListView',
@@ -167,6 +187,8 @@
data() {
return {
visibleComment: false,
administrators: false,
userInfoQuery: {},
releaseList: [],
loading: false,
formInline: {},
@@ -205,7 +227,15 @@
}
},
mounted() {
this.administrators = false
this.userInfoQuery = this.userInfo()
if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
this.userInfo().userRoleList.forEach(res => {
if (res.roleCode == 'admin') {
this.administrators = true
}
})
}
},
methods: {
...mapGetters(['userInfo']),
@@ -229,6 +259,28 @@
downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
}
},
deleteClick(item) {
let _this = this
this.$confirm({
content: _this.$t('ConfirmDelete'),
onOk() {
let url = ''
if (item.problemKnowledgeBaseId) {
url = '/problemKnowledgeBase/problemKnowledgeBaseCommentEO/deleteBatch'
} else {
url = '/project/problemKnowledgeBaseReplyEO/deleteBatch'
}
deleteAction(url, { ids: item.id }).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.releaseData()
} else {
_this.$message.warning(res.message)
}
})
}
})
},
download(item) {
downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username })
},
@@ -494,22 +546,22 @@
margin-top: 10px;
.content-box-content-botton-text {
max-width: 200px;
/*max-width: 200px;*/
/*min-width: 120px;*/
height: 32px;
display: inline-block;
text-align: center;
line-height: 32px;
padding: 0 10px;
background: #EFF1F3;
/*padding: 0 10px;*/
/*background: #EFF1F3;*/
border-radius: 4px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
font-size: 12px;
font-size: 14px;
font-weight: 400;
color: #040B29;
margin-right: 10px;
margin-right: 20px;
cursor: pointer;
.file-text {
@@ -517,6 +569,7 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
text-decoration: underline;
display: inline-block;
margin-right: 6px;
cursor: pointer;
@@ -632,6 +685,10 @@
margin-top: 6px;
}
.answer-text-index {
width: 100%;
}
.answer-text {
display: inline-block;
padding: 3px 14px;
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+82 -24
View File
@@ -3,25 +3,49 @@
<div class="doc-detail-wrap">
<div class="doc-detail-header" style="position: fixed;top: 0">
<div class="doc-detail-title">
<!-- <span style="line-height: 66px;display: inline-block;float: left" @click="backClick">-->
<!-- <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
<!-- </span>-->
<!-- <span style="line-height: 66px;display: inline-block;float: left" @click="backClick">-->
<!-- <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
<!-- </span>-->
{{$t('managePublishing')}}
</div>
</div>
<div style="padding-top: 68px;background: #fff">
<div class="detail-content" style="padding: 30px">
<div class="search-detail-wrap">
<a-form layout="inline" @keyup.enter.native="onSearch">
<div class="box-title-text">
<div class="title-text" :title="$t('searchContent')">
<span>{{$t('searchContent')}}</span>
<a-form layout="inline" style="width: 1200px;margin: 0 auto" @keyup.enter.native="onSearch">
<a-row :gutter="24">
<a-col :span="10">
<div class="box-title-text">
<div class="title-text" :title="$t('searchContent')">
<span>{{$t('searchContent')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('searchContent')"
v-model="queryParam.searchStr"></a-input>
</div>
</a-col>
<a-col :span="10">
<div class="box-title-text">
<div class="title-text" :title="$t('releaseStatus')">
<span>{{$t('releaseStatus')}}</span>
</div>
<a-select :placeholder="$t('PleaseSelect')+$t('releaseStatus')"
v-model="queryParam.releaseStatus">
<a-select-option v-for="(item, key) in releaseStatusList"
:key="key"
:value="item.value">
<span class="selectText" :title=" item.name ">
{{ item.name}}
</span>
</a-select-option>
</a-select>
</div>
</a-col>
<div style="text-align: right">
<a-button class="box-button" type="primary" @click="onSearch">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="ResetSearch">{{$t('reset')}}
</a-button>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('searchContent')"
v-model="searchStr"></a-input>
<a-button class="box-button" type="primary" @click="onSearch">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="ResetSearch">{{$t('reset')}}</a-button>
</div>
</a-row>
</a-form>
</div>
<div v-if="conList.length > 0" style="height: calc(100vh - 240px);overflow:auto;">
@@ -41,9 +65,14 @@
<div class="text-content">
{{item.contentOne}}
</div>
<div class="text-text-right-text-One">
{{item.releaseStatus == 'Draft'?$t('draft'):$t('HaveReleased')}}
</div>
<div class="text-text-right-text">
<a style="margin-right: 10px" @click="edit(item)">{{$t('edit')}}</a>
<a @click="deleteData(item)">{{$t('delete')}}</a>
<a style="margin-right: 10px" @click="edit(item)"
v-if="userInfoQuery.username == item.createBy || administrators">{{$t('edit')}}</a>
<a @click="deleteData(item)"
v-if="userInfoQuery.username == item.createBy || administrators">{{$t('delete')}}</a>
</div>
</div>
</div>
@@ -83,10 +112,22 @@
conList: [],
total: 0,
pageSize: 10,
searchStr: '',
queryParam: {},
releaseStatusList: [
{
name: this.$t('draft'),
value: 'Draft'
},
{
name: this.$t('HaveReleased'),
value: 'Have released'
}
],
loading: false,
administrators: false,
downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
pageNo: 1,
userInfoQuery: {},
url: {
getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page',
deleteBatch: '/problemKnowledgeBase/problemKnowledgeBaseEO/deleteBatch'
@@ -96,6 +137,15 @@
mounted() {
this.getList()
document.title = this.$t('managePublishing')
this.administrators = false
this.userInfoQuery = this.userInfo()
if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
this.userInfo().userRoleList.forEach(res => {
if (res.roleCode == 'admin') {
this.administrators = true
}
})
}
},
methods: {
...mapGetters(['userInfo']),
@@ -113,20 +163,21 @@
this.getList()
},
ResetSearch() {
this.searchStr = ''
this.queryParam = {}
this.pageNo = 1
this.getList()
},
getText(str) {
let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
return words.replace(/\s/g, '') //这里是去除空格
//.replace(/\s/g, '') //这里是去除空格
return words
},
getList() {
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
createBy: this.userInfo().username,
searchStr: this.searchStr
...this.queryParam
}
this.loading = true
getAction(this.url.getInfoList, query).then((res) => {
@@ -271,11 +322,21 @@
.text-text-right {
padding: 19px 19px;
width: calc(100% - 180px);
width: calc(100% - 300px);
box-sizing: border-box;
/*margin-left: 38px;*/
}
.text-text-right-text-One {
width: 120px;
height: 100%;
text-align: center;
position: absolute;
right: 180px;
top: 50%;
transform: translate-Y(-50%);
}
.text-text-right-text {
width: 180px;
height: 100%;
@@ -351,16 +412,13 @@
.search-detail-wrap {
width: 100%;
margin: 0 auto;
margin-bottom: 16px;
}
.box-title-text {
line-height: 1.4;
display: flex;
align-items: center;
margin-bottom: 10px;
text-align: center;
justify-content: center;
}
.title-text {
@@ -380,7 +438,7 @@
.box-input {
/*min-width: 200px;*/
display: inline-block;
width: 50%;
width: 100%;
height: 38px;
margin-top: 2px;
margin-right: 16px;
jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
+54 -15
View File
@@ -44,19 +44,27 @@
</a-form>
</div>
<div class="table-operator">
<div @click="monthlyTitleTemplateClick" class="operator-text">
<div @click="monthlyTitleTemplateClick"
v-has="'monthlyReportFilling:titleTemplate'"
class="operator-text">
<a-icon type="apartment"/>
{{$t('monthlyTitleTemplate')}}
</div>
<div @click="monthlyIntegrationAndExportClick" class="operator-text">
<div @click="monthlyIntegrationAndExportClick"
v-has="'monthlyReportFilling:integratedExport'"
class="operator-text">
<a-icon type="import"/>
{{$t('monthlyIntegrationAndExport')}}
</div>
<div @click="addContentClick" class="operator-text">
<div @click="addContentClick"
v-has="'monthlyReportFilling:adding'"
class="operator-text">
<a-icon type="plus"/>
{{$t('addContent')}}
</div>
<div @click="BatchDeleteClick" class="operator-text">
<div @click="BatchDeleteClick"
v-has="'monthlyReportFilling:batchDelete'"
class="operator-text">
<a-icon type="delete"/>
{{$t('BatchDelete')}}
</div>
@@ -74,10 +82,28 @@
:columns="columns"
>
<span slot="operation" slot-scope="text,record">
<a class="text-operation" @click="copyClick(record)">{{$t('copy')}}</a>
<a class="text-operation" @click="viewClick(record)">{{$t('view')}}</a>
<a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
<a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
<a class="text-operation"
v-has="'monthlyReportFilling:copy'"
@click="copyClick(record)">
{{$t('copy')}}
</a>
<a class="text-operation"
v-has="'monthlyReportFilling:view'"
@click="viewClick(record)">
{{$t('view')}}
</a>
<a class="text-operation"
v-if="record.createBy == userData.username || administrators"
v-has="'monthlyReportFilling:edit'"
@click="edit(record)">
{{$t('edit')}}
</a>
<a class="text-operation"
v-if="record.createBy == userData.username || administrators"
v-has="'monthlyReportFilling:delete'"
@click="deleteLib(record)">
{{$t('deleteLib')}}
</a>
</span>
</a-table>
<div class="page" v-if="dataSource && dataSource.length > 0">
@@ -103,6 +129,7 @@
import fillTable from './modules/fillTable'
import fillAdd from './modules/fillAdd'
import moment from 'moment'
import { mapGetters } from 'vuex'
export default {
name: 'RegulationMonthlyFill',
@@ -118,14 +145,14 @@
list: '/report/lawsMonthlyReportWriteEO/page',
exportData: '/report/lawsMonthlyReportWriteEO/exportMonthlyReport'
},
exportStatusList:[
exportStatusList: [
{
value:'2',
name:this.$t('hasBeenExport')
value: '2',
name: this.$t('hasBeenExport')
},
{
value:'1',
name:this.$t('notExport')
value: '1',
name: this.$t('notExport')
}
],
loading: false,
@@ -192,15 +219,27 @@
width: 190,
scopedSlots: { customRender: 'operation' }
}
]
],
userData:{},
administrators:false
}
},
mounted() {
this.queryParam.month = moment(new Date()).format('YYYY-MM')
this.getList()
this.userData = this.userInfo()
this.administrators = false
if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
this.userInfo().userRoleList.forEach(res => {
if (res.roleCode == 'admin') {
this.administrators = true
}
})
}
},
methods: {
copyClick(row){
...mapGetters(['userInfo']),
copyClick(row) {
let _this = this
this.$confirm({
content: _this.$t('ConfirmReplication'),
jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
+14 -3
View File
@@ -22,7 +22,7 @@
</a-form>
</div>
<div class="table-operator">
<div @click="uploadMonthlyClick" class="operator-text">
<div @click="uploadMonthlyClick" v-has="'monthlyReportManagement:upload'" class="operator-text">
<a-icon type="cloud-upload"/>
{{$t('uploadMonthly')}}
</div>
@@ -51,14 +51,16 @@
</span>
<span slot="operation" slot-scope="text,record">
<a class="text-operation"
v-if="record.createBy == userData.username"
v-has="'monthlyReportManagement:release'"
v-if="record.createBy == userData.username || administrators"
@click="withdraw(record)">
{{record.issueStatus == 2 ? $t('release') : $t('withdraw')}}
</a>
<a class="text-operation"
v-if="record.createBy == userData.username && record.issueStatus == 2"
v-if="(record.createBy == userData.username || administrators) && record.issueStatus == 2"
@click="deleteLib(record)">{{$t('deleteLib')}}</a>
<a class="text-operation"
v-has="'monthlyReportManagement:download'"
v-if="record.createBy == userData.username || record.issueStatus == 1"
@click="download(record)">{{$t('download')}}</a>
</span>
@@ -110,6 +112,7 @@
downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
userData: {},
administrators:false,
columns: [
{
title: this.$t('RegulationMonthlyName'),
@@ -161,6 +164,14 @@
mounted() {
this.getList()
this.userData = this.userInfo()
this.administrators = false
if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
this.userInfo().userRoleList.forEach(res => {
if (res.roleCode == 'admin') {
this.administrators = true
}
})
}
},
methods: {
...mapGetters(['userInfo']),
jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+10 -10
View File
@@ -98,7 +98,7 @@
:placeholder="$t('PleaseSelect')+$t('scopeOfApplication')"
:type="'checkbox'"
:disabled="disabled"
:triggerChange="false" :dictCode="'apply_scope'"/>
:triggerChange="false" :dictCode="'fa3_gui1_yue4_bao4_-_shi4_yong4_fan4_wei2'"/>
</a-form-model-item>
</div>
</a-col>
@@ -255,7 +255,7 @@
<span class="Required" v-if="!disabled">*</span>
<span class="title-text-text" :title="$t('regulatoryContact')">{{$t('regulatoryContact')}}</span>
</div>
<a-form-model-item class="itemModel" prop="lawsContactName">
<a-form-model-item class="itemModel-multi" prop="lawsContactName">
<PersonnelSelection
:query="{db_field_name:'lawsContact',db_field_txt:$t('regulatoryContact')}"
:personneQuery="formInline"
@@ -366,15 +366,15 @@
],
workProgressEn: [
{
max: 300,
message: this.$t('workProgressEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
max: 5000,
message: this.$t('workProgressEn') + this.$t('cannotExceed') + 5000 + this.$t('Characters'),
trigger: 'blur'
}
],
workProgressCn: [
{
max: 300,
message: this.$t('workProgressEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
max: 5000,
message: this.$t('workProgressEn') + this.$t('cannotExceed') + 5000 + this.$t('Characters'),
trigger: 'blur'
}
],
@@ -385,8 +385,8 @@
trigger: 'blur'
},
{
max: 300,
message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
max: 5000,
message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 5000 + this.$t('Characters'),
trigger: 'blur'
}
],
@@ -397,8 +397,8 @@
trigger: 'blur'
},
{
max: 300,
message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
max: 5000,
message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 5000 + this.$t('Characters'),
trigger: 'blur'
}
],
jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue
+4 -4
View File
@@ -241,8 +241,8 @@
trigger: 'blur'
},
{
max: 300,
message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
max: 5000,
message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 5000 + this.$t('Characters'),
trigger: 'blur'
}
],
@@ -253,8 +253,8 @@
trigger: 'blur'
},
{
max: 300,
message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
max: 5000,
message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 5000 + this.$t('Characters'),
trigger: 'blur'
}
]
jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue
+2 -1
View File
@@ -205,7 +205,8 @@
},
getText(str) {
let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
return words.replace(/\s/g, '') //这里是去除空格
//.replace(/\s/g, '') //这里是去除空格
return words
},
getList() {
let query = {
jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
+1
View File
@@ -155,6 +155,7 @@
</div>
<a-form-model-item class="itemModel" :prop="item.db_field_name">
<PersonnelSelection :query="item"
v-if="visible"
:personneQuery="formInline"
@change="PersonnelSelectionChange"
:disabled="disabled"
jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue
+3 -2
View File
@@ -60,7 +60,7 @@
<span style="cursor: pointer"
@click="fileClick(resultData.fileNameRight,resultData.fileIdRight)">{{resultData.fileNameRight}}</span>
</div>
<div class="detail-content-header-content-rightOne">
<div class="detail-content-header-content-rightOne" :title="$t('comparisonDifferenceComment')">
{{$t('comparisonDifferenceComment')}}
</div>
<div class="detail-content-header-content-right" v-if="!isDisplay">
@@ -162,7 +162,7 @@
<span>{{$t('fullTextComments')}}</span>
</div>
<a-form-model-item class="itemModel" style="width: calc(100% - 113px)" prop="comment">
<a-textarea :placeholder="$t('pleaseEnter')+$t('fullTextComments')"
<a-textarea :placeholder="$t('pleaseEnterfullTextComments')"
v-model.trim="formInlineText.comment"
:rows="4"/>
</a-form-model-item>
@@ -494,6 +494,7 @@
.operator-text-text {
cursor: pointer;
margin-right: 53px;
max-width: 138px;
font-size: 14px;
font-weight: 400;
color: #040B29;
jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
+10 -6
View File
@@ -91,7 +91,9 @@
</div>
</div>
<div class="Remarks">
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<a-form-model :model="formInline"
class="formAdd" :rules="rules"
ref="ruleForm">
<div class="box-title-text-Remarks">
<div class="title-text-Remarks" :title="$t('comparativeComments')">
<span>{{$t('comparativeComments')}}</span>
@@ -99,7 +101,7 @@
<a-form-model-item class="itemModel" prop="comment">
<a-textarea :placeholder="$t('pleaseEnter')+$t('comparativeComments')"
v-model="formInline.comment"
:rows="4"/>
:rows="3"/>
</a-form-model-item>
</div>
</a-form-model>
@@ -135,7 +137,7 @@
<span>{{$t('fullTextComments')}}</span>
</div>
<a-form-model-item class="itemModel" style="width: calc(100% - 113px)" prop="comment">
<a-textarea :placeholder="$t('pleaseEnter')+$t('fullTextComments')"
<a-textarea :placeholder="$t('PleaseEnter')+' '+$t('fullTextComments')"
v-model.trim="formInlineText.comment"
:rows="4"/>
</a-form-model-item>
@@ -536,7 +538,7 @@
.detail-content-left {
width: 50%;
float: left;
height: 620px;
height: calc(100vh - 210px);
border-right: 2px #EFF1F3 solid;
padding: 24px 32px;
box-sizing: border-box;
@@ -545,7 +547,7 @@
.detail-content-right {
width: 50%;
height: 620px;
height: calc(100vh - 210px);
float: left;
padding: 24px 32px;
box-sizing: border-box;
@@ -593,6 +595,7 @@
.Remarks {
margin-top: 20px;
width: 50%;
display: inline-block;
padding: 0 32px;
box-sizing: border-box;
}
@@ -602,7 +605,8 @@
}
.submit-button {
width: 100%;
display: inline-block;
width: 50%;
margin-top: 20px;
text-align: right;
padding: 0 32px;
jero-web/src/views/documentTools/documentComparison/index.vue
+22 -13
View File
@@ -8,7 +8,7 @@
<div class="title-text" :title="$t('standard')">
<span>{{$t('standard')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
<a-input class="box-input" :placeholder="$t('enterStandard')"
v-model="queryParam.serialNumber"></a-input>
</div>
</a-col>
@@ -17,7 +17,7 @@
<div class="title-text" :title="$t('title')">
<span>{{$t('title')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
<a-input class="box-input" :placeholder="$t('entertitle')"
v-model="queryParam.title"></a-input>
</div>
</a-col>
@@ -42,11 +42,11 @@
</a-form>
</div>
<div class="table-operator">
<div @click="initiatingProcessClick" class="operator-text">
<div @click="initiatingProcessClick" v-has="'documentComparison:Initiate'" class="operator-text">
<a-icon type="apartment"/>
{{$t('initiateComparison')}}
</div>
<div @click="BatchDelete" class="operator-text">
<div @click="BatchDelete" v-has="'documentComparison:batchDelete'" class="operator-text">
<a-icon type="delete"/>
{{$t('BatchDelete')}}
</div>
@@ -67,15 +67,15 @@
<span slot="operation" slot-scope="text,record">
<a class="text-operation" @click="comparisonResultsClick(record)">{{$t('comparisonResults')}}</a>
<a class="text-operation"
v-if="record.createBy == userInfoQuery.username"
v-if="record.createBy == userInfoQuery.username || administrators"
@click="subscribe(record)">
{{!record.releaseState || record.releaseState == 'draft' ? $t('release') :$t('withdraw')}}
</a>
<a class="text-operation"
v-if="record.createBy == userInfoQuery.username && record.releaseState == 'draft'"
v-if="(record.createBy == userInfoQuery.username || administrators) && record.releaseState == 'draft'"
@click="edit(record)">{{$t('edit')}}</a>
<a class="text-operation"
v-if="record.createBy == userInfoQuery.username && record.releaseState == 'draft'"
v-if="(record.createBy == userInfoQuery.username || administrators) && record.releaseState == 'draft'"
@click="deleteData(record)">{{$t('delete')}}</a>
</span>
<span slot="serialNumberRight" :title="text" slot-scope="text,record">
@@ -132,10 +132,11 @@
pageNo: 1,
queryParam: {},
userInfoQuery: {},
administrators:false,
selectedRowKeysRecord: [],
columns: [
{
title: this.$t('standard') + 1,
title: this.$t('standard') + ' 1',
align: 'center',
dataIndex: 'serialNumberLeft',
width: 170,
@@ -143,7 +144,7 @@
scopedSlots: { customRender: 'serialNumberLeft' }
},
{
title: this.$t('title') + 1,
title: this.$t('title') + ' 1',
align: 'center',
dataIndex: 'titleLeft',
width: 170,
@@ -151,7 +152,7 @@
scopedSlots: { customRender: 'serialNumberLeft' }
},
{
title: this.$t('TextStatus') + 1,
title: this.$t('TextStatus') + ' 1',
align: 'center',
width: 200,
ellipsis: true,
@@ -166,7 +167,7 @@
// scopedSlots: { customRender: 'fileNameLeft' }
// },
{
title: this.$t('standard') + 2,
title: this.$t('standard') + ' 2',
align: 'center',
dataIndex: 'serialNumberRight',
ellipsis: true,
@@ -174,7 +175,7 @@
width: 170
},
{
title: this.$t('title') + 2,
title: this.$t('title') + ' 2',
align: 'center',
dataIndex: 'titleRight',
scopedSlots: { customRender: 'serialNumberRight' },
@@ -182,7 +183,7 @@
width: 170
},
{
title: this.$t('TextStatus') + 2,
title: this.$t('TextStatus') + ' 2',
align: 'center',
width: 200,
ellipsis: true,
@@ -233,6 +234,14 @@
this.queryParam = { ...this.queryParam }
}
this.userInfoQuery = this.userInfo()
this.administrators = false
if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
this.userInfo().userRoleList.forEach(res => {
if (res.roleCode == 'admin') {
this.administrators = true
}
})
}
this.getList()
},
methods: {
jero-web/src/views/documentTools/documentTranslation/index.vue
+22 -9
View File
@@ -8,7 +8,7 @@
<div class="title-text" :title="$t('standard')">
<span>{{$t('standard')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
<j-input class="box-input" :placeholder="$t('enterStandard')"
v-model="queryParam.serialNumber"></j-input>
</div>
</a-col>
@@ -17,7 +17,7 @@
<div class="title-text" :title="$t('title')">
<span>{{$t('title')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
<j-input class="box-input" :placeholder="$t('entertitle')"
v-model="queryParam.title"></j-input>
</div>
</a-col>
@@ -27,7 +27,7 @@
<span>{{$t('translationResults')}}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.translationResult"
:placeholder="$t('PleaseSelect')+$t('translationResults')"
:placeholder="$t('selectTranslationResults')"
:type="'select'"
:triggerChange="false" dictCode="translation_result"/>
</div>
@@ -59,15 +59,15 @@
</a-form>
</div>
<div class="table-operator">
<div @click="uploadClick" class="operator-text">
<div @click="uploadClick" v-has="'documentTranslation:upload'" class="operator-text">
<a-icon type="cloud-upload"/>
{{$t('upload1')}}
</div>
<div @click="RetrieveFilesClick" class="operator-text">
<div @click="RetrieveFilesClick" v-has="'documentTranslation:retrieval'" class="operator-text">
<a-icon type="database"/>
{{$t('RetrieveFiles')}}
</div>
<div @click="BatchDelete" class="operator-text">
<div @click="BatchDelete" v-has="'documentTranslation:batchDeletion'" class="operator-text">
<a-icon type="delete"/>
{{$t('BatchDelete')}}
</div>
@@ -86,18 +86,22 @@
>
<!-- -->
<span slot="operation" slot-scope="text,record">
<a class="text-operation" @click="viewClick(record)">{{$t('view')}}</a>
<a class="text-operation"
v-has="'documentTranslation:view'"
@click="viewClick(record)">{{$t('view')}}</a>
<!-- <a class="text-operation" @click="checkClick(record)">{{$t('check')}}</a>-->
<a class="text-operation"
v-if="record.createBy == userInfoQuery.username"
v-if="record.createBy == userInfoQuery.username || administrators"
@click="subscribe(record)">
{{!record.releaseCondition || record.releaseCondition == 'draft' ? $t('release') :$t('withdraw')}}
</a>
<a class="text-operation"
v-has="'documentTranslation:download'"
v-if="record.translationResult == 'Translation done'"
@click="downloadData(record)">{{$t('download')}}</a>
<a class="text-operation"
v-if="record.createBy == userInfoQuery.username && record.releaseCondition == 'draft'"
v-has="'documentTranslation:delete'"
v-if="(record.createBy == userInfoQuery.username || administrators) && record.releaseCondition == 'draft'"
@click="deleteData(record)">{{$t('delete')}}</a>
</span>
<span slot="standardTitle" slot-scope="text,record" :title="text">
@@ -158,6 +162,7 @@
queryParam: {},
userInfoQuery: {},
selectedRowKeysRecord: [],
administrators:false,
columns: [
{
title: this.$t('standard'),
@@ -233,6 +238,14 @@
}
this.getList()
this.userInfoQuery = this.userInfo()
this.administrators = false
if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
this.userInfo().userRoleList.forEach(res => {
if (res.roleCode == 'admin') {
this.administrators = true
}
})
}
},
methods: {
...mapGetters(['userInfo']),
jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue
+15 -7
View File
@@ -4,8 +4,8 @@
<div class="text-left">
<div class="text-left-wrap">
<div class="text-left-select">
<span class="text-sel" :title="$t('problemClassification')">{{$t('problemClassification')}}</span>
<a-select :placeholder="$t('PleaseSelect')+$t('problemClassification')"
<span class="text-sel" :title="$t('classification')">{{$t('classification')}}</span>
<a-select :placeholder="$t('selectClassification')"
class="text-select"
mode="multiple"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -23,7 +23,7 @@
<div class="text-left-select">
<span class="text-sel" :title="$t('market')">{{$t('market')}}</span>
<j-multi-select-tag class="text-select" v-model="queryParamOne.target_market"
:placeholder="$t('PleaseSelect')+$t('market')"
:placeholder="$t('selectMarket')"
:type="'select'"
:triggerChange="false" :dictCode="'region'"/>
</div>
@@ -176,13 +176,20 @@
})
},
checkedClick(item) {
let newUrl = this.$router.resolve({
path: '/problemKnowledgeBaseView',
localStorage.setItem('problemknowledgeBase',JSON.stringify(item))
this.$router.push({
path: '/problemknowledgeBase',
query: {
id: item.id
}
})
window.open(newUrl.href, '_blank')
// let newUrl = this.$router.resolve({
// path: '/problemknowledgeBase',
// query: {
// id: item.id
// }
// })
// window.open(newUrl.href, '_blank')
},
pageOnChange(page, pageSize) {
this.pageNo = page
@@ -222,7 +229,8 @@
},
getText(str) {
let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
return words.replace(/\s/g, '') //这里是去除空格
//.replace(/\s/g, '') //这里是去除空格
return words
},
getParagraphInfoList() {
let queryParamIndex = JSON.parse(JSON.stringify(this.queryParam))
jero-web/src/views/documentTools/searchCenter/components/whole.vue
+2 -1
View File
@@ -201,7 +201,8 @@
},
getText(str) {
let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
return words.replace(/\s/g, '') //这里是去除空格
//.replace(/\s/g, '') //这里是去除空格
return words
},
getList() {
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
jero-web/src/views/documentTools/searchCenter/index.vue
+1 -1
View File
@@ -26,7 +26,7 @@
v-else-if="active === $t('whole') || active === $t('problemKnowledgeBase')
|| active === $t('monthlyReportRegulations')"
class="inputSearch"
:placeholder="$t('pleaseEnter')+$t('searchContent')"
:placeholder="$t('enterSearchContent')"
></a-input>
<a-button class="textSearch"
v-if="active === $t('DocumentLibrary')"
jero-web/src/views/externalReports/components/addModel.vue
+1 -1
View File
@@ -18,7 +18,7 @@
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('file')">{{$t('file')}}</span>
:title="$t('fileName')">{{$t('fileName')}}</span>
</div>
<a-form-model-item class="itemModel" prop="fileKey">
<a-button type="primary" class="button-text"
jero-web/src/views/externalReports/index.vue
+1074 -1053
View File
File diff suppressed because it is too large Load Diff
jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+1
View File
@@ -99,6 +99,7 @@
<PersonnelSelection
:query="{db_field_name:'userId',db_field_txt:$t('engineer')}"
:personneQuery="formInline"
v-if="visible"
:distributionEngineerList="distributionEngineerList"
@change="PersonnelSelectionChange"
v-model="formInline.userIdName"/>
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+1
View File
@@ -717,6 +717,7 @@
if (res.success) {
this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode
this.$message.success(this.$t('OperationSuccessful'))
this.$refs.CollectionTabel.getHeader(this.currentPersonRole)
this.visibleRoleSwitching = false
this.confirmLoadingRoleSwitching = false
localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode))
jero-web/src/views/projectManagement/components/addModel.vue
+4 -3
View File
@@ -107,10 +107,11 @@
<span class="Required">*</span>
<span class="title-text-text" :title="$t('StudioEngineer')">{{$t('StudioEngineer')}}</span>
</div>
<a-form-model-item class="itemModel" :prop="'studioEngineerName'">
<a-form-model-item class="itemModel-multi" :prop="'studioEngineerName'">
<PersonnelSelection :query="{db_field_name:'studioEngineer',db_field_txt:$t('StudioEngineer')}"
:isSingleChoice="true"
:personneQuery="formInline"
v-if="visible"
@change="PersonnelSelectionChange"
:disabled="disabled"
v-model="formInline.studioEngineerName"/>
@@ -124,11 +125,11 @@
<div class="title-text">
<span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
</div>
<a-form-model-item class="itemModel" :prop="'certificationEngineerName'">
<a-form-model-item class="itemModel-multi" :prop="'certificationEngineerName'">
<PersonnelSelection
:query="{db_field_name:'certificationEngineer',db_field_txt:$t('certifiedEngineer')}"
:personneQuery="formInline"
:selectDepartment="true"
v-if="visible"
@change="PersonnelSelectionChange"
:disabled="disabled"
v-model="formInline.certificationEngineerName"/>
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+10 -7
View File
@@ -1456,15 +1456,18 @@
this.selectedRowKeys = value
},
searchQuery() {
this.selectedRowKeys = []
this.getList()
},
searchReset() {
this.queryParam = {}
this.selectedRowKeys = []
this.$refs.globalAdvancedQueryRef.resetLine()
this.$refs.globalAdvancedQueryRef.emitCallback()
// this.getList()
},
addModelList() {
this.selectedRowKeys = []
this.getList()
},
handleSuperQuery(params, matchType) {
@@ -2130,7 +2133,7 @@
} else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
window.open(url, '_blank')
}else if(fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg'){
} else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix)
window.open(url, '_blank')
} else {
@@ -2151,7 +2154,7 @@
} else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix)
window.open(url, '_blank')
}else if(fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg'){
} else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + id + fileSuffix)
window.open(url, '_blank')
} else {
@@ -2484,17 +2487,17 @@
}
::v-deep .ant-table-body-one {
padding-bottom: 0!important;
padding-bottom: 0 !important;
}
::v-deep .antfixedLeft {
padding-bottom: 0!important;
overflow: scroll!important;
padding-bottom: 0 !important;
overflow: scroll !important;
}
::v-deep .antfixedRight {
padding-bottom: 0!important;
overflow: scroll!important;
padding-bottom: 0 !important;
overflow: scroll !important;
}
</style>
<style>
jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+4 -2
View File
@@ -176,8 +176,9 @@
<span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
</div>
<!-- :prop="'lawEngineerName'"-->
<a-form-model-item class="itemModel">
<a-form-model-item class="itemModel-multi">
<PersonnelSelection
v-if="editVisible"
:query="{db_field_name:'lawEngineer',db_field_txt:$t('regulatoryEngineer')}"
:personneQuery="formInline"
:isDelete='true'
@@ -196,8 +197,9 @@
<span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
</div>
<!-- :prop="'engineeringInterfacePersonName'"-->
<a-form-model-item class="itemModel">
<a-form-model-item class="itemModel-multi">
<PersonnelSelection
v-if="editVisible"
:query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
:personneQuery="formInline"
:isDelete='true'
jero-web/src/views/projectManagement/components/personBatting.vue
+2
View File
@@ -20,6 +20,7 @@
<PersonnelSelection
:query="{db_field_name:'lawEngineer',db_field_txt:$t('regulatoryEngineer')}"
:personneQuery="formInline"
v-if="visible"
@change="PersonnelSelectionChange"
v-model="formInline.lawEngineerName"/>
</a-form-model-item>
@@ -36,6 +37,7 @@
<PersonnelSelection
:query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
:personneQuery="formInline"
v-if="visible"
@change="PersonnelSelectionChange"
v-model="formInline.engineeringInterfacePersonName"/>
</a-form-model-item>
jero-web/src/views/regulationsKanban/index.vue
+4 -2
View File
@@ -65,7 +65,9 @@
</div>
<div class="table-operator" style="overflow:hidden;margin-bottom: 20px">
<div style="float: right;margin-bottom: 0px;margin-left: 20px">
<div class="operator-text" @click="deriveconformanceresults()">
<div class="operator-text"
v-has="'complianceKanban:export'"
@click="deriveconformanceresults()">
<a-icon type="solution"/>
{{ $t('Deriveconformanceresults') }}
</div>
@@ -96,7 +98,7 @@
<!-- {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}-->
<!-- </span>-->
<span slot="operation" slot-scope="text,record">
<a class="text-operation" @click="handlecody(record)">{{$t('view')}}</a>
<a class="text-operation" v-has="'complianceKanban:view'" @click="handlecody(record)">{{$t('view')}}</a>
</span>
</a-table>
</div>
jero-web/src/views/regulatoryEarlyWarning/index.vue
+5 -2
View File
@@ -8,11 +8,14 @@
:url="url"/>
</div>
<div class="table-operator">
<div @click="handleCompare" class="operator-text">
<div @click="handleCompare" v-has="'regulatoryEarlyWarning:push'"
class="operator-text">
<a-icon type="rocket" :rotate="45"/>
{{$t('Push')}}
</div>
<div @click="handleExport" class="operator-text">
<div @click="handleExport"
v-has="'regulatoryEarlyWarning:export'"
class="operator-text">
<a-icon type="export" :rotate="-90"/>
{{$t('export')}}
</div>