打回时 是否推送到小组长配置项

server.config.ts

@@ -3,11 +3,11 @@ import type { ServerOptions } from 'vite'
 const server: ServerOptions = {
   proxy: {
     '^/?(api|file)/': {
-      // target: 'http://192.168.10.41:8200',
+      target: 'http://192.168.10.41:8200',
       // target: 'http://192.168.10.178:8200',
       // target: 'http://192.168.10.108:8200',
       // target: 'http://cet-test.markingtool.cn',
-      target: 'http://192.168.10.136:80',
+      // target: 'http://192.168.10.136:80',
       // target: 'http://cet-dev.markingtool.cn:8200',
     },
   },

src/api/api-types/marking.d.ts

@@ -201,7 +201,7 @@ export namespace Marking {
 
   type RejectMarkHistory = BaseDefine<{ description?: string; id: number; reason?: string }>
   // type RejectCustomQueryTask = BaseDefine<{ description?: string; reason?: string; taskId: number }>
-  type RejectCustomQueryTask = BaseDefine<{ description?: string; reason?: string; taskIds: any }>
+  type RejectCustomQueryTask = BaseDefine<{ description?: string; reason?: string; taskIds: any; sendDeputy?: boolean }>
 
   interface ArbitrationListItem {
     chiefName: string

src/components/shared/SendBackMark.vue

@@ -63,6 +63,7 @@ const { formRef, elFormRef } = useForm()
 const model = reactive({
   reason: '',
   description: '',
+  sendDeputy: [],
 })
 const { fetch: getExamInfo } = useFetch('getExamInfo')
 
@@ -87,14 +88,23 @@ const reason = ['给分太高', '给分太低', '注意,评分偏紧', '注意,
 }))
 
 const items: any[] = [
-  { label: '打回原因', labelWidth: '80px', prop: 'reason', slotType: 'select', slot: { options: reason } },
+  { label: '打回原因', labelWidth: '90px', prop: 'reason', slotType: 'select', slot: { options: reason } },
   {
     label: '说明',
-    labelWidth: '80px',
+    labelWidth: '90px',
     prop: 'description',
     slotType: 'input',
     slot: { type: 'textarea', maxlength: 300, resize: 'none', rows: 6, showWordLimit: true },
   },
+  {
+    prop: 'sendDeputy',
+    label: '推送给小组长',
+    slotType: 'checkbox',
+    labelWidth: '90px',
+    slot: {
+      options: [{ label: '是', slotLabel: '' }],
+    },
+  },
 ]
 
 const { fetch: rejectMarkHistory } = useFetch('rejectMarkHistory')
@@ -120,7 +130,12 @@ const onSendBack = async () => {
 
     if (props.type === 'custom-check') {
       // await rejectCustomCheckData({ description: model.description, reason: model.reason, taskId: props.id })
-      await rejectCustomCheckData({ description: model.description, reason: model.reason, taskIds: props.id })
+      await rejectCustomCheckData({
+        description: model.description,
+        reason: model.reason,
+        taskIds: props.id,
+        sendDeputy: model.sendDeputy?.length > 0,
+      })
     } else {
       await ApiMap[props.type]({ description: model.description, reason: model.reason, id: props.id })
     }

src/modules/analysis/personnel-statistics/index.vue

@@ -111,9 +111,10 @@ const columnMap: any = {
   markingRate: '速度',
 }
 const labelList = Object.keys(columnMap)
-const checkedList = ref(JSON.parse(JSON.stringify(labelList)))
+let columnsByLocal = getUserConfigByType('personnelStatisticsColumns')
+const checkedList = columnsByLocal ? ref(columnsByLocal) : ref(JSON.parse(JSON.stringify(labelList)))
 const checkboxList = ref(labelList.map((item: any) => ({ value: item, content: columnMap[item] })))
-const filterColumns = ref(JSON.parse(JSON.stringify(labelList)))
+const filterColumns = ref(JSON.parse(JSON.stringify(checkedList.value)))
 let initCheckedList: any = []
 function dialogOpen() {
   initCheckedList = checkedList.value
@@ -125,6 +126,7 @@ function sure() {
   filterColumns.value = checkedList.value
   initCheckedList = checkedList.value
   showColumnsSetting.value = false
+  setUserConfigByType('personnelStatisticsColumns', checkedList.value)
 }
 const mainStore = useMainStore()
 const deputyHasInit = ref(false)