调整页面

src/views/examined/examined_popup.vue

@@ -4,7 +4,7 @@
       ref="popupRef"
       :title="popupTitle"
       :async="true"
-      width="80vw"
+      width="800px"
       @confirm="handleSubmit"
       @close="handleClose"
     >
@@ -16,21 +16,26 @@
       >
         <el-col>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="12">
               <el-form-item label="ID" prop="id">
                 <el-input readonly v-model="formData.id" />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="12">
               <el-form-item label="任务名称" prop="name">
                 <el-input readonly v-model="formData.name" />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="12">
               <el-form-item label="任务金额" prop="flow_cate">
                 <el-input readonly v-model="formData.flow_cate" />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="所属公司" prop="name">
+                <el-input readonly v-model="formData.name" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col>
@@ -45,30 +50,39 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="12">
               <el-form-item label="任务完成时间" prop="id">
                 <el-input readonly v-model="formData.id" />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="12">
-              <el-form-item label="所属公司" prop="name">
-                <el-input readonly v-model="formData.name" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
               <el-form-item label="片区经理" prop="flow_cate">
                 <el-input readonly v-model="formData.flow_cate" />
               </el-form-item>
             </el-col>
           </el-row>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="24">
+          <el-form-item label="">
+            <el-timeline>
+              <el-timeline-item
+                v-for="(activity, index) in activities"
+                :key="index"
+                :type="activity.type"
+                :hollow="activity.hollow"
+                :timestamp="activity.timestamp"
+              >
+                {{ activity.content }}
+              </el-timeline-item>
+            </el-timeline>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item
-            label="片区经理审核"
+            label="审核"
             prop="flow_detail.check_type"
             clearable
             :style="{ width: '100%' }"
-            required
           >
             <el-radio-group v-model="formData.flow_detail.type">
               <el-radio :label="1">通过</el-radio>
@@ -76,20 +90,13 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-row>
-          <el-form-item
+          <el-col>
-            label="风控部审核"
+            <el-form-item label="备注" prop="remark">
-            prop="flow_detail.check_type"
+              <el-input v-model="formData.remark" clearable type="textarea" />
-            clearable
-            :style="{ width: '100%' }"
-            required
-          >
-            <el-radio-group v-model="formData.flow_detail.type">
-              <el-radio :label="1">通过</el-radio>
-              <el-radio :label="2">驳回</el-radio>
-            </el-radio-group>
             </el-form-item>
           </el-col>
+        </el-row>
       </el-form>
     </popup>
   </div>
@@ -118,6 +125,23 @@ const popupTitle = computed(() => {
   return mode.value == "edit" ? "审核" : "新增";
 });
 
+const activities = ref([
+  {
+    content: "任务完成",
+    timestamp: "2023-8-28 13:30:00",
+  },
+  {
+    content: "张三三审核",
+    timestamp: "2023-8-28 13:30:00",
+  },
+  {
+    content: "李思思审核",
+    timestamp: "2023-8-28 13:30:00",
+    type: "primary",
+    hollow: true,
+  },
+]);
+
 // 表单数据
 const formData = reactive({
   id: "",
@@ -183,3 +207,8 @@ defineExpose({
 });
 </script>
 
+<style lang="scss" scoped>
+:deep(.el-timeline-item__wrapper) {
+  top: -8px !important;
+}
+</style>

src/views/examined/index_list.vue

@@ -33,24 +33,13 @@
           <el-table-column label="片区经理" prop="remark" show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            label="片区经理审核状态"
+            label="当前审核人"
-            prop="status"
+            prop="department"
             show-overflow-tooltip
           >
-            <template #default="{ row }">
-              <span v-if="row.status == 3" style="color: #ff0000">已驳回</span>
-              <span v-if="row.status == 2" style="color: #f56c6c">未通过</span>
-              <span v-if="row.status == 1" style="color: #67c23a">已通过</span>
-              <span v-if="row.status == 0" style="color: #e6a23c">未审核</span>
-            </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="审核状态" prop="status" show-overflow-tooltip>
-            label="风控部审核状态"
-            prop="status"
-            show-overflow-tooltip
-          >
             <template #default="{ row }">
-              <span v-if="row.status == 3" style="color: #ff0000">已驳回</span>
               <span v-if="row.status == 2" style="color: #f56c6c">未通过</span>
               <span v-if="row.status == 1" style="color: #67c23a">已通过</span>
               <span v-if="row.status == 0" style="color: #e6a23c">未审核</span>