diff --git a/src/api/inventory/invPlaceOrder.js b/src/api/inventory/invPlaceOrder.js
index 1cf4479b..e1c43a75 100644
--- a/src/api/inventory/invPlaceOrder.js
+++ b/src/api/inventory/invPlaceOrder.js
@@ -23,3 +23,12 @@ export function selectPlaceList(params) {
     params: params
   });
 }
+
+
+export function selectMutiPlace(params) {
+  return axios({
+    url: "/spms/inv/product/mutiPlace",
+    method: "get",
+    params: params
+  });
+}
diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue
index 0010360a..79aef221 100644
--- a/src/views/basic/busType/bussinessType.vue
+++ b/src/views/basic/busType/bussinessType.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <el-form  :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
           <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
@@ -9,37 +9,37 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-          <el-form-item class="query-form-item" label="出入库类型:">
-            <el-select v-model="filterQuery.mainAction" style="width: 90%" placeholder="请选择出入库类型">
-              <el-option label="全部" value=""></el-option>
-              <el-option label="入库" value="WareHouseIn"></el-option>
-              <el-option label="出库" value="WareHouseOut"></el-option>
-            </el-select>
-          </el-form-item>
+            <el-form-item class="query-form-item" label="出入库类型:">
+              <el-select v-model="filterQuery.mainAction" style="width: 90%" placeholder="请选择出入库类型">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="入库" value="WareHouseIn"></el-option>
+                <el-option label="出库" value="WareHouseOut"></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="6">
-          <el-form-item class="query-form-item" label="是否启用:">
-            <el-select v-model="filterQuery.enable" style="width: 90%" placeholder="是否启用">
-              <el-option label="全部" value=""></el-option>
-              <el-option label="已启用" value="1"></el-option>
-              <el-option label="未启用" value="0"></el-option>
-            </el-select>
-          </el-form-item>
+            <el-form-item class="query-form-item" label="是否启用:">
+              <el-select v-model="filterQuery.enable" style="width: 90%" placeholder="是否启用">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="已启用" value="1"></el-option>
+                <el-option label="未启用" value="0"></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="6">
-          <el-form-item class="query-form-item" label="仓库类型:">
-            <el-select v-model="filterQuery.actionType" style="width: 90%" placeholder="请选择仓库类型">
-              <el-option label="入账库" :value="1"></el-option>
-              <el-option label="预验收库" :value="2"></el-option>
-              <el-option label="寄售库" :value="3"></el-option>
-            </el-select>
-          </el-form-item>
+            <el-form-item class="query-form-item" label="仓库类型:">
+              <el-select v-model="filterQuery.actionType" style="width: 90%" placeholder="请选择仓库类型">
+                <el-option label="入账库" :value="1"></el-option>
+                <el-option label="预验收库" :value="2"></el-option>
+                <el-option label="寄售库" :value="3"></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
 
 
-      <div class="top-right-btn" >
+      <div class="top-right-btn">
         <el-button-group style="width: 600px">
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
@@ -169,12 +169,12 @@
   </div>
 </template>
 <script>
-import { getBusTypeList, deleteBusType, updateBusType, insertBusType, exportFile } from '@/api/basic/busType'
+import {getBusTypeList, deleteBusType, updateBusType, insertBusType, exportFile} from '@/api/basic/busType'
 import modifyDialog from './bussinessTypeModify'
 import axios from 'axios'
 import store from '@/store'
-import { findConfig } from '@/api/sync/spsSyncStatus'
-import { isBlank } from '@/utils/strUtil'
+import {findConfig} from '@/api/sync/spsSyncStatus'
+import {isBlank} from '@/utils/strUtil'
 
 export default {
   data() {
@@ -186,7 +186,7 @@ export default {
         page: 1,
         limit: 20
       },
-      showSearch:true,
+      showSearch: true,
       addDialogVisible: false,
       modifyDialogVisible: false,
       list: [],
@@ -242,6 +242,7 @@ export default {
         checkBalance: null,
         secCheckBalance: null,
         preInBack: false,
+        spaceOut: 0,
         vailDispatch: false,
         vailGroupBuy: 0,
         inStock: false,
@@ -375,6 +376,7 @@ export default {
         if (this.inputQuery.sortNum < 0) {
           this.$message.error("排序不能小于0！");
           return;
+
         } else if (this.inputQuery.sortNum > 999) {
           this.$message.error("排序不能大于999！");
           return;
@@ -451,7 +453,7 @@ export default {
         const binaryData = []
         binaryData.push(response)
         let url = window.URL.createObjectURL(
-          new Blob(binaryData, { type: 'application/json' })
+          new Blob(binaryData, {type: 'application/json'})
         )
         this.loading = false
         const eleLink = document.createElement('a')
@@ -520,6 +522,7 @@ export default {
         preIn: null,
         originAction: null,
         preInBack: false,
+        spaceOut: 0,
         vailDispatch: false,
         vailGroupBuy: 0,
         inStock: false,
diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 99d0e98f..06914290 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -408,7 +408,27 @@
             </el-col>
           </el-row>
           <el-divider></el-divider>
+          <el-row>
+            <el-col span="5">
+              <span class="sptext">按货位出库</span>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="5">
+              <el-select v-model="inputQuery.spaceOut" style="width: 65%"
+                         :disabled=" inputQuery.mainAction!= 'WareHouseOut'"
+              >
+                <el-option label="无" :value="0"></el-option>
+                <el-option label="按指定货位出库" :value="1"></el-option>
+                <el-option label="默认货位出库" :value="2"></el-option>
+              </el-select>
 
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="13">
+              <span class="sptext">设置是否按货位出库</span>
+            </el-col>
+          </el-row>
+          <el-divider></el-divider>
           <el-row>
             <el-col span="5">
               <span class="sptext">预验收剩余库存自动退库</span>
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 0553ef8c..47a0bbca 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -164,7 +164,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="预警时间单位:">
-              <el-select v-model="editQuery.isDateBy" style="width: 65%" placeholder="状态" clearable>
+              <el-select v-model="editQuery.isDateBy" style="width: 80%" placeholder="状态" clearable>
                 <el-option label="天" :value="1"></el-option>
                 <el-option label="小时" :value="2"></el-option>
               </el-select>
diff --git a/src/views/inout/DialogCheck.vue b/src/views/inout/DialogCheck.vue
index 0cdfdbf7..e55c8215 100644
--- a/src/views/inout/DialogCheck.vue
+++ b/src/views/inout/DialogCheck.vue
@@ -350,7 +350,7 @@ export default {
     },
 
     showImgViewer(row) {
-      this.certFileUrl = this.IMAGE_URL + "/mapi" + "/udiwms/image/register/file/getImage?type=image2&name=";
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
       this.imgList = [];
       previewImage({imageUrl: this.inputQuery.filePath, certFileUrl: this.certFileUrl}).then(response => {
         if (response.code === 20000) {
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 4e5d9d2b..018b72b7 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -5,7 +5,7 @@
         :model="orderFormData"
         :rules="formRules"
         ref="dataForm"
-        label-width="100px"
+        label-width="110px"
         style="margin-bottom: -15px"
       >
         <el-button-group
@@ -210,20 +210,18 @@
             </el-form-item>
           </el-col>
         </el-row>
-
-        <el-row v-if="preSpaceShow">
+        <el-row v-if="curSpaceShow">
           <el-col :span="11">
-            <el-form-item prop="checkPreInInvCode" label="预验收仓库:">
+            <el-form-item prop="curSpaceCode" label="当前货位:">
               <el-select
-                v-model="orderFormData.checkPreInInvCode"
-                placeholder="预验收仓库"
+                v-model="orderFormData.curSpaceCode"
+                placeholder="当前货位"
                 style="width: 90%"
                 :disabled="corpOrderIdDisabled"
-                @change="changePreInInv"
                 filterable
               >
                 <el-option
-                  v-for="item in curPreInInvOptions"
+                  v-for="item in curSpaceOptions"
                   :key="item.name"
                   :label="item.name"
                   :value="item.code"
@@ -236,8 +234,34 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row v-if="preInSpaceShow">
+          <!--          <el-col :span="11">-->
+          <!--            <el-form-item prop="checkPreInInvCode" label="预验收出库仓库:">-->
+          <!--              <el-select-->
+          <!--                v-model="orderFormData.checkPreInInvCode"-->
+          <!--                placeholder="预验收仓库"-->
+          <!--                style="width: 90%"-->
+          <!--                :disabled="corpOrderIdDisabled"-->
+          <!--                @change="changePreInInv"-->
+          <!--                filterable-->
+          <!--              >-->
+          <!--                <el-option-->
+          <!--                  v-for="item in curPreInInvOptions"-->
+          <!--                  :key="item.name"-->
+          <!--                  :label="item.name"-->
+          <!--                  :value="item.code"-->
+          <!--                >-->
+          <!--                  <span style="float: left">{{ item.name }}</span>-->
+          <!--                  <span style="float: right; color: #8492a6; font-size: 13px">{{-->
+          <!--                      item.code-->
+          <!--                    }}</span>-->
+          <!--                </el-option>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <el-col :span="11">
-            <el-form-item prop="checkPreInSpaceCode" label="预验收货位:">
+            <el-form-item prop="checkPreInSpaceCode" label="预验收出库货位:">
               <el-select
                 v-model="orderFormData.checkPreInSpaceCode"
                 placeholder="预验收货位"
@@ -261,6 +285,59 @@
           </el-col>
 
         </el-row>
+        <el-row v-if="preSpaceShow">
+
+          <!--          <el-col :span="11">-->
+          <!--            <el-form-item prop="checkPreInInvCode" label="预验收仓库:">-->
+          <!--              <el-select-->
+          <!--                v-model="orderFormData.checkPreInInvCode"-->
+          <!--                placeholder="预验收仓库"-->
+          <!--                style="width: 90%"-->
+          <!--                :disabled="corpOrderIdDisabled"-->
+          <!--                @change="changePreInInv"-->
+          <!--                filterable-->
+          <!--              >-->
+          <!--                <el-option-->
+          <!--                  v-for="item in curPreInInvOptions"-->
+          <!--                  :key="item.name"-->
+          <!--                  :label="item.name"-->
+          <!--                  :value="item.code"-->
+          <!--                >-->
+          <!--                  <span style="float: left">{{ item.name }}</span>-->
+          <!--                  <span style="float: right; color: #8492a6; font-size: 13px">{{-->
+          <!--                      item.code-->
+          <!--                    }}</span>-->
+          <!--                </el-option>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <el-col :span="11">
+            <el-form-item prop="preCurSpaceCode" label="寄售出库货位:">
+              <el-select
+                v-model="orderFormData.preCurSpaceCode"
+                placeholder="寄售出库货位"
+                style="width: 90%"
+                :disabled="corpOrderIdDisabled"
+                filterable
+              >
+                <el-option
+                  v-for="item in curPreSpaceOptions"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{
+                      item.code
+                    }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+        </el-row>
+
 
         <el-row v-if="errView == 1">
           <el-col :span="20">
@@ -379,6 +456,21 @@
       ></DialogSelectUnit>
     </el-dialog>
 
+    <el-dialog
+      title="请指定当前产品所在货位"
+      :visible.sync="selectSpaceVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="selectSpaceVisible"
+      width="80%"
+      append-to-body
+    >
+      <DialogSelectSpace
+        :spaceCodeList="spaceCodeList"
+        v-on:selectSpaceBind="selectSpaceBind"
+      ></DialogSelectSpace>
+    </el-dialog>
+
 
   </div>
 </template>
@@ -406,6 +498,7 @@ import A from "../../plugins/KeyScaner";
 import {findByInvUser} from "@/api/basic/busType";
 import {getInvSpaceList} from "@/api/inventory/invSpace";
 import DialogSelectUnit from "./DialogSelectUnit";
+import DialogSelectSpace from "./DialogSelectSpace";
 
 export default {
   name: "ioCreateOrder",
@@ -444,6 +537,10 @@ export default {
         checkPreInOrders: null,
         checkPreInInvCode: null,
         checkPreInSpaceCode: null,
+        curSpaceCode: null,
+        preSpaceCode: null,
+        preCurSpaceCode: null,  //单据
+
       },
       checkPreInArray: [],
       errView: 0,
@@ -463,9 +560,11 @@ export default {
       busTypeOptions: [],
       fromInvOptions: [],
 
-      preSpaceShow: false,       //是否显示选择预验收界面
+
       curPreInInvOptions: [],    //预验收仓库
       curPreInSpaceOptions: [],  //预验收货位
+      curPreSpaceOptions: [],    //寄售货位
+      curSpaceOptions: [], //当前货位
 
       curAction: {
         corpType: 0,
@@ -512,6 +611,7 @@ export default {
       fromStorageOptions: [],
       curRow: null,
       dialogTableVisible: false,
+      selectSpaceVisible: false,
       sitcomScan: false,
       selectRlTitle: "绑定产品",
       selectUnitTitle: "绑定供应商",
@@ -526,7 +626,12 @@ export default {
       viewBizVisible: false,
       viewCodeVisible: false,
       viewCodeDetailVisible: false,
-      documentShow: false, //控制预选单显示隐藏
+      documentShow: false,      //控制预验收选入单据界面
+      curSpaceShow: false,     //正常出入库选入出库界面
+      preInSpaceShow: false,   //是否显示选择预验收界面
+      preSpaceShow: false,     //寄售，预验收仓库界面
+
+      spaceCodeList: [],
     };
   },
   components: {
@@ -535,7 +640,7 @@ export default {
     bizDetailPanel,
     editCodeDialog,
     DialogCreateOrderSelect,
-    DialogSelectUnit
+    DialogSelectUnit, DialogSelectSpace
   },
   methods: {
     //获取用户仓库列表
@@ -549,8 +654,9 @@ export default {
             this.curInvOptions.length > 0 &&
             this.orderFormData.invWarehouseCode == null
           ) {
-            this.orderFormData.invWarehouseCode = this.curInvOptions[0].code;
+            this.orderFormData.invCode = this.curInvOptions[0].code;
             this.getBusTypeByInv();
+            this.findCurSpaceList(this.orderFormData.invCode);
           }
         })
         .catch(() => {
@@ -566,14 +672,22 @@ export default {
       // this.orderFormData.checkPreInOrders = JSON.parse(JSON.stringify(val));
     },
     //仓库改变
-    changeInv() {
+    changeInv(row) {
       this.orderFormData.action = null;
       this.orderFormData.checkPreInOrders = null;
       this.checkPreInArray = [];
       if (this.documentShow) {
         this.documentShow = false;
       }
+
+      this.curSpaceShow = false;
+      this.preInSpaceShow = false;
+      this.preSpaceShow = false;
+      this.orderFormData.curSpaceCode = false;
+      this.orderFormData.checkPreInSpaceCode = false;
+      this.orderFormData.preCurSpaceCode = false;
       this.getBusTypeByInv();
+      this.findCurSpaceList(row);
     },
 
     //根据仓库,用户获取单据类型
@@ -677,11 +791,43 @@ export default {
       if (this.curAction.scanPreIn && this.curAction.backPreinType == 1 && this.curAction.preInBack) {
         this.documentShow = true;
       } else if (this.curAction.scanPreIn && this.curAction.backPreinType == 2 && this.curAction.preInBack) {
-        this.preSpaceShow = true;
+        this.preInSpaceShow = true;
         this.findPreInInvList();
       } else {
         this.documentShow = false;
+        this.preInSpaceShow = false;
+      }
+
+      if (this.curAction.scanPreIn && this.curAction.spaceOut == 1) {
+        this.preInSpaceShow = true;
+        this.curSpaceShow = false;
+        this.preSpaceShow = false;
+        this.orderFormData.curSpaceCode = null;
+        this.orderFormData.checkPreInSpaceCode = null;
+        this.orderFormData.preCurSpaceCode = null;
+        this.findPreInSpaceList();
+      } else if (this.curAction.advancePreIn && this.curAction.spaceOut == 1) {
+        this.preInSpaceShow = false;
+        this.curSpaceShow = false;
+        this.preSpaceShow = true;
+        this.orderFormData.curSpaceCode = null;
+        this.orderFormData.checkPreInSpaceCode = null;
+        this.orderFormData.preCurSpaceCode = null;
+        this.findPreSpaceList()
+      } else if (this.curAction.spaceOut == 1) {
+        this.curSpaceShow = true;
+        this.preInSpaceShow = false;
+        this.preSpaceShow = false;
+        this.orderFormData.curSpaceCode = null;
+        this.orderFormData.checkPreInSpaceCode = null;
+        this.orderFormData.preCurSpaceCode = null;
+      } else {
+        this.curSpaceShow = false;
+        this.preInSpaceShow = false;
         this.preSpaceShow = false;
+        this.orderFormData.curSpaceCode = null;
+        this.orderFormData.checkPreInSpaceCode = null;
+        this.orderFormData.preCurSpaceCode = null;
       }
     },
 
@@ -712,6 +858,7 @@ export default {
 
     //切换预验收仓库
     changePreInInv(row) {
+      this.orderFormData.checkPreInSpaceCode = null;
       this.findPreInSpaceList(row.code);
     },
 
@@ -732,7 +879,7 @@ export default {
     //获取预验收货位
     findPreInSpaceList(val) {
       let query = {
-        invStorageCode: val,
+        filterType: "preIn",
         status: 1,
         code: this.orderFormData.checkPreInSpaceCode,
       }
@@ -742,6 +889,32 @@ export default {
     },
 
 
+    //获取寄售
+    findPreSpaceList(val) {
+      let query = {
+        filterType: "pre",
+        status: 1,
+        code: this.orderFormData.preSpaceCode,
+      }
+      getInvSpaceList(query).then((res) => {
+        this.curPreSpaceOptions = res.data.list || [];
+      })
+    },
+
+
+    //获取当前货位
+    findCurSpaceList(val) {
+      let query = {
+        invWarehouseCode: val,
+        status: 1,
+        code: this.orderFormData.curSpaceCode,
+      }
+      getInvSpaceList(query).then((res) => {
+        this.curSpaceOptions = res.data.list || [];
+      })
+    },
+
+
     //添加条码
     addCode(event) {
       this.originCode = "";
@@ -831,12 +1004,14 @@ export default {
           this.$refs.inputRef.select();
         } else {
           if (response.code == 502) {
+            //该产品绑定多个产品ID处理
             this.curRow = response.data;
             this.orderFormData.billNo = this.curRow.orderId;
             this.refreshCodesPanel();
             this.$message.error(response.message);
             this.selectRlTitle = response.message;
           } else if (response.code == 503) {
+            //该产品绑定多个供应商处理
             this.curRow = response.data;
             this.orderFormData.billNo = this.curRow.orderId;
             this.codeFormData.relId = this.curRow.relId,
@@ -902,6 +1077,10 @@ export default {
               message: "提交失败！" + this.editTitle,
               customClass: "messageIndex",
             });
+          } else if (response.code == 511) {
+            //该UDI码绑定多个货位处理
+            this.spaceCodeList = response.data;
+            this.selectSpaceVisible = true;
           } else {
             this.$alert(response.message, "提示", {
               confirmButtonText: "确定",
@@ -1087,6 +1266,20 @@ export default {
       this.orderFormData.selectSupId = row.erpId;
       this.addCode();
     },
+
+    selectSpaceBind(val) {
+      if (this.curAction.scanPreIn) {
+        this.orderFormData.checkPreInSpaceCode = val;
+      } else if (this.curAction.advancePreIn) {
+        this.orderFormData.preCurSpaceCode = val;
+      } else {
+        this.orderFormData.curSpaceCode = val;
+      }
+      this.addCode();
+      this.selectSpaceVisible = false;
+    },
+
+
     closeCodeDialog() {
       this.editOriginCodeVisible = false;
       this.refreshCodesPanel();
diff --git a/src/views/inout/DialogSelectSpace.vue b/src/views/inout/DialogSelectSpace.vue
new file mode 100644
index 00000000..71d26834
--- /dev/null
+++ b/src/views/inout/DialogSelectSpace.vue
@@ -0,0 +1,91 @@
+<template>
+  <div>
+
+    <el-table
+      v-loading="loading"
+      :data="spaceCodeList"
+      style="width: 100%"
+      highlight-current-row
+      height="500"
+      border
+      @current-change="handleDetail"
+    >
+      <el-table-column label="序号" type="index"></el-table-column>
+      <el-table-column
+        label="UDI码"
+        prop="code"
+        width="220"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="仓库" prop="invName" width="120"></el-table-column>
+      <el-table-column label="货位" prop="invSpaceName" width="120"></el-table-column>
+      <el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
+      <el-table-column label="物资名称" prop="productName" width="200" show-overflow-tooltip></el-table-column>
+      <el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column>
+      <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
+      <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
+      <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
+      <el-table-column label="计量单位" prop="expireDate" width="120"></el-table-column>
+      <el-table-column label="注册备案号" prop="zczbhhzbapzbh" show-overflow-tooltip
+                       width="200"></el-table-column>
+      <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip
+                       width="200"></el-table-column>
+      <el-table-column label="供应商" prop="supName" show-overflow-tooltip
+                       width="200"></el-table-column>
+      <el-table-column width="200" label="操作" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="small"
+            @click.native.stop="selectSpace(scope.row)"
+          >选入绑定
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import {selectMutiPlace} from "@/api/inventory/invPlaceOrder";
+
+export default {
+  name: "DialogSelectSpace",
+  props: {
+    spaceCodeList: {
+      type: Object,
+      required: true,
+    },
+
+
+  },
+  data() {
+    return {
+      loading: false,
+      list: [],
+      filterQuery: {
+        invCode: null,
+        code: null,
+      },
+    }
+  },
+  methods: {
+
+    selectSpace(row) {
+      this.$emit("selectSpaceBind", row.invSpaceCode);
+      this.$emit("closeBindDialog", true);
+    },
+  },
+  created() {
+    this.list = this.spaceCodeList;
+  },
+  mounted() {
+
+  }
+
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue
index 76982252..ff8b4e0b 100644
--- a/src/views/inout/InvoiceCkeck.vue
+++ b/src/views/inout/InvoiceCkeck.vue
@@ -653,7 +653,7 @@ export default {
     },
     showImgViewer(row) {
       this.certFileUrl =
-        this.IMAGE_URL + "/mapi" +
+        this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name=";
       this.imgList = [];
       previewImage({
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 812b3870..53235c63 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -777,7 +777,7 @@ export default {
       this.showSearch = !this.showSearch;
     },
     showImgViewer(row) {
-      this.certFileUrl = this.IMAGE_URL + "/mapi" + "/udiwms/image/register/file/getImage?type=image2&name=";
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
       this.imgList = [];
       previewImage({imageUrl: row.licenseUrl, certFileUrl: this.certFileUrl}).then(response => {
         if (response.code === 20000) {
diff --git a/src/views/inout/InvoiceRegistrationDetermine.vue b/src/views/inout/InvoiceRegistrationDetermine.vue
index 02338cdf..c50b9e3c 100644
--- a/src/views/inout/InvoiceRegistrationDetermine.vue
+++ b/src/views/inout/InvoiceRegistrationDetermine.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-card>
-      <el-form :model="determineData"  label-width="150px" border>
+      <el-form :model="determineData" label-width="150px" border>
 
-        <el-row type="flex" justify="end" >
+        <el-row type="flex" justify="end">
           <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: 10px">
             <el-button type="primary" @click.native="determineBtn()" :loading="loading">确认</el-button>
             <el-button type="primary" @click.native="closeDialog()" :loading="loading">取消</el-button>
@@ -13,12 +13,14 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="单据号" prop="billNo">
-              <el-input v-model="determineData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
+              <el-input v-model="determineData.billNo" style="width: 90%" auto-complete="off"
+                        :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item  label="收货仓库" prop="billNo">
-              <el-input v-model="determineData.invName" style="width: 90%"  auto-complete="off" :disabled="true"></el-input>
+            <el-form-item label="收货仓库" prop="billNo">
+              <el-input v-model="determineData.invName" style="width: 90%" auto-complete="off"
+                        :disabled="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -26,12 +28,14 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="单据类型" prop="billNo">
-              <el-input v-model="determineData.billTypeName" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
+              <el-input v-model="determineData.billTypeName" style="width: 90%" auto-complete="off"
+                        :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item  label="送货单位" prop="billNo">
-              <el-input v-model="determineData.fromCorpName" style="width: 90%"  auto-complete="off" :disabled="true"></el-input>
+            <el-form-item label="送货单位" prop="billNo">
+              <el-input v-model="determineData.fromCorpName" style="width: 90%" auto-complete="off"
+                        :disabled="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -218,23 +222,15 @@
 
 <script>
 import {
-  deleteByOrderId,
-  getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder
-} from '../../api/inout/order'
-import { getLocalJoinByUser } from '@/api/basic/busType'
-import { getInvListByUser } from '@/api/system/invWarehouse'
-import { isBlank } from '@/utils/strUtil'
-import { selectSysParamByKey } from '@/api/param/systemParamConfig'
-import { filterListInvoice, getBizDetailList, deleteById, insertInvoice, updateOrder,filterBizOrderList } from '@/api/inout/orderDetailBiz'
-import { getCodeList } from '@/api/inout/code'
+  filterListInvoice,
+  updateOrder,
+  filterBizOrderList
+} from '@/api/inout/orderDetailBiz'
 import AcceptOrder from '@/views/inout/DialogReviewOrder'
 import DialogInvoice from '@/views/inout/DialogInvoice'
 import InvoiceRegister from '@/views/inout/InvoiceRegister'
 
-import { inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile } from '@/api/itextpdf/orderPrint'
-import { getDeptListByUser } from '@/api/auth/authDept'
-import { getBasicUnitMaintains } from '@/api/basic/basicUnitMaintain'
-import { previewImage } from '@/api/purchase/supCompany'
+import {previewImage} from '@/api/purchase/supCompany'
 import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
 
 const formJson = {
@@ -400,7 +396,7 @@ export default {
       subRow: null
     }
   },
-  components: { AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer },
+  components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer},
   methods: {
     getOrderDetails() {
       this.codeQuery.page = 1;
@@ -435,7 +431,7 @@ export default {
     },
     getBizDetailList(row) {
       this.bizQuery.orderIdFk = this.determineData.billNo;
-      if(row != null) {
+      if (row != null) {
         this.bizQuery.batchNo = row.batchNo;
         this.bizQuery.relId = row.bindRlFk;
       }
@@ -458,26 +454,26 @@ export default {
     },
 
     determineBtn() {
-      var data={
-        billNo:this.determineData.billNo,
-        checkStatus:1
+      var data = {
+        billNo: this.determineData.billNo,
+        checkStatus: 1
       }
-      let index = this.codeDetailList.findIndex(item=>item.regStatus==false)
-      if(index!=-1){
+      let index = this.codeDetailList.findIndex(item => item.regStatus == false)
+      if (index != -1) {
         this.$confirm("还有未登记的发票, 是否继续提交?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
-        }).then( ()=>{
+        }).then(() => {
           updateOrder(data).then((res) => {
             this.closeDialog();
           }).catch((error) => {
           })
-        }).catch( ()=>{
+        }).catch(() => {
 
         })
 
-      }else{
+      } else {
         updateOrder(data).then((res) => {
           this.closeDialog();
         }).catch((error) => {
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index 1de2da75..de77d3f9 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -736,7 +736,7 @@ export default {
     printOrder(row) {
       let tQuery = {
         action: row.action,
-        moduleId: 1,
+        status: row.status,
       }
       this.loading = true;
       inspectionOrderPDFFromTemplateFile(tQuery).then((response) => {
@@ -745,7 +745,7 @@ export default {
             templateId: response.data,
             orderIdFk: row.billNo,
             action: row.action,
-            moduleId: 1,
+            status: row.status,
           }
           orderPDFFromTemplateFile(tQuery).then((response) => {
             //将pdf文件转换为url。
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index d1d4aa8f..e142471b 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@@ -520,6 +520,7 @@ export default {
       imgList: [],
       imgViewerVisible: false,
       BASE_URL: process.env.VUE_APP_BASE_API,
+      IMAGE_URL: process.env.VUE_APP_SYNC_API,
       showSearch: true,
       filterQuery: {
         id: "",
@@ -697,7 +698,7 @@ export default {
       this.showSearch = !this.showSearch;
     },
     showImgViewer(row) {
-      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      this.certFileUrl = this.IMAGE_URL + "/mapi" + "/udiwms/image/register/file/getImage?type=image2&name=";
       this.imgList = [];
       previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
         if (response.code === 20000) {
@@ -730,13 +731,14 @@ export default {
     printOrder(row) {
       let tQuery = {
         action: row.action,
-        moduleId: 2,
+        status: row.status,
       }
       this.loading = true;
       inspectionOrderPDFFromTemplateFile(tQuery).then((response) => {
         if (response.code === 20000) {
           tQuery = {
             templateId: response.data,
+            status: row.status,
             orderIdFk: row.billNo,
             action: row.action,
             moduleId: 2,
@@ -892,7 +894,7 @@ export default {
         page: 1,
         limit: 10
       };
-      if(!isBlank(this.currentRow.billNo)) {
+      if (!isBlank(this.currentRow.billNo)) {
         this.getBizDetailList();
       }
     },
@@ -930,7 +932,7 @@ export default {
         page: 1,
         limit: 10
       };
-      if(!isBlank(this.currentRow.billNo)) {
+      if (!isBlank(this.currentRow.billNo)) {
         this.getCodeDetailList();
       }
     },
@@ -970,7 +972,7 @@ export default {
         page: 1,
         limit: 10
       };
-      if(!isBlank(this.currentRow.billNo)) {
+      if (!isBlank(this.currentRow.billNo)) {
         this.getResultDetailList();
       }