From f37664dd0e7c6b4850d5f792dfdca3ef718a9681 Mon Sep 17 00:00:00 2001
From: "bbl\\baobl" <bbl17156787365@163.com>
Date: Mon, 20 May 2024 15:39:00 +0800
Subject: [PATCH] no message

---
 src/components/Crud/CRUD.operation.vue        | 264 ++++++++++--------
 .../base-data/item/confirmSelectItem.vue      |  14 +
 src/views/base-data/item/index.vue            |   7 +-
 src/views/base-data/point/index.vue           |  12 +-
 src/views/business-data/asn/index.vue         |   4 +-
 src/views/business-data/asnDetail/index.vue   |   6 +-
 .../business-data/businessTask/agvTask.vue    |  80 +++---
 .../business-data/businessTask/asnTask.vue    |   2 +-
 src/views/business-data/inventory/index.vue   |  55 +++-
 src/views/business-data/pick/index.vue        |   7 +-
 src/views/business-data/pickDetail/index.vue  |  28 +-
 11 files changed, 283 insertions(+), 196 deletions(-)
 create mode 100644 src/views/base-data/item/confirmSelectItem.vue

diff --git a/src/components/Crud/CRUD.operation.vue b/src/components/Crud/CRUD.operation.vue
index 614594d..0370cac 100644
--- a/src/components/Crud/CRUD.operation.vue
+++ b/src/components/Crud/CRUD.operation.vue
@@ -2,112 +2,111 @@
   <div class="crud-opts">
     <span class="crud-opts-left">
       <!--左侧插槽-->
-      <slot name="left"/>
+      <slot name="left" />
       <el-button
-        v-if="crud.optShow.add"
-        v-permission="permission.add"
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="crud.toAdd"
+          v-if="crud.optShow.add"
+          v-permission="permission.add"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="crud.toAdd"
       >
         新增
       </el-button>
       <el-button
-        v-if="crud.optShow.edit"
-        v-permission="permission.edit"
-        class="filter-item"
-        size="mini"
-        type="success"
-        icon="el-icon-edit"
-        :disabled="crud.selections.length !== 1"
-        @click="crud.toEdit(crud.selections[0])"
+          v-if="crud.optShow.edit"
+          v-permission="permission.edit"
+          class="filter-item"
+          size="mini"
+          type="success"
+          icon="el-icon-edit"
+          :disabled="crud.selections.length !== 1"
+          @click="crud.toEdit(crud.selections[0])"
       >
         修改
       </el-button>
       <el-button
-        v-if="crud.optShow.del"
-        slot="reference"
-        v-permission="permission.del"
-        class="filter-item"
-        type="danger"
-        icon="el-icon-delete"
-        size="mini"
-        :loading="crud.delAllLoading"
-        :disabled="crud.selections.length === 0"
-        @click="toDelete(crud.selections)"
+          v-if="crud.optShow.del"
+          slot="reference"
+          v-permission="permission.del"
+          class="filter-item"
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :loading="crud.delAllLoading"
+          :disabled="crud.selections.length === 0"
+          @click="toDelete(crud.selections)"
       >
         删除
       </el-button>
       <el-button
-        v-if="crud.optShow.download"
-        v-permission="permission.download"
-        :loading="crud.downloadLoading"
-        :disabled="!crud.data.length"
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-download"
-        @click="crud.doExport"
+          v-if="crud.optShow.download"
+          :loading="crud.downloadLoading"
+          :disabled="!crud.data.length"
+          class="filter-item"
+          size="mini"
+          type="warning"
+          icon="el-icon-download"
+          @click="crud.doExport"
       >导出</el-button>
       <!--右侧-->
-      <slot name="right"/>
+      <slot name="right" />
     </span>
     <el-button-group class="crud-opts-right">
       <el-button
-        size="mini"
-        plain
-        type="info"
-        icon="el-icon-search"
-        @click="toggleSearch()"
+          size="mini"
+          plain
+          type="info"
+          icon="el-icon-search"
+          @click="toggleSearch()"
       />
       <el-button
-        size="mini"
-        icon="el-icon-refresh"
-        @click="crud.refresh()"
+          size="mini"
+          icon="el-icon-refresh"
+          @click="crud.refresh()"
       />
       <el-popover
-        placement="bottom-end"
-        width="150"
-        trigger="click"
+          placement="bottom-end"
+          width="150"
+          trigger="click"
       >
         <el-button
-          slot="reference"
-          size="mini"
-          icon="el-icon-s-grid"
+            slot="reference"
+            size="mini"
+            icon="el-icon-s-grid"
         >
           <i
-            class="fa fa-caret-down"
-            aria-hidden="true"
+              class="fa fa-caret-down"
+              aria-hidden="true"
           />
         </el-button>
         <el-checkbox
-          v-model="allColumnsSelected"
-          :indeterminate="allColumnsSelectedIndeterminate"
-          @change="handleCheckAllChange"
+            v-model="allColumnsSelected"
+            :indeterminate="allColumnsSelectedIndeterminate"
+            @change="handleCheckAllChange"
         >
           全选
         </el-checkbox>
         <el-checkbox
-          v-for="item in tableColumns"
-          :key="item.property"
-          v-model="item.visible"
-          @change="handleCheckedTableColumnsChange(item)"
+            v-for="item in tableColumns"
+            :key="item.property"
+            v-model="item.visible"
+            @change="handleCheckedTableColumnsChange(item)"
         >
           {{ item.label }}
         </el-checkbox>
       </el-popover>
       <el-button
-        size="mini"
-        type="warning" plain
-        @click="postToTableConfig()"
+          size="mini"
+          type="warning" plain
+          @click="postToTableConfig()"
       ><span>保存</span></el-button>
     </el-button-group>
   </div>
 </template>
 <script>
-import CRUD, {crud} from '@crud/crud'
+import CRUD, { crud } from '@crud/crud'
 import crudTableConfig from '@/api/tableConfig'
 import Sortable from 'sortablejs'
 
@@ -131,28 +130,22 @@ export default {
   props: {
     permission: {
       type: Object,
-      default: () => {
-        return {}
-      }
+      default: () => { return {} }
     },
     ignoreColumns: {
       type: Array,
-      default: () => {
-        return []
-      }
+      default: () => { return [] }
     },
     tableKey: {
       type: String,
-      default: () => {
-        return ''
-      }
+      default: () => { return '' }
     }
   },
   data() {
     return {
-      hiddenColumns: [],
-      table_configs: [],
-      table_configs_xs: [],
+      hiddenColumns:[],
+      table_configs:[],
+      table_configs_xs:[],
       tableColumns: [],
       allColumnsSelected: true,
       allColumnsSelectedIndeterminate: false,
@@ -179,42 +172,62 @@ export default {
   mounted() {
     //初始化数据
     this.columnDrop();
-    this.hiddenColumns = JSON.parse(sessionStorage.getItem(this.tableKey));
     setTimeout(() => {
       // 方法区
       this.initcolumn();
-    }, 600)
-    setTimeout(() => {
-      // 方法区
-      this.showcolumn();
-    }, 1000)
+    }, 200)
+
 
   },
   methods: {
 
     initcolumn() {
       this.updateTableColumns()
-      const table = this.crud.props.table
-      this.table_configs_xs.forEach((column, index) => {
-        const vm = table.$children.find(e => e.label === column.label)
-        const columnConfig = vm.columnConfig
-        vm.owner.store.commit('removeColumn', columnConfig, null)
-      })
-      this.ignoreNextTableColumnsChange = false
+      const strHidden=sessionStorage.getItem(this.tableKey)
+      this.hiddenColumns= JSON.parse(strHidden);
+      if(this.hiddenColumns.length>0){
+        console.log("------移除---------------")
+        const table = this.crud.props.table
+        this.table_configs_xs.forEach((column,index) => {
+          const vm = table.$children.find(e => e.label === column.label)
+
+          const columnConfig = vm.columnConfig
+
+
+          console.log(columnConfig)
+          vm.owner.store.commit('removeColumn', columnConfig, null)
+
+        })
+        this.ignoreNextTableColumnsChange = false
+        console.log("--------移除完成-------------")
+        setTimeout(() => {
+          // 方法区
+          this.showcolumn();
+        }, 200)
+      }
+
+      //vm.owner.store.commit('insertColumn', columnConfig, newIndex+myindex + 1 , null)
+
+
     },
     showcolumn() {
+      console.log("------显示列------")
+      const strHidden=sessionStorage.getItem(this.tableKey)
+      this.hiddenColumns= JSON.parse(strHidden);
       const table = this.crud.props.table
-      this.hiddenColumns.forEach((column, index) => {
+      this.hiddenColumns.forEach((column,index) => {
+
         const vm = table.$children.find(e => e.prop === column.property)
         const columnConfig = vm.columnConfig
-        if (column.visible) {
-          columnConfig.width = column.width
-          columnConfig.visible = column.visible
-          vm.owner.store.commit('insertColumn', columnConfig, index + 1, null)
+        console.log(columnConfig.label)
+        if(column.visible){
+          columnConfig.width=column.width
+          columnConfig.visible=column.visible
+          vm.owner.store.commit('insertColumn', columnConfig, index+1  , null)
         }
-
       })
-      this.updateTableColumns();
+      console.log("------显示列完成------")
+      this. updateTableColumns();
     },
     //列拖拽
     columnDrop() {
@@ -224,49 +237,51 @@ export default {
         delay: 0,
         onEnd: evt => {
           // 根据中文label进行拖拉
-          this.ColumnsDrop(evt.item.innerText, evt.newIndex)
+          this.ColumnsDrop(evt.item.innerText,evt.newIndex)
         }
       })
     },
 
     //新加方法
-    ColumnsDrop(oldText, newIndex) {
+    ColumnsDrop(oldText,newIndex) {
       const table = this.crud.props.table
       let myindex = -1 //空格
       let oldIndex1 = 0
-      let step = -1
+      let  step = -1
       let count = 0
       //
-      this.tableColumns.some((column, index) => {
-        if (column.visible) {
+      this.tableColumns.some((column,index) => {
+        if(column.visible) {
           count++
         }
       })
       // 定位拖拉中文表头位置以及在该字段之前隐藏字段数量
-      this.tableColumns.some((column, index) => {
-        if (column.label === oldText) {
+      this.tableColumns.some((column,index) => {
+        if(column.label === oldText) {
           oldIndex1 = index
           return true
-        } else {
+        }else{
           // 空格在字段前面
-          if (step > index) {
+          if(step>index){
             myindex++
           }
         }
         step++
       })
-      if (myindex === -1) {
+      if (myindex === -1  ) {
         myindex = 0
       }
-      let item = this.tableColumns[oldIndex1]
+      let item= this.tableColumns[oldIndex1]
       const vm = table.$children.find(e => e.prop === item.property)
       const columnConfig = vm.columnConfig
-      if (oldIndex1 < newIndex) { // 从左至右拖动
-        vm.owner.store.commit('insertColumn', columnConfig, newIndex + myindex, null)
+      /*this.tableColumns.splice(oldIndex1-1, 1)
+      this.tableColumns.splice(myindex-1, 0, item)*/
+      if(oldIndex1 <newIndex){ // 从左至右拖动
+        vm.owner.store.commit('insertColumn', columnConfig, newIndex+myindex  , null)
         vm.owner.store.commit('removeColumn', columnConfig, null)
-      } else { //从右至左拖动
+      }else { //从右至左拖动
         vm.owner.store.commit('removeColumn', columnConfig, null)
-        vm.owner.store.commit('insertColumn', columnConfig, newIndex + myindex, null)
+        vm.owner.store.commit('insertColumn', columnConfig, newIndex+myindex  , null)
       }
       // 列重新排序
       this.ignoreNextTableColumnsChange = false
@@ -290,6 +305,7 @@ export default {
       const fullTableColumns = table.$children.map(e => e.columnConfig).filter(columnFilter)
       cols = sortWithRef(fullTableColumns, refCols)
       cols.forEach(config => {
+
         const column = {
           property: config.property,
           label: config.label,
@@ -336,7 +352,7 @@ export default {
       })
       if (selectedCount === 0) {
         this.crud.notify('请至少选择一列', CRUD.NOTIFICATION_TYPE.WARNING)
-        this.$nextTick(function () {
+        this.$nextTick(function() {
           item.visible = true
         })
         return
@@ -344,9 +360,23 @@ export default {
       this.allColumnsSelected = selectedCount === totalCount
       this.allColumnsSelectedIndeterminate = selectedCount !== totalCount && selectedCount !== 0
       this.updateColumnVisible(item)
+      /*const columns = []
+      this.tableColumns.forEach(column => {
+        if(column.visible==false){
+          columns.push(column.property)
+        }
+        console.log("-"+column.property+"--"+column.visible)
+      })
+      const post_table_config = {
+        value: JSON.stringify(columns),
+        tableType: this.tableKey
+      }
+
+      crudTableConfig.add(post_table_config)*/
+      //this.postToTableConfig();
     },
-    postToTableConfig() {
-      this.updateTableColumns();
+    postToTableConfig(){
+      this. updateTableColumns();
       const columns = []
       this.tableColumns.forEach(column => {
         const table_config = {
@@ -362,11 +392,11 @@ export default {
         tableType: this.tableKey
       }
 
-      this.crud.loading = true
+      this.crud.loading=true
       crudTableConfig.add(post_table_config).then(res => {
         setTimeout(() => {
           // 方法区
-          this.crud.loading = false
+          this.crud.loading=false
         }, 500)
 
       })
@@ -381,7 +411,7 @@ export default {
       if (item.visible) {
         // 找出合适的插入点
         const columnIndex = this.tableColumns.indexOf(item)
-        vm.owner.store.commit('insertColumn', columnConfig, columnIndex + 1, null)
+        vm.owner.store.commit('insertColumn', columnConfig, columnIndex+1, null)
       } else {
         vm.owner.store.commit('removeColumn', columnConfig, null)
       }
@@ -401,11 +431,9 @@ export default {
   display: flex;
   align-items: center;
 }
-
 .crud-opts .crud-opts-right {
   margin-left: auto;
 }
-
 .crud-opts .crud-opts-right span {
   float: left;
 }
diff --git a/src/views/base-data/item/confirmSelectItem.vue b/src/views/base-data/item/confirmSelectItem.vue
new file mode 100644
index 0000000..586dc94
--- /dev/null
+++ b/src/views/base-data/item/confirmSelectItem.vue
@@ -0,0 +1,14 @@
+<template>
+  <div>
+    222
+  </div>
+</template>
+
+<script>
+import { Message } from "element-ui";
+
+
+export default {
+  name: 'confirmSelectItem'
+}
+</script>
diff --git a/src/views/base-data/item/index.vue b/src/views/base-data/item/index.vue
index c2740bc..309ac6b 100644
--- a/src/views/base-data/item/index.vue
+++ b/src/views/base-data/item/index.vue
@@ -82,9 +82,6 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="时长" >
-            <el-input v-model="form.extendD2" type="number" style="width: 180px;"/>
-          </el-form-item>
           <el-form-item label="长">
             <el-input v-model="form.length" type="number" style="width: 180px;"/>
           </el-form-item>
@@ -126,7 +123,8 @@
         height="68vh"
         @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
-        <el-table-column prop="xh" label="序号" type="index" width="50"/>
+<!--        <el-table-column prop="xh" label="序号" type="index" width="50"/>-->
+        <el-table-column prop="id" label="ID" width="50"/>
         <el-table-column prop="code" label="sku" width="150"/>
         <el-table-column prop="name" label="名称" width="150"/>
         <el-table-column prop="goodType" label="存储库区" width="150">
@@ -137,7 +135,6 @@
             {{ dict.label.item_unit[scope.row.unit] }}
           </template>
         </el-table-column>
-        <el-table-column prop="extendD2" label="冷却时长"/>
         <el-table-column prop="length" label="长"/>
         <el-table-column prop="width" label="宽"/>
         <el-table-column prop="height" label="高"/>
diff --git a/src/views/base-data/point/index.vue b/src/views/base-data/point/index.vue
index 9e554bc..256f425 100644
--- a/src/views/base-data/point/index.vue
+++ b/src/views/base-data/point/index.vue
@@ -14,7 +14,7 @@
           v-model="query.status"
           clearable
           size="small"
-          placeholder="状态"
+          placeholder="预占用"
           class="filter-item"
           style="width: 100px"
           @change="crud.toQuery"
@@ -85,7 +85,7 @@
             slot="right"
             class="filter-item"
             type="primary"
-            icon="el-icon-edit"
+            icon="el-icon-check"
             size="mini"
             v-show="true"
             :loading="crud.delAllLoading"
@@ -207,11 +207,11 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="状态">
+          <el-form-item label="预占用">
             <el-select
               v-model="form.status"
               size="small"
-              placeholder="状态"
+              placeholder="预占用"
               class="filter-item"
               style="width: 370px"
             >
@@ -282,7 +282,7 @@
             <div>{{ scope.row.area.name }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="status" label="状态">
+        <el-table-column prop="status" label="预占用">
           <template slot-scope="scope">
             {{ dict.label.use_status[scope.row.status] }}
           </template>
@@ -390,7 +390,7 @@ export default {
       queryTypeOptions: [
         {key: 'code', display_name: '代码'},
         {key: 'name', display_name: '名称'},
-        {key: 'status', display_name: '状态'},
+        {key: 'status', display_name: '预占用'},
         {key: 'beatCode', display_name: '区域编码'},
         {key: 'areaCode', display_name: '仓库'},
         {key: 'enabled', display_name: '启用'}
diff --git a/src/views/business-data/asn/index.vue b/src/views/business-data/asn/index.vue
index ea0aacb..90f8dc4 100644
--- a/src/views/business-data/asn/index.vue
+++ b/src/views/business-data/asn/index.vue
@@ -32,7 +32,7 @@
             class="filter-item"
             type="primary"
             size="mini"
-            icon="el-icon-document-add"
+            icon="el-icon-check"
             :disabled="crud.selections.length !== 1 || this.crud.selections[0].status!=='OPEN'"
             @click="startAsn(crud.selections[0].id)"
         >
@@ -44,7 +44,7 @@
             class="filter-item"
             type="primary"
             size="mini"
-            icon="el-icon-document-add"
+            icon="el-icon-check"
             :disabled="crud.selections.length !== 1 || this.crud.selections[0].status!=='ACTIVE'"
             @click="cancelAsn(crud.selections[0].id)"
         >
diff --git a/src/views/business-data/asnDetail/index.vue b/src/views/business-data/asnDetail/index.vue
index 50437e1..e5de47d 100644
--- a/src/views/business-data/asnDetail/index.vue
+++ b/src/views/business-data/asnDetail/index.vue
@@ -73,6 +73,9 @@
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
+          <el-form-item label="行号" prop="lineNo">
+            <el-input v-model="form.lineNo" style="width: 200px;" />
+          </el-form-item>
           <el-form-item label="物料" prop="item" style="width: 200px">
             <el-select v-model="form.item" value-key="id" filterable placeholder="请选择物料"
                        style="width: 200px;">
@@ -180,7 +183,7 @@ import pagination from '@crud/Pagination'
 
 const defaultForm = {
   id: null,
-  asn:null,
+  asn:{id:null},
   item: null,
   stock: null,
   lineNo: null,
@@ -269,6 +272,7 @@ export default {
       }else {
         this.asn = this.$route.query.asn
         this.query.asnId = this.asn.id
+        defaultForm.asn.id = this.asn.id
         this.asnFrom = this.asn
         this.crud.toQuery()
       }
diff --git a/src/views/business-data/businessTask/agvTask.vue b/src/views/business-data/businessTask/agvTask.vue
index b7aa27b..9a9f6d6 100644
--- a/src/views/business-data/businessTask/agvTask.vue
+++ b/src/views/business-data/businessTask/agvTask.vue
@@ -5,42 +5,38 @@
       <div v-if="crud.props.searchToggle" type="flex">
         <!-- 搜索 -->
         <date-range-picker start-placeholder="创建日期" v-model="query.createTime" class="date-item" />
+        <el-input
+            v-model="query.jobId"
+            clearable
+            placeholder="任务编号"
+            style="width: 140px;"
+            class="filter-item"
+            @keyup.enter.native="crud.toQuery"/>
         <el-input v-model="query.startSlotCode" clearable placeholder="起点位置" style="width: 120px;"
                   class="filter-item" @keyup.enter.native="crud.toQuery"/>
         <el-input v-model="query.endSlotCode" clearable placeholder="终点位置" style="width: 120px;"
                   class="filter-item" @keyup.enter.native="crud.toQuery"/>
-        <el-input
-            v-model="query.id"
-            clearable
-            placeholder="任务序号"
-            style="width: 140px;"
-            class="filter-item"
-            @keyup.enter.native="crud.toQuery"/>
-        <div>
-
-          <el-select v-model="query.status" clearable multiple placeholder="任务状态" style="width: 180px;"
-                     class="filter-item">
-            <el-option
+        <el-input v-model="query.stockTypeCode" clearable placeholder="容器类型" style="width: 220px;"
+                  class="filter-item" @keyup.enter.native="crud.toQuery"/>
+        <el-select v-model="query.status" clearable multiple placeholder="任务状态" style="width: 180px;"
+                   class="filter-item">
+          <el-option
               v-for="taskStatus in dict.task_status"
               :key="taskStatus.id"
               :label="taskStatus.label"
               :value="taskStatus.value"
-            />
-          </el-select>
-          <el-select v-model="query.jobType" clearable placeholder="工作类型" style="width: 120px;" class="filter-item">
-            <el-option
+          />
+        </el-select>
+        <el-select v-model="query.jobType" @change="crud.toQuery" clearable placeholder="工作类型" style="width: 120px;" class="filter-item">
+          <el-option
               v-for="taskType in dict.task_type"
               :key="taskType.id"
               :label="taskType.label"
               :value="taskType.value"
-            />
-          </el-select>
+          />
+        </el-select>
 
-          <rrOperation :crud="crud"/>
-          <!--        重置-->
-          <el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="resetQuery">重置
-          </el-button>
-        </div>
+        <rrOperation :crud="crud"/>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" :tableKey="this.$options.name"/>
@@ -60,20 +56,17 @@
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
                  :title="crud.status.title" width="500px">
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-          <el-form-item label="容器编码" prop="stockCode">
-            <el-input v-model="form.stockCode" style="width: 370px;"/>
+          <el-form-item label="任务编码" prop="jobId">
+            <el-input v-model="form.jobId" style="width: 190px;"/>
           </el-form-item>
           <el-form-item label="容器类型" prop="stockTypeCode">
-            <el-input v-model="form.stockTypeCode" style="width: 370px;"/>
+            <el-input v-model="form.stockTypeCode" style="width: 190px;"/>
           </el-form-item>
           <el-form-item label="起点位置" prop="startSlotCode">
-            <el-input v-model="form.startSlotCode" style="width: 370px;"/>
+            <el-input v-model="form.startSlotCode" style="width: 190px;"/>
           </el-form-item>
           <el-form-item label="终点位置" prop="endSlotCode">
-            <el-input v-model="form.endSlotCode" style="width: 370px;"/>
-          </el-form-item>
-          <el-form-item label="容器当前位置" prop="slotCode">
-            <el-input v-model="form.slotCode" style="width: 370px;"/>
+            <el-input v-model="form.endSlotCode" style="width: 190px;"/>
           </el-form-item>
           <el-form-item label="任务状态" prop="status">
             <el-select v-model="form.status" filterable placeholder="请选择">
@@ -86,10 +79,17 @@
             </el-select>
           </el-form-item>
           <el-form-item label="任务类型">
-            <el-input v-model="form.type" style="width: 370px;"/>
+            <el-input v-model="form.type" style="width: 190px;"/>
           </el-form-item>
           <el-form-item label="工作类型" prop="jobType">
-            <el-input v-model="form.jobType" style="width: 370px;"/>
+            <el-select v-model="form.jobType" filterable placeholder="请选择">
+              <el-option
+                  v-for="item in dict.task_type"
+                  :key="item.id"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -109,7 +109,8 @@
         :default-sort="{prop: 'id', order: 'descending'}"
         @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
-        <el-table-column prop="id" label="任务序号"/>
+        <el-table-column prop="id" label="任务ID"/>
+        <el-table-column prop="jobId" label="任务编码"/>
         <el-table-column prop="stockTypeCode" width="170" label="容器类型"/>
         <el-table-column prop="startSlotCode" label="起点位置" width="130"/>
         <el-table-column prop="endSlotCode" label="终点位置" width="130" sortable :formatter="formatter"/>
@@ -207,7 +208,7 @@ export default {
       crudMethod: {...crudAgvTask},
       optShow: {
         add: false,
-        edit: false,
+        edit: true,
         del: false,
         reset: false,
         download: true
@@ -228,9 +229,6 @@ export default {
         missionStatus: ''
       },
       rules: {
-        stockCode: [
-          {required: true, message: '容器码不能为空', trigger: 'blur'}
-        ],
         stockTypeCode: [
           {required: true, message: '容器类型不能为空', trigger: 'blur'}
         ],
@@ -240,17 +238,11 @@ export default {
         endSlotCode: [
           {required: true, message: '终点位置不能为空', trigger: 'blur'}
         ],
-        slotCode: [
-          {required: true, message: '容器当前位置不能为空', trigger: 'blur'}
-        ],
         status: [
           {required: true, message: '任务状态不能为空', trigger: 'blur'}
         ],
         jobType: [
           {required: true, message: '工作类型不能为空', trigger: 'blur'}
-        ],
-        boxCode: [
-          {required: true, message: '容器号不能为空', trigger: 'blur'}
         ]
       },
       queryTypeOptions: [
diff --git a/src/views/business-data/businessTask/asnTask.vue b/src/views/business-data/businessTask/asnTask.vue
index 104d992..e0dbbfc 100644
--- a/src/views/business-data/businessTask/asnTask.vue
+++ b/src/views/business-data/businessTask/asnTask.vue
@@ -271,7 +271,7 @@ export default {
         optShow: {
           add: false,
           edit: false,
-          del: false,
+          del: true,
           reset: true,
           download: true
         },
diff --git a/src/views/business-data/inventory/index.vue b/src/views/business-data/inventory/index.vue
index 3186a93..538eedc 100644
--- a/src/views/business-data/inventory/index.vue
+++ b/src/views/business-data/inventory/index.vue
@@ -10,14 +10,6 @@
         class="filter-item"
         @keyup.enter.native="crud.toQuery"
       />
-      <el-input
-        v-model="query.itemName"
-        clearable
-        placeholder="物料名称"
-        style="width: 140px;"
-        class="filter-item"
-        @keyup.enter.native="crud.toQuery"
-      />
 
       <el-input
         v-model="query.propC1"
@@ -29,13 +21,38 @@
       />
 
       <el-input
-        v-model="query.stockName"
+        v-model="query.pointCode"
         clearable
-        placeholder="容器号"
+        placeholder="点位号"
         style="width: 140px;"
         class="filter-item"
         @keyup.enter.native="crud.toQuery"
       />
+      <el-select v-model="query.areaCode" style="width: 120px;" clearable placeholder="区域"
+                 class="filter-item" @change="crud.toQuery">
+        <el-option
+            v-for="area in areaList"
+            :key="area.id"
+            :label="area.name"
+            :value="area.code"
+        />
+      </el-select>
+      <el-input
+          v-model="query.prodMtrl"
+          clearable
+          placeholder="成品物料码"
+          style="width: 120px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+      />
+      <el-input
+          v-model="query.owner"
+          clearable
+          placeholder="货主"
+          style="width: 100px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+      />
       <rrOperation :crud="crud" />
 
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -158,6 +175,9 @@
             <div>{{ scope.row.itemKey.item.name }}</div>
           </template>
         </el-table-column>
+        <el-table-column prop="prodMtrl" label="成品物料码" />
+        <el-table-column prop="owner" label="货主" />
+
         <el-table-column :show-overflow-tooltip="true" prop="propC1" label="批次号">
           <template slot-scope="scope">
             <div>{{ scope.row.itemKey.propC1 }}</div>
@@ -249,6 +269,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import {queryPickTask} from "@/api/task";
 import {getPoints} from "@/api/point";
+import {getAres} from "@/api/area";
 
 const defaultForm = {
   id: null,
@@ -256,6 +277,8 @@ const defaultForm = {
   itemKey: { item: { id:null },propC7:null },
   point: null,
   stock: null,
+  owner: null,
+  prodMtrl: null,
   bigStockId: null,
   quantity: null,
   queuedQty: null,
@@ -302,6 +325,7 @@ export default {
       ButReplaceInvFlag: false,
       points: [],
       stocks: [],
+      areaList: [],
       items: [],
       permission: {
         add: ['admin', 'inventory:add'],
@@ -319,6 +343,7 @@ export default {
   },
   mounted() {
     this.getPoints()
+    this.getArea()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -335,6 +360,16 @@ export default {
         })
       })
     },
+    getArea() {
+      getAres({size: 50}).then(res => {
+        this.areaList = res.content.map(function (obj) {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
     getPoints() {
       getPoints().then(res => {
         this.points= res.map(function(obj) {
diff --git a/src/views/business-data/pick/index.vue b/src/views/business-data/pick/index.vue
index 6593e13..ebedfde 100644
--- a/src/views/business-data/pick/index.vue
+++ b/src/views/business-data/pick/index.vue
@@ -25,9 +25,10 @@
           size="small"
           placeholder="订单状态"
           class="filter-item"
+          @change="crud.toQuery"
       >
         <el-option
-            v-for="item in dict.asn_status"
+            v-for="item in dict.pick_status"
             :key="item.id"
             :label="item.label"
             :value="item.value"
@@ -40,7 +41,7 @@
             slot="right"
             class="filter-item"
             type="success"
-            icon="el-icon-edit"
+            icon="el-icon-check"
             size="mini"
             :disabled="crud.selections.length !== 1 || this.crud.selections[0].status !=='OPEN'"
             @click="allocate(crud.selections)"
@@ -51,7 +52,7 @@
             slot="right"
             class="filter-item"
             type="success"
-            icon="el-icon-edit"
+            icon="el-icon-check"
             size="mini"
             :loading="crud.delAllLoading"
             :disabled="crud.selections.length !== 1 || this.crud.selections[0].status !=='ALLOCATE'"
diff --git a/src/views/business-data/pickDetail/index.vue b/src/views/business-data/pickDetail/index.vue
index f0ceb0e..15735fe 100644
--- a/src/views/business-data/pickDetail/index.vue
+++ b/src/views/business-data/pickDetail/index.vue
@@ -61,12 +61,24 @@
         >
           保存
         </el-button>
+        <el-button
+            slot="right"
+            v-permission="permission.add"
+            class="filter-item"
+            type="primary"
+            size="mini"
+            plain="plain"
+            icon="el-icon-document-add"
+            @click="crud.toAdd"
+        >
+          添加物料
+        </el-button>
         <el-button
           v-permission="permission.allocate"
           slot="right"
           class="filter-item"
           type="success"
-          icon="el-icon-edit"
+          icon="el-icon-check"
           size="mini"
           :disabled="crud.selections.length !== 1 || this.crud.selections[0].orderQty<=this.crud.selections[0].allocatedQty"
           @click="allocate(crud.selections)"
@@ -79,7 +91,7 @@
           slot="right"
           class="filter-item"
           type="success"
-          icon="el-icon-edit"
+          icon="el-icon-check"
           size="mini"
           :loading="crud.delAllLoading"
           :disabled="show_cancelfp"
@@ -121,6 +133,7 @@
           type="index"
           width="50"
         />
+        <el-table-column prop="lineNo" width="120" label="行号" />
         <el-table-column prop="pick.relatedBill1" width="120" label="系统单号" />
         <el-table-column :show-overflow-tooltip="true" prop="itemName" label="物料编码">
           <template slot-scope="scope">
@@ -165,7 +178,6 @@
       </el-table>
       <!--拣货确认界面-->
       <PickTask ref="pickTask" />
-
       <!--表单组件-->
       <el-dialog
         :close-on-click-modal="false"
@@ -175,6 +187,9 @@
         width="580px"
       >
         <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="120px">
+          <el-form-item v-if="false" label="出库单ID">
+            <el-input v-model="form.pick.id" style="width: 135px;" />
+          </el-form-item>
           <el-form-item label="明细行号">
             <el-input v-model="form.lineNo" style="width: 135px;" />
           </el-form-item>
@@ -262,7 +277,7 @@ import {getBillType} from "@/api/billType";
 
 const defaultForm = {
   id: null,
-  pick: { relatedBill1: null },
+  pick: { relatedBill1: null,id: null },
   item: null,
   lineNo: null,
   po: null,
@@ -303,7 +318,7 @@ export default {
       sort: 'id,desc',
       crudMethod: { ...crudPickDetail },
       optShow: {
-        add: true,
+        add: false,
         edit: false,
         del: false,
         reset: false,
@@ -314,6 +329,7 @@ export default {
   },
   data() {
     return {
+      tjwlFromFlag: false,
       show_jh: true,
       show_cancelfp: true,
       pickList: [],
@@ -481,7 +497,7 @@ export default {
         this.crud.notify("找不到出库单",400)
       }else {
         this.query.pickId = this.pick.id
-        this.form.pick = this.pick
+        defaultForm.pick.id = this.pick.id
         this.crud.toQuery()
       }
     },