diff --git a/patches/naive-ui+2.38.1.patch b/patches/naive-ui+2.38.1.patch index dc5de2a..81b5da8 100644 --- a/patches/naive-ui+2.38.1.patch +++ b/patches/naive-ui+2.38.1.patch @@ -22,7 +22,7 @@ index 3aacec9..a63ab54 100644 + class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error flex` + }, [h('img', { + style: { width: '1rem', height: '1rem' }, -+ src: 'http://47.93.59.251/api/upload/ocr/1713246379185_c.png' ++ src: '/src/assets/icons/notice.svg' + }), feedbackNodes]) : mergedValidationStatus === 'success' ? h("div", { key: "controlled-success", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--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: 'http://47.93.59.251/api/upload/ocr/1711419313955_c.png' ++ style: { width: '1rem', height: '1rem' },src: '/src/assets/icons/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/assets/icons/notice.svg b/src/assets/icons/notice.svg new file mode 100644 index 0000000..543a225 --- /dev/null +++ b/src/assets/icons/notice.svg @@ -0,0 +1,19 @@ + + + 警示 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/config/final.ts b/src/config/final.ts index b3b466d..ee9dfba 100644 --- a/src/config/final.ts +++ b/src/config/final.ts @@ -1,6 +1,5 @@ -import type { AsideEntity } from './aside' -import { IzApprovalStatus, IzCustomlevel, IzCustomname, IzCustomtype, IzProductVue, IzProjectVue, IzProjecttype, IzShowAll, IzStatus, IzVisitcity, IzfirmVue, IztaskrromVue, IzvisitproVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue } from '@/views/home/aside/comp/items' import { defineAsyncComponent } from "vue" +import type { AsideEntity } from './aside' export interface RowData { id: string @@ -114,7 +113,7 @@ export const asideMap: Recordable = { izyear: { label: '提报时间', defaultValue: null, - isDefaultFilter: false, + isDefaultFilter: true, key: 'izyear', // component: TimeVue, component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/Time.vue")), diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue index 6e41d38..00731f4 100644 --- a/src/layout/components/Header/RecycleModal.vue +++ b/src/layout/components/Header/RecycleModal.vue @@ -720,7 +720,7 @@ watch(() => pagination.pageNo, (newVal, oldVal) => { -
+
pagination.pageNo, (newVal, oldVal) => { left: 16px; bottom: 16px; background: linear-gradient(180deg,rgba(6,0,0,0.01),rgba(0, 0, 0, 0.44) 100%); - + border-radius: 0 0 7px 7px; .time-item { display: flex; align-items: center; diff --git a/src/store/modules/workOrder.ts b/src/store/modules/workOrder.ts index a729454..cc77f01 100644 --- a/src/store/modules/workOrder.ts +++ b/src/store/modules/workOrder.ts @@ -1,9 +1,10 @@ import { getPackageList } from '@/api/work/work' import { store } from '@/store' -import { useMessage } from 'naive-ui' import { defineStore } from 'pinia' +import { createDiscreteApi } from 'naive-ui' import type { OrderState, PackageListItem } from '/#/workorder' +const { message } = createDiscreteApi(['message']) export const useWorkOrderStore = defineStore({ id: 'work-order', state: (): OrderState => ({ @@ -32,18 +33,14 @@ export const useWorkOrderStore = defineStore({ }, forward() { const len = this.packageList.length - const message = useMessage() - if (this.currentIndex === len - 1) - message.error('已经到达最后一个') + return message.error('已经到达最后一个') this.setActive(++this.currentIndex) }, back() { - const message = useMessage() - if (this.currentIndex === 0) - message.error('已经到达第一个') + return message.error('已经到达第一个') this.setActive(--this.currentIndex) }, diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue index 6f66c81..ff90a69 100644 --- a/src/views/home/aside/comp/AdvanceFilter.vue +++ b/src/views/home/aside/comp/AdvanceFilter.vue @@ -434,7 +434,7 @@ defineExpose({ z-index: 10; background: #ffffff; left: 0; - + top:0; &-left { display: flex; align-items: center; diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue index cd76aa1..3ff92ab 100644 --- a/src/views/home/aside/comp/modals/FilterModal.vue +++ b/src/views/home/aside/comp/modals/FilterModal.vue @@ -610,4 +610,16 @@ function handleOk() { ::v-deep(.n-input .n-input__input-el) { height: 24px; } +::v-deep(.n-dropdown){ + width: 76px; +height: 84px; +background: #ffffff; +box-shadow: 0px 2px 8px 0px rgba(0,0,0,0.15); +>div{ + text-align: center; + height: 50%; + color: #666666; + border-bottom: 1px solid #eeeeee; +} +} diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue index 10f02e4..0573d40 100644 --- a/src/views/worksheet/aside/WorkSheetList.vue +++ b/src/views/worksheet/aside/WorkSheetList.vue @@ -1,6 +1,5 @@