diff --git a/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue b/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue
index 5c9b3f45..07028036 100644
--- a/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue
+++ b/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue
@@ -10,36 +10,14 @@
           label-width="80px"
           label-suffix=":"
         >
-<<<<<<< Updated upstream
-          <el-form-item label="生产车间">
-            <el-select
-              v-model="query.product_area"
-              clearable
-              filterable
-              size="mini"
-              placeholder="区域类型"
-              class="filter-item"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.product_area"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-=======
->>>>>>> Stashed changes
+
+
           <el-form-item label="任务号">
             <label slot="label">任&nbsp;&nbsp;务&nbsp;号:</label>
             <el-input
               v-model="query.task_code"
               clearable
-<<<<<<< Updated upstream
-              style="width: 180px"
-=======
               style="width: 240px"
->>>>>>> Stashed changes
               placeholder="任务号"
               @keyup.enter.native="crud.toQuery"
             />
@@ -49,11 +27,7 @@
             <el-input
               v-model="query.vehicle_code"
               clearable
-<<<<<<< Updated upstream
-              style="width: 180px"
-=======
               style="width: 240px"
->>>>>>> Stashed changes
               placeholder="载具号"
               @keyup.enter.native="crud.toQuery"
             />
@@ -62,71 +36,11 @@
             <el-input
               v-model="query.point_code"
               clearable
-<<<<<<< Updated upstream
-              style="width: 180px"
-=======
               style="width: 240px"
->>>>>>> Stashed changes
               placeholder="起点"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-<<<<<<< Updated upstream
-          <el-form-item label="任务类型">
-            <el-select
-              v-model="query.task_type"
-              style="width: 180px"
-              placeholder="任务类型"
-              class="filter-item"
-              clearable
-              @change="hand"
-            >
-              <el-option
-                v-for="item in taskTypeList"
-                :key="item.value"
-                clearable
-                :label="item.text"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="完成方式">
-            <el-select
-              v-model="query.finished_type"
-              style="width: 180px"
-              placeholder="完成方式"
-              class="filter-item"
-              clearable
-              @change="hand"
-            >
-              <el-option
-                v-for="item in finishTypeList"
-                :key="item.code"
-                clearable
-                :label="item.name"
-                :value="item.code"
-              />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="创建时间">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="任务状态">
-            <el-select
-              v-model="task_status"
-              multiple
-              style="width: 200px"
-=======
           <el-form-item label="创建时间">
             <el-date-picker
               v-model="query.createTime"
@@ -143,112 +57,19 @@
               v-model="query.task_status"
               multiple
               style="width: 360px"
->>>>>>> Stashed changes
               placeholder="任务状态"
               class="filter-item"
               clearable
               @change="handTaskStatus"
             >
               <el-option
-<<<<<<< Updated upstream
-                label="调度中任务"
-                value="-1"
-              />
-              <el-option
-                v-for="item in taskStatusList"
-                :key="item.code"
-=======
                 v-for="item in taskStatusList"
                 :key="item.value"
->>>>>>> Stashed changes
                 :label="item.label"
                 :value="item.value"
               />
             </el-select>
           </el-form-item>
-<<<<<<< Updated upstream
-          <rrOperation />
-        </el-form>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <span>
-        未完成数：
-        <el-input
-          v-model="undo"
-          clearable
-          style="width: 60px"
-        />
-        <el-button type="primary" @click="taskScheduler()">任务调度</el-button>
-      </span>
-
-      <crudOperation :permission="permission" />
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        v-loading="crud.loading"
-        :data="crud.data"
-        size="mini"
-        style="width: 100%;"
-        @selection-change="crud.selectionChangeHandler"
-      >
-        <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="table_fk_id" label="关联业务" min-width="100" show-overflow-tooltip />
-        <el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
-        <el-table-column v-if="true" prop="material_id" label="物料id" min-width="150" show-overflow-tooltip />
-        <el-table-column v-if="true" prop="material_spec" label="规格" min-width="150" show-overflow-tooltip />
-        <el-table-column prop="task_name" label="任务类型" :min-width="flexWidth('task_name',crud.data,'任务类型')" />
-        <el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip :formatter="acsTypeName" />
-        <el-table-column prop="task_status" label="任务状态" width="120px" :formatter="formatTaskStatusName" />
-        <el-table-column prop="point_code1" label="起点" :min-width="flexWidth('point_code1',crud.data,'起点')" />
-        <el-table-column prop="point_code2" label="倒料点" :min-width="flexWidth('point_code2',crud.data,'终点')" />
-        <el-table-column prop="point_code3" label="终点" :min-width="flexWidth('point_code3',crud.data,'返回点')" />
-        <el-table-column prop="product_area" label="生产车间" />
-        <el-table-column prop="point1_region_name" label="起点区域" width="120" />
-        <el-table-column prop="point2_region_name" label="倒料点区域" min-width="120" show-overflow-tooltip />
-        <el-table-column prop="point3_region_name" label="终点区域" min-width="120" show-overflow-tooltip />
-        <el-table-column prop="vehicle_code" label="载具编码1" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="remark" label="提示" width="120" show-overflow-tooltip />
-        <el-table-column prop="finished_type" label="任务完成类型" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ dict.label.task_finished_type[scope.row.finished_type] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="create_time" label="创建时间" width="135">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.create_time) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="update_time" label="修改时间" width="135">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.update_time) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="priority" label="任务优先级" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="task_step" label="任务执行步骤" min-width="100" show-overflow-tooltip />
-        <el-table-column
-          v-permission="['admin','instruction:edit','instruction:del']"
-          fixed="right"
-          label="操作"
-          width="160px"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              icon="el-icon-upload"
-              @click="doOperate(scope.row, 'c')"
-            >下发</el-button>
-            <el-button
-              type="text"
-              icon="el-icon-success"
-              @click="doOperate(scope.row, 'a')"
-            >完成</el-button>
-=======
           <rrOperation/>
         </el-form>
       </div>
@@ -339,91 +160,30 @@
               :disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
             >完成
             </el-button>
->>>>>>> Stashed changes
             <el-button
               type="text"
               icon="el-icon-error"
               @click="doOperate(scope.row, 'b')"
-<<<<<<< Updated upstream
-            >取消</el-button>
-=======
               :disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
             >取消
             </el-button>
->>>>>>> Stashed changes
           </template>
         </el-table-column>
       </el-table>
       <!--分页组件-->
-<<<<<<< Updated upstream
-      <pagination />
-    </div>
-    <el-dialog
-      title="任务详情"
-      :fullscreen="fullscreen"
-      :visible.sync="viewDialogVisible"
-      width="30%"
-    >
-      <!--  组件-->
-      <!--      <component-->
-      <!--        :is="currentComponent"-->
-      <!--        :task-uuid="task_id"-->
-      <!--        :dialog-visible="viewDialogVisible"-->
-      <!--      />-->
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="viewDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="viewDialogVisible = false">确 定</el-button>
-      </span>
-    </el-dialog>
-=======
       <pagination/>
     </div>
->>>>>>> Stashed changes
   </div>
 </template>
 
 <script>
-<<<<<<< Updated upstream
-import crudTask from '@/views/wms/dispatch_manage/task/task'
-import CRUD, { crud, header, presenter } from '@crud/crud'
-=======
 import crudSchBaseTask from './schBaseTask'
 // import crudSchBaseTaskconfig from './config/schBaseTaskconfig'
 import CRUD, {crud, form, header, presenter} from '@crud/crud'
->>>>>>> Stashed changes
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-<<<<<<< Updated upstream
-import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-
-export default {
-  name: 'Task',
-  dicts: ['SCH_TASK_TYPE_DTL', 'vehicle_type', 'task_finished_type', 'product_area'],
-  components: {
-    pagination, crudOperation, rrOperation, Treeselect, udOperation
-  },
-  mixins: [presenter(), header(), crud()],
-  cruds() {
-    return CRUD({
-      title: '任务',
-      url: 'api/schBaseTask',
-      idField: 'task_id',
-      sort: 'task_code,desc',
-      crudMethod: { ...crudTask },
-      query: {
-        task_code: '',
-        vehicle_code: '',
-        start_point_code: '',
-        next_point_code: '',
-        task_type: '',
-        finished_type: '',
-        product_area: 'A1',
-        task_status: '-1'
-      },
-=======
 import crudDict from '@/views/system/dict/dict'
 
 
@@ -461,88 +221,18 @@ export default {
       url: 'api/schBaseTask',
       idField: 'task_id',
       sort: 'task_code,desc',
->>>>>>> Stashed changes
       optShow: {
         add: false,
         edit: false,
         del: false,
         download: false,
         reset: true
-<<<<<<< Updated upstream
-      }
-=======
       },
       crudMethod: {...crudSchBaseTask}
->>>>>>> Stashed changes
     })
   },
   data() {
     return {
-<<<<<<< Updated upstream
-      viewDialogVisible: false,
-      fullscreen: false,
-      currentComponent: '',
-      openParam: {},
-      undo: 0,
-      create_time: [],
-      task_status: ['-1'],
-      taskStatusList: [],
-      taskTypeList: [],
-      acsTaskTypeList: [],
-      finishTypeList: [],
-      permission: {
-
-      },
-      rules: {},
-      classes1: []
-    }
-  },
-  created() {
-    this.initClass1()
-    crudTask.getTaskStatus().then(data => {
-      this.taskStatusList = data
-    })
-    crudTask.getFinishType().then(data => {
-      this.finishTypeList = data
-    })
-    crudTask.getTaskType().then(res => {
-      this.taskTypeList = res
-    })
-    crudTask.undo().then(res => {
-      this.undo = res
-    })
-    crudTask.getAcsTaskType().then(res => {
-      this.acsTaskTypeList = res
-    })
-    this.crud.query.task_status = ['-1']
-    // this.crud.toQuery()
-  },
-  methods: {
-    [CRUD.HOOK.afterRefresh]() {
-      crudTask.undo().then(res => {
-        this.undo = res
-      })
-    },
-    initClass1() {
-      const param = {
-        parent_class_code: 'task_type'
-      }
-    },
-    taskScheduler() {
-      crudTask.scheduler().then(res => {
-        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      })
-    },
-    buildTree(classes) {
-      classes.forEach(data => {
-        if (data.children) {
-          this.buildTree(data.children)
-        }
-        if (data.hasChildren && !data.children) {
-          data.children = null // 重点代码
-        }
-      })
-=======
       permission: {},
       rules: {},
       taskStatusList: [],
@@ -555,32 +245,11 @@ export default {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
->>>>>>> Stashed changes
     },
     hand(value) {
       this.crud.toQuery()
     },
     handTaskStatus(value) {
-<<<<<<< Updated upstream
-      this.crud.query.task_status = value.toString()
-      this.crud.toQuery()
-    },
-    acsTypeName(row, column) {
-      for (const item of this.acsTaskTypeList) {
-        if (Number(item.value) === Number(row.acs_task_type)) {
-          return item.label
-        }
-      }
-      return ''
-    },
-    formatTaskStatusName(row, column) {
-      for (const item of this.taskStatusList) {
-        if (item.value === row.task_status) {
-          return item.label
-        }
-      }
-      return ''
-=======
       this.crud.query.more_task_status = null
       if (value) {
         this.crud.query.more_task_status = value.toString()
@@ -595,7 +264,6 @@ export default {
     getStatusName(code) {
       const status = this.taskStatusList.find(item => item.code === code)
       return status ? status.name : '-'
->>>>>>> Stashed changes
     },
     doOperate(row, command) {
       let method_name = ''
@@ -614,16 +282,6 @@ export default {
           break
       }
       if (method_name === 'view') {
-<<<<<<< Updated upstream
-        this.view(row)
-        return
-      }
-      const data = {
-        task_id: row.task_id,
-        method_name: method_name
-      }
-      crudTask.operation(data).then(res => {
-=======
         // this.view(row)
         return
       }
@@ -633,49 +291,14 @@ export default {
         config_code: row.config_code
       }
       crudSchBaseTask.operation(data).then(res => {
->>>>>>> Stashed changes
         this.crud.toQuery()
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
       }).catch(err => {
         console.log(err.response.data.message)
       })
-<<<<<<< Updated upstream
-    },
-    view(row) {
-      this.task_id = row.task_id
-      switch (row.task_type) {
-        case '01':// 入库
-          this.fullscreen = true
-          this.currentComponent = 'IOStore'
-          break
-        case '02':// 出库
-          this.fullscreen = true
-          this.currentComponent = 'IOStore'
-          break
-        case '03':// 入空载具
-          this.crud.notify('入空载具无详情', CRUD.NOTIFICATION_TYPE.INFO)
-          return
-        case '04':// 出空载具
-          this.crud.notify('出空载具无详情', CRUD.NOTIFICATION_TYPE.INFO)
-          return
-        case '05':// 转储
-          this.fullscreen = true
-          this.currentComponent = 'DumpInv'
-          break
-        case '06':// 质检
-          this.fullscreen = true
-          this.currentComponent = 'Quality'
-          break
-      }
-      this.viewDialogVisible = true
-    }
 
-  }
-
-=======
     }
   }
->>>>>>> Stashed changes
 }
 </script>