From f3be642c1a31b3c43254af9c44991ffc67f7d256 Mon Sep 17 00:00:00 2001 From: lihui_ocr Date: Wed, 22 May 2024 14:23:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=8D=E9=80=9A=E8=BF=87=E5=BC=B9?= =?UTF-8?q?=E6=A1=86=E9=97=AE=E9=A2=98=20=E5=9B=BE=E6=A0=87=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E6=B2=89=E6=B5=B8=E6=A8=A1=E5=BC=8F=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- patches/naive-ui+2.38.1.patch | 4 +-- src/components/Approval/NotPassed.vue | 26 +++++++++++----- src/views/final/comp/NewFilterModal.vue | 5 +-- src/views/home/aside/Aside.vue | 6 ++++ .../home/aside/comp/modals/NewFilterModal.vue | 5 +-- src/views/task/content/Content.vue | 19 +++++++++--- src/views/task/modal/ConfrimModal.vue | 4 ++- src/views/task/modal/NewFilterModal.vue | 5 +-- src/views/worksheet/content/Content.vue | 31 ++++++++++++++----- 9 files changed, 71 insertions(+), 34 deletions(-) diff --git a/patches/naive-ui+2.38.1.patch b/patches/naive-ui+2.38.1.patch index def1206..5fd0e0e 100644 --- a/patches/naive-ui+2.38.1.patch +++ b/patches/naive-ui+2.38.1.patch @@ -21,7 +21,7 @@ index 3aacec9..a63ab54 100644 - }, feedbackNodes) : mergedValidationStatus === 'success' ? h("div", { + class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error flex` + }, [h('img', { -+ style: { width: '1rem', height: '1rem' }, ++ style: { width: '0rem', height: '0rem' }, + src: 'notice.svg' + }), feedbackNodes]) : mergedValidationStatus === 'success' ? h("div", { key: "controlled-success", @@ -179,7 +179,7 @@ index 4f47aad..6dae078 100644 const feedbackNodes = children || feedback ? ((0, vue_1.h)("div", { key: "__feedback__", class: `${mergedClsPrefix}-form-item-feedback__line` }, children || feedback)) : this.renderExplains.length ? ((_a = this.renderExplains) === null || _a === void 0 ? void 0 : _a.map(({ key, render }) => ((0, vue_1.h)("div", { key: key, class: `${mergedClsPrefix}-form-item-feedback__line` }, render())))) : null; - return feedbackNodes ? (mergedValidationStatus === 'warning' ? ((0, vue_1.h)("div", { key: "controlled-warning", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--warning` }, feedbackNodes)) : mergedValidationStatus === 'error' ? ((0, vue_1.h)("div", { key: "controlled-error", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error` }, feedbackNodes)) : mergedValidationStatus === 'success' ? ((0, vue_1.h)("div", { key: "controlled-success", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--success` }, feedbackNodes)) : ((0, vue_1.h)("div", { key: "controlled-default", class: `${mergedClsPrefix}-form-item-feedback` }, feedbackNodes))) : null; + return feedbackNodes ? (mergedValidationStatus === 'warning' ? ((0, vue_1.h)("div", { key: "controlled-warning", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--warning` }, feedbackNodes)) : mergedValidationStatus === 'error' ? ((0, vue_1.h)("div", { key: "controlled-error", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error flex` }, [h('img', { -+ style: { width: '1rem', height: '1rem' },src: 'notice.svg' ++ style: { width: '0rem', height: '0rem' },src: 'notice.svg' + }), feedbackNodes])) : mergedValidationStatus === 'success' ? ((0, vue_1.h)("div", { key: "controlled-success", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--success` }, feedbackNodes)) : ((0, vue_1.h)("div", { key: "controlled-default", class: `${mergedClsPrefix}-form-item-feedback` }, feedbackNodes))) : null; }); } diff --git a/src/components/Approval/NotPassed.vue b/src/components/Approval/NotPassed.vue index 881a192..fe3b1c2 100644 --- a/src/components/Approval/NotPassed.vue +++ b/src/components/Approval/NotPassed.vue @@ -4,6 +4,7 @@ import { useMessage } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' import { audit } from '@/api/task/task' + const emit = defineEmits(['success', 'close', 'show']) const message = useMessage() const loading = ref(false) @@ -40,9 +41,7 @@ function closeModal() { show.value = false emit('close') - formData.disposeTypeId = '262403670085013522' - formData.failCauseId = '260402999231251188' - formData.comment = '' + } defineExpose({ @@ -50,6 +49,11 @@ defineExpose({ closeModal, }) watch(show, (value) => { +if(value){ + formData.disposeTypeId = '262403670085013522' + formData.failCauseId = '260402999231251188' + formData.comment = '' +} // console.log(value) emit('show', value) }) @@ -85,13 +89,21 @@ async function handleSumbit(e: MouseEvent) { if (!errors) { try { const list: any = [] + + if( Array.isArray(state.idItemList) ){ state.idItemList.forEach((item) => { list.push({ formId: item.id, taskId: item.taskId, taskName: item.fromTaskName, }) - }) + })}else{ + list.push({ + formId: state.idItemList.id, + taskId: state.idItemList.taskId, + taskName: state.idItemList.fromTaskName, + }) + } const disposeTypeItem = disposeOptions.value.find( item => item.value === formData.disposeTypeId, ) @@ -126,9 +138,7 @@ async function handleSumbit(e: MouseEvent) { } } }) - formData.disposeTypeId = '262403670085013522' - formData.failCauseId = '260402999231251188' - formData.comment = '' + } async function selectChange(id) { @@ -196,7 +206,7 @@ async function selectChange(id) { - + { + console.log(configStore) + if(typeof configStore.fetchConfig === 'function'){ configStore.fetchConfig() configStore.fetchCustomConfig() + }else{ + location.reload(); + } + }) nextTick(() => { diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue index 51ac3bb..a947769 100644 --- a/src/views/home/aside/comp/modals/NewFilterModal.vue +++ b/src/views/home/aside/comp/modals/NewFilterModal.vue @@ -180,10 +180,7 @@ const operatorOptions = [ label: '等于', value: 'eq', }, - { - label: '不等于', - value: 'notEq', - }, + ] const logicOptions = ref([]) diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index 4eb3b30..e287156 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -55,6 +55,7 @@ const props = defineProps({ default:{} } }) +const huadong=ref(false) const tishiref=ref() const paramasref=ref() const emit = defineEmits(['setAsideItemName','goBack']) @@ -761,6 +762,14 @@ function cancel() { }) } } +function handleMouseEnter(){ + console.log(true) + huadong.value=true + +} +function handleMouseLeave(){ + huadong.value=false +}