|
@@ -59,10 +59,10 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div :class="sbTableKey === 'key1' ? '' : 'vh'" class="flex-table">
|
|
|
- <el-button v-if="sbTableKey === 'key1' && !isBatch" hc-btn type="warning" class=" mb-4" @click="BatchClick(true)">
|
|
|
+ <el-button v-if="sbTableKey === 'key1' && !isBatch && isShowDqBtn" hc-btn type="warning" class=" mb-4" @click="BatchClick(true)">
|
|
|
批量电签
|
|
|
</el-button>
|
|
|
- <el-button v-if="sbTableKey === 'key1' && isBatch" hc-btn type="warning" class=" mb-4" @click="BatchClick(false)">
|
|
|
+ <el-button v-if="sbTableKey === 'key1' && isBatch && isShowDqBtn" hc-btn type="warning" class=" mb-4" @click="BatchClick(false)">
|
|
|
取消批量签名/章
|
|
|
</el-button>
|
|
|
<div v-if="taskReviewType === '1'" class="data-table taskReviewData">
|
|
@@ -261,19 +261,26 @@ const isBatch = ref(false)
|
|
|
const BatchClick = (val)=>{
|
|
|
isBatch.value = val
|
|
|
}
|
|
|
+const isShowDqBtn = ref(true)
|
|
|
//任务审核
|
|
|
const rowTaskName = async (row) => {
|
|
|
- if (row.id && row.type !== 2) {
|
|
|
+ // if (row.id && row.type !== 2) {
|
|
|
+ if (row.type !== 2) {
|
|
|
+ isShowDqBtn.value = true
|
|
|
+ } else {
|
|
|
+ isShowDqBtn.value = false
|
|
|
+ }
|
|
|
taskReviewInfo.value = row
|
|
|
const { error, code, data } = await tasksApi.queryTaskInfo({
|
|
|
taskIds:row.id,
|
|
|
+ type:row.type,
|
|
|
})
|
|
|
if (!error && code === 200) {
|
|
|
const approvalFileList = getArrValue(data)
|
|
|
taskReviewData.value = approvalFileList
|
|
|
if (approvalFileList.length > 0) {
|
|
|
batchPdfUrl.value = approvalFileList[0].pdfUrl
|
|
|
- if (sbTableKey.value === 'key1') {
|
|
|
+ if (sbTableKey.value === 'key1' && row.type !== 2) {
|
|
|
queryCurrentUserData()
|
|
|
} else {
|
|
|
logoName.value = ''
|
|
@@ -292,12 +299,12 @@ const rowTaskName = async (row) => {
|
|
|
taskReviewData.value = []
|
|
|
batchPdfUrl.value = ''
|
|
|
}
|
|
|
- } else {
|
|
|
- taskReviewInfo.value = {}
|
|
|
- taskReviewData.value = []
|
|
|
- batchPdfUrl.value = ''
|
|
|
- // window?.$message?.warning('此数据异常')
|
|
|
- }
|
|
|
+ // } else {
|
|
|
+ // taskReviewInfo.value = {}
|
|
|
+ // taskReviewData.value = []
|
|
|
+ // batchPdfUrl.value = ''
|
|
|
+ // // window?.$message?.warning('此数据异常')
|
|
|
+ // }
|
|
|
}
|
|
|
|
|
|
//批量审批
|
|
@@ -351,10 +358,17 @@ const rowTaskReviewClick = async ({ row }) => {
|
|
|
//获取PDF数据
|
|
|
const queryTaskInfo = async (row, taskids) => {
|
|
|
taskId.value = taskids && taskids.length > 0 ? taskids : row['id']
|
|
|
- //验收任务类型不能获取pdf
|
|
|
- if (row.type !== 2) {
|
|
|
+ //验收任务类型传2,不能盖章
|
|
|
+ // if (row.type !== 2) {
|
|
|
+
|
|
|
+ if (row.type !== 2) {
|
|
|
+ isShowDqBtn.value = true
|
|
|
+ } else {
|
|
|
+ isShowDqBtn.value = false
|
|
|
+ }
|
|
|
const { error, code, data } = await tasksApi.queryTaskInfo({
|
|
|
taskIds: taskids && taskids.length > 0 ? taskids : row['id'],
|
|
|
+ type:row.type,
|
|
|
|
|
|
})
|
|
|
//处理数据
|
|
@@ -362,7 +376,10 @@ const queryTaskInfo = async (row, taskids) => {
|
|
|
const alldata = getArrValue(data)
|
|
|
let approvalFileList = alldata
|
|
|
if (approvalFileList.length > 0) {
|
|
|
- await queryCurrentUserData()
|
|
|
+ // await queryCurrentUserData()
|
|
|
+ if (row['type'] !== 2) {
|
|
|
+ await queryCurrentUserData()
|
|
|
+ }
|
|
|
pdfDataClick(row, row.id)
|
|
|
pdfItem.value.pdfUrl = approvalFileList[0].pdfUrl
|
|
|
batchPdfUrl.value = approvalFileList[0].pdfUrl
|
|
@@ -378,10 +395,10 @@ const queryTaskInfo = async (row, taskids) => {
|
|
|
row['pdfUrl'] = ''
|
|
|
window?.$message?.warning(data.msg || 'PDF异常')
|
|
|
}
|
|
|
- } else {
|
|
|
- batchPdfUrl.value = ''
|
|
|
- row['pdfUrl'] = ''
|
|
|
- }
|
|
|
+ // } else {
|
|
|
+ // batchPdfUrl.value = ''
|
|
|
+ // row['pdfUrl'] = ''
|
|
|
+ // }
|
|
|
|
|
|
|
|
|
}
|