diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 59006fdf..67ccebb9 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -14,6 +14,7 @@
           <el-button
             size="mini"
             type="primary"
+            v-if="documentShow"
             @click.native="OptionalDocument()"
             >选入预验收库单
           </el-button>
@@ -184,10 +185,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row v-if="documentShow">
           <el-col :span="11">
             <el-form-item prop="" label="预验收单据:">
-              <el-input v-model="orderFormData.Acceptance"></el-input>
+              <el-input
+                :disabled="true"
+                v-model="orderFormData.checkPreInOrders"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -284,7 +288,10 @@
       append-to-body
       @close="closeDialogtwo"
     >
-      <dialog-create-order-select @giveselectbox="giveselectbox" :closeDialogtwo="closeDialogtwo">
+      <dialog-create-order-select
+        @giveselectbox="giveselectbox"
+        :closeDialogtwo="closeDialogtwo"
+      >
       </dialog-create-order-select>
     </el-dialog>
   </div>
@@ -346,7 +353,7 @@ export default {
         remark: null,
         fromType: 2,
         errMsg: null,
-        Acceptance: null,
+        checkPreInOrders: null,
       },
       errView: 0,
       //选入相关
@@ -419,6 +426,8 @@ export default {
       viewBizVisible: false,
       viewCodeVisible: false,
       viewCodeDetailVisible: false,
+     
+      documentShow:false,//控制预选单显示隐藏
     };
   },
   components: {
@@ -446,14 +455,18 @@ export default {
         })
         .catch(() => {});
     },
-     //接收预选单传值
-     giveselectbox(val){
-         this.orderFormData.Acceptance=val
+    //接收预选单传值
+    giveselectbox(val) {
+      this.orderFormData.checkPreInOrders = val;
     },
     //仓库改变
     changeInv() {
       this.orderFormData.action = null;
       this.getBusTypeByInv();
+
+      // if(scanPreIn = true  &&  backPreinType === 1){
+
+      // }
     },
 
     //根据仓库,用户获取单据类型
@@ -552,6 +565,11 @@ export default {
         this.orderFormData.fromInvCode = null;
         this.findFromInvList();
       }
+      if(this.curAction.scanPreIn = true  &&  this.curAction.backPreinType == 1){
+        this.documentShow=true
+      }
+
+
     },
 
     //获取往来仓库列表
@@ -914,7 +932,7 @@ export default {
   created() {
     //页面初始化
     this.codeFormData.code = "";
-    this.giveselectbox()
+    this.giveselectbox();
     //页面类型
     if (this.viewType == 2) {
       //2.新增扫码单据页面，1、新增业务单据页面，3、正常页面
diff --git a/src/views/inout/DialogCreateOrderSelect.vue b/src/views/inout/DialogCreateOrderSelect.vue
index ce28b099..74f699d3 100644
--- a/src/views/inout/DialogCreateOrderSelect.vue
+++ b/src/views/inout/DialogCreateOrderSelect.vue
@@ -125,7 +125,7 @@
         border
         @row-click="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55"></el-table-column>
+        <!-- <el-table-column type="selection" width="55"></el-table-column> -->
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column
           label="扫码单据类型"
@@ -241,12 +241,11 @@ const formJson = {
 export default {
   name: "IoAuditedOrder",
   props: {
-        closeDialogtwo: {
-            type: Function,
-            required: true,
-        },
-
+    closeDialogtwo: {
+      type: Function,
+      required: true,
     },
+  },
   data() {
     return {
       showSearch: true,
@@ -362,8 +361,8 @@ export default {
       resultTotal: 0,
       resultDetailLoading: false,
       resultDetailList: [],
-      selectboxs:[],
-      selectbox:"",
+      selectboxs: [],
+      selectbox: "",
     };
   },
   components: {},
@@ -401,26 +400,24 @@ export default {
       this.getList();
     },
     //选入
-     combine() {
-         this.closeDialogtwo()
-        this.$emit("giveselectbox", this.selectbox);
-      },
-      //选择
-      select(selection,row){
-          
-        //   console.log(row);
-        this.selectboxs.push(row)
-        let nerArr = JSON.parse(JSON.stringify(this.selectboxs))
-         let qwe = nerArr.map(item=>{
-      // 每一项的单号
-      return item.billNo
-    })
-        this.selectbox=qwe
-      },
-    //关闭对话框
-    closeLocalDialog(){
-           
+    combine() {
+      this.closeDialogtwo();
+      this.$emit("giveselectbox", this.currentRow.billNo);
     },
+    //   //选择
+    //   select(selection,row){
+
+    //     //   console.log(row);
+    //     this.selectboxs.push(row)
+    //     let nerArr = JSON.parse(JSON.stringify(this.selectboxs))
+    //      let qwe = nerArr.map(item=>{
+    //   // 每一项的单号
+    //   return item.billNo
+    // })
+    //     this.selectbox=qwe
+    //   },
+    //关闭对话框
+    closeLocalDialog() {},
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
@@ -437,7 +434,7 @@ export default {
     },
     handleSelectionChange(val) {
       this.currentRow = val;
-      console.log(this.currentRow);
+      console.log(this.currentRow.billNo);
       this.getOrderDetails();
     },
     // 获取单据 业务详情、扫码详情、扫码明细
diff --git a/vue.config.js b/vue.config.js
index 0c3feeb1..bf23e227 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,11 +35,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-<<<<<<< HEAD
-        target: `http://192.168.0.166:9991/`,
-=======
+
+
         target: `http://192.168.0.66:9150/UDI_WMS_MC/`,
->>>>>>> 9888474ccf2da85118a27d3e30da15957c8302ff
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",