Compare commits
No commits in common. 'main' and 'bak' have entirely different histories.
|
Before Width: | Height: | Size: 927 B |
|
Before Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 5.7 KiB |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 607 B |
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 1009 B |
|
Before Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 697 B |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 203 B |
|
Before Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 866 B |
|
Before Width: | Height: | Size: 592 B |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 678 B |
|
Before Width: | Height: | Size: 591 B |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 930 B |
|
After Width: | Height: | Size: 230 KiB |
|
After Width: | Height: | Size: 230 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 500 KiB |
|
Before Width: | Height: | Size: 818 B |
|
Before Width: | Height: | Size: 208 KiB |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 509 B |
|
Before Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 9.1 KiB |
|
Before Width: | Height: | Size: 9.0 KiB |
|
Before Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 8.1 KiB |
|
Before Width: | Height: | Size: 8.8 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 2.1 KiB |
@ -1,253 +0,0 @@
|
||||
<script lang="ts" setup>
|
||||
import { computed, onBeforeMount, reactive, ref } from 'vue'
|
||||
import { useMessage } from 'naive-ui'
|
||||
import { useDictionary } from '@/store/modules/dictonary'
|
||||
import { audit } from '@/api/task/task'
|
||||
|
||||
const emit = defineEmits(['success'])
|
||||
const message = useMessage()
|
||||
const loading = ref(false)
|
||||
|
||||
const dictonaryStore = useDictionary()
|
||||
const state: any = reactive({
|
||||
idItemList: [],
|
||||
})
|
||||
const formRef = ref()
|
||||
const show = ref(false)
|
||||
const cardStyle = {
|
||||
'width': '520px',
|
||||
'--n-padding-bottom': '10px',
|
||||
'--n-padding-left': '0px',
|
||||
}
|
||||
|
||||
const rules = {
|
||||
disposeTypeId: [
|
||||
{ required: true, message: '请选择处理方式', trigger: 'blur' },
|
||||
],
|
||||
failCauseId: [
|
||||
{ required: true, message: '请选择不通过原因', trigger: 'blur' },
|
||||
],
|
||||
}
|
||||
|
||||
const formData = reactive({
|
||||
disposeTypeId: '262403670085013522',
|
||||
failCauseId: '260402999231251188',
|
||||
comment: '',
|
||||
})
|
||||
|
||||
function showModal(value) {
|
||||
state.idItemList = value
|
||||
show.value = true
|
||||
}
|
||||
|
||||
function closeModal() {
|
||||
show.value = false
|
||||
}
|
||||
|
||||
defineExpose({
|
||||
showModal,
|
||||
})
|
||||
|
||||
const disposeOptions = ref<any[]>([]) // 处理方式
|
||||
const failCauseOptions = ref<any[]>([]) // 不通过原因
|
||||
const selectItem = ref(null)
|
||||
|
||||
onBeforeMount(async () => {
|
||||
const rejectList = await dictonaryStore.fetchTFList()
|
||||
const backList = await dictonaryStore.fetchBackList()
|
||||
|
||||
failCauseOptions.value = rejectList
|
||||
disposeOptions.value = backList
|
||||
})
|
||||
|
||||
const showOther = computed(() => {
|
||||
const failCauseItem = failCauseOptions.value.find(item => item.value === formData.failCauseId)
|
||||
return failCauseItem?.label === '其他'
|
||||
})
|
||||
/*
|
||||
* 需要的参数字段结构
|
||||
* [{
|
||||
* id: ''
|
||||
* taskId:''
|
||||
* fromTaskName: ''
|
||||
* }]
|
||||
*/
|
||||
async function handleSumbit(e: MouseEvent) {
|
||||
e.preventDefault()
|
||||
formRef.value.validate(async (errors) => {
|
||||
if (!errors) {
|
||||
try {
|
||||
const list: any = []
|
||||
state.idItemList.forEach((item) => {
|
||||
list.push({
|
||||
formId: item.id,
|
||||
taskId: item.taskId,
|
||||
taskName: item.fromTaskName,
|
||||
})
|
||||
})
|
||||
const disposeTypeItem = disposeOptions.value.find(item => item.value === formData.disposeTypeId)
|
||||
const failCauseItem = failCauseOptions.value.find(item => item.value === formData.failCauseId)
|
||||
|
||||
const param = {
|
||||
result: false,
|
||||
comment: showOther.value ? formData.comment : '',
|
||||
disposeType: disposeTypeItem.label,
|
||||
disposeTypeId: formData.disposeTypeId,
|
||||
failCauseId: formData.failCauseId,
|
||||
failCauseName: failCauseItem.label,
|
||||
flowTaskInfoList: list,
|
||||
}
|
||||
|
||||
audit(param).then((res) => {
|
||||
const { code } = res
|
||||
if (code === 'OK') {
|
||||
message.success(res.message)
|
||||
emit('success', param)
|
||||
closeModal()
|
||||
}
|
||||
else { message.error(res.message) }
|
||||
})
|
||||
}
|
||||
finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
async function selectChange(id) {
|
||||
selectItem.value = failCauseOptions.value.find(v => v.id === id)
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<n-modal v-model:show="show" transform-origin="center">
|
||||
<n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
|
||||
<div class="wrapper">
|
||||
<div class="wrapper-header">
|
||||
<span class="wrapper-left">选择不通过原因</span>
|
||||
<SvgIcon
|
||||
size="22"
|
||||
class="icon"
|
||||
name="close-none-border"
|
||||
@click="closeModal"
|
||||
/>
|
||||
</div>
|
||||
<n-form
|
||||
ref="formRef"
|
||||
size="large"
|
||||
:model="formData"
|
||||
:rules="rules"
|
||||
require-mark-placement="left"
|
||||
>
|
||||
<div class="wrapper-content">
|
||||
<n-form-item class="form-item" label="处理方式" path="disposeTypeId">
|
||||
<n-select v-model:value="formData.disposeTypeId" filterable :options="disposeOptions" />
|
||||
</n-form-item>
|
||||
|
||||
<n-form-item class="form-item" label="不通过原因" path="failCauseId">
|
||||
<n-select v-model:value="formData.failCauseId" filterable :options="failCauseOptions" @change="selectChange" />
|
||||
</n-form-item>
|
||||
<n-form-item v-show="showOther" class="form-item-area" label="" path="">
|
||||
<n-input v-model:value="formData.comment" placeholder-class="pl" type="textarea" placeholder="备注内容" />
|
||||
</n-form-item>
|
||||
</div>
|
||||
</n-form>
|
||||
</div>
|
||||
<template #footer>
|
||||
<div class="wrapper-footer">
|
||||
<n-button type="info" @click="handleSumbit">
|
||||
确定
|
||||
</n-button>
|
||||
<n-button secondary class="btn" style="margin-left:15px" @click="closeModal">
|
||||
取消
|
||||
</n-button>
|
||||
</div>
|
||||
</template>
|
||||
</n-card>
|
||||
</n-modal>
|
||||
</template>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.wrapper {
|
||||
&-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
height: 56px;
|
||||
border-bottom: 0.5px solid #d9d9d9;
|
||||
padding: 0 24px
|
||||
}
|
||||
|
||||
&-left {
|
||||
font-size: 18px;
|
||||
font-family: PingFang SC, PingFang SC-Medium;
|
||||
font-weight: 500;
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
.icon{
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
&-content {
|
||||
padding: 24px;
|
||||
}
|
||||
|
||||
&-footer {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
padding-right: 24px;
|
||||
padding-bottom: 10px;
|
||||
border-top: 0.5px solid #d9d9d9;
|
||||
padding-top: 15px;
|
||||
}
|
||||
|
||||
&-info {
|
||||
font-weight: bold;
|
||||
position: relative;
|
||||
|
||||
&:before {
|
||||
background-color: #1980ff;
|
||||
content: '';
|
||||
width: 5px;
|
||||
border-radius: 2px;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
position: absolute;
|
||||
}
|
||||
}
|
||||
|
||||
.form-item-area{
|
||||
margin-top: -30px;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
::v-deep(.n-card__content) {
|
||||
padding: 0!important;
|
||||
}
|
||||
|
||||
::v-deep(.n-card > .n-card-header) {
|
||||
--n-padding-top: 0px;
|
||||
--n-padding-bottom: 12px;
|
||||
}
|
||||
|
||||
::v-deep(.n-divider:not(.n-divider--vertical)) {
|
||||
margin-top: 0px;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
::v-deep(.n-form-item-label__text) {
|
||||
color: #666666;
|
||||
}
|
||||
|
||||
::v-deep(.n-input__placeholder) {
|
||||
color: #333333!important;
|
||||
}
|
||||
|
||||
.btn{
|
||||
border: 1px solid #cad2dd;
|
||||
background-color: #fff;
|
||||
}
|
||||
</style>
|
||||
@ -1,217 +0,0 @@
|
||||
<script lang="ts" setup>
|
||||
import { computed, onBeforeMount, reactive, ref, toRefs, unref } from 'vue'
|
||||
import { useDialog, useMessage } from 'naive-ui'
|
||||
import { useDictionary } from '@/store/modules/dictonary'
|
||||
import { audit } from '@/api/task/task'
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'commit', rejectId: any, backId: any, isOther: boolean)
|
||||
}>()
|
||||
const message = useMessage()
|
||||
|
||||
const dictonaryStore = useDictionary()
|
||||
const state: any = reactive({
|
||||
detail: {},
|
||||
})
|
||||
const { detail } = toRefs(state)
|
||||
const show = ref(false)
|
||||
const cardStyle = {
|
||||
'width': '520px',
|
||||
'--n-padding-bottom': '10px',
|
||||
'--n-padding-left': '0px',
|
||||
}
|
||||
|
||||
function showModal(value) {
|
||||
console.log(value)
|
||||
state.detail = value
|
||||
show.value = true
|
||||
}
|
||||
|
||||
function closeModal() {
|
||||
show.value = false
|
||||
}
|
||||
|
||||
defineExpose({
|
||||
showModal,
|
||||
})
|
||||
|
||||
const backOptions = ref<any[]>([])
|
||||
const reasonOptions = ref<any[]>([])
|
||||
const selectBackId = ref(null)
|
||||
const selectRejectId = ref(null)
|
||||
const selectItem = ref(null)
|
||||
const otherValue = ref(null)
|
||||
const showOther = computed(() => {
|
||||
return (selectItem.value as any)?.label === '其他'
|
||||
})
|
||||
|
||||
const comomitValue = computed(() => {
|
||||
return (selectItem.value as any)?.label === '其他' ? otherValue.value : selectRejectId.value
|
||||
})
|
||||
|
||||
async function handleSumbit(e: MouseEvent) {
|
||||
e.preventDefault()
|
||||
|
||||
// selectRejectId.value === 'other'
|
||||
// emit('commit', unref(comomitValue), unref(selectBackId), showOther.value)
|
||||
console.log(state.detail)
|
||||
console.log(comomitValue)
|
||||
const param = {
|
||||
formid: [state.detail.id],
|
||||
taskId: ['66b06dda-e673-11ee-a934-0242bc74e4f3'],
|
||||
approvd: false,
|
||||
taskComment: comomitValue.value,
|
||||
taskname: showOther.value ? state.detail.detail.tasks : ['其他'],
|
||||
}
|
||||
audit(param).then((res) => {
|
||||
const { code } = res
|
||||
if (code === 'OK')
|
||||
closeModal()
|
||||
else message.error(res.message)
|
||||
})
|
||||
}
|
||||
|
||||
onBeforeMount(async () => {
|
||||
const rejectList = await dictonaryStore.fetchTFList()
|
||||
const backList = await dictonaryStore.fetchBackList()
|
||||
|
||||
reasonOptions.value = rejectList
|
||||
backOptions.value = backList
|
||||
|
||||
// TODO 删除此项 通过name=其他 判断
|
||||
// 添加其他选项
|
||||
// reasonOptions.value.push({
|
||||
// label: '其他',
|
||||
// value: 'other',
|
||||
// })
|
||||
})
|
||||
|
||||
async function selectChange(id) {
|
||||
console.log(id, 'selectChange')
|
||||
selectItem.value = reasonOptions.value.find(v => v.id == id)
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<n-modal v-model:show="show" transform-origin="center">
|
||||
<n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
|
||||
<div class="wrapper">
|
||||
<div class="wrapper-header">
|
||||
<span class="wrapper-left">选择不通过原因</span>
|
||||
<div class="wrapper-right">
|
||||
<div class="wrapper-right-close" @pointerdown="closeModal">
|
||||
<div class="wrapper-right-icon" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wrapper-content">
|
||||
<span>处理方式</span>
|
||||
<n-select v-model:value="selectBackId" filterable style="margin-top: 10px;" :options="backOptions" />
|
||||
</div>
|
||||
<div class="wrapper-content">
|
||||
<span>不通过原因</span>
|
||||
<n-select v-model:value="selectRejectId" filterable style="margin-top: 10px;" :options="reasonOptions" @change="selectChange" />
|
||||
<n-input v-show="showOther" v-model:value="otherValue" type="textarea" placeholder="备注内容" style="margin-top: 10px;" />
|
||||
</div>
|
||||
|
||||
<!-- <div class="wrapper-content">
|
||||
<n-input
|
||||
type="textarea"
|
||||
placeholder="备注内容" v-model="showOther"></n-input>
|
||||
</div> -->
|
||||
</div>
|
||||
<template #footer>
|
||||
<div class="wrapper-footer">
|
||||
<n-button type="info" @click="handleSumbit">
|
||||
确认
|
||||
</n-button>
|
||||
<n-button secondary style="margin-left:15px" @click="closeModal">
|
||||
取消
|
||||
</n-button>
|
||||
</div>
|
||||
</template>
|
||||
</n-card>
|
||||
</n-modal>
|
||||
</template>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.wrapper {
|
||||
&-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
&-left {
|
||||
font-weight: bold;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
&-right {
|
||||
&-close {
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
&-icon {
|
||||
background: #000;
|
||||
display: inline-block;
|
||||
width: 18px;
|
||||
height: 1px;
|
||||
transform: rotate(45deg);
|
||||
-webkit-transform: rotate(45deg);
|
||||
margin-bottom: 8px;
|
||||
|
||||
&:after {
|
||||
content: '';
|
||||
display: block;
|
||||
width: 18px;
|
||||
height: 1px;
|
||||
background: #000;
|
||||
transform: rotate(-90deg);
|
||||
-webkit-transform: rotate(-90deg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&-content {
|
||||
padding: 18px 10px;
|
||||
}
|
||||
|
||||
&-footer {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
&-info {
|
||||
font-weight: bold;
|
||||
position: relative;
|
||||
|
||||
&:before {
|
||||
background-color: #1980ff;
|
||||
content: '';
|
||||
width: 5px;
|
||||
border-radius: 2px;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
position: absolute;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
::v-deep(.n-card.n-card--content-segmented > .n-card__content:not(:first-child)) {
|
||||
border: 0px;
|
||||
}
|
||||
|
||||
::v-deep(.n-card > .n-card-header) {
|
||||
--n-padding-top: 0px;
|
||||
--n-padding-bottom: 12px;
|
||||
}
|
||||
|
||||
::v-deep(.n-divider:not(.n-divider--vertical)) {
|
||||
margin-top: 0px;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
</style>
|
||||
@ -1,6 +0,0 @@
|
||||
// 任务审核状态
|
||||
export const TASK_STATUS_OBJ = {
|
||||
1: '待审批',
|
||||
2: '通过',
|
||||
3: '不通过',
|
||||
} as any
|
||||
@ -1,11 +0,0 @@
|
||||
const commonKeyDown = (keyCode: number) => {
|
||||
document.dispatchEvent(new KeyboardEvent('keydown', { keyCode }));
|
||||
}
|
||||
const c = () => {
|
||||
commonKeyDown(27)
|
||||
}
|
||||
const initBind = (mousetrap) => {
|
||||
mousetrap.bind('c', c)
|
||||
}
|
||||
|
||||
export default initBind;
|
||||