修改任务管理的搜索条件

src/views/produce/components/taskWorkList.vue

@@ -35,6 +35,7 @@
         </el-link>
       </template>
       <template v-slot:disposalStatus="{ row }">
+        <el-tag v-if="row.disposalStatus == 0" type="success">待接收</el-tag>
         <el-tag v-if="row.disposalStatus == 1" type="success">已接收</el-tag>
         <el-tag v-if="row.disposalStatus == 2" type="danger">已拒绝</el-tag>
       </template>
@@ -66,28 +67,6 @@
         >
       </template>
 
-      <template v-slot:teamId="{ row }">
-        <el-link
-          v-if="row.disposalStatus == 1"
-          type="primary"
-          :underline="false"
-          @click="openDotLineDetail('plan', row)"
-          >查看详情</el-link
-        >
-        <span v-else>-</span>
-      </template>
-
-      <template v-slot:taskId="{ row }">
-        <el-link
-          v-if="row.disposalStatus == 1"
-          type="primary"
-          :underline="false"
-          @click="openDotLineDetail('task', row)"
-          >查看详情</el-link
-        >
-        <span v-else>-</span>
-      </template>
-
       <template v-slot:action="{ row }">
         <el-popconfirm
           icon="el-icon-info"
@@ -110,7 +89,6 @@
     </ele-pro-table>
 
     <Ddtails ref="detailsRef" @success="reload" />
-    <dotLinePopup ref="dotLinePopupRef"></dotLinePopup>
   </div>
 </template>
 
@@ -119,10 +97,9 @@
   import tableColumnsMixin from '@/mixins/tableColumnsMixin';
   import { pageByCurrentUser, taskManagement } from '@/api/workOrderList';
   import Ddtails from '@/views/taskList/components/Ddtails.vue';
-  import dotLinePopup from '@/views/produceOrder/components/details/dotLinePopup.vue';
 
   export default {
-    components: { Ddtails, dotLinePopup },
+    components: { Ddtails },
     mixins: [tableColumnsMixin],
     emits: ['changeIsPreProductionResult'],
     props: {
@@ -371,7 +348,7 @@
           },
           {
             prop: 'statusText',
-            label: '状态',
+            label: '执行状态',
             align: 'center',
             // formatter: (row) => {
             //   const obj = this.statusOpt.find((i) => i.value == row.status);
@@ -381,7 +358,7 @@
           },
           {
             prop: 'disposalStatus',
-            label: '任务接收状态',
+            label: '接收状态',
             align: 'center',
             slot: 'disposalStatus',
             width: 120
@@ -393,22 +370,6 @@
             slot: 'totalFirstArticleDualInspectionStatus',
             width: 120
           },
-          {
-            prop: 'teamId',
-            label: '计划布点',
-            align: 'center',
-            slot: 'teamId',
-            showOverflowTooltip: true,
-            width: 120
-          },
-          {
-            prop: 'taskId',
-            label: '任务布点',
-            align: 'center',
-            slot: 'taskId',
-            showOverflowTooltip: true,
-            width: 120
-          },
           {
             prop: 'customerName',
             label: '客户名称',
@@ -547,9 +508,6 @@
           this.reload();
         });
       },
-      openDotLineDetail(type, row) {
-        this.$refs.dotLinePopupRef?.open(type, row);
-      },
 
       /* 表格数据源 */
       datasource({ page, where }) {

src/views/taskList/components/task-search.vue

@@ -18,15 +18,27 @@
       seekList() {
         return [
           {
-            label: '任务状态：',
+            label: '接收状态：',
+            value: 'disposalStatus',
+            type: 'select',
+            placeholder: '请选择',
+            planList: [
+              { label: '待接收', value: 0 },
+              { label: '已接收', value: 1 },
+              { label: '已拒绝', value: 2 }
+            ]
+          },
+          {
+            label: '执行状态：',
             value: 'status',
             type: 'select',
             placeholder: '请选择',
             planList: [
               { label: '进行中', value: 1 },
+              { label: '已转派', value: 2 },
+              { label: '已取消', value: 3 },
+              { label: '已关闭', value: 4 },
               { label: '已完成', value: 5 }
-              // { label: '已转派', value: 2 },
-              // { label: '已取消', value: 3 }
             ]
           },
           {

src/views/taskList/index.vue

@@ -528,7 +528,7 @@
           },
           {
             prop: 'statusText',
-            label: '状态',
+            label: '执行状态',
             align: 'center',
             // formatter: (row) => {
             //   const obj = this.statusOpt.find((i) => i.value == row.status);
@@ -538,7 +538,7 @@
           },
           {
             prop: 'disposalStatus',
-            label: '任务状态',
+            label: '接收状态',
             align: 'center',
             slot: 'disposalStatus',
             width: 120