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

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

Browse Source
This commit is contained in:
wangzhijiang
2022-07-25 18:14:32 +08:00
parent 9e7f4a7e00 4ce35d14e6
commit 34cd200c7c
4 changed files with 66 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+2
View File
@@ -1184,4 +1184,6 @@ module.exports = {
Openpersonnel:'Open Personnel',
originalText:'Original Text',
translatedText:'Translated Text',
Administrativeprivileges:'Administrativ Pprivileges',
Checkthepermissions:'Check The Permissions',
}
jero-web/src/common/lang/zh-cn.js
+2
View File
@@ -1188,4 +1188,6 @@ module.exports = {
Openpersonnel:'开放人员',
originalText:'原文',
translatedText:'译文',
Administrativeprivileges:'管理权限',
Checkthepermissions:'查看权限',
}
jero-web/src/views/externalReports/components/addModel.vue
+38 -38
View File
@@ -20,11 +20,11 @@
<span class="title-text-text"
:title="$t('fileName')">{{$t('fileName')}}</span>
</div>
<a-form-model-item class="itemModel" prop="paramsTemplateName">
<a-form-model-item class="itemModel" prop="fileName">
<a-button type="primary" class="button-text"
@click="clickButtonToUpload('accessory_id')">
{{ (formInline.fileName === 'null' || formInline.fileName === '' ||
formInline.fileName == null) ? $t('clickUpload') : $t('viewUploadedFiles')
@click="clickButtonToUpload('fileName')">
{{ (formInline['fileName'] === 'null' || formInline['fileName'] === '' ||
formInline['fileName'] == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
</a-button>
</a-form-model-item>
@@ -48,40 +48,40 @@
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('Openpersonnel')">{{$t('Openpersonnel')}}</span>
</div>
<a-form-model-item class="itemModel" prop="description">
<PersonnelSelection
:query="{db_field_name:'Openpersonnel',db_field_txt:$t('Openpersonnel')}"
:personneQuery="formInline"
@change="PersonnelSelectionChange"
v-model="formInline.Openpersonnel"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('Downloadprivileges')">{{$t('Downloadprivileges')}}</span>
</div>
<a-form-model-item class="itemModel" prop="description">
<PersonnelSelection
:query="{db_field_name:'Downloadprivileges',db_field_txt:$t('Downloadprivileges')}"
:personneQuery="formInline"
@change="PersonnelSelectionChange"
v-model="formInline.lawEngineerName"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<!-- <a-row :gutter="24">-->
<!-- <a-col :span="24">-->
<!-- <div class="box-title-text">-->
<!-- <div class="title-text">-->
<!-- <span class="title-text-text"-->
<!-- :title="$t('Openpersonnel')">{{$t('Openpersonnel')}}</span>-->
<!-- </div>-->
<!-- <a-form-model-item class="itemModel" prop="description">-->
<!-- <PersonnelSelection-->
<!-- :query="{db_field_name:'Openpersonnel',db_field_txt:$t('Openpersonnel')}"-->
<!-- :personneQuery="formInline"-->
<!-- @change="PersonnelSelectionChange"-->
<!-- v-model="formInline.Openpersonnel"/>-->
<!-- </a-form-model-item>-->
<!-- </div>-->
<!-- </a-col>-->
<!-- </a-row>-->
<!-- <a-row :gutter="24">-->
<!-- <a-col :span="24">-->
<!-- <div class="box-title-text">-->
<!-- <div class="title-text">-->
<!-- <span class="title-text-text"-->
<!-- :title="$t('Downloadprivileges')">{{$t('Downloadprivileges')}}</span>-->
<!-- </div>-->
<!-- <a-form-model-item class="itemModel" prop="description">-->
<!-- <PersonnelSelection-->
<!-- :query="{db_field_name:'Downloadprivileges',db_field_txt:$t('Downloadprivileges')}"-->
<!-- :personneQuery="formInline"-->
<!-- @change="PersonnelSelectionChange"-->
<!-- v-model="formInline.lawEngineerName"/>-->
<!-- </a-form-model-item>-->
<!-- </div>-->
<!-- </a-col>-->
<!-- </a-row>-->
</a-form-model>
</a-form>
</a-spin>
jero-web/src/views/externalReports/index.vue
+24 -10
View File
@@ -91,7 +91,7 @@
<div class="title-text" :title="$t('uploadTime')">
<span>{{ $t('uploadTime') }}</span>
</div>
<a-date-picker class="box-input"
<a-range-picker
style='width: 264px'
:placeholder="$t('PleaseSelect')+$t('uploadTime')"
@change="onChange"
@@ -144,7 +144,7 @@
</a>
</span>
<span slot="operation" slot-scope="text,record">
<a class="text-operation" @click="handlelist(record)">{{$t('view')}}</a>
<!-- <a class="text-operation" @click="handlelist(record)">{{$t('view')}}</a>-->
<a class="text-operation" @click="download(record)">{{$t('download')}}</a>
<a class="text-operation" @click="handleEdit(record)">{{$t('edit')}}</a>
<a class="text-operation" @click="batchDel(record)">{{$t('delete')}}</a>
@@ -171,6 +171,7 @@
<a-modal
class="add-menus"
:title="menuTitle"
:width="600"
:visible="menuRightVisible"
:confirm-loading="confirmLoading"
@cancel="handleCancelMenuRight"
@@ -186,19 +187,27 @@
:wrapper-col="wrapperCol"
>
<a-form-model-item :label="$t('Foldername')" prop="name">
<a-input v-model="form.name" :placeholder="$t('PleaseEnter')+$t('Foldername')"/>
<a-input class="box-input add-input" v-model="form.name" :placeholder="$t('PleaseEnter')+$t('Foldername')"/>
</a-form-model-item>
<a-form-model-item :label="$t('Folderpermissions')" prop="itemName">
<PersonnelSelection
<a-form-model-item :label="$t('Administrativeprivileges')" prop="itemName">
<PersonnelSelection class="box-input add-input"
:personneQuery="form"
:query="{db_field_name:'Folderpermissions',db_field_txt:$t('Folderpermissions')}"
:query="{db_field_name:'Administrativeprivileges',db_field_txt:$t('Administrativeprivileges')}"
@change="PersonnelSelectionChange"
v-model="form.folderpermissions"/>
v-model="form.Administrativeprivileges"/>
</a-form-model-item>
<a-form-model-item :label="$t('Checkthepermissions')" prop="itemName">
<PersonnelSelection
class="box-input add-input"
:personneQuery="form"
:query="{db_field_name:'Checkthepermissions',db_field_txt:$t('Checkthepermissions')}"
@change="PersonnelSelectionChange"
v-model="form.Checkthepermissions"/>
</a-form-model-item>
<a-form-model-item :label="$t('Folderorder')" prop="displaySeq">
<a-input-number v-model="form.displaySeq" :min="1" :max="99999"
<a-input-number v-model="form.displaySeq" :min="1" :max="99999" class="box-input add-input"
:placeholder="$t('PleaseEnter')+$t('Folderorder')" :formatter="limitNumber"
:parser="limitNumber" style="width: 100%"/>
:parser="limitNumber" />
<!-- <a-input-number v-model="rowCount" :min="1" :placeholder="$t('pleaseEnter')+$t('numberRows')" :formatter="limitNumber" :parser="limitNumber" />-->
</a-form-model-item>
</a-form-model>
@@ -947,7 +956,12 @@ export default {
},
// 上传文件
handleuploadFile(e) {
this.$refs.addModelRef.addModel()
if (this.menuId) {
this.$refs.addModelRef.addModel()
} else {
this.$message.warning(this.$t('selectDirectoryTerms'))
}
},
onSearch() {
let self = this