|
|
@@ -41,7 +41,7 @@
|
|
|
<template #header="{ titleId, titleClass }">
|
|
|
<div class="hc-card-header flex items-center">
|
|
|
<div :id="titleId" :class="titleClass">任务审核 【已开启电签】</div>
|
|
|
- <div v-if="taskReviewType === '1'" class="ml-6 font-bold text-main">
|
|
|
+ <div v-if="taskReviewType === '1'" class="text-main ml-6 font-bold">
|
|
|
任务名称：{{ taskReviewInfo.taskName }}
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -91,7 +91,7 @@
|
|
|
|
|
|
<!-- 设置重签规则 -->
|
|
|
<hc-new-dialog v-model="showSetSignRulesModal" title="设置重签规则" widths="38rem">
|
|
|
- <div class="text-orange mb-10">
|
|
|
+ <div class="mb-10 text-orange">
|
|
|
<span
|
|
|
class="mr-4"
|
|
|
>提示：设置默认时长，在任务被废除需要重签的时候，规定的重签上报时间提示时间段内，系统提示用户重签信息，但是超过处理时间，系统可默认自动授权重签</span>
|
|
|
@@ -115,13 +115,23 @@
|
|
|
</template>
|
|
|
</hc-new-dialog>
|
|
|
|
|
|
+ <!-- 短信认证还是公章认证 -->
|
|
|
+ <hc-dialog v-model="isSmsAndUKey" title="确认认证方式" widths="26rem" @close="smsAndUKeyCancel">
|
|
|
+ <div class="mb-6px mt-6px line-height-7">请选择认证方式，是个人短信认证，还是公章认证方式进行签字审批。</div>
|
|
|
+ <template #footer>
|
|
|
+ <el-button size="large" @click="smsAndUKeyCancel">取消操作</el-button>
|
|
|
+ <el-button :loading="smsAuthLoading" hc-btn type="primary" @click="smsAuthClick">个人认证</el-button>
|
|
|
+ <el-button :loading="uKeyAuthLoading" hc-btn type="success" @click="uKeyAuthClick">公章认证</el-button>
|
|
|
+ </template>
|
|
|
+ </hc-dialog>
|
|
|
+
|
|
|
<!-- 短信认证 -->
|
|
|
- <HcSmsAuth :loading="SMSAuthLoading" :show="SMSAuthShow" @cancel="SMSAuthCancel" @confirm="SMSAuthConfirm" />
|
|
|
+ <HcSmsAuth :show="SMSAuthShow" :tab-key="smsAuthKey" @cancel="SMSAuthCancel" @confirm="SMSAuthConfirm" />
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script setup>
|
|
|
-import { onMounted, ref } from 'vue'
|
|
|
+import { onMounted, ref, watch } from 'vue'
|
|
|
import { useAppStore } from '~src/store'
|
|
|
import { useRoute, useRouter } from 'vue-router'
|
|
|
import TableCard from './components/TableCard.vue'
|
|
|
@@ -143,20 +153,28 @@ const activeName = routerQuery?.active || 'key1'
|
|
|
//全局变量
|
|
|
const projectId = ref(useAppState.getProjectId)
|
|
|
const contractId = ref(useAppState.getContractId)
|
|
|
-const projectInfo = ref(useAppState.getProjectInfo)
|
|
|
-
|
|
|
|
|
|
//渲染完成
|
|
|
onMounted(() => {
|
|
|
checkSmsCode()
|
|
|
getContractInfoList()
|
|
|
+ setTimeout(() => {
|
|
|
+ showTaskReviewModal.value = true
|
|
|
+ }, 2000)
|
|
|
})
|
|
|
+
|
|
|
+//Ukey是否存在
|
|
|
+const isUKey = ref(useAppState.getIsUKey)
|
|
|
+watch(() => useAppState.getIsUKey, (ukey) => {
|
|
|
+ isUKey.value = ukey
|
|
|
+}, { immediate: true, deep: true })
|
|
|
+
|
|
|
//合同段信息
|
|
|
const contractList = ref([])
|
|
|
|
|
|
const getContractInfoList = async ()=>{
|
|
|
const { error, code, data } = await getContractInfo({
|
|
|
- pid: projectId.value,
|
|
|
+ pid: projectId.value,
|
|
|
})
|
|
|
if (!error && code === 200) {
|
|
|
contractList.value = getArrValue(data)
|
|
|
@@ -189,6 +207,7 @@ const taskReviewForm = ref({ flag: 'OK', comment: '' })
|
|
|
const taskReviewColumns = ref([
|
|
|
{ key: 'fileName', name: '文件名称' },
|
|
|
])
|
|
|
+
|
|
|
//任务审核
|
|
|
const rowTaskName = async (row) => {
|
|
|
if (row.formDataId) {
|
|
|
@@ -293,28 +312,84 @@ const queryTaskInfo = async (row, taskids) => {
|
|
|
}
|
|
|
|
|
|
//确认审批
|
|
|
+const isSmsAndUKey = ref(false)
|
|
|
const ConfirmApprovalClick = async () => {
|
|
|
const formData = taskReviewForm.value
|
|
|
if (formData.flag === 'NO' && !formData.comment) {
|
|
|
window?.$message?.warning('请先输入审核意见')
|
|
|
- } else {
|
|
|
- SMSAuthLoading.value = true
|
|
|
- const { error, code, msg, data } = await checkFlowUserIsExistPfxFile({
|
|
|
- projectId:projectId.value,
|
|
|
- }, false)
|
|
|
- //判断数据
|
|
|
+ return
|
|
|
+ }
|
|
|
+ SMSAuthLoading.value = true
|
|
|
+ const { error, code, msg, data } = await checkFlowUserIsExistPfxFile({
|
|
|
+ projectId: projectId.value,
|
|
|
+ }, false)
|
|
|
+ if (error || code !== 200 || data !== true) {
|
|
|
SMSAuthLoading.value = false
|
|
|
- if (!error && code === 200 && data === true) {
|
|
|
- const ShowAuth = isCheckSmsCodeTime()
|
|
|
- SMSAuthShow.value = ShowAuth
|
|
|
- //免短信验证
|
|
|
- if (!ShowAuth) {
|
|
|
- SMSAuthConfirm()
|
|
|
- }
|
|
|
- } else {
|
|
|
- window.$message?.warning(msg)
|
|
|
- }
|
|
|
+ window.$message?.warning(msg)
|
|
|
+ return
|
|
|
}
|
|
|
+ isSmsAndUKey.value = true
|
|
|
+ SMSAuthLoading.value = false
|
|
|
+}
|
|
|
+
|
|
|
+//个人认证
|
|
|
+const smsAuthKey = ref('1')
|
|
|
+const smsAuthLoading = ref(false)
|
|
|
+const smsAuthClick = async () => {
|
|
|
+ smsAuthLoading.value = true
|
|
|
+ const showAuth = isCheckSmsCodeTime()
|
|
|
+ if (showAuth) {
|
|
|
+ smsAuthKey.value = '1'
|
|
|
+ SMSAuthShow.value = showAuth
|
|
|
+ smsAuthLoading.value = false
|
|
|
+ } else {
|
|
|
+ await SMSAuthConfirm(true)
|
|
|
+ smsAuthLoading.value = false
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+//公章认证
|
|
|
+const uKeyAuthLoading = ref(false)
|
|
|
+const uKeyAuthClick = async () => {
|
|
|
+ smsAuthLoading.value = true
|
|
|
+ const isUsb = await getUsbDevices()
|
|
|
+ console.log('isUsb:', isUsb)
|
|
|
+ if (!isUsb) {
|
|
|
+ smsAuthKey.value = '2'
|
|
|
+ SMSAuthShow.value = true
|
|
|
+ smsAuthLoading.value = false
|
|
|
+ } else {
|
|
|
+ await SMSAuthConfirm(false)
|
|
|
+ smsAuthLoading.value = false
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+//取消
|
|
|
+const smsAndUKeyCancel = () => {
|
|
|
+ smsAuthKey.value = '1'
|
|
|
+ isSmsAndUKey.value = false
|
|
|
+ smsAuthLoading.value = false
|
|
|
+ uKeyAuthLoading.value = false
|
|
|
+}
|
|
|
+
|
|
|
+//获取Ukey设备
|
|
|
+const getUsbDevices = async () => {
|
|
|
+ return new Promise((resolve) => {
|
|
|
+ navigator.usb.getDevices().then(devices => {
|
|
|
+ console.log(devices)
|
|
|
+ let CFIST = false
|
|
|
+ for (let i = 0; i < devices.length; i++) {
|
|
|
+ if (devices[i].manufacturerName === 'CFIST') {
|
|
|
+ CFIST = true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ useAppState.setIsUKey(CFIST)
|
|
|
+ isUKey.value = CFIST
|
|
|
+ resolve(CFIST)
|
|
|
+ }).catch(() => {
|
|
|
+ resolve(false)
|
|
|
+ })
|
|
|
+ })
|
|
|
}
|
|
|
|
|
|
//短信验证有效期
|
|
|
@@ -343,14 +418,18 @@ const isCheckSmsCodeTime = () => {
|
|
|
//短信验证
|
|
|
const SMSAuthLoading = ref(false)
|
|
|
const SMSAuthShow = ref(false)
|
|
|
-const SMSAuthConfirm = () => {
|
|
|
+const SMSAuthConfirm = async (sms = true) => {
|
|
|
const type = taskReviewType.value
|
|
|
if (type === '1') {
|
|
|
- saveCompleteApprovalTask()
|
|
|
+ await saveCompleteApprovalTask()
|
|
|
} else {
|
|
|
- batchCompleteApprovalTask()
|
|
|
+ await batchCompleteApprovalTask()
|
|
|
}
|
|
|
- checkSmsCode()
|
|
|
+ if (sms) await checkSmsCode()
|
|
|
+ isSmsAndUKey.value = false
|
|
|
+ setTimeout(() => {
|
|
|
+ window?.location?.reload() //刷新页面
|
|
|
+ }, 3000)
|
|
|
}
|
|
|
const SMSAuthCancel = () => {
|
|
|
SMSAuthShow.value = false
|
|
|
@@ -373,9 +452,6 @@ const saveCompleteApprovalTask = async () => {
|
|
|
SMSAuthShow.value = false
|
|
|
showTaskReviewModal.value = false
|
|
|
window?.$message?.success('审批成功')
|
|
|
- setTimeout(() => {
|
|
|
- window?.location?.reload() //刷新页面
|
|
|
- }, 3000)
|
|
|
} else {
|
|
|
window?.$message?.warning('审批异常')
|
|
|
}
|
|
|
@@ -404,9 +480,6 @@ const batchCompleteApprovalTask = async () => {
|
|
|
SMSAuthShow.value = false
|
|
|
showTaskReviewModal.value = false
|
|
|
window?.$message?.success('审批成功')
|
|
|
- setTimeout(() => {
|
|
|
- window?.location?.reload() //刷新页面
|
|
|
- }, 3000)
|
|
|
} else {
|
|
|
window?.$message?.warning(msg)
|
|
|
}
|
