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

Merge branch 'dev_20240116_OTA' into 'fix_20230911_UAT'

Browse Source 
Dev 20240116 ota

See merge request laws-nio/laws-weilai!366
This commit is contained in:
高嵩
2024-01-17 10:00:47 +00:00
parent 42379645b9 b370f4841b
commit 496750e875
10 changed files with 237 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+58 -9
View File
@@ -60,13 +60,26 @@
<span class="Required">*</span>
<span class="title-text-text" :title="$t('Assessor')">{{$t('Assessor')}}</span>
</div>
<a-form-model-item class="itemModel" prop="evaluatorIdsName">
<PersonnelSelection class="box-input"
:personneQuery="formInline"
:query="{db_field_name:'evaluatorIds',db_field_txt:$t('Assessor')}"
:isInput="true"
@change="PersonnelSelectionChange"
v-model="formInline.evaluatorIdsName"/>
<!-- <a-form-model-item class="itemModel" prop="evaluatorIdsName">-->
<!-- <PersonnelSelection class="box-input"-->
<!-- :personneQuery="formInline"-->
<!-- :query="{db_field_name:'evaluatorIds',db_field_txt:$t('Assessor')}"-->
<!-- :isInput="true"-->
<!-- @change="PersonnelSelectionChange"-->
<!-- v-model="formInline.evaluatorIdsName"/>-->
<!-- </a-form-model-item>-->
<a-form-model-item class="itemModel" prop="evaluatorIds">
<a-select
mode="multiple"
class="box-input"
:value="evaluatorIds"
@change='evaluatorIdsChange'
:placeholder="$t('PleaseSelect')+$t('Assessor')"
>
<a-select-option v-for="i in evaluatorIdsNameOptions" :key="i.id">
{{ i.username }}
</a-select-option>
</a-select>
</a-form-model-item>
</div>
</a-col>
@@ -150,13 +163,25 @@
PersonnelSelection
},
mixins:[ResizeHeader, ResizeColumnProvide],
computed: {
evaluatorIds () {
if (this.formInline.evaluatorIds && this.formInline.evaluatorIds instanceof Array) {
return this.formInline.evaluatorIds
}
if (this.formInline.evaluatorIds && typeof(this.formInline.evaluatorIds)==='string') {
return this.formInline.evaluatorIds.split(',')
}
return []
}
},
data() {
return {
title: this.$t('regulationEngineerInitiateProcess'),
//url传参严格按照当前命名
url: {
seachList: 'document/bussDocumentLibraryEO/queryCondition', //搜索字段
addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy'
addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy',
getEvaluatorList: '/project/projectLawsInventoryEO/getEvaluatorList',
},
loading: false,
JLoading: false,
@@ -181,6 +206,13 @@
trigger: 'change'
}
],
evaluatorIds: [
{
required: true,
message: this.$t('Assessor') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
brands: [
{
required: true,
@@ -243,7 +275,8 @@
width: 150,
dataIndex: 'corresponding_standard'
}
]
],
evaluatorIdsNameOptions: [],
}
},
mounted() {
@@ -262,6 +295,21 @@
},
methods: {
...mapGetters(['userInfo']),
evaluatorIdsChange (val) {
this.formInline.evaluatorIds = val
},
getEvaluatorList () {
this.$set(this.formInline, 'evaluatorIds', [])
if (this.selectedRowKeysRecord.length === 0) {
return this.evaluatorIdsNameOptions = []
}
const query = { documentId: this.selectedRowKeysRecord[0].id }
getAction(this.url.getEvaluatorList, query).then((res) => {
if (res.success) {
this.evaluatorIdsNameOptions = res.result
}
})
},
disabledDate(current) {
return current && current < moment().subtract(1, 'day')
},
@@ -302,6 +350,7 @@
return res.id == this.selectedRowKeys[0]
})
this.selectedRowKeysRecord = [...this.selectedRowKeysRecord]
this.getEvaluatorList()
},
clickButtonToUpload(item) {
this.$refs.uploadFile.perentHandleFunc()
jero-web/src/views/parameter/ParameterTemplate/index.vue
+33 -8
View File
@@ -23,6 +23,18 @@
:triggerChange="false" :dictCode="'region'"/>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('updated')">
<span>{{$t('updated')}}</span>
</div>
<a-range-picker
class="box-input"
v-model="updateTime"
format='YYYY-MM-DD'
@change="onChangeUpdateTime" ></a-range-picker>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
@@ -256,14 +268,14 @@
ellipsis: true,
dataIndex: 'maintainerName'
},
{
title: this.$t('created'),
align: 'left',
dataIndex: 'createTime',
width: 200,
sorter: true,
ellipsis: true
},
// {
// title: this.$t('created'),
// align: 'left',
// dataIndex: 'createTime',
// width: 200,
// sorter: true,
// ellipsis: true
// },
{
title: this.$t('updated'),
align: 'left',
@@ -281,6 +293,7 @@
}
],
queryParam: {},
updateTime: [],
areaVisible: false,
paramsTemplateName: ''
}
@@ -290,6 +303,17 @@
},
methods: {
...mapGetters(['userInfo']),
onChangeUpdateTime(values) {
if (!values || values.length === 0) {
this.queryParam.updateTimeStart = ''
this.queryParam.updateTimeEnd = ''
return
}
let StartTime = values[0].format('YYYY-MM-DD')
let EndTime = values[1].format('YYYY-MM-DD')
this.queryParam.updateTimeStart = StartTime
this.queryParam.updateTimeEnd = EndTime
},
subscribeClick(val) {
let _this = this
this.$confirm({
@@ -540,6 +564,7 @@
searchReset() {
this.pageNo = 1
this.queryParam = {}
this.updateTime = []
this.getList()
},
pageOnChange(page, pageSize) {