XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main
continuous-integration/drone/push Build is passing Details

main
caiyiling 2025-04-22 13:43:19 +08:00
parent 4ff9a7c482 33b3818a9e
commit d6a3bcba30
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue
View File

@ -36,10 +36,10 @@
<el-input-number v-model="form.SignViewMinimumMinutes" controls-position="right" :min="1" :max="50" /> <el-input-number v-model="form.SignViewMinimumMinutes" controls-position="right" :min="1" :max="50" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('dictionary:signature:form:CurrentStaffTrainDays')" prop="CurrentStaffTrainDays"> <el-form-item :label="$t('dictionary:signature:form:CurrentStaffTrainDays')" prop="CurrentStaffTrainDays">
<el-input-number v-model="form.CurrentStaffTrainDays" controls-position="right" :min="1" :max="1000" /> <el-input-number v-model="form.CurrentStaffTrainDays" controls-position="right" :min="0" :max="1000" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('dictionary:signature:form:NewStaffTrainDays')" prop="NewStaffTrainDays"> <el-form-item :label="$t('dictionary:signature:form:NewStaffTrainDays')" prop="NewStaffTrainDays">
<el-input-number v-model="form.NewStaffTrainDays" controls-position="right" :min="1" :max="1000" /> <el-input-number v-model="form.NewStaffTrainDays" controls-position="right" :min="0" :max="1000" />
</el-form-item> </el-form-item>
<!-- <el-form-item v-if="form.Id !== ''" label="是否废除: "> <!-- <el-form-item v-if="form.Id !== ''" label="是否废除: ">
<el-radio-group v-model="form.IsDeleted"> <el-radio-group v-model="form.IsDeleted">
@ -77,7 +77,7 @@ export default {
FileTypeId: '', FileTypeId: '',
Name: '', Name: '',
Path: '', Path: '',
IsDeleted: false, IsDeleted: true,
SignViewMinimumMinutes: null, SignViewMinimumMinutes: null,
DocUserSignType: 0, DocUserSignType: 0,
CurrentStaffTrainDays: null, CurrentStaffTrainDays: null,

13
src/views/dictionary/attachment/components/SignatureTemplate/index.vue
View File

@ -140,8 +140,7 @@
<el-button type="text" @click="handleEdit(scope.row)"> <el-button type="text" @click="handleEdit(scope.row)">
{{ $t('common:button:edit') }} {{ $t('common:button:edit') }}
</el-button> </el-button>
<el-button :disabled="scope.row.IsPublish || scope.row.IsDeleted" type="text" <el-button :disabled="scope.row.IsPublish" type="text" @click="publishSystemDocument([scope.row])">
@click="publishSystemDocument([scope.row])">
{{ $t('dictionary:signature:button:publish') }} {{ $t('dictionary:signature:button:publish') }}
</el-button> </el-button>
<el-button :disabled="scope.row.IsDeleted" type="text" @click="handleRepeal([scope.row])"> <el-button :disabled="scope.row.IsDeleted" type="text" @click="handleRepeal([scope.row])">
@ -240,7 +239,7 @@ export default {
}, },
methods: { methods: {
handleSelectable(row) { handleSelectable(row) {
return !row.IsDeleted return !row.IsDeleted || !row.IsPublish
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;
@ -253,8 +252,10 @@ export default {
distinguishCancelAndClose: true, distinguishCancelAndClose: true,
}) })
if (!confirm) return false if (!confirm) return false
let arr = list.filter(item => !item.IsPublish)
if (arr.length <= 0) return this.getList()
let data = { let data = {
ids: list.map(item => item.Id) ids: arr.map(item => item.Id)
} }
this.loading = true this.loading = true
let res = await publishSystemDocument(data) let res = await publishSystemDocument(data)
@ -340,8 +341,10 @@ export default {
distinguishCancelAndClose: true, distinguishCancelAndClose: true,
}) })
.then(() => { .then(() => {
let arr = row.filter(item => !item.IsDeleted)
if (arr.length <= 0) return this.getList()
let data = { let data = {
Ids: row.map(item => item.Id) Ids: arr.map(item => item.Id)
} }
this.loading = true this.loading = true
outLineSystemDocument(data) outLineSystemDocument(data)