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

uat
caiyiling 2025-04-25 10:53:09 +08:00
parent 8bf6d5f515 74f3852ecc
commit a6b5d0b196
2 changed files with 8 additions and 3 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="0" :max="1000" /> <el-input-number v-model="form.CurrentStaffTrainDays" controls-position="right" :min="1" :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="0" :max="1000" /> <el-input-number v-model="form.NewStaffTrainDays" controls-position="right" :min="1" :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">
@ -81,7 +81,7 @@ export default {
SignViewMinimumMinutes: null, SignViewMinimumMinutes: null,
DocUserSignType: 0, DocUserSignType: 0,
CurrentStaffTrainDays: null, CurrentStaffTrainDays: null,
NewStaffTrainDays: null, NewStaffTrainDays: 14,
}, },
rules: { rules: {
FileTypeId: [ FileTypeId: [

5
src/views/trials/trials-workbench/components/auditDocument/index.vue
View File

@ -694,6 +694,8 @@ export default {
async delData(Ids) { async delData(Ids) {
if (!this.isManage) return false if (!this.isManage) return false
try { try {
let confirm = await this.$confirm(this.$t('trials:trials-workbench:auditDocument:delData'))
if (!confirm) return false
let data = { Ids } let data = { Ids }
let res = await deleteAuditDocument(data) let res = await deleteAuditDocument(data)
if (res.IsSuccess) { if (res.IsSuccess) {
@ -966,6 +968,9 @@ export default {
}, },
// 单行左键双击（进入文件夹或者预览文件） // 单行左键双击（进入文件夹或者预览文件）
handleRowDblclick(row, column, event) { handleRowDblclick(row, column, event) {
if (this.$refs.contextmenu) {
this.$refs.contextmenu.foo()
}
// 判断点击目标是否为展开按钮 // 判断点击目标是否为展开按钮
let isExpandButton = event.target.closest('.el-table__expand-icon'); let isExpandButton = event.target.closest('.el-table__expand-icon');
if (isExpandButton) return; // 阻止触发 if (isExpandButton) return; // 阻止触发