diff --git a/src/config/getData2.js b/src/config/getData2.js
index 00b5fc9..67fba4c 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -271,4 +271,6 @@ export const bcpShutGetdtl = (id, btime, etime, code, scode, stcode) => post('ap
   storagevehicle_id_in: stcode
 })
 // 1.4拼盘完成（按钮)
-export const bcpShutConfirm = () => post('api/pda/bcp/shut/confirm', {})
+export const bcpShutConfirm = (row) => post('api/pda/bcp/shut/confirm', {
+  row: row
+})
diff --git a/src/pages/modules/semifinished/semi-finished-compose-search.vue b/src/pages/modules/semifinished/semi-finished-compose-search.vue
index b1449f9..eb9a275 100644
--- a/src/pages/modules/semifinished/semi-finished-compose-search.vue
+++ b/src/pages/modules/semifinished/semi-finished-compose-search.vue
@@ -6,11 +6,11 @@
                     <div class="search-label">仓库</div>
                     <div class="filter_input_wraper">
                         <el-select v-model="value1" filterable clearable placeholder="请选择">
-                          <el-option
+                            <el-option
                               v-for="item in options1"
-                              :key="item.device_code"
-                              :label="item.device_name"
-                              :value="item.device_code">
+                              :key="item.stor_id"
+                              :label="item.stor_name"
+                              :value="item.stor_id">
                           </el-option>
                         </el-select>
                     </div>
@@ -28,14 +28,14 @@
                     </div>
                 </div>
                 <div class="search-item">
-                    <div class="search-label">业务类型</div>
+                    <div class="search-label">单据类型</div>
                     <div class="filter_input_wraper">
                         <el-select v-model="value2" filterable clearable placeholder="请选择">
-                          <el-option
+                            <el-option
                               v-for="item in options2"
-                              :key="item.device_code"
-                              :label="item.device_name"
-                              :value="item.device_code">
+                              :key="item.value"
+                              :label="item.label"
+                              :value="item.value">
                           </el-option>
                         </el-select>
                     </div>
@@ -43,79 +43,127 @@
                 <div class="search-item">
                     <div class="search-label">物料</div>
                     <div class="filter_input_wraper">
-                        <input type="text" class="filter-input">
+                        <input type="text" class="filter-input" v-model="material_code">
                     </div>
                 </div>
                 <div class="search-item">
                     <div class="search-label">载具号</div>
                     <div class="filter_input_wraper">
-                        <input type="text" class="filter-input">
+                        <input type="text" class="filter-input" v-model="storagevehicle_id_in">
                     </div>
                 </div>
-                <div class="search-item">
-                    <button class="button button--primary">查询</button>
-                    <button class="button button--primary">拼盘完成</button>
+                <div class="search-item flexend">
+                    <button class="button button--primary" @click="_bcpShutGetdtl">查询</button>
+                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': pkId === ''}" @click="_bcpShutConfirm">拼盘完成</button>
                 </div>
             </div>
         </div>
-        <div class="zd_wrapper">
-            <div class="grid_wraper">
-                <div class="slide_new">
-                    <table class="filter-table">
-                        <thead>
-                            <tr>
-                                <th>序号</th>
-                                <th>单据号</th>
-                                <th>状态</th>
-                                <th>类型</th>
-                                <th>物料编号</th>
-                                <th>物料规格</th>
-                                <th>数量</th>
-                                <th>单重(g)</th>
-                                <th>转出货位</th>
-                                <th>转出载具</th>
-                                <th>转入货位</th>
-                                <th>转入载具</th>
-                                <th>创建时间</th>
-                                <th>创建人</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr v-for="(e, i) in [1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7]" :key="i">
-                                <td>序号</td>
-                                <td>序号</td>
-                                <td>序号</td>
-                                <td>序号</td>
-                                <td>序号</td>
-                                <td>序号</td>
-                                <td>序号</td>
-                                <td>序号</td>
-                                <td>序号</td>
-                                <td>序号</td>
-                                <td>序号</td>
-                                <td>序号</td>
-                                <td>序号</td>
-                                <td>序号</td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
+        <div class="grid_wraper">
+            <table class="filter-table">
+                <thead>
+                    <tr>
+                        <th>序号</th>
+                        <th>单据号</th>
+                        <th>状态</th>
+                        <th>类型</th>
+                        <th>物料编号</th>
+                        <th>物料规格</th>
+                        <th>移出货位1</th>
+                        <th>移出载具1</th>
+                        <th>移出重量1</th>
+                        <th>移出货位2</th>
+                        <th>移出载具2</th>
+                        <th>移出重量2</th>
+                        <th>创建时间</th>
+                        <th>创建人</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr v-for="(e, i) in dataList" :key="e.bill_code" :class="{'selected_icon': pkId === e.bill_code}" @click="toRadio(e)">
+                        <td>{{ i+1 }}</td>
+                        <td>{{ e.bill_code }}</td>
+                        <td v-if="bill_status === '10'">生成</td>
+                        <td v-if="bill_status === '20'">提交</td>
+                        <td v-if="bill_status === '30'">执行中</td>
+                        <td v-if="bill_status === '60'">确认</td>
+                        <td v-if="bill_status === '99'">完成</td>
+                        <td>普通拼盘</td>
+                        <td>{{ e.material_code }}</td>
+                        <td>{{ e.material_spec }}</td>
+                        <td>{{ e.turnout_struct_code }}</td>
+                        <td>{{ e.storagevehicle_code }}</td>
+                        <td>{{ e.fact_qty }}</td>
+                        <td>{{ e.turnin_struct_code }}</td>
+                        <td>{{ e.storagevehicle_code_in }}</td>
+                        <td>{{ e.qty }}</td>
+                        <td>{{ e.create_time }}</td>
+                        <td>{{ e.create_name }}</td>
+                    </tr>
+                </tbody>
+            </table>
         </div>
     </div>
 </template>
 
 <script>
+import {bcpShutGetBcpStor, bcpShutGetBillType, bcpShutGetdtl, bcpShutConfirm} from '@config/getData2.js'
+import {dateTimeFtt} from '@config/utils.js'
 export default {
   data () {
     return {
       options1: [],
       value1: '',
-      date: [new Date((new Date().getTime() - 24 * 60 * 60 * 1000)), new Date((new Date().getTime() + 24 * 60 * 60 * 1000))],
+      date: [new Date((new Date().getTime() - 6 * 24 * 60 * 60 * 1000)), new Date((new Date().getTime()))],
       options2: [],
       value2: '',
-      options3: [],
-      value3: ''
+      material_code: '',
+      storagevehicle_id_in: '',
+      dataList: [],
+      disabled1: false,
+      pkId: '',
+      pkObj: {}
+    }
+  },
+  created () {
+    this._bcpShutGetBcpStor()
+    this._bcpShutGetBillType()
+    this._bcpShutGetdtl()
+  },
+  methods: {
+    // 仓库下拉框
+    async _bcpShutGetBcpStor () {
+      let res = await bcpShutGetBcpStor()
+      this.options1 = [...res.data]
+    },
+    // 单据类型下拉框
+    async _bcpShutGetBillType () {
+      let res = await bcpShutGetBillType()
+      this.options2 = [...res.data]
+    },
+    // grid
+    async _bcpShutGetdtl () {
+      let res = await bcpShutGetdtl(this.value1, this.date !== null ? dateTimeFtt(this.date[0]) : '', this.date !== null ? dateTimeFtt(this.date[1]) : '', this.material_code, this.value2, this.storagevehicle_id_in)
+      this.dataList = [...res.data]
+    },
+    toRadio (e) {
+      this.pkId = this.pkId === e.bill_code ? '' : e.bill_code
+      this.pkObj = this.pkId === e.bill_code ? e : {}
+    },
+    async _bcpShutConfirm () {
+      this.disabled1 = true
+      if (!this.pkId) {
+        this.disabled1 = false
+        return
+      }
+      try {
+        let res = await bcpShutConfirm(this.pkObj)
+        this.toast(res.message)
+        this._bcpShutGetdtl()
+        this.pkId = ''
+        this.disabled1 = false
+      } catch (e) {
+        this.disabled1 = false
+      }
     }
   }
 }
@@ -126,4 +174,6 @@ export default {
     width calc(100% - 45px)
 .search-label_1
     width 45px
+.grid_wraper
+    height calc(100% - 95px)
 </style>