diff --git a/src/views/business-data/pick/index.vue b/src/views/business-data/pick/index.vue
index c48d790..3d1948e 100644
--- a/src/views/business-data/pick/index.vue
+++ b/src/views/business-data/pick/index.vue
@@ -4,12 +4,20 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <label class="el-form-item-label">出库单头</label>
-        <el-input v-model="query.code" clearable placeholder="出库单头" style="width: 185px;" class="filter-item"
-                  @keyup.enter.native="crud.toQuery"/>
-        <label class="el-form-item-label">工单明细</label>
-        <el-input v-model="query.gdDetaiId" clearable placeholder="工单明细" style="width: 185px;" class="filter-item"
+        <label class="el-form-item-label">工单编码</label>
+        <el-input v-model="query.gdCode" clearable placeholder="工单编码" style="width: 185px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
+
+        <label class="el-form-item-label">工单状态</label>
+        <el-select v-model="query.status" filterable placeholder="请选择" class="filter-item" style="width: 185px;">
+          <el-option
+            v-for="item in dict.pick_status"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+
+
         <rrOperation :crud="crud"/>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -17,28 +25,51 @@
       <!--表单组件-->
       <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="ID">
-            <el-input v-model="form.id" style="width: 370px;"/>
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="85px">
+
+          <el-form-item label="工单编码" prop="gdCode">
+            <el-select v-model="form.gdCode" @focus="getGd()" filterable clearable placeholder="请选择"
+                       style="width: 350px;"
+                       class="filter-item">
+              <el-option
+                v-for="gd in gds"
+                :key="gd.id"
+                :label="gd.code"
+                :value="gd.code"/>
+            </el-select>
           </el-form-item>
-          <el-form-item label="出库单头">
-            <el-input v-model="form.code" style="width: 370px;"/>
+
+          <el-form-item label="顺序号" prop="lineNo">
+            <el-input v-model="form.lineNo" style="width: 350px;" oninput="value=value.replace(/^0|[^0-9]/g,'')"
+                      min="1"/>
           </el-form-item>
-          <el-form-item label="序号">
-            <el-input v-model="form.lineNo" style="width: 370px;"/>
-          </el-form-item>
-          <el-form-item label="状态">
-            <el-select v-model="form.status" filterable placeholder="请选择">
+
+          <el-form-item label="状态" prop="status">
+            <el-select v-model="form.status" filterable placeholder="请选择" style="width: 350px;">
               <el-option
                 v-for="item in dict.pick_status"
+                v-if="item.value==='OPEN'"
                 :key="item.id"
                 :label="item.label"
                 :value="item.value"/>
             </el-select>
           </el-form-item>
-          <!--          <el-form-item label="关联工单明细">
-                      <el-input v-model="form.gdDetail" style="width: 370px;" />
-                    </el-form-item>-->
+
+          <el-form-item label="成品代码/单品代码" prop="cpCodeOrDpCode">
+            <el-select v-model="form.cpCodeOrDpCode" @focus="getItemAndBigItem()" filterable placeholder="请选择"
+                       style="width: 350px;">
+              <el-option
+                v-for="item in itemAndBigItem"
+                :key="item.id"
+                :label="item.code"
+                :value="item.code"/>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="需求工位" prop="station">
+            <el-input v-model="form.station" style="width: 350px;"/>
+          </el-form-item>
+
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -49,14 +80,18 @@
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
                 @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
-        <el-table-column prop="lineNo" label="序号"/>
-        <el-table-column prop="code" label="出库单头"/>
+        <el-table-column prop="xh" label="序号" type="index" width="50"/>
+        <el-table-column prop="code" label="出库单编码"/>
+        <el-table-column prop="gdCode" label="工单编码"/>
+        <el-table-column prop="lineNo" label="顺序号"/>
         <el-table-column prop="status" label="状态">
           <template slot-scope="scope">
             {{ dict.label.pick_status[scope.row.status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="point.code" label="封包点位"/>
+        <el-table-column prop="cpCodeOrDpCode" label="成品代码/单品代码"/>
+        <el-table-column prop="station" label="需求工位"/>
+        <el-table-column prop="point.code" label="翻包点位"/>
         <el-table-column prop="createTime" label="创建时间"/>
         <el-table-column v-if="checkPer(['admin','pick:edit','pick:del'])" label="操作" width="150px" align="center">
           <template slot-scope="scope">
@@ -80,6 +115,9 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import {queryAllGd} from "@/api/gd";
+import {getItemsList} from "@/api/item";
+import {queryAllBigItem} from "@/api/bigItem";
 
 const defaultForm = {
   id: null,
@@ -99,28 +137,83 @@ export default {
   components: {pagination, crudOperation, rrOperation, udOperation},
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
-    return CRUD({title: 'pick', url: 'api/pick', idField: 'id', sort: 'id,desc', crudMethod: {...crudPick}})
+    return CRUD({
+      title: '出库单',
+      url: 'api/pick',
+      idField: 'id',
+      sort: ['lineNo,asc'],
+      crudMethod: {...crudPick},
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        reset: true,
+        download: true
+      }
+    })
   },
   data() {
     return {
+      gds: [],
+      itemAndBigItem: [],
       permission: {
         add: ['admin', 'pick:add'],
         edit: ['admin', 'pick:edit'],
         del: ['admin', 'pick:del']
       },
-      rules: {},
-      queryTypeOptions: [
-        {key: 'code', display_name: '出库单头'},
-        {key: 'gdDetaiId', display_name: '关联工单明细'}
-      ]
+      rules: {
+        gdCode: [
+          {required: true, message: '请选择工单编码', trigger: 'blur'}
+        ],
+        lineNo: [
+          {required: true, message: '请输入顺序号', trigger: 'blur'},
+        ],
+        status: [
+          {required: true, message: '请选择状态', trigger: 'blur'}
+        ],
+        cpCodeOrDpCode: [
+          {required: true, message: '请选择成品代码/单品代码', trigger: 'blur'}
+        ],
+        station: [
+          {required: true, message: '请输入需求工位', trigger: 'blur'}
+        ]
+      },
     }
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
+    },
+
+    getItemAndBigItem() {
+      // 清空数组，防止重复添加
+      this.itemAndBigItem = [];
+
+      getItemsList({enabled: true}).then(res => {
+        res.forEach(item => {
+          const cpCodeAndDpCode = {code: null};
+          cpCodeAndDpCode.code = item.code;
+          this.itemAndBigItem.push(cpCodeAndDpCode);
+        });
+      })
+
+      queryAllBigItem({}).then(res => {
+        res.forEach(item => {
+          const cpCodeAndDpCode = {code: null};
+          cpCodeAndDpCode.code = item.code;
+          this.itemAndBigItem.push(cpCodeAndDpCode);
+        });
+      })
+
+    },
+    getGd() {
+      queryAllGd({status: 'OPEN'}).then(res => {
+        this.gds = res
+      })
     }
   }
+
 }
 </script>