diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 30408f6..3f15795 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="inputQuery" :rules="formRules" ref="dataForm" label-width="120px" border>
+    <el-form :model="inputQuery" :rules="formRules" ref="dataForm" label-width="150px" border>
       <el-row type="flex">
         <el-col :span="11">
           <el-form-item label="单据类型名称" prop="name">
@@ -22,26 +22,27 @@
                        size="small"
                        style="width: 90%"
                        placeholder="出入库类型"
-                       @change="getOrderType"
-            >
+                       @change="getOrderType">
               <el-option label="入库" value="WareHouseIn"></el-option>
               <el-option label="出库" value="WareHouseOut"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="11" type="flex">
-
-          <el-form-item label="入库方式" prop="actionType">
-            <el-select v-model="inputQuery.actionType"
+        <el-col :span="11">
+          <el-form-item label="往来单位类型" prop="corpType">
+            <el-select v-model="inputQuery.corpType"
                        size="small"
                        style="width: 90%"
-                       clearable
-                       :disabled="inputQuery.mainAction!='WareHouseIn' "
-                       placeholder="请选择入库方式"
+                       placeholder="往来信息"
+                       @change="corpTypeChange"
             >
-              <el-option label="带票" :value="1"></el-option>
-              <el-option label="预验收" :value="2"></el-option>
-              <el-option label="寄售" :value="3"></el-option>
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -54,170 +55,158 @@
                        size="small"
                        style="width: 90%"
                        placeholder=""
+                       @change="inStock"
             >
               <el-option label="是" :value="true"></el-option>
               <el-option label="否" :value="false"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="11" type="flex">
-          <el-form-item label="特定页面" prop="busType">
-            <el-select v-model="inputQuery.busType"
+        <el-col :span="11">
+          <el-form-item label="内部单据自动平衡" prop="supplementOrderType">
+            <el-select :disabled="inputQuery.corpType !=3  || inputQuery.inStock!= true"
                        size="small"
                        style="width: 90%"
-                       placeholder="请选择是否特定页面"
+                       v-model="inputQuery.supplementOrderType"
+                       clearable
+                       placeholder="单据类型"
             >
-              <el-option label="无" :value="1"></el-option>
-              <el-option label="送货单管理" :value="2"></el-option>
-              <el-option label="到货单管理" :value="3"></el-option>
-              <el-option label="退货单管理" :value="4"></el-option>
-              <!--              <el-option label="发票登记" :value="5"></el-option>-->
+              <el-option
+                v-for="item in orderTypeList"
+                :key="item.name"
+                :label="item.name"
+                :value="item.action"
+              >
+                <span style="float: left">{{ item.name }}</span>
+              </el-option>
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row type="flex">
-
         <el-col :span="11">
-          <el-form-item label="往来单位类型" prop="corpType">
-            <el-select v-model="inputQuery.corpType"
-                       size="small"
-                       style="width: 90%"
-                       placeholder="往来信息"
-                       @change="corpTypeChange"
+          <el-form-item label="允许手动输入客户信息" prop="genUnit">
+            <el-select v-model="inputQuery.genUnit" :disabled="inputQuery.corpType != 1" style="width: 90%"
+                       placeholder="是否允许" clearable
             >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
+              <el-option label="允许" :value="true"></el-option>
+              <el-option label="不允许" :value="false"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
 
-        <el-col :span="11">
-          <el-form-item label="内部进出平衡补单" prop="supplementOrderType">
-            <el-select :disabled="inputQuery.corpType !=3"
+        <el-col :span="11" type="flex">
+          <el-form-item label="采购方式" prop="actionType">
+            <el-select v-model="inputQuery.actionType"
                        size="small"
                        style="width: 90%"
-                       v-model="inputQuery.supplementOrderType"
                        clearable
-                       placeholder="单据类型"
+                       :disabled="inputQuery.mainAction!='WareHouseIn' || inputQuery.corpType!=2 "
+                       placeholder="请选择入库方式">
+              <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>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex">
+        <el-col :span="11">
+          <el-form-item label="允许供应商使用" prop="prefix">
+            <el-select v-model="inputQuery.spUse"
+                       :disabled=" inputQuery.corpType!=2 "
+                       style="width: 90%" placeholder="是否允许" clearable>
+              <el-option label="是" :value="true"></el-option>
+              <el-option label="否" :value="false"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="11">
+          <el-form-item label="预验收使用结束退回" prop="preInBack">
+            <el-select v-model="inputQuery.preInBack"
+                       :disabled="inputQuery.actionType != 2 || inputQuery.mainAction!='WareHouseIn' ||
+                                inputQuery.corpType != 2  "
+
+                       style="width: 90%"
+                       placeholder="是否退回" clearable
             >
-              <el-option
-                v-for="item in orderTypeList"
-                :key="item.name"
-                :label="item.name"
-                :value="item.action"
-              >
-                <span style="float: left">{{ item.name }}</span>
-              </el-option>
+              <el-option label="是" :value="true"></el-option>
+              <el-option label="否" :value="false"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      <!--        <el-col :span="11">-->
-      <!--          <el-form-item label="特殊单据往来" prop="defaultUnit">-->
-      <!--            <el-select-->
-      <!--              v-model="inputQuery.defaultUnit"-->
-      <!--              filterable-->
-      <!--              remote-->
-      <!--              size="small"-->
-      <!--              style="width: 90%"-->
-      <!--              :disabled="inputQuery.corpType!=4"-->
-      <!--              clearable="true"-->
-      <!--              reserve-keyword-->
-      <!--              :remote-method="findSpecialMethod"-->
-      <!--            >-->
-      <!--              <el-option-->
-      <!--                v-for="item in fromSpecialOptions"-->
-      <!--                :key="item.name"-->
-      <!--                :label="item.name"-->
-      <!--                :value="item.erpId"-->
-      <!--              >-->
-      <!--                <span style="float: left">{{ item.name }}</span>-->
-      <!--              </el-option>-->
-      <!--            </el-select>-->
-      <!--          </el-form-item>-->
-      <!--        </el-col>-->
-      <!--      </el-row>-->
 
       <el-row type="flex">
+        <el-col :span="11">
+          <el-form-item label="是否检查近效期" prop="prefix">
+            <el-select v-model="inputQuery.checkVailDate"
+                       style="width: 90%" placeholder="" clearable>
+              <el-option label="是" :value="true"></el-option>
+              <el-option label="否" :value="false"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="11">
+          <el-form-item label="是否检查过期" prop="prefix">
+            <el-select v-model="inputQuery.checkExpire"
+                       style="width: 90%" placeholder="" clearable>
+              <el-option label="是" :value="true"></el-option>
+              <el-option label="否" :value="false"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
+      <el-row type="flex">
         <el-col :span="11">
-          <el-form-item label="供应商使用" prop="prefix">
-            <el-select v-model="inputQuery.spUse" style="width: 90%" placeholder="是否允许" clearable>
-              <el-option label="允许" :value="true"></el-option>
-              <el-option label="不允许" :value="false"></el-option>
+          <el-form-item label="是否检查资质过期" prop="prefix">
+            <el-select v-model="inputQuery.checkCertExpire"
+                       style="width: 90%" placeholder="" clearable>
+              <el-option label="是" :value="true"></el-option>
+              <el-option label="否" :value="false"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="11">
           <el-form-item label="单据前缀" prop="prefix">
-            <el-input v-model="inputQuery.prefix" size="small" style="width: 90%"></el-input>
+            <el-input
+              @input="inputQuery.prefix = inputQuery.prefix.replace(/[\W]/g, '')"
+              v-model="inputQuery.prefix" size="small" style="width: 90%">
+            </el-input>
           </el-form-item>
         </el-col>
-
-        <!--        <el-col :span="11" class="el-col">-->
-        <!--          <el-form-item label="单据详情展示方式" prop="orderVisibleType">-->
-        <!--            <el-select v-model="inputQuery.orderVisibleType"-->
-        <!--                       size="small"-->
-        <!--                       style="width: 90%"-->
-        <!--                       placeholder="单据详情展示方式"-->
-        <!--            >-->
-        <!--              <el-option label="批次号" :value=0></el-option>-->
-        <!--              <el-option label="条码清单" :value=1></el-option>-->
-        <!--            </el-select>-->
-        <!--          </el-form-item>-->
-        <!--        </el-col>-->
       </el-row>
 
-
       <el-row type="flex">
 
-      </el-row>
-      <!--      <el-row type="flex">-->
-      <!--        <el-col :span="11">-->
-      <!--          <el-form-item label="第三方单据类型" prop="prefix">-->
-      <!--            <el-select v-model="inputQuery.originAction"-->
-      <!--                       size="small"-->
-      <!--                       clearable-->
-      <!--                       style="width: 90%"-->
-      <!--                       filterable-->
-      <!--                       placeholder="请选择第三方系统单据类型"-->
-      <!--            >-->
-      <!--              <el-option-->
-      <!--                v-for="item in originTypes"-->
-      <!--                :key="item.id"-->
-      <!--                :label="item.name"-->
-      <!--                :value="item.action">-->
-      <!--                <span style="float: left;font-size: 13px">{{ item.name }}</span>-->
-      <!--                <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{-->
-      <!--                    item.thirdSysName-->
-      <!--                  }}</span>-->
-      <!--              </el-option>-->
-      <!--            </el-select>-->
-      <!--          </el-form-item>-->
-      <!--        </el-col>-->
-      <!--      </el-row>-->
-      <el-row type="flex">
-        <el-col :span="23" type="flex">
-          <el-form-item prop="remark">
-            <label slot="label">备&emsp;&emsp;注</label>
-            <el-input v-model="inputQuery.remark" size="small" style="width: 90%" type="textarea"
-                      row="3"
+        <el-col :span="11">
+          <el-form-item label="禁用单据类型" prop="prefix">
+            <el-select v-model="inputQuery.enable" style="width: 90%" placeholder="状态" clearable>
+              <el-option label="否" :value="true"></el-option>
+              <el-option label="是" :value="false"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="11">
+          <el-form-item prop="remark" label="备注">
+            <el-input v-model="inputQuery.remark" size="small" style="width: 90%" type="textarea" autosize
             ></el-input>
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row type="flex">
+
+      </el-row>
     </el-form>
 
     <div style="margin-left: 25px">
       <el-collapse>
-        <el-collapse-item title="单据设置">
-          <div style="width: 100%;margin: 0 auto;margin-top: 10px">
+        <el-collapse-item title="供应商送货设置" v-if="inputQuery.corpType==2 && inputQuery.mainAction!= 'WareHouseOut'">
+
+          <div style="width: 100%;margin-top: 15px">
             <el-row>
               <el-col span="5">
                 <span class="spanHeader">参数</span>
@@ -233,84 +222,86 @@
             </el-row>
             <el-divider direction="horizontal"></el-divider>
           </div>
-
-          <el-row>
+          <el-row style="margin-top: 15px">
             <el-col span="5">
-              <span class="sptext">启用单据类型</span>
+              <span class="sptext">采集UDI码时进行三期校验</span>
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
-              <el-select v-model="inputQuery.enable" style="width: 65%" placeholder="状态" clearable>
+              <el-select v-model="inputQuery.codeFillCheck" style="width: 65%"
+                         :disabled="inputQuery.corpType!=2 || inputQuery.mainAction!= 'WareHouseIn'"
+                         placeholder="是否启用" clearable>
                 <el-option label="启用" :value="true"></el-option>
                 <el-option label="不启用" :value="false"></el-option>
               </el-select>
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="13">
-              <span class="sptext">是否启用此单据类型</span>
+              <span class="sptext">采集UDI码时进行三期校验</span>
             </el-col>
           </el-row>
-          <el-divider direction="horizontal"></el-divider>
-
+          <el-divider></el-divider>
           <el-row>
             <el-col span="5">
-              <span class="sptext">允许手动输入客户信息</span>
+              <span class="sptext">外包装码补齐关联关系</span>
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
-              <el-select v-model="inputQuery.genUnit" :disabled="inputQuery.corpType != 1" style="width: 65%"
-                         placeholder="是否允许" clearable
+              <el-select v-model="inputQuery.fillCodeRel" style="width: 65%" placeholder="是否启用" clearable
+                         :disabled="inputQuery.corpType!=2 || inputQuery.mainAction!= 'WareHouseIn'"
               >
-                <el-option label="允许" :value="true"></el-option>
-                <el-option label="不允许" :value="false"></el-option>
+                <el-option label="是" :value="true"></el-option>
+                <el-option label="否" :value="false"></el-option>
               </el-select>
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="13">
-              <span class="sptext">允许客户在做单时手动输入客户信息</span>
+              <span class="sptext">外包装码补齐关联关系</span>
             </el-col>
           </el-row>
-          <el-divider direction="horizontal"></el-divider>
-
+          <el-divider></el-divider>
           <el-row>
             <el-col span="5">
-              <span class="sptext">允许科室多次使用出库</span>
+              <span class="sptext">校验物资是否可配送</span>
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
-              <el-select v-model="inputQuery.useDyCount" :disabled="inputQuery.corpType != 1" style="width: 65%"
-                         placeholder="是否启用" clearable
+              <el-select v-model="inputQuery.vailDispatch" style="width: 65%" placeholder="是否启用" clearable
+                         :disabled="inputQuery.corpType!=2 || inputQuery.mainAction!= 'WareHouseIn'"
               >
-                <el-option label="允许" :value="true"></el-option>
-                <el-option label="不允许" :value="false"></el-option>
+                <el-option label="启用" :value="true"></el-option>
+                <el-option label="不启用" :value="false"></el-option>
               </el-select>
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="13">
-              <span class="sptext">允许产品多次使用使用出库</span>
+              <span class="sptext">校验物资是否可配送</span>
             </el-col>
           </el-row>
-          <el-divider direction="horizontal"></el-divider>
+          <el-divider></el-divider>
+
           <el-row>
             <el-col span="5">
-              <span class="sptext">预验收是否带回</span>
+              <span class="sptext">校验是否集采产品</span>
             </el-col>
+            <el-divider direction="vertical"></el-divider>
             <el-col span="5">
-              <el-select v-model="inputQuery.preInBack" :disabled="inputQuery.actionType != 2" style="width: 65%"
-                         placeholder="是否带回" clearable
-              >
-                <el-option label="是" :value="true"></el-option>
-                <el-option label="否" :value="false"></el-option>
+              <el-select v-model="inputQuery.vailGroupBuy" style="width: 65%" placeholder="是否启用" clearable>
+                <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>
+              <span class="sptext">校验是否集采产品</span>
             </el-col>
           </el-row>
+          <el-divider></el-divider>
         </el-collapse-item>
 
-        <el-collapse-item title="单据默认选项">
-          <div style="width: 100%;margin: 0 auto">
+        <el-collapse-item title="医院使用出库设置" v-if="inputQuery.mainAction!='WareHouseIn'">
+          <div style="width: 100%;margin-top: 15px">
             <el-row>
               <el-col span="5">
                 <span class="spanHeader">参数</span>
@@ -326,17 +317,18 @@
             </el-row>
             <el-divider direction="horizontal"></el-divider>
           </div>
+
           <el-row>
             <el-col span="5">
-              <span class="sptext">出库时必须校验预验收库存</span>
+              <span class="sptext">预验收使用禁止无库存出库</span>
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
-              <el-select v-model="inputQuery.scanPreIn" style="width: 65%" :disabled="inputQuery.corpType!='1'"
-                         placeholder="是否启用" clearable
-              >
-                <el-option label="启用" :value="true"></el-option>
-                <el-option label="不启用" :value="false"></el-option>
+              <el-select v-model="inputQuery.scanPreIn" style="width: 65%"
+                         :disabled="inputQuery.corpType!=1 || inputQuery.mainAction== 'WareHouseIn'"
+                         placeholder="是否启用" clearable>
+                <el-option label="是" :value="true"></el-option>
+                <el-option label="否" :value="false"></el-option>
               </el-select>
             </el-col>
             <el-divider direction="vertical"></el-divider>
@@ -353,7 +345,7 @@
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
               <el-select v-model="inputQuery.vailInv" style="width: 65%"
-                         :disabled="inputQuery.mainAction!='WareHouseOut'"
+                         :disabled="inputQuery.corpType!=1 || inputQuery.mainAction!= 'WareHouseOut'"
                          placeholder="是否启用" clearable
               >
                 <el-option label="启用" :value="true"></el-option>
@@ -369,66 +361,34 @@
 
           <el-row>
             <el-col span="5">
-              <span class="sptext">采集UDI码时进行三期校验</span>
-            </el-col>
-            <el-divider direction="vertical"></el-divider>
-            <el-col span="5">
-              <el-select v-model="inputQuery.codeFillCheck" style="width: 65%" placeholder="是否启用" clearable>
-                <el-option label="启用" :value="true"></el-option>
-                <el-option label="不启用" :value="false"></el-option>
-              </el-select>
-            </el-col>
-            <el-divider direction="vertical"></el-divider>
-            <el-col span="13">
-              <span class="sptext">采集UDI码时进行三期校验</span>
-            </el-col>
-          </el-row>
-          <el-divider></el-divider>
-
-          <el-row>
-            <el-col span="5">
-              <span class="sptext">校验产品是否可配送</span>
+              <span class="sptext">允许科室多次使用出库</span>
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
-              <el-select v-model="inputQuery.vailDispatch" style="width: 65%" placeholder="是否启用" clearable>
-                <el-option label="启用" :value="true"></el-option>
-                <el-option label="不启用" :value="false"></el-option>
+              <el-select v-model="inputQuery.useDyCount" style="width: 65%"
+                         :disabled="inputQuery.corpType!=1 || inputQuery.mainAction!= 'WareHouseOut'"
+                         placeholder="是否启用" clearable
+              >
+                <el-option label="是" :value="true"></el-option>
+                <el-option label="否" :value="false"></el-option>
               </el-select>
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="13">
-              <span class="sptext">校验产品是否可配送</span>
+              <span class="sptext">允许科室多次使用出库</span>
             </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.vailGroupBuy" style="width: 65%" placeholder="是否启用" clearable>
-                <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-collapse-item>
-        <el-collapse-item title="校验业务单">
+
+        <el-collapse-item title="是否校验业务单设置">
           <div>
             <div style="width: 100%;margin: 0 auto;margin-top: 20px">
               <el-row style="margin-bottom: 15px">
                 <el-col span="18">
                   <el-checkbox v-model="inputQuery.checkEnable">
-                    <span class="spanTitle">单据是否必须手动校验业务单，请指定单据的来源类型(校验业务单)</span>
+                    <span class="spanTitle">单据是否必须校验业务单，请指定单据的来源类型</span>
                   </el-checkbox>
                 </el-col>
               </el-row>
@@ -646,13 +606,13 @@
             </el-row>
           </div>
         </el-collapse-item>
-        <el-collapse-item title="一次审核">
+        <el-collapse-item title="是否人工核对单据设置(一次审核)">
           <div>
             <div style="width: 100%;margin: 0 auto;margin-top: 20px">
               <el-row style="margin-bottom: 15px">
                 <el-col span="18">
                   <el-checkbox v-model="inputQuery.thrCheckEnable">
-                    <span class="spanTitle">单据是否必须手动确认出入库(送/收货)，请指定单据的来源类型(一次审核)</span>
+                    <span class="spanTitle">单据是否必须人工核对，请指定单据的来源类型</span>
                   </el-checkbox>
                 </el-col>
               </el-row>
@@ -854,18 +814,17 @@
             </el-row>
           </div>
         </el-collapse-item>
-        <el-collapse-item title="二次审核">
+        <el-collapse-item title="是否人工审核据设置(二次审核)">
           <div>
             <div style="width: 100%;margin: 0 auto;margin-top: 20px">
               <el-row style="margin-bottom: 15px">
                 <el-col span="18">
                   <el-checkbox v-model="inputQuery.secCheckEnable">
-                    <span class="spanTitle">单据是否必须手动审核，请指定单据的来源类型(二次审核)</span>
+                    <span class="spanTitle">单据是否必须人工审核，请指定单据的来源类型</span>
                   </el-checkbox>
                 </el-col>
               </el-row>
             </div>
-
             <el-divider direction="horizontal"></el-divider>
             <div style="width: 100%;margin: 0 auto">
               <el-row>
@@ -1108,13 +1067,13 @@ export default {
             trigger: 'change'
           }
         ],
-        busType: [
-          {
-            required: true,
-            message: '请选择特定页面',
-            trigger: 'change'
-          }
-        ]
+        // busType: [
+        //   {
+        //     required: true,
+        //     message: '请选择特定页面',
+        //     trigger: 'change'
+        //   }
+        // ]
       },
       filterQuery: {
         enabled: true,
@@ -1166,6 +1125,13 @@ export default {
 
       })
     },
+
+    inStock() {
+      if (!this.inputQuery.inStock) {
+        this.inputQuery.supplementOrderType = ""
+      }
+    },
+
     corpTypeChange(type) {
       if (type != 2) {
         this.inputQuery.genUnit = false
@@ -1183,6 +1149,16 @@ export default {
         this.inputQuery.genUnit = this.oldData.genUnit
         this.inputQuery.useDyCount = this.oldData.useDyCount
       }
+
+      if (this.inputQuery.corpType != 3) { //往来类型非内部使用时，平衡补单为空
+        this.inputQuery.supplementOrderType = ""
+      }
+
+      if (this.inputQuery.corpType != 2) {    //往来类型非供应商时，采购方式未无
+        this.inputQuery.actionType = 0;
+        this.inputQuery.spUse = false;
+      }
+
     },
 
     //获取单据类型
@@ -1239,7 +1215,7 @@ export default {
     corpType: function (val) {
       if (val != 1) {
         this.inputQuery.orderTypeEnable = true
-        this.inputQuery.supplementOrderType = null
+        this.inputQuery.supplementOrderType = ""
       } else {
         this.inputQuery.orderTypeEnable = false
       }
diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index bbbd7c5..c7e0019 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -189,6 +189,7 @@ import {getLocalJoinBusType, getLocalJoinByUser} from "@/api/basic/busLocalType"
 import {filterAll, filterAllByUser} from "@/api/system/invWarehouse";
 import {filterSubByInv, findInvByUser} from '@/api/system/invSubWarehouse'
 import {convertDate} from "@/utils/date"
+import {filterOrder} from "@/api/inout/order";
 
 export default {
   name: "stockOrder",
@@ -375,8 +376,8 @@ export default {
         this.query.startTime = null;
         this.query.endTime = null;
       }
-      this.query.status = 3
-      stockOrderList(this.query)
+      this.query.vueType = "supDelivery";
+      filterOrder(this.query)
         .then(response => {
           this.loading = false;
           if (response.code == 20000) {
@@ -436,7 +437,7 @@ export default {
     getBusType() {
       let query = {
         enabled: true,
-        busType: 2,//默认只能选择送货单
+        vueType: "supDelivery",
       };
       getLocalJoinByUser(query)
         .then((response) => {
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index d26294a..2a48d07 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -561,7 +561,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
-        busType: 2,//默认只能选择送货单
+        vueType: "supInvoice",
       };
       getLocalJoinByUser(query)
         .then((response) => {
@@ -623,7 +623,7 @@ export default {
       this.loading = true;
       this.currentRow = {billNo: ""};
       this.clearDetailList();
-      this.filterQuery.busType = 4;   //默认只查询送货单
+      this.filterQuery.vueType = "supInvoice";
       filterInvoice(this.filterQuery)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index 8986d84..62928fa 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -32,7 +32,7 @@
                          @change="invChange"
               >
                 <el-option
-                  v-for="item in invList"
+                  v-for="item in subInvList"
                   :key="item.name"
                   :label="item.name"
                   :value="item.code">
@@ -631,7 +631,7 @@ export default {
       let query = {
         code: this.filterQuery.invWarehouseCode,
         enabled: true,
-        busType: 2,//默认只能选择送货单
+        vueType: "supDelivery",
       };
       getLocalJoinByUser(query)
         .then((response) => {
@@ -686,6 +686,7 @@ export default {
       this.loading = true;
       this.currentRow = {billNo: ""};
       this.clearDetailList();
+      this.filterQuery.vueType = "supDelivery";
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index 0b4d3d8..ead32a4 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -381,7 +381,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
-        busType: 2,//默认只能选择送货单
+        vueType: "supDelivery",
       };
       getLocalJoinByUser(query)
         .then((response) => {
@@ -414,7 +414,7 @@ export default {
     //获取订单列表
     getList() {
       this.loading = true;
-      this.filterQuery.busType = 2;
+      this.filterQuery.vueType = "supDelivery";
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 105f3a4..12883c0 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -380,7 +380,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
-        busType: 2,//默认只能选择送货单
+        vueType: "supDelivery",
       };
       getLocalJoinByUser(query)
         .then((response) => {
@@ -408,6 +408,7 @@ export default {
     //获取订单列表
     getList() {
       this.loading = true;
+      this.filterQuery.vueType = "supDelivery";
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index 5f1d6b7..103ab4f 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -339,7 +339,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
-        busType: 2,//默认只能选择送货单
+        vueType: "supDelivery",
       };
       getLocalJoinByUser(query)
         .then((response) => {
@@ -370,7 +370,7 @@ export default {
     //获取订单列表
     getList() {
       this.loading = true;
-      this.filterQuery.busType = 2;
+      this.filterQuery.vueType = "supDelivery";
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index 258d919..8ddd9c0 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -201,7 +201,7 @@
     <el-tabs type="border-card" style="margin: 15px">
       <!--单据业务详情-->
       <el-tab-pane>
-        <span slot="label">单据 {{ currentRow.billNo }}-业务扫码校验结果</span>
+        <span slot="label">单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务扫码校验结果</span>
         <el-form :inline="true" :model="bizQuery" class="query-form" size="mini">
           <el-form-item class="query-form-item" label="产品名称:">
             <el-input
@@ -502,7 +502,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
-        busType: 2,//默认只能选择送货单
+        vueType: "supDelivery",
       };
       getLocalJoinByUser(query)
         .then((response) => {
@@ -528,7 +528,7 @@ export default {
     //获取订单列表
     getList() {
       this.loading = true;
-      this.filterQuery.busType = 2;
+      this.filterQuery.vueType = "supDelivery";
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
@@ -656,7 +656,7 @@ export default {
       this.getBizDetailList();
     },
     getBizDetailList() {
-      if (isBlank(this.currentRow.billNo)) {
+      if (this.currentRow == null || isBlank(this.currentRow.billNo)) {
         this.$message.error("请先选择需要查询的单据！")
         return;
       }
diff --git a/src/views/inout/IoDeliveryAuditOrder.vue b/src/views/inout/IoDeliveryAuditOrder.vue
index b3c7dea..d3c9077 100644
--- a/src/views/inout/IoDeliveryAuditOrder.vue
+++ b/src/views/inout/IoDeliveryAuditOrder.vue
@@ -754,7 +754,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
-        busType: 2,//默认只能选择送货单
+        vueType: "supDelivery",
       };
       getLocalJoinByUser(query)
         .then((response) => {
@@ -817,7 +817,7 @@ export default {
       this.loading = true;
       this.currentRow = {billNo: ""};
       this.clearDetailList();
-      this.filterQuery.busType = 2;     //送货出入库单据类型
+      this.filterQuery.vueType = "supDelivery";
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/inout/IoSupAduitOrder.vue b/src/views/inout/IoSupAduitOrder.vue
index 0e8ec28..ccc1fab 100644
--- a/src/views/inout/IoSupAduitOrder.vue
+++ b/src/views/inout/IoSupAduitOrder.vue
@@ -554,7 +554,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
-        busType: 2,//默认只能选择送货单
+        vueType: "supDelivery",
       };
       getLocalJoinByUser(query)
         .then((response) => {
@@ -594,7 +594,7 @@ export default {
       this.loading = true;
       this.currentRow = {billNo: ""};
       this.clearDetailList();
-      this.filterQuery.busType = 2;
+      this.filterQuery.vueType = "supDelivery";
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/inout/IoSupSecAuditOrder.vue b/src/views/inout/IoSupSecAuditOrder.vue
index 93811d3..c6a6414 100644
--- a/src/views/inout/IoSupSecAuditOrder.vue
+++ b/src/views/inout/IoSupSecAuditOrder.vue
@@ -594,7 +594,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
-        busType: 2,//默认只能选择送货单
+        vueType: "supDelivery",
       };
       getLocalJoinByUser(query)
         .then((response) => {
@@ -634,7 +634,7 @@ export default {
       this.loading = true;
       this.currentRow = {billNo: ""};
       this.clearDetailList();
-      this.filterQuery.busType = 2;
+      this.filterQuery.vueType = "supDelivery";
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index b680a18..ecb475c 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -43,7 +43,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item class="query-form-item" label="生产企业:">
-              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
+              <el-input v-model="filterQuery.manufacturer" placeholder="生产企业"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>