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

修改禅道bug

Browse Source
This commit is contained in:
zyx.net
2022-08-05 16:54:44 +08:00
parent e4e4f7cadc
commit a02df1284b
2 changed files with 84 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/externalReports/index.vue
+82 -35
View File
@@ -139,7 +139,6 @@
:columns="columns" :columns="columns"
> >
<span slot="projectName" slot-scope="text,record" :title="text"> <span slot="projectName" slot-scope="text,record" :title="text">
<a @click="entryNameClick(record)">
{{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
</a> </a>
</span> </span>
@@ -186,30 +185,72 @@
:label-col="labelCol" :label-col="labelCol"
:wrapper-col="wrapperCol" :wrapper-col="wrapperCol"
> >
<a-form-model-item :label="$t('Foldername')" prop="folderName"> <a-row :gutter="24">
<a-input class="box-input add-input" v-model.trim="form.folderName" :placeholder="$t('PleaseEnter')+$t('Foldername')"/> <a-col :span="24">
</a-form-model-item> <div class="box-title-text">
<a-form-model-item :label="$t('Administrativeprivileges')" prop="authManageIdsName"> <div class="title-text">
<PersonnelSelection class="box-input add-input" <span class="Required">*</span>
:personneQuery="form" <span class="title-text-text"
:query="{db_field_name:'authManageIds',db_field_txt:$t('Administrativeprivileges')}" :title="$t('Foldername')">{{$t('Foldername')}}</span>
@change="PersonnelSelectionChange" </div>
v-model="form.authManageIdsName"/> <a-form-model-item prop="folderName">
</a-form-model-item> <a-input class="box-input add-input" style='width: 239%' v-model.trim="form.folderName" :placeholder="$t('PleaseEnter')+$t('Foldername')"/>
<a-form-model-item :label="$t('Checkthepermissions')" prop="authViewIdsName"> </a-form-model-item>
<PersonnelSelection </div>
class="box-input add-input" </a-col>
:personneQuery="form" </a-row>
:query="{db_field_name:'authViewIds',db_field_txt:$t('Checkthepermissions')}" <a-row :gutter="24">
@change="PersonnelSelectionChange" <a-col :span="24">
v-model="form.authViewIdsName"/> <div class="box-title-text">
</a-form-model-item> <div class="title-text">
<a-form-model-item :label="$t('Folderorder')" prop="orderId"> <span class="title-text-text"
<a-input-number v-model="form.orderId" :min="1" :max="9999" class="box-input add-input" :title="$t('Administrativeprivileges')">{{$t('Administrativeprivileges')}}</span>
:placeholder="$t('PleaseEnter')+$t('Folderorder')" :formatter="limitNumber" </div>
:parser="limitNumber" /> <a-form-model-item class="itemModel" prop="authManageIdsName">
<!-- <a-input-number v-model="rowCount" :min="1" :placeholder="$t('pleaseEnter')+$t('numberRows')" :formatter="limitNumber" :parser="limitNumber" />--> <PersonnelSelection class="box-input add-input"
</a-form-model-item> :personneQuery="form"
:query="{db_field_name:'authManageIds',db_field_txt:$t('Administrativeprivileges')}"
@change="PersonnelSelectionChange"
v-model="form.authManageIdsName"/>
</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('Checkthepermissions')">{{$t('Checkthepermissions')}}</span>
</div>
<a-form-model-item class="itemModel" prop="authViewIdsName">
<PersonnelSelection
class="box-input add-input"
:personneQuery="form"
:query="{db_field_name:'authViewIds',db_field_txt:$t('Checkthepermissions')}"
@change="PersonnelSelectionChange"
v-model="form.authViewIdsName"/>
</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="Required">*</span>
<span class="title-text-text"
:title="$t('Folderorder')">{{$t('Folderorder')}}</span>
</div>
<a-form-model-item class="itemModel" prop="orderId">
<a-input-number v-model="form.orderId" :min="1" :max="9999" class="box-input add-input"
:placeholder="$t('PleaseEnter')+$t('Folderorder')" :formatter="limitNumber"
:parser="limitNumber" />
<!-- <a-input-number v-model="rowCount" :min="1" :placeholder="$t('pleaseEnter')+$t('numberRows')" :formatter="limitNumber" :parser="limitNumber" />-->
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model> </a-form-model>
</a-modal> </a-modal>
@@ -324,6 +365,7 @@ export default {
title: this.$t('fileDeclaration'), title: this.$t('fileDeclaration'),
align: 'center', align: 'center',
dataIndex: 'fileDescription', dataIndex: 'fileDescription',
scopedSlots: { customRender: 'projectName' }
}, },
{ {
title: this.$t('uploadedBy'), title: this.$t('uploadedBy'),
@@ -1028,32 +1070,33 @@ export default {
.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;
} }
.title-text { .title-text {
width: 20%; width: 114px;
min-width: 80px; text-align: right;
color: #000F16;
display: inline-block; display: inline-block;
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
margin-right: 16px; margin-right: 16px;
margin-top: 3px;
text-align: right;
white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 48px;
} }
.box-input { .box-input {
display: inline-block; display: inline-block;
width: 70%;
height: 38px; height: 38px;
width: 100%;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px; margin-top: 2px;
} }
.add-input { .add-input {
width: 82%; width: 82%;
} }
@@ -1097,6 +1140,10 @@ export default {
height: 38px; height: 38px;
width: 100%; width: 100%;
} }
.Required {
color: red;
margin-right: 4px;
}
.split-detail { .split-detail {
/*height: 100% !important;*/ /*height: 100% !important;*/
jero-web/src/views/parameter/parameterexport/components/addModel.vue
+2 -2
View File
@@ -213,11 +213,11 @@ export default {
Action(url, query).then((res) => { Action(url, query).then((res) => {
if (res.success) { if (res.success) {
this.confirmLoading = false this.confirmLoading = false
this.$message.success(res.message) this.$message.success(this.$t('OperationSuccessful'))
this.visible = false this.visible = false
this.$emit('addModelList') this.$emit('addModelList')
} else { } else {
this.$message.warning(res.message) this.$message.warning(this.$t('operationFailed'))
this.confirmLoading = false this.confirmLoading = false
} }
}) })