刘洋 il y a 8 mois
Parent
commit
325e5d3ed2

+ 4 - 3
src/render/components/SelectBoolean/index.vue

@@ -37,10 +37,11 @@ const emit = defineEmits(["update:value", "change"]);
 
 const { optionList } = useDictOption(props.type);
 
-const selected = ref<number | undefined>();
+const selected = ref<number | undefined | string>();
 
 const onChange = () => {
-  const val = selected.value === undefined ? null : Boolean(selected.value);
+  const val =
+    selected.value === undefined ? null : Boolean(Number(selected.value));
   emit("update:value", val);
   emit("change", val);
 };
@@ -48,7 +49,7 @@ const onChange = () => {
 watch(
   () => props.value,
   (val) => {
-    selected.value = val === null ? undefined : val ? 1 : 0;
+    selected.value = val === null ? undefined : val ? "1" : "0";
   },
   {
     immediate: true,

+ 4 - 4
src/render/constants/enumerate.ts

@@ -33,12 +33,12 @@ export const IMAGE_TYPE = {
 export type ImageType = keyof typeof IMAGE_TYPE;
 
 export const BOOLEAN_TYPE = {
-  0: "否",
-  1: "是",
+  "0": "否",
+  "1": "是",
 };
 export const BOOLEAN_ENABLE_TYPE = {
-  0: "禁用",
-  1: "启用",
+  "0": "禁用",
+  "1": "启用",
 };
 
 export const abc = "abcdefghijklmnopqrstuvwxyz".toUpperCase();

+ 5 - 1
src/render/views/BaseDataConfig/UserManage.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="user-manage">
-    <qm-low-form :params="params" :fields="fields"></qm-low-form>
+    <qm-low-form
+      :params="params"
+      :fields="fields"
+      :label-width="60"
+    ></qm-low-form>
     <a-table
       :data-source="dataList"
       :columns="columns"

+ 9 - 0
src/render/views/DataCheck/CheckAction.vue

@@ -279,7 +279,16 @@ function onExamNumberEdited(val: string) {
   customSearchModel.examNumber = val;
 }
 
+const clearFieldsWithSelect = () => {
+  searchModel.examStatus = "";
+  searchModel.hasFilled = null;
+  searchModel.questionFilled = null;
+  searchModel.subjectiveFilled = null;
+  searchModel.paperTypeStatus = "";
+};
 function dataCheckTypeChange() {
+  //清空部分字段先
+  clearFieldsWithSelect();
   switch (searchDataCheckType.value) {
     // 缺考有作答
     case "1":

+ 4 - 2
src/render/views/DataCheck/QuestionPanel.vue

@@ -15,10 +15,12 @@
       </a-descriptions-item>
       <a-descriptions-item label="卷型号" :span="6">
         <template v-if="simple">
-          {{ info.paperType }}
+          {{ info.paperType || "#" }}
         </template>
         <template v-else>
-          <a-button class="ant-gray m-r-4px">{{ info.paperType }}</a-button>
+          <a-button class="ant-gray m-r-4px">{{
+            info.paperType || "#"
+          }}</a-button>
           <a-button v-if="paperTypeArea && editable" @click="onEditPaperType">
             <template #icon><SwapOutlined /></template>
           </a-button>

+ 2 - 1
src/render/views/Review/index.vue

@@ -60,7 +60,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onBeforeUnmount, onMounted } from "vue";
+import { ref, reactive, onBeforeUnmount, onMounted, watch } from "vue";
 import {
   CheckCircleFilled,
   CloseCircleFilled,
@@ -151,6 +151,7 @@ async function onMark(assignedSuspect: boolean) {
 
 async function onSearch(subjectCode: string) {
   searchModel.subjectCode = subjectCode;
+  await releaseTask();
   await getNextTask();
   await updateProgress();
 }