diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 24280f0f..79d7bedf 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -598,7 +598,7 @@
                 <el-select v-model="inputQuery.checkPdaEd" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
@@ -621,7 +621,7 @@
                 <el-select v-model="inputQuery.checkUdims" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
@@ -644,7 +644,7 @@
                 <el-select v-model="inputQuery.checkPc" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
@@ -667,7 +667,7 @@
                 <el-select v-model="inputQuery.checkSp" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
@@ -689,7 +689,7 @@
                 <el-select v-model="inputQuery.checkChange" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
@@ -712,7 +712,7 @@
                 <el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 75%"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
@@ -734,7 +734,7 @@
                 <el-select v-model="inputQuery.checkCopy" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 394f8f51..2c8aed38 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -341,10 +341,9 @@ export default {
         endTime: "",
         inCodeStatus: 0,
       };
-      this.getList();
-
       this.haveDistributionVisible = true;
       this.actDateRange = [];
+      this.getList();
     },
     hideSearch() {
       this.showSearch = !this.showSearch;
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index e4c53f00..f7e1733e 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -124,6 +124,7 @@
               v-if="
                 curAction.corpType === 0 ||
                 curAction.corpType === 2 ||
+                curAction.corpType === 4 ||
                 (curAction.corpType === 1 && !curAction.genUnit)
               "
             >
@@ -790,6 +791,7 @@ export default {
         page: 1,
         limit: 20,
       };
+      debugger
       if (this.curAction.corpType == 3) {
         //内部科室
         cQuery.corpType = 3;
@@ -801,6 +803,9 @@ export default {
       } else if (this.curAction.corpType == 1) {
         cQuery.corpType = 1;
         cQuery.outType = 2;
+      }else if (this.curAction.corpType == 4) {
+        //供应商信息
+        cQuery.corpType = 4;
       } else
         return;
       getBasicUnitMaintains(cQuery)
@@ -815,6 +820,7 @@ export default {
 
     //单据类型改变
     actionChange(item) {
+
       this.orderFormData.checkPreInOption = null;
       this.orderFormData.checkPreInOrders = null;
       this.checkPreInArray = [];
@@ -829,6 +835,7 @@ export default {
       if (
         this.curAction.corpType == 0 ||
         this.curAction.corpType == 2 ||
+        this.curAction.corpType == 4 ||
         (this.curAction.corpType == 1 && !this.curAction.genUnit)
       ) {
         //1.切换往来单位
diff --git a/src/views/inout/muti/ioOrderMutiEditDialog.vue b/src/views/inout/muti/ioOrderMutiEditDialog.vue
index f20636b3..95732523 100644
--- a/src/views/inout/muti/ioOrderMutiEditDialog.vue
+++ b/src/views/inout/muti/ioOrderMutiEditDialog.vue
@@ -61,12 +61,12 @@
           <el-col :span="17">
             <el-form-item label="往来单位:">
               <el-input v-model="inputQuery.fromCorp" ref="fromCorpInputRef"
-                        @keypress.enter.native="addFromCorp($event)" :disabled="this.inputQuery.udiCode==null"
+                        @keypress.enter.native="addFromCorp($event)" :disabled="this.inputQuery.udiCode==null || this.showFlg ==false"
                         placeholder="请输入往来单位" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="2">
-            <el-button type="primary" size="mini" :disabled="this.inputQuery.udiCode==null" @click="addFromCorp"
+            <el-button type="primary" size="mini" :disabled="this.inputQuery.udiCode==null  || this.showFlg == false" @click="addFromCorp"
                        style="margin-left: 15px">添加
             </el-button>
           </el-col>
@@ -153,6 +153,7 @@ export default {
         supId: null,
       },
       pId: null,
+      showFlg:false,
       popupsVisible: false,
       orderMutiDelectVisible: false,
       tableName: '使用记录选择',
@@ -255,6 +256,8 @@ export default {
                         this.inputQuery.totalCount = response.data.data.totalCount
                         this.inputQuery.useCount = response.data.data.useCount
                         this.$refs.fromCorpInputRef.focus();
+                        this.checkType=null;
+                        this.showFlg=false;
                         this.enterKeyup();
                       } else {
                         this.$refs.markInputRef.focus();
@@ -270,6 +273,8 @@ export default {
                 });
               } else if (data == 'no') {
                 this.inputQuery.mark = "";
+                this.checkType=1;
+                this.showFlg=false;
                 this.$refs.markInputRef.focus();
                 this.enterKeyup();
               }
@@ -321,6 +326,9 @@ export default {
 
       if (this.inputQuery.fromCorp != 'true' && this.inputQuery.fromCorp != 'false') {
         var query = {
+          udiCode:this.inputQuery.udiCode,
+          mark:this.inputQuery.mark,
+          checkType:this.checkType,
           mutiIdFk: this.pId,
           fromCorp: this.inputQuery.fromCorp
         }
@@ -418,6 +426,7 @@ export default {
           this.inputQuery.totalCount = response.data.totalCount
           this.inputQuery.useCount = response.data.useCount
           this.pId = response.data.id;
+          this.showFlg=true;
           this.$refs.fromCorpInputRef.focus();
           this.selectMutiDetailList()
         } else {
diff --git a/src/views/inventory/inner/innerOrder.vue b/src/views/inventory/inner/innerOrder.vue
index 93356a98..d6c01351 100644
--- a/src/views/inventory/inner/innerOrder.vue
+++ b/src/views/inventory/inner/innerOrder.vue
@@ -4,19 +4,20 @@
       <el-form :model="filterQuery" label-width="100px">
         <el-row>
           <el-form-item label="单据号">
-            <el-input v-model="filterQuery.recordKey" style="width: 100%" placeholder="请输入单据号" clearable></el-input>
+            <el-input v-model="filterQuery.recordKey" style="width: 100%" placeholder="请输入单据号"
+                      clearable></el-input>
           </el-form-item>
           <el-form-item label="单据日期">
             <el-date-picker
-              style="width: 100%"
-              :picker-options="pickerOptions"
-              v-model="actDateRange"
-              type="daterange"
-              format="yyyy 年 MM 月 dd 日"
-              value-format="yyyy-MM-dd"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+                style="width: 100%"
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
             >
             </el-date-picker>
           </el-form-item>
@@ -62,11 +63,11 @@
       </el-table>
 
       <pagination
-        v-show="total>0"
-        :total="total"
-        :limit.sync="filterQuery.limit"
-        :page.sync="filterQuery.page"
-        @pagination="handleCurrentChange"
+          v-show="total>0"
+          :total="total"
+          :limit.sync="filterQuery.limit"
+          :page.sync="filterQuery.page"
+          @pagination="handleCurrentChange"
       ></pagination>
 
     </el-card>
@@ -86,33 +87,33 @@
     </el-card>
 
     <el-dialog
-      :title="formMap[formName]"
-      :visible.sync="newSpDistributionVisible"
-      width="80%"
-      v-if="newSpDistributionVisible"
-      @close='closeDialog'
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
+        :title="formMap[formName]"
+        :visible.sync="newSpDistributionVisible"
+        width="80%"
+        v-if="newSpDistributionVisible"
+        @close='closeDialog'
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
     >
       <pureApplyEdit
-        :closeDialog="closeDialog"
-        :idQuery="idQuery"
+          :closeDialog="closeDialog"
+          :idQuery="idQuery"
       ></pureApplyEdit>
     </el-dialog>
 
 
     <el-dialog
-      title="内部码标签打印"
-      :visible.sync="qrcodeExportVisible"
-      width="80%"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      v-if="qrcodeExportVisible"
-      @close='closeQRCodeExportDialog'
+        title="内部码标签打印"
+        :visible.sync="qrcodeExportVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="qrcodeExportVisible"
+        @close='closeQRCodeExportDialog'
     >
       <innerCodeDetail
-        :closeDialog="closeQRCodeExportDialog"
-        :inQuery="inQuery"
+          :closeDialog="closeQRCodeExportDialog"
+          :inQuery="inQuery"
       ></innerCodeDetail>
     </el-dialog>
 
@@ -205,6 +206,7 @@ export default {
         editStatus: 1,
       };
       this.actDateRange = [];
+      this.detailList = []
       this.getList();
     },
 
@@ -223,33 +225,33 @@ export default {
       }
 
       listInnerOrder(this.filterQuery)
-        .then((response) => {
-          if (response.code == 20000) {
-            this.list = response.data.list || [];
-            this.total = response.data.total || 0;
-          } else {
-            this.$message.error(response.message);
-          }
-          this.loading = false;
-        })
-        .catch(() => {
-          this.loading = false;
-          this.list = [];
-          this.total = 0;
-        });
+          .then((response) => {
+            if (response.code == 20000) {
+              this.list = response.data.list || [];
+              this.total = response.data.total || 0;
+            } else {
+              this.$message.error(response.message);
+            }
+            this.loading = false;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
     },
     handleDetail(row) {
       let query = {orderIdFk: row.recordKey};
       this.loading = true;
       listInnerOrderDetail(query) //查找该单号下的所有条码
-        .then((response) => {
-          this.detailList = response.data.list || [];
-          this.loading = false;
-        })
-        .catch(() => {
-          this.loading = false;
-          this.detailList = [];
-        });
+          .then((response) => {
+            this.detailList = response.data.list || [];
+            this.loading = false;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.detailList = [];
+          });
     },
     submitOrder(row) {
       this.loading = true;
@@ -258,18 +260,18 @@ export default {
         purApplyEntity: row,
       }
       inserThrOrderWeb(tQuery)
-        .then(response => {
-          this.loading = false;
-          if (response.code === 20000) {
-            this.$message.success("提交成功！");
-            this.getList();
-          } else {
-            this.$message.error(response.message);
-          }
-        })
-        .catch(() => {
-          this.loading = false;
-        })
+          .then(response => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success("提交成功！");
+              this.getList();
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          })
     },
     deleteDialog(row) {
       this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
@@ -277,25 +279,25 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       })
-        .then(() => {
-          delInnerOrder(row.id)
-            .then((response) => {
-              this.loading = false;
-              if (response.code == 20000) {
-                this.$message.success("删除成功");
-                this.getList();
-                this.detailList = "";
-              } else {
-                this.$message.error(response.message);
-              }
-            })
-            .catch(() => {
-              this.loading = false;
-            });
+          .then(() => {
+            delInnerOrder(row.id)
+                .then((response) => {
+                  this.loading = false;
+                  if (response.code == 20000) {
+                    this.$message.success("删除成功");
+                    this.getList();
+                    this.detailList = "";
+                  } else {
+                    this.$message.error(response.message);
+                  }
+                })
+                .catch(() => {
+                  this.loading = false;
+                });
 
-        })
-        .catch(() => {
-        });
+          })
+          .catch(() => {
+          });
     },
     handleCurrentChange(val) {
       this.filterQuery.page = val.page;