bug fix

src/components/global/search-form/components/search-form-item.vue

@@ -33,7 +33,15 @@
   ></template>
   <!-- 文本框 -->
   <template v-if="item.type == undefined || item.type == 'text'">
-    <t-input v-model="params[item.prop]" v-bind="attrs" />
+    <t-input
+      v-model="params[item.prop]"
+      v-bind="attrs"
+      @enter="
+        () => {
+          search();
+        }
+      "
+    />
   </template>
   <!-- 数字 -->
   <template v-if="item.type == 'number'">
@@ -118,6 +126,7 @@ import { ChevronDownIcon } from 'tdesign-icons-vue-next';
 const props = defineProps({
   item: Object,
   params: Object,
+  search: { type: Function, default: () => {} },
 });
 const attrs = computed(() => {
   let obj = {};

src/components/global/search-form/index.vue

@@ -17,8 +17,11 @@
           :style="{ width: colToWidth(item.colSpan || 0) }"
           :class="{ 'buttons-wrap': item.type == 'buttons' }"
         >
-          <slot :name="item.cell || item.prop" v-bind="{ item, params }">
-            <SearchFormItem :item="item" :params="params" />
+          <slot
+            :name="item.cell || item.prop"
+            v-bind="{ item, params, search }"
+          >
+            <SearchFormItem :item="item" :params="params" :search="search" />
           </slot>
         </t-form-item>
         <div class="flex-1"></div>
@@ -30,8 +33,11 @@
           :style="{ width: colToWidth(item.colSpan || 0) }"
           :class="{ 'buttons-wrap': item.type == 'buttons' }"
         >
-          <slot :name="item.cell || item.prop" v-bind="{ item, params }">
-            <SearchFormItem :item="item" :params="params" />
+          <slot
+            :name="item.cell || item.prop"
+            v-bind="{ item, params, search }"
+          >
+            <SearchFormItem :item="item" :params="params" :search="search" />
           </slot>
         </t-form-item>
         <div v-if="showExpandBtn && !showAll" class="flex-1 text-right">
@@ -57,8 +63,11 @@
           :style="{ width: colToWidth(item.colSpan || 0) }"
           :class="{ 'buttons-wrap': item.type == 'buttons' }"
         >
-          <slot :name="item.cell || item.prop" v-bind="{ item, params }">
-            <SearchFormItem :item="item" :params="params" />
+          <slot
+            :name="item.cell || item.prop"
+            v-bind="{ item, params, search }"
+          >
+            <SearchFormItem :item="item" :params="params" :search="search" />
           </slot>
         </t-form-item>
       </div>
@@ -107,6 +116,7 @@ const props = defineProps({
   params: Object, // 搜索参数
   showAll: { type: Boolean, default: true }, //是否要求直接展开，无需折叠换行按钮
   inPadding: Boolean,
+  search: { type: Function, default: () => {} },
 });
 //fields示例：（目前支持控件：input、select、dropdown按钮、treeSelect、date选择框、time选择框、timerange时间范围选择框、daterange日期范围选择框...后期可以按需求扩展）
 /*

src/views/my-workbenches/workbenches/message-reminder/index.vue

@@ -15,7 +15,7 @@
         >{{ item.label }}</div
       >
     </div>
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #service="{ item, params }">
         <select-service-unit
           v-model="params[item.prop]"

src/views/my-workbenches/workbenches/my-waits/index.vue

@@ -12,7 +12,7 @@
         >{{ item.label }}</div
       >
     </div>
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #service="{ item, params }">
         <select-service-unit
           v-model="params[item.prop]"

src/views/my-workbenches/workbenches/notice/index.vue

@@ -16,7 +16,7 @@
       >
     </div>
 
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #service="{ item, params }">
         <select-service-unit
           v-model="params[item.prop]"

src/views/project-quality/project-quality-manage/issues-feedback/index.vue

@@ -10,7 +10,7 @@
         作废
       </t-button>
     </div>
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #service="{ item, params }">
         <select-service-unit v-model="params[item.prop]"></select-service-unit>
       </template>

src/views/project-quality/project-quality-manage/issues-query/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="issues-feedback flex flex-col h-full">
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #service="{ item, params }">
         <select-service-unit v-model="params[item.prop]"></select-service-unit>
       </template>
       <template #user="{ item, params }">
         <select-url-user
-            v-model="params[item.prop]"
-            url="/api/admin/tb/quality/problem/apply/user/list"
-            clearable
+          v-model="params[item.prop]"
+          url="/api/admin/tb/quality/problem/apply/user/list"
+          clearable
         ></select-url-user>
       </template>
     </SearchForm>

src/views/resource-guard/device-guard/registration-query/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="registration-query flex flex-col h-full">
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #service="{ item, params }">
         <select-service-unit v-model="params[item.prop]"></select-service-unit>
       </template>

src/views/resource-guard/person-guard/person-allocate/index.vue

@@ -8,7 +8,7 @@
         >批量调配</t-button
       >
     </div>
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="mixinSearch">
       <template #service="{ item, params }">
         <select-service-unit
           v-model="params[item.prop]"
@@ -241,6 +241,10 @@ const fields = ref([
     ],
   },
 ]);
+const mixinSearch = () => {
+  search();
+  getStatisticsInfo();
+};
 const params = reactive({
   serviceUnitId: '',
   province: '',

src/views/resource-guard/person-guard/person-files/index.vue

@@ -48,7 +48,7 @@
       </t-space>
     </div>
 
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="mixinSearch">
       <template #city="{ item, params }">
         <select-area v-model="params[item.prop]" :level="2"></select-area>
       </template>
@@ -273,6 +273,10 @@ const fields = ref([
     },
   },
 ]);
+const mixinSearch = () => {
+  search();
+  getStatisticsInfo();
+};
 const params = reactive({
   city: '',
   supplierId: '',

src/views/service-unit/dispatch/dispatch-manage/index.vue

@@ -25,7 +25,7 @@
         >批量划定</t-button
       >
     </div>
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="refresh">
       <template #service="{ item, params }">
         <select-service-unit v-model="params[item.prop]"></select-service-unit>
       </template>

src/views/service-unit/service-unit-manage/range-manage/add-range-dialog.vue

@@ -21,7 +21,7 @@
           <template #icon><CloseIcon /></template>
         </t-button>
       </div>
-      <SearchForm :fields="fields" :params="params">
+      <SearchForm :fields="fields" :params="params" :search="search">
         <template #user="{ item, params }">
           <select-type-user
             v-model="params[item.prop]"

src/views/service-unit/service-unit-manage/range-manage/index.vue

@@ -6,7 +6,7 @@
         新增服务范围
       </t-button>
     </div>
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="mixinSearch">
       <template #service-unit="{ item, params }">
         <select-service-unit v-model="params[item.prop]"></select-service-unit>
       </template>
@@ -148,6 +148,10 @@ const fields = ref([
     ],
   },
 ]);
+const mixinSearch = () => {
+  search();
+  getTotalData();
+};
 const params = reactive({
   serviceUnitId: '',
   city: '',

src/views/service-unit/service-unit-manage/regional-planning/index.vue

@@ -6,7 +6,7 @@
         >新增大区
       </t-button>
     </div>
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #service="{ item, params }">
         <select-service-unit v-model="params[item.prop]"></select-service-unit>
       </template>

src/views/service-unit/service-unit-manage/unit-manage/index.vue

@@ -6,7 +6,7 @@
         新增服务单元</t-button
       >
     </div>
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #leader="{ item, params }">
         <select-type-user
           v-model="params[item.prop]"

src/views/sop/sop-manage/device-out-in/index.vue

@@ -12,7 +12,7 @@
         >
       </t-space>
     </div>
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #service="{ item, params }">
         <select-service-unit v-model="params[item.prop]"></select-service-unit>
       </template>

src/views/sop/sop-manage/office-sop/index.vue

@@ -40,7 +40,7 @@
         缩小</t-button
       >
     </div>
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #service="{ item, params }">
         <select-service-unit
           v-model="params[item.prop]"

src/views/sop/sop-manage/plan-change/index.vue

@@ -426,7 +426,7 @@ const toViewHistory = () => {
 
 const submitHandle = async () => {
   const valid = await formRef.value.validate();
-  if (valid !== true) return;
+  if (valid !== true) return MessagePlugin.error('请完善必填项');
 
   if (IS_NEW_MODE.value) {
     const res = await createPlanChange({

src/views/sop/sop-manage/project-change-report/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="office-sop flex flex-col h-full">
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #service="{ item, params }">
         <select-service-unit v-model="params[item.prop]"></select-service-unit>
       </template>

src/views/sop/sop-manage/quality-issue/index.vue

@@ -424,7 +424,7 @@ const submitHandle = async (flowApprove = 'START') => {
   );
   if (flowApprove === 'START') {
     const valid = await form.value[0].validate();
-    if (valid !== true) return;
+    if (valid !== true) return MessagePlugin.error('请完善必填项');
 
     if (curStepSetup.value !== 1) {
       const rejectFormIds = approveRejectFormIds[curStepData.taskKey];

src/views/sop/sop-manage/sop-step/index.vue

@@ -559,7 +559,7 @@ const toViewHistory = () => {
 const switchStep = async (stepData) => {
   if (IS_EDIT_MODE.value) {
     const valid = await form.value.validate();
-    if (valid !== true) return;
+    if (valid !== true) return MessagePlugin.error('请完善必填项');
 
     allFormData.value = { ...allFormData.value, ...formData.value };
   }
@@ -606,7 +606,7 @@ const submitHandle = async (approve = 'START') => {
   if (approve !== 'DRAFT') {
     // 提交
     const valid = await form.value.validate();
-    if (valid !== true) return;
+    if (valid !== true) return MessagePlugin.error('请完善必填项');
 
     if (curStepData.value.setup !== 1) {
       const rejectFormIds = approveRejectFormIds[curStepData.value.taskKey];
@@ -651,7 +651,7 @@ const submitHandle = async (approve = 'START') => {
 // 编辑-保存
 const saveHandle = async () => {
   const valid = await form.value.validate();
-  if (valid !== true) return;
+  if (valid !== true) return MessagePlugin.error('请完善必填项');
 
   const res = await sopSaveApi({
     id: props.sop.id,

src/views/sop/sop-manage/student-sop/index.vue

@@ -40,7 +40,7 @@
         缩小</t-button
       >
     </div>
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #service="{ item, params }">
         <select-service-unit
           v-model="params[item.prop]"

src/views/sop/sop-monitor/delay-warning/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="delay-warning flex flex-col h-full">
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #service="{ item, params }">
         <select-service-unit
           v-model="params[item.prop]"

src/views/sop/sop-monitor/violation-registration/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="violation-registration flex flex-col h-full">
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #service="{ item, params }">
         <select-service-unit
           v-model="params[item.prop]"

src/views/system/config-manage/checkin-manage/index.vue

@@ -6,7 +6,7 @@
         >新增考勤配置
       </t-button>
     </div>
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #service="{ item, params }">
         <select-service-unit
           v-model="params[item.prop]"

src/views/system/config-manage/customer-manage/index.vue

@@ -27,7 +27,7 @@
         </t-popup>
       </t-space>
     </div>
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #manager="{ item, params }">
         <select-type-user v-model="params[item.prop]" type="ACCOUNT_MANAGER">
         </select-type-user>

src/views/system/config-manage/device-manage/index.vue

@@ -54,7 +54,7 @@
         </t-popup>
       </t-space>
     </div>
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #supplier="{ item, params }">
         <select-supplier
           v-model="params[item.prop]"

src/views/system/notice-log/log-manage/index.vue

@@ -1,7 +1,11 @@
 <template>
   <div>
     <div class="flex flex-col h-full">
-      <SearchForm :fields="fields" :params="params"></SearchForm>
+      <SearchForm
+        :fields="fields"
+        :params="params"
+        :search="search"
+      ></SearchForm>
       <div class="flex-1 page-wrap">
         <t-table
           size="small"

src/views/system/notice-log/notice-manage/notice-message-dialog.vue

@@ -18,7 +18,7 @@
         >已阅/全部：{{ messageCount.reviewed }}/{{ messageCount.total }}</span
       >
     </div>
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="mixinSearch">
       <template #supplier="{ item, params }">
         <select-supplier v-model="params[item.prop]"> </select-supplier>
       </template>
@@ -139,6 +139,10 @@ const fields = ref([
     ],
   },
 ]);
+const mixinSearch = () => {
+  search();
+  getCount();
+};
 const params = reactive({
   status: '',
   city: '',

src/views/system/task/task-manage/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-col h-full">
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="search">
       <template #type="{ item, params }">
         <t-select
           v-model="params[item.prop]"

src/views/work-hours/work-hours-manage/abnormal-check/done-check.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="wait-check">
-    <SearchForm :fields="fields" :params="params" showAll>
+    <SearchForm :fields="fields" :params="params" showAll :search="search">
       <template #service="{ item, params }">
         <select-service-unit v-model="params[item.prop]"></select-service-unit>
       </template>

src/views/work-hours/work-hours-manage/abnormal-check/wait-check.vue

@@ -20,7 +20,7 @@
         >批量拒绝
       </t-button>
     </div>
-    <SearchForm :fields="fields" :params="params" showAll>
+    <SearchForm :fields="fields" :params="params" showAll :search="search">
       <template #service="{ item, params }">
         <select-service-unit v-model="params[item.prop]"></select-service-unit>
       </template>

src/views/work-hours/work-hours-manage/work-attendance-detail/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-col h-full">
-    <SearchForm :fields="fields" :params="params" showAll>
+    <SearchForm :fields="fields" :params="params" showAll :search="mixinSearch">
       <template #service="{ item, params }">
         <select-service-unit v-model="params[item.prop]"></select-service-unit>
       </template>
@@ -199,6 +199,10 @@ const fields = ref([
     },
   },
 ]);
+const mixinSearch = () => {
+  search();
+  getStatisticsInfo();
+};
 const params = reactive({
   serviceId: '',
   userName: '',

src/views/work-hours/work-hours-manage/work-attendance/index.vue

@@ -16,7 +16,7 @@
         >批量导出</t-button
       >
     </div>
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="mixinSearch">
       <template #service="{ item, params }">
         <select-service-unit v-model="params[item.prop]"></select-service-unit>
       </template>
@@ -325,6 +325,10 @@ const fields = ref([
     },
   },
 ]);
+const mixinSearch = () => {
+  search();
+  getStatisticsInfo();
+};
 const params = reactive({
   serviceUnitId: '',
   dingSubmitStatusDesc: '',

src/views/work-hours/work-hours-manage/work-statistics/index.vue

@@ -6,7 +6,7 @@
         >导出统计结果
       </t-button>
     </div>
-    <SearchForm :fields="fields" :params="params">
+    <SearchForm :fields="fields" :params="params" :search="mixinSearch">
       <template #service="{ item, params }">
         <select-service-unit v-model="params[item.prop]"></select-service-unit>
       </template>
@@ -194,6 +194,10 @@ const fields = ref([
     },
   },
 ]);
+const mixinSearch = () => {
+  search();
+  getStatisticsInfo();
+};
 const params = reactive({
   serviceId: '',
   status: '',