Merge branch 'test' into jie

pull/8/head
lizijiee 1 year ago
commit 4718a96318

@ -27,6 +27,29 @@ index 3aacec9..a63ab54 100644
key: "controlled-success",
class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--success`
}, feedbackNodes) : h("div", {
diff --git a/node_modules/naive-ui/es/modal/src/Modal.mjs b/node_modules/naive-ui/es/modal/src/Modal.mjs
index 9508b72..63f417b 100644
--- a/node_modules/naive-ui/es/modal/src/Modal.mjs
+++ b/node_modules/naive-ui/es/modal/src/Modal.mjs
@@ -13,6 +13,10 @@ import { modalInjectionKey, modalProviderInjectionKey } from "./interface.mjs";
import style from "./styles/index.cssr.mjs";
export const modalProps = Object.assign(Object.assign(Object.assign(Object.assign({}, useTheme.props), {
show: Boolean,
+ showMask: {
+ type: Boolean,
+ default: true
+ },
unstableShowMask: {
type: Boolean,
default: true
@@ -309,6 +313,7 @@ export default defineComponent({
"aria-hidden": true,
ref: "containerRef",
class: `${mergedClsPrefix}-modal-mask`,
+ style: this.showMask ? '' : {background:'none'},
onClick: this.handleClickoutside
}) : null;
}
diff --git a/node_modules/naive-ui/es/pagination/src/Pagination.mjs b/node_modules/naive-ui/es/pagination/src/Pagination.mjs
index 5bd975b..e1c6ebc 100644
--- a/node_modules/naive-ui/es/pagination/src/Pagination.mjs
@ -161,3 +184,71 @@ index 4f47aad..6dae078 100644
});
}
}))) : null));
diff --git a/node_modules/naive-ui/lib/modal/src/Modal.js b/node_modules/naive-ui/lib/modal/src/Modal.js
index 47f6ac2..801e8e7 100644
--- a/node_modules/naive-ui/lib/modal/src/Modal.js
+++ b/node_modules/naive-ui/lib/modal/src/Modal.js
@@ -17,7 +17,11 @@ const presetProps_1 = require("./presetProps");
const BodyWrapper_1 = __importDefault(require("./BodyWrapper"));
const interface_1 = require("./interface");
const index_cssr_1 = __importDefault(require("./styles/index.cssr"));
-exports.modalProps = Object.assign(Object.assign(Object.assign(Object.assign({}, _mixins_1.useTheme.props), { show: Boolean, unstableShowMask: {
+exports.modalProps = Object.assign(Object.assign(Object.assign(Object.assign({}, _mixins_1.useTheme.props), {
+ show: Boolean, showMask: {
+ type: Boolean,
+ default: true,
+ }, unstableShowMask: {
type: Boolean,
default: true
}, maskClosable: {
@@ -38,7 +42,8 @@ exports.modalProps = Object.assign(Object.assign(Object.assign(Object.assign({},
}, closeOnEsc: {
type: Boolean,
default: true
- }, blockScroll: { type: Boolean, default: true } }), presetProps_1.presetProps), {
+ }, blockScroll: { type: Boolean, default: true }
+}), presetProps_1.presetProps), {
// events
onEsc: Function, 'onUpdate:show': [Function, Array], onUpdateShow: [Function, Array], onAfterEnter: Function, onBeforeLeave: Function, onAfterLeave: Function, onClose: Function, onPositiveClick: Function, onNegativeClick: Function, onMaskClick: Function,
// private
@@ -47,7 +52,8 @@ exports.modalProps = Object.assign(Object.assign(Object.assign(Object.assign({},
default: undefined
},
// deprecated
- overlayStyle: [String, Object], onBeforeHide: Function, onAfterHide: Function, onHide: Function });
+ overlayStyle: [String, Object], onBeforeHide: Function, onAfterHide: Function, onHide: Function
+});
exports.default = (0, vue_1.defineComponent)({
name: 'Modal',
inheritAttrs: false,
@@ -226,21 +232,25 @@ exports.default = (0, vue_1.defineComponent)({
var _a;
(_a = this.onRender) === null || _a === void 0 ? void 0 : _a.call(this);
const { unstableShowMask } = this;
- return (0, vue_1.withDirectives)((0, vue_1.h)("div", { role: "none", ref: "containerRef", class: [
+ return (0, vue_1.withDirectives)((0, vue_1.h)("div", {
+ role: "none", ref: "containerRef", class: [
`${mergedClsPrefix}-modal-container`,
this.themeClass,
this.namespace
- ], style: this.cssVars },
- (0, vue_1.h)(BodyWrapper_1.default, Object.assign({ style: this.overlayStyle }, this.$attrs, { ref: "bodyWrapper", displayDirective: this.displayDirective, show: this.show, preset: this.preset, autoFocus: this.autoFocus, trapFocus: this.trapFocus, blockScroll: this.blockScroll }, this.presetProps, { onEsc: this.handleEsc, onClose: this.handleCloseClick, onNegativeClick: this.handleNegativeClick, onPositiveClick: this.handlePositiveClick, onBeforeLeave: this.handleBeforeLeave, onAfterEnter: this.onAfterEnter, onAfterLeave: this.handleAfterLeave, onClickoutside: unstableShowMask ? undefined : this.handleClickoutside, renderMask: unstableShowMask
+ ], style: this.cssVars
+ },
+ (0, vue_1.h)(BodyWrapper_1.default, Object.assign({ style: this.overlayStyle }, this.$attrs, { ref: "bodyWrapper", displayDirective: this.displayDirective, show: this.show, preset: this.preset, autoFocus: this.autoFocus, trapFocus: this.trapFocus, blockScroll: this.blockScroll }, this.presetProps, {
+ onEsc: this.handleEsc, onClose: this.handleCloseClick, onNegativeClick: this.handleNegativeClick, onPositiveClick: this.handlePositiveClick, onBeforeLeave: this.handleBeforeLeave, onAfterEnter: this.onAfterEnter, onAfterLeave: this.handleAfterLeave, onClickoutside: unstableShowMask ? undefined : this.handleClickoutside, renderMask: unstableShowMask
? () => {
var _a;
return ((0, vue_1.h)(vue_1.Transition, { name: "fade-in-transition", key: "mask", appear: (_a = this.internalAppear) !== null && _a !== void 0 ? _a : this.isMounted }, {
default: () => {
- return this.show ? ((0, vue_1.h)("div", { "aria-hidden": true, ref: "containerRef", class: `${mergedClsPrefix}-modal-mask`, onClick: this.handleClickoutside })) : null;
+ return this.show ? ((0, vue_1.h)("div", { "aria-hidden": true, ref: "containerRef", class: `${mergedClsPrefix}-modal-mask` ,style:this.showMask ? '' : {background:'none'}, onClick: this.handleClickoutside })) : null;
}
}));
}
- : undefined }), this.$slots)), [
+ : undefined
+ }), this.$slots)), [
[
vdirs_1.zindexable,
{

@ -25,12 +25,11 @@ export async function getApprovalList(page: PageParam) {
*
* @param param
*/
export async function audit(params: ApprovalParam) {
export async function audit(params) {
return http.request({
url: `/flow/task/completeBatchFlow?`,
method: 'post',
params: qs.stringify(params, { indices: false }),
headers: { 'Content-Type': ContentTypeEnum.FORM_DATA },
params,
})
}

@ -1,19 +1,20 @@
<script lang="ts" setup>
import { computed, onBeforeMount, reactive, ref, toRefs, unref } from 'vue'
import { useDialog, useMessage } from 'naive-ui'
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<{
(e: 'commit', rejectId: any, backId: any, isOther: boolean)
(e: 'success')
}>()
const message = useMessage()
const loading = ref(false)
const dictonaryStore = useDictionary()
const state: any = reactive({
detail: {},
idItemList: [],
})
const { detail } = toRefs(state)
const formRef = ref()
const show = ref(false)
const cardStyle = {
'width': '520px',
@ -21,9 +22,23 @@ const cardStyle = {
'--n-padding-left': '0px',
}
const rules = {
disposeTypeId: [
{ required: true, message: '请选择处理方式', trigger: 'blur' },
],
failCauseId: [
{ required: true, message: '请选择不通过原因', trigger: 'blur' },
],
}
const formData = reactive({
disposeTypeId: '',
failCauseId: '',
comment: '',
})
function showModal(value) {
console.log(value)
state.detail = value
state.idItemList = value
show.value = true
}
@ -35,60 +50,75 @@ defineExpose({
showModal,
})
const backOptions = ref<any[]>([])
const reasonOptions = ref<any[]>([])
const selectBackId = ref(null)
const selectRejectId = ref(null)
const disposeOptions = ref<any[]>([]) //
const failCauseOptions = ref<any[]>([]) //
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
failCauseOptions.value = rejectList
disposeOptions.value = backList
})
// TODO name=
//
// reasonOptions.value.push({
// label: '',
// value: 'other',
// })
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('审核成功')
emit('success')
closeModal()
}
else { message.error(res.message) }
})
}
finally {
loading.value = false
}
}
})
}
async function selectChange(id) {
console.log(id, 'selectChange')
selectItem.value = reasonOptions.value.find(v => v.id == id)
selectItem.value = failCauseOptions.value.find(v => v.id === id)
}
</script>
@ -98,27 +128,33 @@ async function selectChange(id) {
<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;" />
<SvgIcon
size="22"
class="icon"
name="close-none-border"
@click="closeModal"
/>
</div>
<!-- <div class="wrapper-content">
<n-input
type="textarea"
placeholder="备注内容" v-model="showOther"></n-input>
</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" type="textarea" placeholder="备注内容" />
</n-form-item>
</div>
</n-form>
</div>
<template #footer>
<div class="wrapper-footer">
@ -140,49 +176,31 @@ async function selectChange(id) {
display: flex;
justify-content: space-between;
align-items: center;
padding: 10px;
height: 56px;
border-bottom: 0.5px solid #d9d9d9;
padding: 0 24px
}
&-left {
font-weight: bold;
font-size: 16px;
font-size: 18px;
font-family: PingFang SC, PingFang SC-Medium;
font-weight: 500;
color: #333333;
}
&-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);
}
}
.icon{
cursor: pointer;
}
&-content {
padding: 18px 10px;
padding: 24px;
}
&-footer {
display: flex;
justify-content: flex-end;
padding-right: 24px;
padding-bottom: 10px;
}
&-info {
@ -199,10 +217,14 @@ async function selectChange(id) {
position: absolute;
}
}
.form-item-area{
margin-top: -30px;
}
}
::v-deep(.n-card.n-card--content-segmented > .n-card__content:not(:first-child)) {
border: 0px;
::v-deep(.n-card__content) {
padding: 0!important;
}
::v-deep(.n-card > .n-card-header) {

@ -115,7 +115,7 @@ function highlightText(text, query) {
<div class="list_title">
历史搜索
</div>
<div class="history-list flex">
<div class="flex history-list">
<div class="tag-wrap">
<div v-for="(item, index) of historyList" :key="index" class="tag" @click="handlerHistory(item.historyname)">
{{ item.historyname }}

@ -14,7 +14,7 @@ defineExpose({
<template>
<div>
<n-modal v-model:show="show" :mask="false" transform-origin="center">
<n-modal v-model:show="show" :mask="false" :showMask="false" transform-origin="center">
<Search @close="show = false" />
</n-modal>
</div>

@ -54,16 +54,16 @@ export default defineComponent({
: "",
icon: undefined,
key: item.resKey,
label: item.name,
label: item.description,
meta: {
title: item.name,
title: item.description,
permissions: [item.resKey],
},
path: item.resUrl,
name: item.resKey,
svgname: item.icon,
svgsize: 32,
title: item.name,
svgsize: item.resUrl == "/home" ? 60 : 22,
title: item.description,
};
return v;
});

@ -216,7 +216,7 @@ export const useDictionaryStore = defineStore({
// 退回方式
async fetchBackList() {
const list = await getBackList()
this.backList = generateOptions(list, 'codeno', 'name')
this.backList = generateOptions2(list)
return this.backList
},
// 退回方式

@ -152,7 +152,6 @@ const rules = {
function handleSubmit(e) {
e.preventDefault();
console.log(formRef.value,'formRef')
loginSuccess.value = true;
formRef.value.validate(async (errors) => {
if (!errors) {
@ -165,7 +164,6 @@ function handleSubmit(e) {
codetoken: userStore.getCapToken,
agentcode: enterprisecode,
};
try {
const { code, message: msg } = await userStore.login(params);
loginRejectMessge.value = msg;
@ -177,11 +175,14 @@ function handleSubmit(e) {
localStorage.removeItem("LOGIN_FORM_PASS");
}
loginSuccess.value = true;
await userStore.getInformation();
const { data: userInfo } = await userStore.getInformation();
message.destroyAll();
const toPath = decodeURIComponent((route.query?.redirect || "/") as string);
message.success("登录成功,即将进入系统");
if (route.name === LOGIN_NAME) router.replace("/");
if (route.name === LOGIN_NAME)
router.replace(
userInfo.frontmenuTList ? userInfo.frontmenuTList[0]["resUrl"] : "/"
);
else router.replace(toPath);
} else {
loginSuccess.value = false;
@ -245,11 +246,14 @@ function handleSmsSubmit(e) {
loginSuccess.value = true;
// const { code, message: msg } = await userStore.login(params)
await userStore.setStorageToken(res.data);
await userStore.getInformation();
const { data: userInfo } = await userStore.getInformation();
message.destroyAll();
const toPath = decodeURIComponent((route.query?.redirect || "/") as string);
message.success("登录成功,即将进入系统");
if (route.name === LOGIN_NAME) router.replace("/");
if (route.name === LOGIN_NAME)
router.replace(
userInfo.frontmenuTList ? userInfo.frontmenuTList[0]["resUrl"] : "/"
);
else router.replace(toPath);
} else {
message.destroyAll();

@ -15,7 +15,6 @@ import { isEmpty } from '@/utils'
import { formatToDateHMS } from '@/utils/dateUtil'
import { hideDownload } from '@/utils/image'
import emitter from '@/utils/mitt'
import ConfrimModal from '../modal/ConfrimModal.vue'
import CustomSettingModal from '../modal/CustomSettingModal.vue'
import PictureTable from './PictureTable.vue'
import TaskTable from './TaskTable.vue'
@ -154,27 +153,27 @@ function approvalHandler(items?: any) {
}
function rejectHandler(items?: any) {
let cloneItem: any
if (batch.value) {
processItems = selectItems.value
}
else if (overTask.value) {
cloneItem = clone(overTask.value)
processItems = [cloneItem]
}
// let cloneItem: any
// if (batch.value) {
// processItems = selectItems.value
// }
// else if (overTask.value) {
// cloneItem = clone(overTask.value)
// processItems = [cloneItem]
// }
if (items !== undefined && !(items instanceof PointerEvent))
processItems = items
// if (items !== undefined && !(items instanceof PointerEvent))
// processItems = items
const msg = validate(processItems)
// const msg = validate(processItems)
if (msg !== null) {
message.error(msg)
return
}
// if (msg !== null) {
// message.error(msg)
// return
// }
const modal = unref(notPassModalRef)! as any
modal.showModal()
modal.showModal(selectItems.value)
}
function approval() {
@ -343,6 +342,10 @@ function previewHandler(event: MouseEvent) {
if (imageRef.value && (imageRef.value as any).src)
(imageRef.value as any).mergedOnClick()
}
function reloadList() {
getImgList()
}
</script>
<template>
@ -589,8 +592,7 @@ function previewHandler(event: MouseEvent) {
<History :data="taskDetailInfo" />
</n-tab-pane>
</n-tabs>
<NotPassed />
<ConfrimModal ref="notPassModalRef" @commit="reject" />
<NotPassed ref="notPassModalRef" @success="reloadList" />
<BatchModal
ref="batchModalRef"
@reject="rejectHandler"

Loading…
Cancel
Save