Compare commits

..

No commits in common. "0785219954fc8ce25023dd868d70751b446b2813" and "4164b24bd951cb48d72642ce110d3a2adafa9c48" have entirely different histories.

8 changed files with 76 additions and 107 deletions

View File

@ -9,10 +9,10 @@
class="upload-temporary-file"
>
<div class="base-dialog-body">
<el-form-item :label="$t('dictionary:attachment:label:code')" prop="Code">
<el-form-item label="Code" prop="Code">
<el-input v-model="form.Code" />
</el-form-item>
<el-form-item :label="$t('dictionary:attachment:label:businessScenario')" prop="BusinessScenarioEnum">
<el-form-item label="业务场景: " prop="BusinessScenarioEnum">
<el-select
v-model="form.BusinessScenarioEnum"
style="width:100%;"
@ -28,7 +28,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('dictionary:attachment:export:form:file')">
<el-form-item label="文件: ">
<div class="upload-container">
<el-upload
class="upload-demo"

View File

@ -2,8 +2,7 @@
<BaseContainer>
<template slot="search-container">
<el-form :inline="true" size="small">
<!-- 业务场景 -->
<el-form-item :label="$t('dictionary:attachment:label:businessScenario')">
<el-form-item label="业务场景">
<el-select
v-model="searchData.BusinessScenarioEnum"
style="width:150px;"
@ -17,8 +16,7 @@
</el-select>
</el-form-item>
<!-- 文件名称 -->
<el-form-item :label="$t('dictionary:attachment:label:name')">
<el-form-item label="文件名称">
<el-input
v-model="searchData.Name"
style="width:130px;"
@ -59,14 +57,14 @@
<el-table-column type="index" width="40" />
<el-table-column
prop="Code"
:label="$t('dictionary:attachment:label:code')"
label="Code"
show-overflow-tooltip
sortable="custom"
/>
<el-table-column
prop="BusinessScenarioEnum"
:label="$t('dictionary:attachment:label:businessScenario')"
label="业务场景"
show-overflow-tooltip
sortable="custom"
>
@ -78,18 +76,18 @@
<el-table-column
prop="Name"
:label="$t('dictionary:attachment:label:name')"
label="文件名称"
show-overflow-tooltip
sortable="custom"
/>
<el-table-column
prop="Description"
:label="$t('dictionary:attachment:label:description')"
label="描述"
show-overflow-tooltip
/>
<el-table-column
prop="IsDeleted"
:label="$t('dictionary:attachment:label:isDeleted')"
label="是否废除"
show-overflow-tooltip
sortable="custom"
>
@ -100,7 +98,7 @@
</el-table-column>
<el-table-column
prop="UpdateTime"
:label="$t('dictionary:attachment:label:updateTime')"
label="上传时间"
show-overflow-tooltip
sortable="custom"
/>
@ -111,19 +109,19 @@
type="text"
@click="handleDownload(scope.row)"
>
{{ $t('common:button:download') }}
下载
</el-button>
<el-button
type="text"
@click="handleEdit(scope.row)"
>
{{ $t('common:action:edit') }}
编辑
</el-button>
<el-button
type="text"
@click="handleDelete(scope.row)"
>
{{ $t('common:button:delete') }}
删除
</el-button>
</template>
</el-table-column>
@ -178,9 +176,9 @@ export default {
},
methods: {
handleDelete(row) {
this.$confirm(this.$t('dictionary:attachment:export:confirm:delete')).then(() => {
this.$confirm('确定删除该文件?').then(() => {
deleteCommonDocument(row.Id).then(() => {
this.$message.success(this.$t('common:message:deletedSuccessfully'))
this.$message.success('删除成功')
this.getList()
})
})
@ -197,7 +195,7 @@ export default {
},
//
handleAdd() {
this.editDialog.title = this.$t('common:button:new')
this.editDialog.title = 'Add'
this.currentRow = { FileTypeEnum: FileTypeEnum }
this.editDialog.visible = true
},
@ -210,7 +208,7 @@ export default {
},
//
handleEdit(row) {
this.editDialog.title = this.$t('common:action:edit')
this.editDialog.title = 'Edit'
this.currentRow = { ...row }
this.editDialog.visible = true
},

View File

@ -9,7 +9,7 @@
class="upload-temporary-file"
>
<div class="base-dialog-body">
<el-form-item :label="$t('dictionary:attachment:export:search:code')" prop="Code">
<el-form-item label="Code" prop="Code">
<el-input v-model="form.Code" />
</el-form-item>
<el-form-item
@ -76,9 +76,8 @@
:label="$t('dictionary:attachment:export:form:isDeleted')"
>
<el-radio-group v-model="form.IsDeleted">
<el-radio v-for="item of $d.YesOrNo" :key="`IsDeleted${item.value}`" :label="item.value">
{{ item.label }}
</el-radio>
<el-radio :label="true"></el-radio>
<el-radio :label="false"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item

View File

@ -60,7 +60,7 @@
<el-table-column type="index" width="40" />
<el-table-column
prop="Code"
:label="$t('dictionary:attachment:export:search:code')"
label="Code"
show-overflow-tooltip
sortable="custom"
/>
@ -235,7 +235,7 @@ export default {
},
//
handleAdd() {
this.editDialog.title = this.$t('common:button:new')
this.editDialog.title = 'Add'
this.currentRow = { FileTypeEnum: FileTypeEnum }
this.editDialog.visible = true
},
@ -252,7 +252,7 @@ export default {
},
//
handleEdit(row) {
this.editDialog.title = this.$t('common:action:edit')
this.editDialog.title = 'Edit'
this.currentRow = { ...row }
this.editDialog.visible = true
},

View File

@ -247,7 +247,7 @@ export default {
},
//
handleAdd() {
this.title = this.$t('common:button:new')
this.title = 'Add'
this.currentRow = {}
this.editVisible = true
},
@ -262,7 +262,7 @@ export default {
},
//
handleEdit(row) {
this.title = this.$t('common:action:edit')
this.title = 'Edit'
this.currentRow = { ...row }
this.editVisible = true
},

View File

@ -8,36 +8,32 @@
label-width="160px"
size="small"
>
<el-form-item :label="$t('template:anonymization:label:group')" prop="Group">
<el-form-item label="Group: " prop="Group">
<el-input v-model="form.Group" />
</el-form-item>
<el-form-item :label="$t('template:anonymization:label:element')" prop="Group">
<el-form-item label="Element: " prop="Group">
<el-input v-model="form.Element" />
</el-form-item>
<!-- tag Description -->
<el-form-item :label="$t('template:anonymization:label:tagDescription')" prop="Group">
<el-form-item label="tag Description: " prop="Group">
<el-input v-model="form.TagDescription" />
</el-form-item>
<!-- Tag DescriptionCN -->
<el-form-item :label="$t('template:anonymization:label:tagDescriptionCN')" prop="Group">
<el-form-item label="Tag DescriptionCN: " prop="Group">
<el-input v-model="form.TagDescriptionCN" />
</el-form-item>
<!-- Value Representation -->
<el-form-item :label="$t('template:anonymization:label:valueRepresentation')" prop="Group">
<el-form-item label="Value Representation: " prop="Group">
<el-input v-model="form.ValueRepresentation" />
</el-form-item>
<!-- Is Fixed -->
<el-form-item :label="$t('template:anonymization:label:isFixed')">
<el-form-item label="Is Fixed: ">
<el-switch
v-model="form.IsFixed"
:active-value="true"
:inactive-value="false"
/>
</el-form-item>
<el-form-item :label="$t('template:anonymization:label:valueReplace')">
<el-form-item label="Replace Value: ">
<el-input v-model="form.ReplaceValue" />
</el-form-item>
<el-form-item :label="$t('template:anonymization:label:isEnable')">
<el-form-item label="Is Enable: ">
<el-switch
v-model="form.IsEnable"
:active-value="true"
@ -47,8 +43,8 @@
</el-form>
</template>
<template slot="dialog-footer">
<el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">{{ $t('common:button:cancel') }}</el-button>
<el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">{{ $t('common:button:save') }}</el-button>
<el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">Cancel</el-button>
<el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
</template>
</base-model>
</template>
@ -86,7 +82,7 @@ export default {
IsAdd: false
},
rules: {
Group: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }]
Group: [{ required: true, message: 'Please specify', trigger: 'blur' }]
},
model_cfg: { visible: false, showClose: true, width: '600px', title: '' }
}
@ -112,7 +108,7 @@ export default {
this.btnLoading = true
addOrUpdateSystemAnonymization(this.form).then(res => {
this.btnLoading = false
this.$message.success(this.$t('common:message:savedSuccessfully'))
this.$message.success('Saved successfully!')
this.model_cfg.visible = false
this.$emit('getList')
}).catch(() => {

View File

@ -3,20 +3,16 @@
<!-- 搜索框 -->
<div class="search">
<el-form :inline="true" size="mini" class="base-search-form">
<!-- Group -->
<el-form-item :label="$t('template:anonymization:label:group')">
<el-form-item label="Group:">
<el-input v-model="searchData.Group" clearable style="width:120px;" />
</el-form-item>
<!-- Element -->
<el-form-item :label="$t('template:anonymization:label:element')">
<el-form-item label="Element:">
<el-input v-model="searchData.Element" clearable style="width:120px;" />
</el-form-item>
<!-- Tag Description -->
<el-form-item :label="$t('template:anonymization:label:tagDescription')">
<el-form-item label="Tag Description:">
<el-input v-model="searchData.TagDescription" clearable style="width:120px;" />
</el-form-item>
<!-- Tag DescriptionCN -->
<el-form-item :label="$t('template:anonymization:label:tagDescriptionCN')">
<el-form-item label="Tag DescriptionCN:">
<el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
</el-form-item>
<el-form-item>
@ -33,7 +29,7 @@
</el-form-item>
</el-form>
<span style="margin-left:auto">
<el-button type="primary" size="mini" @click="handleAdd">{{ $t('common:button:new') }}</el-button>
<el-button type="primary" size="mini" @click="handleAdd">New</el-button>
</span>
</div>
@ -46,39 +42,33 @@
height="100"
>
<el-table-column type="index" width="60" />
<!-- Group -->
<el-table-column
prop="Group"
:label="$t('template:anonymization:label:group')"
label="Group"
show-overflow-tooltip
/>
<!-- Element -->
<el-table-column
prop="Element"
:label="$t('template:anonymization:label:element')"
label="Element"
show-overflow-tooltip
min-width="110"
/>
<!-- Tag Description -->
<el-table-column
prop="TagDescription"
:label="$t('template:anonymization:label:tagDescription')"
label="Tag Description"
min-width="110"
/>
<!-- Tag DescriptionCN -->
<el-table-column
prop="TagDescriptionCN"
:label="$t('template:anonymization:label:tagDescriptionCN')"
label="Tag DescriptionCN"
min-width="110"
/>
<!-- Value Representation -->
<el-table-column
prop="ValueRepresentation"
:label="$t('template:anonymization:label:valueRepresentation')"
label="Value Representation"
min-width="110"
/>
<!-- Is Fixed -->
<el-table-column :label="$t('template:anonymization:label:isFixed')" width="100">
<el-table-column label="Is Fixed" width="100">
<template slot-scope="scope">
<el-switch
v-model="scope.row.IsFixed"
@ -88,14 +78,12 @@
/>
</template>
</el-table-column>
<!-- Value Replace -->
<el-table-column
prop="ReplaceValue"
:label="$t('template:anonymization:label:valueReplace')"
label="Value Replace"
min-width="110"
/>
<!-- Is Enable -->
<el-table-column :label="$t('template:anonymization:label:isEnable')" width="100" fixed="right">
<el-table-column label="Is Enable" width="100" fixed="right">
<template slot-scope="scope">
<el-switch
v-model="scope.row.IsEnable"
@ -105,21 +93,21 @@
/>
</template>
</el-table-column>
<el-table-column :label="$t('common:action:action')" width="200" fixed="right">
<el-table-column label="Action" width="200" fixed="right">
<template slot-scope="scope">
<el-button
type="primary"
size="mini"
@click="handleEdit(scope.row)"
>
{{ $t('common:button:edit') }}
Edit
</el-button>
<el-button
type="danger"
size="mini"
@click="handleDelete(scope.row)"
>
{{ $t('common:button:delete') }}
Delete
</el-button>
</template>
</el-table-column>
@ -165,7 +153,7 @@ export default {
switchChange(event, item) {
this.loading = true
addOrUpdateSystemAnonymization(item).then(res => {
this.$message.success(this.$t('common:message:savedSuccessfully'))
this.$message.success('Saved successfully!')
this.loading = false
}).catch(() => {
this.loading = false
@ -173,12 +161,12 @@ export default {
},
handleAdd() {
this.$nextTick(() => {
this.$refs['AddDICOMConfig'].openDialog(this.$t('common:button:new'), {})
this.$refs['AddDICOMConfig'].openDialog('New Anonymization', {})
})
},
handleEdit(row) {
this.$nextTick(() => {
this.$refs['AddDICOMConfig'].openDialog(this.$t('common:action:edit'), row)
this.$refs['AddDICOMConfig'].openDialog('Edit Anonymization', row)
})
},
handleDelete(row) {

View File

@ -3,20 +3,16 @@
<!-- 搜索框 -->
<div class="search">
<el-form :inline="true" size="mini" class="base-search-form">
<!-- Group -->
<el-form-item :label="$t('template:anonymization:label:group')">
<el-form-item label="Group:">
<el-input v-model="searchData.Group" clearable style="width:120px;" />
</el-form-item>
<!-- Element -->
<el-form-item :label="$t('template:anonymization:label:element')">
<el-form-item label="Element:">
<el-input v-model="searchData.Element" clearable style="width:120px;" />
</el-form-item>
<!-- Tag Description -->
<el-form-item :label="$t('template:anonymization:label:tagDescription')">
<el-form-item label="Tag Description:">
<el-input v-model="searchData.TagDescription" clearable style="width:120px;" />
</el-form-item>
<!-- Tag DescriptionCN -->
<el-form-item :label="$t('template:anonymization:label:tagDescriptionCN')">
<el-form-item label="Tag DescriptionCN:">
<el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
</el-form-item>
<el-form-item>
@ -33,7 +29,7 @@
</el-form-item>
</el-form>
<span style="margin-left:auto">
<el-button type="primary" size="mini" @click="handleAdd">{{ $t('common:button:new') }}</el-button>
<el-button type="primary" size="mini" @click="handleAdd">New</el-button>
</span>
</div>
@ -46,39 +42,33 @@
height="100"
>
<el-table-column type="index" width="60" />
<!-- Group -->
<el-table-column
prop="Group"
:label="$t('template:anonymization:label:group')"
label="Group"
show-overflow-tooltip
/>
<!-- Element -->
<el-table-column
prop="Element"
:label="$t('template:anonymization:label:element')"
label="Element"
show-overflow-tooltip
min-width="110"
/>
<!-- Tag Description -->
<el-table-column
prop="TagDescription"
:label="$t('template:anonymization:label:tagDescription')"
label="Tag Description"
min-width="110"
/>
<!-- Tag DescriptionCN -->
<el-table-column
prop="TagDescriptionCN"
:label="$t('template:anonymization:label:tagDescriptionCN')"
label="Tag DescriptionCN"
min-width="110"
/>
<!-- Value Representation -->
<el-table-column
prop="ValueRepresentation"
:label="$t('template:anonymization:label:valueRepresentation')"
label="Value Representation"
min-width="110"
/>
<!-- Is Fixed -->
<el-table-column :label="$t('template:anonymization:label:isFixed')" width="100">
<el-table-column label="Is Fixed" width="100">
<template slot-scope="scope">
<el-switch
v-model="scope.row.IsFixed"
@ -88,14 +78,12 @@
/>
</template>
</el-table-column>
<!-- Value Replace -->
<el-table-column
prop="ReplaceValue"
:label="$t('template:anonymization:label:valueReplace')"
label="Value Replace"
min-width="110"
/>
<!-- Is Enable -->
<el-table-column :label="$t('template:anonymization:label:isEnable')" width="100" fixed="right">
<el-table-column label="Is Enable" width="100" fixed="right">
<template slot-scope="scope">
<el-switch
v-model="scope.row.IsEnable"
@ -105,21 +93,21 @@
/>
</template>
</el-table-column>
<el-table-column :label="$t('common:action:action')" width="200" fixed="right">
<el-table-column label="Action" width="200" fixed="right">
<template slot-scope="scope">
<el-button
type="primary"
size="mini"
@click="handleEdit(scope.row)"
>
{{ $t('common:action:edit') }}
Edit
</el-button>
<el-button
type="danger"
size="mini"
@click="handleDelete(scope.row)"
>
{{ $t('common:button:delete') }}
Delete
</el-button>
</template>
</el-table-column>
@ -164,7 +152,7 @@ export default {
switchChange(event, item) {
this.loading = true
addOrUpdateSystemAnonymization(item).then(res => {
this.$message.success(this.$t('common:message:savedSuccessfully'))
this.$message.success('Saved successfully!')
this.loading = false
}).catch(() => {
this.loading = false
@ -172,12 +160,12 @@ export default {
},
handleEdit(row) {
this.$nextTick(() => {
this.$refs['AddDICOMConfig'].openDialog(this.$t('common:action:edit'), row)
this.$refs['AddDICOMConfig'].openDialog('Edit Anonymization', row)
})
},
handleAdd() {
this.$nextTick(() => {
this.$refs['AddDICOMConfig'].openDialog(this.$t('common:button:new'), {
this.$refs['AddDICOMConfig'].openDialog('New IncreaseFields', {
Group: '',
Element: '',
TagDescription: '',