添加接收单完成接口
This commit is contained in:
parent
b6568dc20f
commit
bb95e35b1e
|
@ -183,13 +183,23 @@ const receiveOrderModel: TableModel = {
|
|||
update: false
|
||||
},
|
||||
primary: true,
|
||||
type: "string"
|
||||
type: "string",
|
||||
query: {
|
||||
type: 'like'
|
||||
}
|
||||
},
|
||||
{
|
||||
key: "state",
|
||||
name: "接收状态",
|
||||
type: "enum",
|
||||
default: 'receiving',
|
||||
query: {
|
||||
type: 'enum',
|
||||
options: [{name: '接收中', value: 'receiving'}, {name: '审核中', value: 'examining'}, {
|
||||
name: '已完成',
|
||||
value: 'finish'
|
||||
}]
|
||||
},
|
||||
config: {
|
||||
options: [{name: '接收中', value: 'receiving'}, {name: '审核中', value: 'examining'}, {
|
||||
name: '已完成',
|
||||
|
@ -281,7 +291,7 @@ const receiveOrderModel: TableModel = {
|
|||
config: {
|
||||
targetModel: userModel,
|
||||
nameKey: "name",
|
||||
instanceKey:'contact_user',
|
||||
instanceKey: 'contact_user',
|
||||
key: "id",
|
||||
add: false,
|
||||
edit: false
|
||||
|
@ -338,7 +348,7 @@ const receiveOrderModel: TableModel = {
|
|||
],
|
||||
props: {
|
||||
hiddenColumns: [
|
||||
'subject_id', 'sender_phone', 'sender_email', 'sender_wx', 'sender_name', 'url_code', 'code','contact_user_id'
|
||||
'subject_id', 'sender_phone', 'sender_email', 'sender_wx', 'sender_name', 'url_code', 'code', 'contact_user_id'
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -40,7 +40,10 @@
|
|||
<el-input class="inline-block w-40" v-model="itemEditTemp.url_code">
|
||||
<template #prepend>{{ host + '/frcb/#/?u=' }}</template>
|
||||
</el-input>
|
||||
<el-button class="ml-4" @click="()=>{copyTextToClipboard(host + '/frcb/#/?u='+itemEditTemp.url_code);ElMessage.success('复制成功')}">复制</el-button>
|
||||
<el-button class="ml-4"
|
||||
@click="()=>{copyTextToClipboard(host + '/frcb/#/?u='+itemEditTemp.url_code);ElMessage.success('复制成功')}">
|
||||
复制
|
||||
</el-button>
|
||||
<el-button class="ml-4" type="primary" @click="reMakeCode">重新生成链接和密码</el-button>
|
||||
</div>
|
||||
|
||||
|
@ -121,34 +124,35 @@
|
|||
<el-form-item label="通知记录">
|
||||
<div class="flex w-full max-h-[14rem]">
|
||||
<div class="flex-1">
|
||||
<el-table :data="itemEditTemp.notice_logs" border style="--el-table-header-bg-color: #232323;height: 100%;">
|
||||
<el-table-column label="通知方式" prop="type" align="center" width="120">
|
||||
<template #default="{row}">
|
||||
{{ {phone: '短信', email: '邮箱'}[row.notice_type] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="手机/邮箱" align="center" prop="account"></el-table-column>
|
||||
<el-table-column label="通知时间" align="center" prop="notice_time">
|
||||
<template #default="{row}">
|
||||
{{ datetimeFormat(row['notice_time']) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="通知内容" prop="content" align="center" width="300">
|
||||
<template #default="{row}">
|
||||
<el-tooltip
|
||||
class="box-item"
|
||||
effect="dark"
|
||||
:content="row.content"
|
||||
placement="top-start"
|
||||
>
|
||||
<el-text class="w-150px mb-2" truncated>
|
||||
{{ row.content }}
|
||||
</el-text>
|
||||
</el-tooltip>
|
||||
<el-table :data="itemEditTemp.notice_logs" border
|
||||
style="--el-table-header-bg-color: #232323;height: 100%;">
|
||||
<el-table-column label="通知方式" prop="type" align="center" width="120">
|
||||
<template #default="{row}">
|
||||
{{ {phone: '短信', email: '邮箱'}[row.notice_type] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="手机/邮箱" align="center" prop="account"></el-table-column>
|
||||
<el-table-column label="通知时间" align="center" prop="notice_time">
|
||||
<template #default="{row}">
|
||||
{{ datetimeFormat(row['notice_time']) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="通知内容" prop="content" align="center" width="300">
|
||||
<template #default="{row}">
|
||||
<el-tooltip
|
||||
class="box-item"
|
||||
effect="dark"
|
||||
:content="row.content"
|
||||
placement="top-start"
|
||||
>
|
||||
<el-text class="w-150px mb-2" truncated>
|
||||
{{ row.content }}
|
||||
</el-text>
|
||||
</el-tooltip>
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
@ -170,6 +174,18 @@
|
|||
<template #footer>
|
||||
<div class="flex">
|
||||
<div class="ml-auto">
|
||||
<el-popconfirm
|
||||
width="220"
|
||||
confirm-button-text="确定"
|
||||
cancel-button-text="取消"
|
||||
@confirm="finishOrder"
|
||||
icon-color="#626AEF"
|
||||
title="确认完成接收任务?"
|
||||
>
|
||||
<template #reference>
|
||||
<el-button size="small" type="success" class="mr-4">完成接收</el-button>
|
||||
</template>
|
||||
</el-popconfirm>
|
||||
<el-button size="small" type="danger" @click="showDeleteConfirm">删除</el-button>
|
||||
<el-button size="small" @click="itemEditVisible = false">关闭</el-button>
|
||||
<el-button size="small" type="primary" native-type="submit" @click="saveChange(editRuleFormRef)">保存
|
||||
|
@ -207,6 +223,18 @@ function reMakeCode() {
|
|||
itemEditTemp.value.code = getRandomNumCode(4)
|
||||
}
|
||||
|
||||
function finishOrder() {
|
||||
api.post('/file-receive/receive/receive_order/finish_order', {
|
||||
id: itemEditTemp.value.id,
|
||||
}).then(res => {
|
||||
ElMessage.success('成功')
|
||||
emit('change')
|
||||
itemEditVisible.value = false
|
||||
}).catch(e => {
|
||||
ElMessage.warning(e.response.data?.detail)
|
||||
})
|
||||
}
|
||||
|
||||
function showDeleteConfirm() {
|
||||
ElMessageBox.confirm("确认删除?", "Warning", {
|
||||
confirmButtonText: "确定",
|
||||
|
|
Loading…
Reference in New Issue