diff --git a/.env.production b/.env.production
index 51a50f6..0fe478f 100644
--- a/.env.production
+++ b/.env.production
@@ -7,15 +7,23 @@ ENV = 'production'
 
 #林纪裕
 # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
-# VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
 # 吴总测试服务器
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
 
 # 平潭
 # VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
 
-# 文明点
-VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
+# 文明东
+# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
+
+# 实施测试服务器 ljy
+# VUE_APP_BASE_API = 'http://192.168.0.66:8504/UDI_SPMS_SERVER/'
+
+# 实施测试服务器 wqq
+# VUE_APP_BASE_API = 'http://192.168.0.66:9160/UDI_SPMS_SERVER/'
+
+
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
 
diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index 309977f..19469ff 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -3,7 +3,7 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="送货单号:">
               <el-input v-model="filterQuery.billNo" placeholder="请输入送货单号"
                         style="width: 90%"
@@ -11,17 +11,8 @@
             </el-form-item>
           </el-col>
 
-          <!--          <el-col :span="6">-->
-          <!--            <el-form-item class="query-form-item" label="出入库类型:">-->
-          <!--              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
-          <!--                <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="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="收货仓库:">
               <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
                          style="width: 90%"
@@ -37,9 +28,17 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="出入库类型:">
+              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
+                <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="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
                          style="width: 90%"
@@ -56,8 +55,16 @@
           </el-col>
         </el-row>
         <el-row>
-
-          <el-col :span="8">
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="单据来源:">
+              <el-select v-model="filterQuery.sourceLocalType" placeholder="请选择单据来源" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="手工建单" value="1"></el-option>
+                <el-option label="自动建单" value="2"></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.fromCorp"
@@ -92,7 +99,7 @@
           <!--            </el-form-item>-->
           <!--          </el-col>-->
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="创建时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -109,7 +116,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="审核时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -564,6 +571,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        sourceLocalType: "1",
       },
 
       corpLoading: false,
@@ -700,6 +708,7 @@ export default {
         status: null,
         limit: 10,
         startTime: null,
+        sourceLocalType: "1",
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue
index 1398649..6cb3c76 100644
--- a/src/views/inout/IoSupSearchOrder.vue
+++ b/src/views/inout/IoSupSearchOrder.vue
@@ -41,7 +41,16 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="出入库类型:">
+              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
+                <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.action" placeholder="请选择单据类型"
                          style="width: 90%"
@@ -58,7 +67,16 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="单据来源:">
+              <el-select v-model="filterQuery.sourceLocalType" placeholder="请选择单据来源" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="手工建单" value="1"></el-option>
+                <el-option label="自动建单" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="创建时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -74,7 +92,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="审核时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -430,6 +448,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        sourceLocalType: "1",
       },
 
       reviceStatus: {
@@ -561,9 +580,11 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        sourceLocalType: "1",
+
       };
-      this.actDateRange=[];
-      this.auditDateRange=[];
+      this.actDateRange = [];
+      this.auditDateRange = [];
       this.getList();
     },
     onSubmit() {
@@ -603,7 +624,7 @@ export default {
         });
     },
     handleSelectionChange(val) {
-      this.currentRow.billNo=val.billNo;
+      this.currentRow.billNo = val.billNo;
       this.getOrderDetails();
     },
     // 获取单据 业务详情、扫码详情、扫码明细
diff --git a/src/views/inventory/InvPreProducts.vue b/src/views/inventory/InvPreProducts.vue
index 3f93b94..10002cb 100644
--- a/src/views/inventory/InvPreProducts.vue
+++ b/src/views/inventory/InvPreProducts.vue
@@ -142,10 +142,10 @@
         <el-table-column label="物资名称" prop="cpmctymc" width="180"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="180" 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="inCount" width="120"></el-table-column>-->
-        <!--        <el-table-column label="出库数量" prop="outCount" 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="inCount" width="120"></el-table-column>
+        <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
         <el-table-column label="库存数量" prop="reCount" width="120"></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
                          width="180"></el-table-column>
diff --git a/src/views/inventory/InvSupPreInProducts.vue b/src/views/inventory/InvSupPreInProducts.vue
index e7ffcd9..d4907e6 100644
--- a/src/views/inventory/InvSupPreInProducts.vue
+++ b/src/views/inventory/InvSupPreInProducts.vue
@@ -246,7 +246,7 @@ export default {
 
     getList() {
       this.loading = true;
-      this.filterQuery.supId = this.$store.getters.customerId;
+      // this.filterQuery.supId = this.$store.getters.customerId;
       getInvPreInProduct(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
@@ -266,7 +266,7 @@ export default {
     },
     getInvList() {
       let query = {
-        advanceType: true,
+        advanceType: 2,
       };
       getInvListByUser(query)
         .then((response) => {
diff --git a/src/views/inventory/InvSupPreProducts.vue b/src/views/inventory/InvSupPreProducts.vue
index 83f6298..65984a3 100644
--- a/src/views/inventory/InvSupPreProducts.vue
+++ b/src/views/inventory/InvSupPreProducts.vue
@@ -266,7 +266,7 @@ export default {
     },
     getInvList() {
       let query = {
-        advanceType: 2,
+        advanceType: 3, //获取寄售库1：入账，2：预验收，3：寄售
       };
       getInvListByUser(query)
         .then((response) => {
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index eeb977d..6ad7fd8 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -19,8 +19,8 @@
         <el-form-item label="仓库类型" prop="advanceType">
           <el-select v-model="subData.advanceType" placeholder="请选择仓库类型" style="width: 80%">
             <el-option label="入账库" :value="1"/>
-            <el-option label="寄售库" :value="2"/>
-            <el-option label="预验收库" :value="3"/>
+            <el-option label="预验收库" :value="2"/>
+            <el-option label="寄售库" :value="3"/>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -200,8 +200,8 @@
                 <el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型"
                            style="width: 80%">
                   <el-option label="入账库" value="1"/>
-                  <el-option label="寄售库" value="2"/>
-                  <el-option label="预验收库" value="3"/>
+                  <el-option label="预验收库" value="2"/>
+                  <el-option label="寄售库" value="3"/>
                 </el-select>
               </el-form-item>
 
diff --git a/src/views/system/param/busTypePre.vue b/src/views/system/param/busTypePre.vue
index a0030e9..227b1b9 100644
--- a/src/views/system/param/busTypePre.vue
+++ b/src/views/system/param/busTypePre.vue
@@ -55,7 +55,13 @@
             <span>{{ enableMap[scope.row.supplementAll] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="说明" prop="intro"></el-table-column>
+        <el-table-column label="创建单据模式" prop="createType">
+
+          <template slot-scope="scope">
+            <span>{{ createTypeMap[scope.row.createType] }}</span>
+          </template>
+
+        </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
@@ -137,11 +143,12 @@ export default {
         defaultInvCode: null,
         beforeTime: 0,
         busBeforeTime: 0,
-        supplementAll: null,
+        supplementAll: true,
         intro: null,
         remark: null,
         auditStatus: null,
         busAuditStatus: null,
+        createType: null,
       },
       enableMap: {
         true: "全量补单",
@@ -153,6 +160,14 @@ export default {
         2: "待审核",
         3: "已审核"
       },
+
+      createTypeMap: {
+        1: "送货至入库补单",
+        2: "向上级仓库补单",
+        3: "预验收转入库补单",
+        4: "寄售转入库补单",
+      },
+
       total: 0,
       loading: false,
       formMap: {
@@ -273,11 +288,13 @@ export default {
         defaultInvCode: null,
         beforeTime: 0,
         busBeforeTime: 0,
-        supplementAll: null,
+        supplementAll: true,
         intro: null,
         remark: null,
         auditStatus: null,
         busAuditStatus: null,
+        createType: null,
+
       };
       this.modifyDialogVisible = true;
     },
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index 72fc7f0..e19e04f 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/src/views/system/param/busTypePreModify.vue
@@ -97,7 +97,8 @@
                        style="width: 90%">
               <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="3"></el-option>
+              <el-option label="寄售转入库补单" :value="4"></el-option>
             </el-select>
           </el-form-item>
         </el-col>