diff --git a/src/views/basic/workplace/addBusTypeDialog.vue b/src/views/basic/workplace/addBusTypeDialog.vue
index c25af955..0878989d 100644
--- a/src/views/basic/workplace/addBusTypeDialog.vue
+++ b/src/views/basic/workplace/addBusTypeDialog.vue
@@ -194,6 +194,7 @@ import {getInvListByUser} from '@/api/system/invWarehouse'
 import {getCollectBusType} from '@/api/basic/collectPoint/gatherOrderType'
 import {getBusTypeList} from '@/api/basic/busType'
 import {addBusType, updateType} from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import { getOriginBusType } from '@/api/thrsys/busOriginType'
 
 export default {
   props: {
@@ -278,15 +279,17 @@ export default {
     },
     getBusType() {
       let query = {
+        thirdSys: null,
+        key: "",
         page: 1,
         limit: 50
       }
-      getCollectBusType(query)
+      getOriginBusType(query)
         .then((response) => {
           let busTypeList = response.data.list || []
           let busTypes = busTypeList.map(busType => {
             return {
-              code: busType.fromBusTypeCode,
+              code: busType.action,
               name: busType.name
             }
           })
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 83441792..551e0986 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -209,7 +209,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="单据类型" prop="thrBusName" width="140"></el-table-column>
-                <el-table-column label="出入库" prop="inoutType" width="100">
+                <el-table-column label="出入库方式" prop="inoutType" width="100">
                   <template slot-scope="scope">
                     <span>{{ inoutTypes[scope.row.inoutType] }}</span>
                   </template>
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index ff90d207..e7af0715 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -56,6 +56,10 @@
                        v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
             >上货完成
             </el-button>
+            <el-button size="mini" type="primary" @click.native="" :loading="submitLoading"
+                       v-if="splitType=='return'" style="margin-right: 8px;border-radius: 5%;"
+            >草稿保存
+            </el-button>
             <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
                        v-if="splitType=='return'" style="margin-right: 8px;border-radius: 5%;"
             >退货完成
diff --git a/src/views/collect/IoCreateOrderBlank.vue b/src/views/collect/IoCreateOrderBlank.vue
index 501b2268..d7bf0c13 100644
--- a/src/views/collect/IoCreateOrderBlank.vue
+++ b/src/views/collect/IoCreateOrderBlank.vue
@@ -271,6 +271,7 @@
       v-if="chooseDraftOrderVisible"
     >
       <chooseDraftOrderDialog
+        :viewType="1"
         :rowData="rowData"
         :closeChooseDialog="closeChooseDialog"
         :handleChoose="handleChoose"
diff --git a/src/views/collect/chooseDraftOrderDialog.vue b/src/views/collect/chooseDraftOrderDialog.vue
index 16f4b1a5..cae54721 100644
--- a/src/views/collect/chooseDraftOrderDialog.vue
+++ b/src/views/collect/chooseDraftOrderDialog.vue
@@ -78,28 +78,6 @@
               ></el-date-picker>
             </el-form-item>
           </template>
-          <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:">
-            <el-select
-              v-model="filterQuery.workPlaceCode"
-              placeholder="当前工位"
-              style="width: 90%"
-              disabled
-              filterable
-            >
-              <el-option
-                v-for="item in curWorkPlaces"
-                :key="item.workplaceId"
-                :label="item.workplaceName"
-                :value="item.workplaceId"
-
-              >
-                <span style="float: left">{{ item.workplaceName }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{
-                    item.workplaceId
-                  }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
         </el-row>
       </el-form>
       <div class="top-right-btn">
@@ -707,6 +685,10 @@ export default {
       type: Object,
       required: true,
     },
+    viewType: {
+      type: Object,
+      required: true,
+    },
     closeChooseDialog: {
       type: Function,
       required: true
@@ -740,6 +722,7 @@ export default {
         getInvList: [],
         getDeptList: [],
         getBusType: [],
+        getWorkPlaceList: []
       },
       //界面配置---------------------end
 
@@ -1190,8 +1173,8 @@ export default {
       this.closeChooseDialog()
       this.handleChoose(this.currentRow)
     },
-    //获取当前货位
-    findCurWorkPlaces(val) {
+    //获取当前工位
+    findCurWorkPlaces(_this,val) {
       let query = {
         key: val,
         status: 1,
@@ -1200,9 +1183,15 @@ export default {
         limit: 100,
       }
       listPage(query).then((res) => {
-        this.curWorkPlaces = res.data.list || [];
-        if (this.curWorkPlaces.length == 1) {
-          this.orderFormData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
+        let list = res.data.list || []
+        _this.options.getWorkPlaceList = list.map(item => {
+          return {
+            code: item.workplaceId,
+            label: item.workplaceName
+          };
+        })
+        if (_this.options.getWorkPlaceList .length == 1){
+          _this.filterQuery.workPlaceCode = _this.options.getWorkPlaceList[0].code;
         }
       })
     },
@@ -1217,7 +1206,7 @@ export default {
   created() {
     this.getInvList(this);
     this.getBusType(this);
-    this.findCurWorkPlaces();
+    this.findCurWorkPlaces(this,"");
 
     this.splitType = this.$route.query.splitType;
     if (this.splitType == "search") {
diff --git a/src/views/collect/selectCollectOrderDialog.vue b/src/views/collect/selectCollectOrderDialog.vue
index d0a56098..32402565 100644
--- a/src/views/collect/selectCollectOrderDialog.vue
+++ b/src/views/collect/selectCollectOrderDialog.vue
@@ -234,6 +234,7 @@ import {convertDate} from "@/utils/date";
 import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownloadDialog";
 import prescribeOriginPanel from "./PannelOrderBiz";
 import {orderPage} from "@/api/collect/collectOrder";
+import { selectCorpList } from '@/api/basic/basicUnitMaintain'
 
 export default {
   name: "selectPrescribeDialog",
@@ -284,7 +285,10 @@ export default {
       deleteData: {},
       radioCheck: null,
       curRow: null,
-      panelALive: false
+      panelALive: false,
+      options: {
+        fromCorp: [],
+      },
     }
   },
 
@@ -373,7 +377,18 @@ export default {
         _this.panelALive = true;
       });
     },
-
+    // findCorpList(_this,val){
+    //   let query = {
+    //     erpId : val
+    //   }
+    //   selectCorpList(query)
+    //     .then((response) => {
+    //       _this.options.fromCorp = response.data || [];
+    //       if (_this.options.fromCorp.length == 1){
+    //         _this.filterQuery.fromCorp = _this.options.fromCorp[0].code;
+    //       }
+    //     })
+    // },
     handleChange(val) {
       this.radioCheck = val.id;
       this.currentRow = val;
@@ -388,6 +403,7 @@ export default {
       this.queryList = re.data.queryList;
       this.fromList = re.data.fromList;
       this.getList();
+      // this.findCorpList(this,this.fromCorp);
     });
 
   }