bug 修复中...

src/components/shared/SendBackMark.vue

@@ -100,7 +100,7 @@ const items: any = computed(() => {
       slot: { type: 'textarea', maxlength: 300, resize: 'none', rows: 6, showWordLimit: true },
     },
   ]
-  if (needRejectMessage.value) {
+  if (needRejectMessage.value && !['MARKER', 'DEPUTY'].includes(mainStore.myUserInfo?.role || '')) {
     options.push({
       prop: 'sendDeputy',
       label: '推送给小组长',
@@ -142,7 +142,7 @@ const onSendBack = async () => {
         reason: model.reason,
         taskIds: props.id,
       }
-      if (needRejectMessage.value) {
+      if (needRejectMessage.value && !['MARKER', 'DEPUTY'].includes(mainStore.myUserInfo?.role || '')) {
         params.sendDeputy = model.sendDeputy?.length > 0
       }
       await rejectCustomCheckData(params)

src/modules/analysis/view-marked-detail/index.vue

@@ -211,6 +211,7 @@ const {
 
 /** 刷新 */
 const onRefresh = () => {
+  isMult.value = false
   fetchTable()
 }
 

src/modules/marking/inquiry/index.vue

@@ -295,6 +295,23 @@ const transGroupOptions = computed(() => {
   return groupListWithAll.value || []
 })
 
+const timePickerShow = ref(false)
+const disabledDate = (current: any) => {
+  if (!model.time[0] && !model.time[1]) {
+    return true
+  }
+  if (model.time?.filter(Boolean)?.length == 1) {
+  }
+}
+const handleCalendarChange = (values: any) => {
+  model.time = values
+}
+const handleOpenChange = (status: boolean) => {
+  timePickerShow.value = !!status
+}
+const handleOkChange = (value: any) => {
+  timePickerShow.value = false
+}
 const items = computed<EpFormItem[]>(() => [
   OneRow({
     label: '科目',
@@ -346,6 +363,12 @@ const items = computed<EpFormItem[]>(() => [
       placeholder: ['开始时间', '结束时间'],
       locale: locale,
       size: 'large',
+      allowEmpty: [true, true],
+      open: timePickerShow.value,
+      onOk: handleOkChange,
+      onOpenChange: handleOpenChange,
+      onCalendarChange: handleCalendarChange,
+      disabledDate: disabledDate,
     },
   }),
   FourRow({