fix

src/views/sop/components/select-filter/field-value.vue

@@ -24,7 +24,7 @@
     v-else-if="isSelect"
     v-model="fieldVal"
     multiple
-    :options="field.options || []"
+    :options="parseOptions(field.options)"
     placeholder="请选择"
     :min-collapsed-num="1"
     style="width: 100%"
@@ -68,6 +68,19 @@ const props = defineProps({
   },
 });
 let fieldVal = ref(null);
+const parseOptions = (options) => {
+  let o = [];
+  try {
+    if (options && typeof options === 'string') {
+      o = JSON.parse(options);
+    } else if (Array.isArray(options)) {
+      o = options;
+    }
+  } catch (err) {
+    o = [];
+  }
+  return o;
+};
 
 const isSpecialUserMeta = computed(() => {
   return specialUserMeta.includes(props.field.fieldId);

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

@@ -13,17 +13,24 @@
     <div class="">
       <t-collapse class="sop-step-mid" defaultExpandAll>
         <t-collapse-panel disabled>
-          <t-form colon label-width="72px">
+          <t-form colon>
             <t-row :gutter="[0, 4]">
               <t-col :span="3">
-                <t-form-item label="项目单号">{{ row.crmNo }}</t-form-item>
+                <t-form-item label="项目单号" label-width="100px">{{
+                  row.crmNo
+                }}</t-form-item>
               </t-col>
               <t-col :span="3">
-                <t-form-item label="姓名">{{ row.archivesInfo }}</t-form-item>
+                <t-form-item label="姓名" label-width="100px">{{
+                  row.archivesInfo
+                }}</t-form-item>
               </t-col>
               <t-col :span="3">
-                <t-form-item label="项目角色"
+                <!-- <t-form-item label="项目角色"
                   >{{ roleTypeFilter(row.roleType) }}
+                </t-form-item> -->
+                <t-form-item label="项目角色" label-width="100px"
+                  >{{ row.roleName }}
                 </t-form-item>
               </t-col>
               <t-col :span="3">
@@ -32,26 +39,43 @@
                 </t-form-item>
               </t-col>
               <t-col :span="3">
-                <t-form-item label="sop流水号">{{ row.sopNo }} </t-form-item>
+                <t-form-item label="sop流水号" label-width="100px"
+                  >{{ row.sopNo }}
+                </t-form-item>
               </t-col>
               <t-col :span="3">
-                <t-form-item label="客户名称"
+                <t-form-item label="客户名称" label-width="100px"
                   >{{ row.customName }}
                 </t-form-item>
               </t-col>
               <t-col :span="3">
-                <t-form-item label="有效出勤"
+                <t-form-item label="有效出勤" label-width="100px"
                   >{{ row.actualDays }}天
                 </t-form-item>
               </t-col>
               <t-col :span="3">
-                <t-form-item label="考试开始时间" label-width="100px"
-                  >{{ timestampFilter(row.approachTime) }}
+                <t-form-item label="服务单元" label-width="100px"
+                  >{{ row.serviceUnitName }}
+                </t-form-item>
+              </t-col>
+              <t-col :span="3">
+                <t-form-item label="扫描开始时间" label-width="100px"
+                  >{{ timestampFilter(row.scanStartTime) }}
+                </t-form-item>
+              </t-col>
+              <t-col :span="3">
+                <t-form-item label="扫描结束时间" label-width="100px"
+                  >{{ timestampFilter(row.scanEndTime) }}
                 </t-form-item>
               </t-col>
               <t-col :span="3">
-                <t-form-item label="考试结束时间" label-width="100px"
-                  >{{ timestampFilter(row.departureTime) }}
+                <t-form-item label="评卷开始时间" label-width="100px"
+                  >{{ timestampFilter(row.markPaperStartTime) }}
+                </t-form-item>
+              </t-col>
+              <t-col :span="3">
+                <t-form-item label="评卷结束时间" label-width="100px"
+                  >{{ timestampFilter(row.markPaperEndTime) }}
                 </t-form-item>
               </t-col>
               <!--              <t-col :span="3">-->
@@ -60,11 +84,6 @@
               <!--                  }}-->
               <!--                </t-form-item>-->
               <!--              </t-col>-->
-              <t-col :span="3">
-                <t-form-item label="服务单元"
-                  >{{ row.serviceUnitName }}
-                </t-form-item>
-              </t-col>
             </t-row>
           </t-form>
         </t-collapse-panel>