Merge remote-tracking branch 'origin/dev' into dev

src/views/hot_work/job_data/components/flow_chart.vue

@@ -4,7 +4,7 @@
       <template v-for="(item, index) in flowList" :key="index">
         <el-step :title="item.STEP_NAME" :status="fnGetStatus(item)">
           <template #description>
-            <div>{{ item.ACT_USER_NAME || item.SIGN_USER }}</div>
+            <div>{{ fnGetShowStepUser(item) }}</div>
             <div>{{ item.ACT_TIME }}</div>
           </template>
         </el-step>
@@ -30,6 +30,11 @@ const props = defineProps({
     required: true,
     default: () => {},
   },
+  flowing: {
+    type: Object,
+    required: true,
+    default: () => {},
+  },
 });
 const emits = defineEmits(["update:visible"]);
 const visible = useVModel(props, "visible", emits);
@@ -43,6 +48,17 @@ const fnGetStatus = (step) => {
     return "process";
   }
 };
+
+const fnGetShowStepUser = (step) => {
+  console.log(props);
+  if (step.ACT_USER_NAME) {
+    return step.ACT_USER_NAME;
+  } else if (step.SIGN_USER) {
+    return step.SIGN_USER;
+  } else if (step.CAN_SKIP && !props.flowing[step.ACTOR_FIELD]) {
+    return "已跳过";
+  }
+};
 </script>
 
 <style scoped lang="scss"></style>

src/views/hot_work/job_data/index.vue

@@ -140,6 +140,7 @@
     <flow-chart
       v-model:visible="data.flowChartDialog.visible"
       :flow-list="data.flowChartDialog.flowList"
+      :flowing="data.flowChartDialog.flowing"
     />
     <layout-video
       :src="data.videoDialog.src"
@@ -195,6 +196,7 @@ const data = reactive({
   flowChartDialog: {
     visible: false,
     flowList: {},
+    flowing: {},
   },
   videoDialog: {
     visible: false,
@@ -202,9 +204,10 @@ const data = reactive({
   },
 });
 const fnFlowChart = async (HOTWORK_ID) => {
-  const { flowList } = await getHotWorkFlow({ HOTWORK_ID });
+  const { flowList, flowingWork } = await getHotWorkFlow({ HOTWORK_ID });
   data.flowChartDialog.visible = true;
   data.flowChartDialog.flowList = flowList;
+  data.flowChartDialog.flowing = flowingWork;
 };
 </script>
 

src/views/keyprojects/outsourced/index.vue

@@ -23,7 +23,7 @@
                 filterable
                 v-model="searchForm.UNITS_ID"
                 clearable
-                placeholder="请选择状态"
+                placeholder="请选择相关方"
               >
                 <el-option
                   v-for="item in data.unitsList"

src/views/occupational_health_management/enterprises_occupational_health/index.vue

@@ -13,7 +13,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="事故级别" prop="CHECKTIME">
+            <el-form-item label="检查时间" prop="CHECKTIME">
               <el-date-picker
                 v-model="searchForm.CHECKTIME"
                 value-format="YYYY-MM-DD"