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

1.07部分问题修复
continuous-integration/drone/push Build is passing Details

uat_us
wangxiaoshuang 2025-01-08 14:26:45 +08:00
parent 9ab7afa06f
commit 67a3c4f926
4 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/trials/trials-panel/attachments/attachment-management/index.vue
View File

@ -76,7 +76,7 @@
style="width: 120px" style="width: 120px"
> >
<el-option <el-option
v-for="i of $d.YesOrNo" v-for="i of $d.TrainingStatusEnum"
:key="'IsConfirmed' + i.label" :key="'IsConfirmed' + i.label"
:value="i.value" :value="i.value"
:label="i.label" :label="i.label"
@ -90,7 +90,7 @@
style="width: 120px" style="width: 120px"
> >
<el-option <el-option
v-for="i of $d.YesOrNo" v-for="i of $d.TrainingStatus"
:key="'IsDeleted' + i.label" :key="'IsDeleted' + i.label"
:value="i.value" :value="i.value"
:label="i.label" :label="i.label"
@ -175,11 +175,11 @@
sortable="custom" sortable="custom"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.IsDeleted" type="danger">{{ <el-tag v-if="!scope.row.IsDeleted" type="danger">{{
$fd('YesOrNo', scope.row.IsDeleted) $fd('TrainingStatus', scope.row.IsDeleted)
}}</el-tag> }}</el-tag>
<el-tag v-else type="primary">{{ <el-tag v-else type="primary">{{
$fd('YesOrNo', scope.row.IsDeleted) $fd('TrainingStatus', scope.row.IsDeleted)
}}</el-tag> }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
@ -199,11 +199,11 @@
sortable="custom" sortable="custom"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="!scope.row.IsConfirmed" type="primary">{{ <el-tag v-if="scope.row.IsConfirmed" type="primary">{{
$fd('YesOrNo', scope.row.IsConfirmed) $fd('TrainingStatusEnum', scope.row.IsConfirmed)
}}</el-tag> }}</el-tag>
<el-tag v-else type="danger">{{ <el-tag v-else type="danger">{{
$fd('YesOrNo', scope.row.IsConfirmed) $fd('TrainingStatusEnum', scope.row.IsConfirmed)
}}</el-tag> }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>

10
src/views/trials/trials-panel/attachments/self-attachment/index.vue
View File

@ -25,7 +25,7 @@
<!-- 是否签署 --> <!-- 是否签署 -->
<el-form-item :label="$t('trials:self-attachment:table:isSign')"> <el-form-item :label="$t('trials:self-attachment:table:isSign')">
<el-select v-model="searchData.IsSign" clearable style="width:120px;"> <el-select v-model="searchData.IsSign" clearable style="width:120px;">
<template v-for="item of $d.YesOrNo"> <template v-for="item of $d.TrainingStatusEnum">
<el-option v-if="item.raw.ValueCN !== '无'" :label="item.label" :value="item.value" :key="item.id"/> <el-option v-if="item.raw.ValueCN !== '无'" :label="item.label" :value="item.value" :key="item.id"/>
</template> </template>
</el-select> </el-select>
@ -77,8 +77,8 @@
sortable="custom" sortable="custom"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.IsDeleted" type="danger">{{ $fd('YesOrNo', scope.row.IsDeleted) }}</el-tag> <el-tag v-if="!scope.row.IsDeleted" type="danger">{{ $fd('TrainingStatus', scope.row.IsDeleted) }}</el-tag>
<el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsDeleted) }}</el-tag> <el-tag v-else type="primary">{{ $fd('TrainingStatus', scope.row.IsDeleted) }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<!-- 上传时间 --> <!-- 上传时间 -->
@ -96,8 +96,8 @@
sortable="custom" sortable="custom"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.IsConfirmed" type="primary">{{ $fd('YesOrNo', scope.row.IsConfirmed) }}</el-tag> <el-tag v-if="scope.row.IsConfirmed" type="primary">{{ $fd('TrainingStatusEnum', scope.row.IsConfirmed) }}</el-tag>
<el-tag v-else type="danger">{{ $fd('YesOrNo', scope.row.IsConfirmed) }}</el-tag> <el-tag v-else type="danger">{{ $fd('TrainingStatusEnum', scope.row.IsConfirmed) }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<!-- 签署时间 --> <!-- 签署时间 -->

6
src/views/trials/trials-workbench/components/needSignedSysDoc.vue
View File

@ -42,6 +42,12 @@
show-overflow-tooltip show-overflow-tooltip
sortable="custom" sortable="custom"
/> />
<el-table-column
:label="$t('trials:sysDocBeSigned:table:ConfirmTime')"
prop="ConfirmTime"
show-overflow-tooltip
sortable="custom"
/>
<el-table-column <el-table-column
:label="$t('common:action:action')" :label="$t('common:action:action')"
width="140" width="140"

3
static/pdfjs/web/viewer.js
View File

@ -12380,7 +12380,8 @@ class PDFPageView {
c.style.color = "rgba(0, 191, 255, 0.1)"; c.style.color = "rgba(0, 191, 255, 0.1)";
c.style.whiteSpace = 'nowrap' c.style.whiteSpace = 'nowrap'
// c.innerText = text;//text为水印内容，可以在viewer.html中传入，也可以直接替换成固定的字符串如：c.innerText = "这是一个水印"; // c.innerText = text;//text为水印内容，可以在viewer.html中传入，也可以直接替换成固定的字符串如：c.innerText = "这是一个水印";
c.innerText = `${obj.COMPANY}_${obj.userName}\n${new Date().format('yyyy-MM-dd')}`; // c.innerText = `${obj.COMPANY}_${obj.userName}\n${new Date().format('yyyy-MM-dd')}`;
c.innerText = `${obj.userName}\n${new Date().format('yyyy-MM-dd')}`;
cover.appendChild(c); cover.appendChild(c);
} }
} }