diff --git a/src/pages/modules/buffer/bzjselect.vue b/src/pages/modules/buffer/bzjselect.vue
index be8ea2a..77ea3a4 100644
--- a/src/pages/modules/buffer/bzjselect.vue
+++ b/src/pages/modules/buffer/bzjselect.vue
@@ -2,56 +2,9 @@
     <div class="order-wraper">
         <div class="search-confirm-wrap">
             <div class="search-wrap">
-                <div class="search-item">
-                    <div class="search-label">仓库</div>
-                    <div class="filter_input_wraper">
-                        <el-select v-model="value1" filterable clearable placeholder="请选择">
-                          <el-option
-                              v-for="item in options1"
-                              :key="item.stor_id"
-                              :label="item.stor_name"
-                              :value="item.stor_id">
-                          </el-option>
-                        </el-select>
-                    </div>
-                </div>
-                <div class="search-item">
-                    <div class="search-label">单据类型</div>
-                    <div class="filter_input_wraper">
-                        <el-select v-model="value2" filterable clearable placeholder="请选择">
-                          <el-option
-                              v-for="item in options2"
-                              :key="item.value"
-                              :label="item.label"
-                              :value="item.value">
-                          </el-option>
-                        </el-select>
-                    </div>
-                </div>
-                <div class="search-item">
-                    <div class="search-label">入库点</div>
-                    <div class="filter_input_wraper">
-                        <el-select v-model="value3" filterable clearable placeholder="请选择">
-                          <el-option
-                              v-for="item in options3"
-                              :key="item.point_code"
-                              :label="item.point_name"
-                              :value="item.point_code">
-                          </el-option>
-                        </el-select>
-                    </div>
-                </div>
-                <div class="search-item">
-                    <div class="search-label">备注</div>
-                    <div class="filter_input_wraper">
-                        <input type="text" class="filter-input" v-model="remark">
-                    </div>
-                </div>
                 <div class="search-item_2 flexend">
-                    <button class="button button--primary" @click="toAddBillMater">添加单据物料</button>
-                    <button class="button button--primary" :disabled="disabled2" :class="{'button--defalut': this.value1 === '' || this.value2 === '' || this.value3 === '' || this.dataList === [] || flag}" @click="showDialog">确认入库</button>
-                    <button class="button button--primary" :class="{'button--defalut': pkId === ''}" @click="delRow">删除一行</button>
-                    <button class="button button--primary" @click="toSearch">作业查询</button>
+                    <button class="button button--primary" @click="toSelect">刻字暂存位选择</button>
+                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': !this.pkId}" @click="_confirmIn">空框送回</button>
                 </div>
             </div>
         </div>
@@ -60,76 +13,39 @@
                 <thead>
                     <tr>
                         <th>序号</th>
-                        <th>物料编号</th>
-                        <th>物料名称</th>
+                        <th>设备号</th>
+                        <th>工单号</th>
+                        <th>生产数量</th>
                         <th>物料规格</th>
-                        <th>入库数量</th>
-                        <th>订单号</th>
-                        <th>客户</th>
+                        <th>物料编码</th>
                     </tr>
                 </thead>
                 <tbody>
                     <tr v-for="(e, i) in dataList" :key="i" :class="{'selected_icon': pkId === e.sale_code}" @click="toRadio(e)">
                         <td>{{i + 1}}</td>
-                        <td>{{e.material_code}}</td>
-                        <td>{{e.material_name}}</td>
+                        <td>{{e.device_code}}</td>
+                        <td>{{e.workorder_code}}</td>
+                        <td>{{e.plan_qty}}</td>
                         <td>{{e.material_spec}}</td>
-                        <td><input type="number" class="input" v-model="e.sale_qty"></td>
-                        <!-- <td><input type="number" class="input" :min="0" v-model="el.sale_qty" @blur="e => {if (e.target.value === '') {el.sale_qty=0}}" v-enter-number></td> -->
-                        <td>{{e.sale_code}}</td>
-                        <td>{{e.remark}}</td>
+                        <td>{{e.material_code}}</td>
                     </tr>
                 </tbody>
             </table>
         </div>
-         <jxDialog
-          ref="child"
-          :title="title"
-          :type="type"
-          @toSure="toSureDialog"
-          >
-          <div class="form_wraper">确定继续操作吗？</div>
-        </jxDialog>
     </div>
 </template>
 
 <script>
-import { getBcpStor, getBillType, getPoint, confirmIn } from '../../../config/getData1.js'
-import jxDialog from '@components/dialog.vue'
+import { confirmIn } from '../../../config/getData1.js'
 export default {
-  name: 'finishedinstore',
-  components: {
-    jxDialog
-  },
+  name: 'bzjselect',
   data () {
     return {
-      title: '提示',
-      type: '2',
-      options1: [],
-      value1: '',
-      options2: [],
-      value2: '',
-      options3: [],
-      value3: '',
-      remark: '',
       dataList: [],
       // dataList: [{material_code: '24007845L', material_spec: '23xcds', material_name: '垫片活接直通\DPHJS22\EHJA0703009B', sale_qty: '1000', sale_code: '0022060927', remark: '222'}],
       pkId: '',
       pkObj: {},
-      disabled2: false
-    }
-  },
-  computed: {
-    flag () {
-      let flag = false
-      if (this.dataList.length) {
-        this.dataList.map(el => {
-          if (el.sale_qty === '' || Number(el.sale_qty) < 0) {
-            flag = true
-          }
-        })
-      }
-      return flag
+      disabled1: false
     }
   },
   beforeRouteLeave (to, from, next) {
@@ -138,92 +54,33 @@ export default {
     }
     next()
   },
-  activated () {
-    if (this.$store.getters.materArr.length > 0) {
-      this.dataList = [...this.dataList, ...this.$store.getters.materArr]
-    }
-  },
   created () {
-    this._getBcpStor()
-    this._getBillType()
-    this._getPoint()
+    this._outgetAll()
   },
   methods: {
-    toSureDialog () {
-      this.toSure()
-    },
-    showDialog () {
-      if (this.flag || this.value1 === '' || this.value2 === '' || this.value3 === '' || this.dataList === []) {
-        // this.toast('请填写完整!')
-        return
-      }
-      this.$refs.child.active = true
-    },
-    // 仓库下拉框
-    async _getBcpStor () {
-      let res = await getBcpStor()
-      this.options1 = [...res.data]
-    },
-    // 单据类型下拉框
-    async _getBillType () {
-      let res = await getBillType()
-      this.options2 = [...res.data]
-    },
-    // 入库点下拉框
-    async _getPoint () {
-      let res = await getPoint()
-      this.options3 = [...res.data]
-    },
-    // 确认入库
-    async toSure () {
-      this.$refs.child.disabled = true
-      this.disabled2 = true
-      if (this.value1 === '' || this.value2 === '' || this.value3 === '' || this.dataList === []) {
-        this.disabled2 = false
+    async _confirmIn () {
+      this.disabled1 = true
+      if (!this.pkId) {
+        this.disabled1 = false
         return
       }
       try {
-        let from = {
-          stor_id: this.value1,
-          bill_type: this.value2,
-          point_code: this.value3,
-          remark: this.remark,
-          rows: this.dataList
-        }
-        let res = await confirmIn(from)
+        let res = await confirmIn(this.pkObj)
         this.toast(res.message)
-        this.value1 = ''
-        this.value2 = ''
-        this.value3 = ''
-        this.remark = ''
-        this.dataList = []
-        this.disabled2 = false
-        this.$store.dispatch('setMaterObj', '')
-        this.$refs.child.active = false
-        this.$refs.child.disabled = false
+        this.disabled1 = false
+        this.pkId = ''
+        this.pkObj = {}
+        this._outgetAll()
       } catch (e) {
-        this.disabled2 = false
-        this.$refs.child.active = false
-        this.$refs.child.disabled = false
+        this.disabled1 = false
       }
     },
-    toAddBillMater () {
-      this.$store.dispatch('setMaterArr', [])
-      this.$router.push('/selectfinishedmater')
-    },
-    toSearch () {
+    toSelect () {
       this.$router.push('/finishedinstoresearch')
     },
     toRadio (e) {
       this.pkId = this.pkId === e.sale_code ? '' : e.sale_code
       this.pkObj = this.pkId === e.sale_code ? e : {}
-    },
-    delRow () {
-      if (!this.pkId) {
-        return
-      }
-      this.dataList = this.dataList.filter(el => el.sale_code !== this.pkId)
-      this.$store.dispatch('setMaterArr', this.dataList)
     }
   }
 }
diff --git a/src/pages/modules/buffer/letter-buffer-select.vue b/src/pages/modules/buffer/letter-buffer-select.vue
index be8ea2a..f64f7b5 100644
--- a/src/pages/modules/buffer/letter-buffer-select.vue
+++ b/src/pages/modules/buffer/letter-buffer-select.vue
@@ -3,55 +3,13 @@
         <div class="search-confirm-wrap">
             <div class="search-wrap">
                 <div class="search-item">
-                    <div class="search-label">仓库</div>
+                    <div class="search-label">包装机编号</div>
                     <div class="filter_input_wraper">
-                        <el-select v-model="value1" filterable clearable placeholder="请选择">
-                          <el-option
-                              v-for="item in options1"
-                              :key="item.stor_id"
-                              :label="item.stor_name"
-                              :value="item.stor_id">
-                          </el-option>
-                        </el-select>
-                    </div>
-                </div>
-                <div class="search-item">
-                    <div class="search-label">单据类型</div>
-                    <div class="filter_input_wraper">
-                        <el-select v-model="value2" filterable clearable placeholder="请选择">
-                          <el-option
-                              v-for="item in options2"
-                              :key="item.value"
-                              :label="item.label"
-                              :value="item.value">
-                          </el-option>
-                        </el-select>
-                    </div>
-                </div>
-                <div class="search-item">
-                    <div class="search-label">入库点</div>
-                    <div class="filter_input_wraper">
-                        <el-select v-model="value3" filterable clearable placeholder="请选择">
-                          <el-option
-                              v-for="item in options3"
-                              :key="item.point_code"
-                              :label="item.point_name"
-                              :value="item.point_code">
-                          </el-option>
-                        </el-select>
-                    </div>
-                </div>
-                <div class="search-item">
-                    <div class="search-label">备注</div>
-                    <div class="filter_input_wraper">
-                        <input type="text" class="filter-input" v-model="remark">
+                        <input type="text" class="filter-input" v-model="val1">
                     </div>
                 </div>
                 <div class="search-item_2 flexend">
-                    <button class="button button--primary" @click="toAddBillMater">添加单据物料</button>
-                    <button class="button button--primary" :disabled="disabled2" :class="{'button--defalut': this.value1 === '' || this.value2 === '' || this.value3 === '' || this.dataList === [] || flag}" @click="showDialog">确认入库</button>
-                    <button class="button button--primary" :class="{'button--defalut': pkId === ''}" @click="delRow">删除一行</button>
-                    <button class="button button--primary" @click="toSearch">作业查询</button>
+                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': !this.pkId}" @click="_confirmIn">确认上料</button>
                 </div>
             </div>
         </div>
@@ -60,76 +18,40 @@
                 <thead>
                     <tr>
                         <th>序号</th>
-                        <th>物料编号</th>
-                        <th>物料名称</th>
+                        <th>设备号</th>
+                        <th>工单号</th>
+                        <th>生产数量</th>
                         <th>物料规格</th>
-                        <th>入库数量</th>
-                        <th>订单号</th>
-                        <th>客户</th>
+                        <th>物料编码</th>
                     </tr>
                 </thead>
                 <tbody>
                     <tr v-for="(e, i) in dataList" :key="i" :class="{'selected_icon': pkId === e.sale_code}" @click="toRadio(e)">
                         <td>{{i + 1}}</td>
-                        <td>{{e.material_code}}</td>
-                        <td>{{e.material_name}}</td>
+                        <td>{{e.device_code}}</td>
+                        <td>{{e.workorder_code}}</td>
+                        <td>{{e.plan_qty}}</td>
                         <td>{{e.material_spec}}</td>
-                        <td><input type="number" class="input" v-model="e.sale_qty"></td>
-                        <!-- <td><input type="number" class="input" :min="0" v-model="el.sale_qty" @blur="e => {if (e.target.value === '') {el.sale_qty=0}}" v-enter-number></td> -->
-                        <td>{{e.sale_code}}</td>
-                        <td>{{e.remark}}</td>
+                        <td>{{e.material_code}}</td>
                     </tr>
                 </tbody>
             </table>
         </div>
-         <jxDialog
-          ref="child"
-          :title="title"
-          :type="type"
-          @toSure="toSureDialog"
-          >
-          <div class="form_wraper">确定继续操作吗？</div>
-        </jxDialog>
     </div>
 </template>
 
 <script>
-import { getBcpStor, getBillType, getPoint, confirmIn } from '../../../config/getData1.js'
-import jxDialog from '@components/dialog.vue'
+import { confirmIn } from '../../../config/getData1.js'
 export default {
-  name: 'finishedinstore',
-  components: {
-    jxDialog
-  },
+  name: 'letterbufferselect',
   data () {
     return {
-      title: '提示',
-      type: '2',
-      options1: [],
-      value1: '',
-      options2: [],
-      value2: '',
-      options3: [],
-      value3: '',
-      remark: '',
+      val1: '',
       dataList: [],
       // dataList: [{material_code: '24007845L', material_spec: '23xcds', material_name: '垫片活接直通\DPHJS22\EHJA0703009B', sale_qty: '1000', sale_code: '0022060927', remark: '222'}],
       pkId: '',
       pkObj: {},
-      disabled2: false
-    }
-  },
-  computed: {
-    flag () {
-      let flag = false
-      if (this.dataList.length) {
-        this.dataList.map(el => {
-          if (el.sale_qty === '' || Number(el.sale_qty) < 0) {
-            flag = true
-          }
-        })
-      }
-      return flag
+      disabled1: false
     }
   },
   beforeRouteLeave (to, from, next) {
@@ -138,92 +60,33 @@ export default {
     }
     next()
   },
-  activated () {
-    if (this.$store.getters.materArr.length > 0) {
-      this.dataList = [...this.dataList, ...this.$store.getters.materArr]
-    }
-  },
   created () {
-    this._getBcpStor()
-    this._getBillType()
-    this._getPoint()
+    this._outgetAll()
   },
   methods: {
-    toSureDialog () {
-      this.toSure()
-    },
-    showDialog () {
-      if (this.flag || this.value1 === '' || this.value2 === '' || this.value3 === '' || this.dataList === []) {
-        // this.toast('请填写完整!')
-        return
-      }
-      this.$refs.child.active = true
-    },
-    // 仓库下拉框
-    async _getBcpStor () {
-      let res = await getBcpStor()
-      this.options1 = [...res.data]
-    },
-    // 单据类型下拉框
-    async _getBillType () {
-      let res = await getBillType()
-      this.options2 = [...res.data]
-    },
-    // 入库点下拉框
-    async _getPoint () {
-      let res = await getPoint()
-      this.options3 = [...res.data]
-    },
-    // 确认入库
-    async toSure () {
-      this.$refs.child.disabled = true
-      this.disabled2 = true
-      if (this.value1 === '' || this.value2 === '' || this.value3 === '' || this.dataList === []) {
-        this.disabled2 = false
+    async _confirmIn () {
+      this.disabled1 = true
+      if (!this.pkId) {
+        this.disabled1 = false
         return
       }
       try {
-        let from = {
-          stor_id: this.value1,
-          bill_type: this.value2,
-          point_code: this.value3,
-          remark: this.remark,
-          rows: this.dataList
-        }
-        let res = await confirmIn(from)
+        let res = await confirmIn(this.pkObj)
         this.toast(res.message)
-        this.value1 = ''
-        this.value2 = ''
-        this.value3 = ''
-        this.remark = ''
-        this.dataList = []
-        this.disabled2 = false
-        this.$store.dispatch('setMaterObj', '')
-        this.$refs.child.active = false
-        this.$refs.child.disabled = false
+        this.disabled1 = false
+        this.pkId = ''
+        this.pkObj = {}
+        this._outgetAll()
       } catch (e) {
-        this.disabled2 = false
-        this.$refs.child.active = false
-        this.$refs.child.disabled = false
+        this.disabled1 = false
       }
     },
-    toAddBillMater () {
-      this.$store.dispatch('setMaterArr', [])
-      this.$router.push('/selectfinishedmater')
-    },
-    toSearch () {
+    toSelect () {
       this.$router.push('/finishedinstoresearch')
     },
     toRadio (e) {
       this.pkId = this.pkId === e.sale_code ? '' : e.sale_code
       this.pkObj = this.pkId === e.sale_code ? e : {}
-    },
-    delRow () {
-      if (!this.pkId) {
-        return
-      }
-      this.dataList = this.dataList.filter(el => el.sale_code !== this.pkId)
-      this.$store.dispatch('setMaterArr', this.dataList)
     }
   }
 }