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

1.认证参数导出时增加文件名称输入

Browse Source
This commit is contained in:
sunFlower
2022-09-19 14:27:22 +08:00
parent 194eba9d07
commit 77f1cdd022
4 changed files with 484 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1298,4 +1298,5 @@ module.exports = {
personChargeReceivesTheTask:'Person in charge receives the task', personChargeReceivesTheTask:'Person in charge receives the task',
theResponsiblePersonTaskForTheSecondTime:'The responsible person receives the task for the second time', theResponsiblePersonTaskForTheSecondTime:'The responsible person receives the task for the second time',
processNodesAreInconsistentPleaseSelectConsistentData:'Process nodes are inconsistent; Please select consistent data', processNodesAreInconsistentPleaseSelectConsistentData:'Process nodes are inconsistent; Please select consistent data',
exportFileName:'Export file name',
} }
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1400,4 +1400,5 @@ module.exports = {
personChargeReceivesTheTask:'责任人接收任务', personChargeReceivesTheTask:'责任人接收任务',
theResponsiblePersonTaskForTheSecondTime:'责任人二次接收任务', theResponsiblePersonTaskForTheSecondTime:'责任人二次接收任务',
processNodesAreInconsistentPleaseSelectConsistentData:'流程节点不一致；请选择一致的数据', processNodesAreInconsistentPleaseSelectConsistentData:'流程节点不一致；请选择一致的数据',
exportFileName:'导出文件名称',
} }
jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue
+30 -6
View File
@@ -65,6 +65,22 @@
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text" :title="$t('exportFileName')">
<span class="Required">*</span>
<span>{{$t('exportFileName')}}</span>
</div>
<a-form-model-item class="itemModel" prop="exportName">
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('exportFileName')"
v-model.trim="formInline.exportName"></a-input>
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model> </a-form-model>
</a-form> </a-form>
</a-spin> </a-spin>
@@ -121,6 +137,14 @@ export default {
description:[ description:[
{ min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' }, { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
], ],
exportName:[
{
max: 70,
message: this.$t('exportFileName') + this.$t('cannotExceed') + 70 + this.$t('Characters'),
trigger: 'blur'
},
{ required: true, message: this.$t('PleaseEnter')+this.$t('exportFileName'), trigger: 'blur' },
],
exportTemplateId: [ exportTemplateId: [
{ required: true, message: this.$t('PleaseSelect')+this.$t('CustomTemplateName'), trigger: 'change' }, { required: true, message: this.$t('PleaseSelect')+this.$t('CustomTemplateName'), trigger: 'change' },
], ],
@@ -243,12 +267,12 @@ export default {
// query.certCategoryName = this.contentListStart // query.certCategoryName = this.contentListStart
// } // }
query.paramsManifestId = this.$route.query.id query.paramsManifestId = this.$route.query.id
let long = localStorage.getItem('language') // let long = localStorage.getItem('language')
if (long && long === 'zh-cn') { // if (long && long === 'zh-cn') {
query.exportName = '自定义导出' // query.exportName = '自定义导出'
} else if (long && long === 'en-us') { // } else if (long && long === 'en-us') {
query.exportName = 'Custom' // query.exportName = 'Custom'
} // }
this.confirmLoading = true this.confirmLoading = true
downloadFile('report/detail/exportCustom', query.exportName+'.zip', query) downloadFile('report/detail/exportCustom', query.exportName+'.zip', query)
this.confirmLoading = false this.confirmLoading = false
jero-web/src/views/parameter/managementdetails/index.vue
+105 -95
View File
@@ -5,7 +5,7 @@
<div class="Virtual-detail-header" style="top: 0"> <div class="Virtual-detail-header" style="top: 0">
<div class="Virtual-detail-title"> <div class="Virtual-detail-title">
<span> <span>
{{ $t('ParameterViewPage') }} {{this.$route.query.pageName ? this.$route.query.pageName : $t('ParameterViewPage')}}
</span> </span>
</div> </div>
</div> </div>
@@ -104,39 +104,39 @@
@value='value' @value='value'
@listReset='listReset' @LoginUserType='LoginUserType'/> @listReset='listReset' @LoginUserType='LoginUserType'/>
</div> </div>
<!-- <div>--> <!-- <div>-->
<!-- <a-table--> <!-- <a-table-->
<!-- ref="table"--> <!-- ref="table"-->
<!-- size="middle"--> <!-- size="middle"-->
<!-- :loading="loading"--> <!-- :loading="loading"-->
<!-- :pagination="false"--> <!-- :pagination="false"-->
<!-- :scroll="{x: true}"--> <!-- :scroll="{x: true}"-->
<!-- rowKey="id"--> <!-- rowKey="id"-->
<!-- :data-source="dataSource"--> <!-- :data-source="dataSource"-->
<!-- :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"--> <!-- :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"-->
<!-- :columns="columns"--> <!-- :columns="columns"-->
<!-- >--> <!-- >-->
<!-- <span slot="titleName" slot-scope="text,record" :title="text">--> <!-- <span slot="titleName" slot-scope="text,record" :title="text">-->
<!-- {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }}--> <!-- {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }}-->
<!-- </span>--> <!-- </span>-->
<!-- <span slot="operation" slot-scope="text,record">--> <!-- <span slot="operation" slot-scope="text,record">-->
<!-- <a class="text-operation" @click="edit(record)">{{$t('edit')}}</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" @click="deleteLib(record)">{{$t('deleteLib')}}</a>-->
<!-- </span>--> <!-- </span>-->
<!-- </a-table>--> <!-- </a-table>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="page">--> <!-- <div class="page">-->
<!-- <a-pagination--> <!-- <a-pagination-->
<!-- :show-total="total => $t('total')+` ${total} `+$t('strip')"--> <!-- :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
<!-- show-quick-jumper--> <!-- show-quick-jumper-->
<!-- show-size-changer--> <!-- show-size-changer-->
<!-- :page-size.sync="pageSize"--> <!-- :page-size.sync="pageSize"-->
<!-- :total="total"--> <!-- :total="total"-->
<!-- :current="pageNo"--> <!-- :current="pageNo"-->
<!-- @change="pageOnChange"--> <!-- @change="pageOnChange"-->
<!-- @showSizeChange="SizeChange"--> <!-- @showSizeChange="SizeChange"-->
<!-- />--> <!-- />-->
<!-- </div>--> <!-- </div>-->
<conventionalModel :url="url" ref="conventionalModel"/> <conventionalModel :url="url" ref="conventionalModel"/>
<customelModel :url="url" ref="customelModel"/> <customelModel :url="url" ref="customelModel"/>
<JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading> <JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
@@ -144,15 +144,16 @@
</template> </template>
<script> <script>
import { getAction,postAction } from '../../../api/manage' import { getAction, postAction } from '../../../api/manage'
import axios from 'axios' import axios from 'axios'
import TableCollection from '@/components/tableCollection/index1' import TableCollection from '@/components/tableCollection/index1'
import conventionalModel from './commponts/conventionalmodle' import conventionalModel from './commponts/conventionalmodle'
import customelModel from './commponts/customexportmodle' import customelModel from './commponts/customexportmodle'
import { ACCESS_TOKEN } from '@/store/mutation-types' import { ACCESS_TOKEN } from '@/store/mutation-types'
import PersonnelSelection from '@/components/PersonnelSelection/index' import PersonnelSelection from '@/components/PersonnelSelection/index'
import Vue from 'vue' import Vue from 'vue'
export default {
export default {
name: 'managementdetails', name: 'managementdetails',
components: { components: {
conventionalModel, conventionalModel,
@@ -160,16 +161,16 @@ export default {
TableCollection, TableCollection,
PersonnelSelection PersonnelSelection
}, },
data(){ data() {
return{ return {
columns:[], columns: [],
selectedRowKeys: [], selectedRowKeys: [],
formInline: {}, formInline: {},
textLoading:false, textLoading: false,
url: { url: {
tableHeader: 'report/detail/getHeader', tableHeader: 'report/detail/getHeader',
tableList: 'report/detail/list', tableList: 'report/detail/list',
ConventionalExport: 'report/detail/exportNormal', ConventionalExport: 'report/detail/exportNormal'
// getLoginUserType: 'params/collectManifest/getLoginUserType', // 获取当前登陆人 // getLoginUserType: 'params/collectManifest/getLoginUserType', // 获取当前登陆人
// getquerySdtList: 'params/collectManifest/querySdtList', // 获取工程接口人的列表 // getquerySdtList: 'params/collectManifest/querySdtList', // 获取工程接口人的列表
// updateSdt: 'params/collectManifest/updateSdt', // 提交工程接口人 // updateSdt: 'params/collectManifest/updateSdt', // 提交工程接口人
@@ -189,7 +190,7 @@ export default {
version: 0, version: 0,
itemId: '', itemId: '',
selectedRowKeysValue: [], // table列表所选得数据 selectedRowKeysValue: [], // table列表所选得数据
token:Vue.ls.get(ACCESS_TOKEN), token: Vue.ls.get(ACCESS_TOKEN),
Dateline: {}, Dateline: {},
areaVisibleFreeze: false, // 冻结配置 areaVisibleFreeze: false, // 冻结配置
areaVisibleAssignedby: false, // 分配填写人弹框 areaVisibleAssignedby: false, // 分配填写人弹框
@@ -221,23 +222,22 @@ export default {
} }
] ]
}, },
RoleType: [ ],// 控件类型 RoleType: [],// 控件类型
NotSelectedRowKeysValue: [], NotSelectedRowKeysValue: [],
NoEngineer: 1, // 下发收集的权限,0为没有接口人 1为由接口人 默认有 NoEngineer: 1, // 下发收集的权限,0为没有接口人 1为由接口人 默认有
NotSelectedNoEngineerValue: [], NotSelectedNoEngineerValue: [],
paramsManifest: {} paramsManifest: {}
} }
}, },
props: { props: {},
},
mounted() { mounted() {
// this.Getlist() // this.Getlist()
this.getTableList() this.getTableList()
document.title = this.$t('ParameterViewPage') document.title = this.$t('ParameterViewPage')
}, },
methods:{ methods: {
Getlist() { Getlist() {
getAction(this.url.tableHeader, {paramsManifestId: this.$route.query.id,flag: 8}).then((res) => { getAction(this.url.tableHeader, { paramsManifestId: this.$route.query.id, flag: 8 }).then((res) => {
if (res.success) { if (res.success) {
var jsonHead = res.result var jsonHead = res.result
this.columns = [] this.columns = []
@@ -255,12 +255,12 @@ export default {
this.columns[index].scopedSlots = { this.columns[index].scopedSlots = {
customRender: 'urlClick' customRender: 'urlClick'
} }
}else if(res.db_field_name=='iterms_conditions'){ } else if (res.db_field_name == 'iterms_conditions') {
this.columns[index].width='500' this.columns[index].width = '500'
this.columns[index].scopedSlots = { this.columns[index].scopedSlots = {
customRender: 'showContent' customRender: 'showContent'
} }
}else{ } else {
this.columns[index].scopedSlots = { this.columns[index].scopedSlots = {
customRender: 'detailText' customRender: 'detailText'
} }
@@ -286,7 +286,7 @@ export default {
} }
}) })
}, },
getcompleteby(e){ getcompleteby(e) {
console.log(e) console.log(e)
}, },
PersonnelSelectionChange(value, id) { PersonnelSelectionChange(value, id) {
@@ -427,17 +427,19 @@ export default {
this.pageSize = pageSize this.pageSize = pageSize
// this.$emit('handlePreservation') // this.$emit('handlePreservation')
this.getTableList() this.getTableList()
},
} }
} }
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
/deep/.ant-card-body{
/deep/ .ant-card-body {
margin-top: -28px; margin-top: -28px;
} }
.doc-detail {
.doc-detail {
background: #fff; background: #fff;
height: 100%; height: 100%;
@@ -451,6 +453,7 @@ export default {
justify-content: space-between; justify-content: space-between;
border-bottom: 2px #eff1f3 solid; border-bottom: 2px #eff1f3 solid;
background: #fff; background: #fff;
.Virtual-detail-title { .Virtual-detail-title {
display: inline-block; display: inline-block;
text-overflow: ellipsis; text-overflow: ellipsis;
@@ -487,24 +490,24 @@ export default {
line-height: 42px; line-height: 42px;
} }
} }
} }
.header-text { .header-text {
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
height: 60px; height: 60px;
color: #000F16; color: #000F16;
line-height: 40px; line-height: 40px;
} }
.box-title-text { .box-title-text {
line-height: 1.4; line-height: 1.4;
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 10px;
} }
.title-text { .title-text {
width: 20%; width: 20%;
min-width: 110px; min-width: 110px;
color: #000F16; color: #000F16;
@@ -517,49 +520,52 @@ export default {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.box-input { .box-input {
display: inline-block; display: inline-block;
width: 70%; width: 70%;
height: 38px; height: 38px;
margin-top: 2px; margin-top: 2px;
} }
.box-button { .box-button {
height: 38px; height: 38px;
} }
.text-operation { .text-operation {
margin-right: 8px; margin-right: 8px;
} }
.page { .page {
text-align: right; text-align: right;
margin-top: 20px; margin-top: 20px;
} }
.operator-text-left { .operator-text-left {
font-size: 14px; font-size: 14px;
margin-right: 20px; margin-right: 20px;
background: #eff1f3; background: #eff1f3;
padding: 8px 8px; padding: 8px 8px;
cursor: pointer; cursor: pointer;
border-radius: 4px; border-radius: 4px;
} }
.operator-text-title {
.operator-text-title {
cursor: pointer; cursor: pointer;
margin-right: 22px; margin-right: 22px;
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #040B29; color: #040B29;
margin-bottom: 22px; margin-bottom: 22px;
} }
.box-title-text-index {
.box-title-text-index {
line-height: 1.4; line-height: 1.4;
display: flex; display: flex;
} }
.title-text-Comment {
.title-text-Comment {
width: 74px; width: 74px;
text-align: right; text-align: right;
display: inline-block; display: inline-block;
@@ -571,17 +577,21 @@ export default {
white-space: nowrap; white-space: nowrap;
height: 42px; height: 42px;
line-height: 36px; line-height: 36px;
} }
.box-input .ant-select-selection {
.box-input .ant-select-selection {
height: 38px !important; height: 38px !important;
} }
.itemitem{
.itemitem {
width: 250px; width: 250px;
} }
.box-input .ant-select-selection__rendered {
.box-input .ant-select-selection__rendered {
line-height: 38px; line-height: 38px;
} }
.Required{
.Required {
color: red; color: red;
} }
</style> </style>