搜索条件

yudao-ui-admin-vue3/src/views/pressure2/schedule/components/ShiftSchedule.vue

@@ -109,10 +109,6 @@
                     <span class="status-dot" style="background-color: #67c23a;"></span>
                     <span>已受理</span>
                   </div>
-                  <div class="legend-item">
-                    <span class="status-dot" style="background-color: #13c2c2;"></span>
-                    <span>已受理待安排</span>
-                  </div>
                   <div class="legend-item">
                     <span class="status-dot" style="background-color: #f56c6c;"></span>
                     <span>检测中</span>
@@ -177,6 +173,7 @@ const props = defineProps<{
   unitName?: string
   status?: string
   checkerName?: string
+  onlyAcceptNoUser?: boolean
 }>()
 
 
@@ -243,7 +240,8 @@ const queryParams = computed(() => ({
   checkerName: props.checkerName || '',
   orderBy: sortOrderBy.value,
   orderType: sortOrderType.value,
-  relateDepartment: props.relateDepartment || ''
+  relateDepartment: props.relateDepartment || '',
+  onlyAcceptNoUser: props.onlyAcceptNoUser || false
 }))
 
 // 排序参数
@@ -416,7 +414,6 @@ const getStatusText = (status: number | string | null | undefined): string => {
     100: '已排期',
     200: '待约检',
     300: '已受理',
-    350: '已受理待安排',
     400: '检测中',
     500: '部分办结',
     600: '已办结'
@@ -439,7 +436,6 @@ const getStatusClass = (status: number | string | null | undefined): string => {
     100: 'dot-scheduled',
     200: 'dot-pending-appointment',
     300: 'dot-accepted',
-    350: 'dot-accepted-pending',
     400: 'dot-testing',
     500: 'dot-partial-done',
     600: 'dot-done'
@@ -459,7 +455,7 @@ const canEditDate = (row: ScheduleRow): boolean => {
 
 const canEditCheckers = (row: ScheduleRow): boolean => {
   if (isCopyNotDone(row)) return true
-  return row.status === 100 || row.status === 200 || row.status === 300 || row.status === 350 || row.status === 400
+  return row.status === 100 || row.status === 200 || row.status === 300 || row.status === 400
 }
 
 const canEdit = (row: ScheduleRow): boolean => {
@@ -913,10 +909,6 @@ onMounted(async () => {
   background: #67c23a;
 }
 
-.dot-accepted-pending {
-  background: #13c2c2;
-}
-
 .dot-testing {
   background: #f56c6c;
 }

yudao-ui-admin-vue3/src/views/pressure2/schedule/pipeindex.vue

@@ -47,6 +47,9 @@
           class="!w-200px"
         />
       </el-form-item>
+      <el-form-item>
+        <el-checkbox v-model="onlyAcceptNoUser" @change="handleQuery">已受理待安排</el-checkbox>
+      </el-form-item>
       <!-- 排班表专用搜索条件 -->
       <template v-if="queryParams.type === '300'">
         <el-form-item label="起" prop="shiftStartDate">
@@ -86,7 +89,6 @@
             <el-option label="已排期" value="100"/>
             <el-option label="待约检" value="200"/>
             <el-option label="已受理" value="300"/>
-            <el-option label="已受理待安排" value="350"/>
             <el-option label="检测中" value="400"/>
             <el-option label="部分办结" value="500"/>
             <el-option label="已办结" value="600"/>
@@ -286,6 +288,7 @@
         :unit-name="queryParams.unitName"
         :status="shiftStatus"
         :checker-name="shiftCheckerName"
+        :only-accept-no-user="onlyAcceptNoUser"
       />
     </div>
   </ContentWrap>
@@ -339,6 +342,7 @@ const shiftStartDate = ref(dayjs().startOf('month').format('YYYY-MM-DD'))
 const shiftEndDate = ref(dayjs().endOf('month').format('YYYY-MM-DD'))
 const shiftStatus = ref('')
 const shiftCheckerName = ref('')
+const onlyAcceptNoUser = ref(false)
 const shiftExportLoading = ref(false)
 const shiftScheduleRef = ref() // ShiftSchedule 组件引用
 
@@ -371,7 +375,6 @@ const getStatusText = (taskItem): string => {
     100: '已排期',
     200: '待约检',
     300: '已受理',
-    350: '已受理待安排',
     400: '检测中',
     500: '部分办结',
     600: '已办结'
@@ -448,7 +451,10 @@ const handleQuery = async () => {
     }
     
     // 调用后端API获取数据
-    const response = await EquipPipeSchedulingApi.planSchedulingCalendar(queryParams.value)
+    const response = await EquipPipeSchedulingApi.planSchedulingCalendar({
+      ...queryParams.value,
+      onlyAcceptNoUser: onlyAcceptNoUser.value
+    })
 
     // 处理返回的数据，转换为以日期为键的对象
     const tasksMap: Record<string, PipePlanSchedulingCalendarVO> = {}
@@ -506,6 +512,7 @@ const resetQuery = () => {
   shiftEndDate.value = dayjs().endOf('month').format('YYYY-MM-DD')
   shiftStatus.value = ''
   shiftCheckerName.value = ''
+  onlyAcceptNoUser.value = false
   handleQuery()
 }