diff --git a/config/dev.env.js b/config/dev.env.js
index 2de719862391e5d498726bee3cd277e34fda7d87..aa15fe2918906e965b0b5e2de5fafa138d1976cd 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -1,13 +1,14 @@
 var merge = require('webpack-merge')
 var prodEnv = require('./prod.env')
 
-// 菜花 BASE_API: '"http://10.2.5.124:8090"',
+// 菜花 BASE_API: '"http://10.2.7.116:8090"',
 // 晓辉 BASE_API: '"http://10.2.6.250:8090/admin"',
 // BASE_API: '"http://uat.unlcn.com/wms-admin/"',
+// BASE_API_LOGIN: '"http://10.20.30.111:8090"',
 // BASE_API_LOGIN:'"https://lisa-test.huiyunche.cn/uaa"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   BASE_API_INTEGRATION: '"http://10.20.30.102:8890/lisa-integration"',
-  BASE_API: '"http://uat.unlcn.com/wms-admin/""',
-  BASE_API_LOGIN: '"http://lisa-test.huiyunche.cn/uaa"'
+  BASE_API: '"http://10.2.7.116:8090"',
+  BASE_API_LOGIN: '"http://10.20.30.111:8090/uaa"'
 })
diff --git a/src/filter/customFilters.js b/src/filter/customFilters.js
index c28a0bf75092f62b9569ef415292a677a4f32ddc..cd0056091b44be3690602973ba842e911216df20 100644
--- a/src/filter/customFilters.js
+++ b/src/filter/customFilters.js
@@ -546,3 +546,14 @@ Vue.filter('propertyFilter', (v) => {
     return v
   }
 })
+
+// 工厂备料库存页
+Vue.filter('isShipmentFilter', (v) => {
+  if (v === 'Y') {
+    return '有'
+  } else if (v === 'N') {
+    return '无'
+  } else {
+    return v
+  }
+})
diff --git a/src/views/factoryPreparation/preparationStock.vue b/src/views/factoryPreparation/preparationStock.vue
index fa4e07bf07383af1f4c7c5664c777211f37b1dde..9ea40206557e5cafa5679689cce98b6712faeb2f 100644
--- a/src/views/factoryPreparation/preparationStock.vue
+++ b/src/views/factoryPreparation/preparationStock.vue
@@ -48,6 +48,20 @@
                     v-model="listQuery.condition.vin"  placeholder="请输入车架号, 以逗号来分隔"></el-input>
           <!--<el-input placeholder="请输入车架号" class="w200" clearable v-model="listQuery.condition.vinNo"></el-input>-->
         </el-form-item>
+        <el-form-item label="是否有入库指令">
+          <el-select v-model="listQuery.condition.isShipment" placeholder="请选择状态">
+            <el-option label="未选择" value=""></el-option>
+            <el-option label="有" value="Y"></el-option>
+            <el-option label="无" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="库存转换状态">
+          <el-select v-model="listQuery.condition.stockProperty" placeholder="请选择状态">
+            <el-option label="未选择" value=""></el-option>
+            <el-option label="已转换" value="Y"></el-option>
+            <el-option label="未转换" value="N"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="无单入库时间:">
           <el-date-picker class="w200" v-model="listQuery.condition.startDate" type="datetime" placeholder="选择日期时间"
                           value-format="yyyy-MM-dd HH:mm:ss"
@@ -83,7 +97,7 @@
       <el-table-column :key="key" align="center" :width="value.width" v-for='(value,key) in tableThead'
                        :label="value.title">
         <template slot-scope="scope">
-          <div v-if="value.key === 'stockStatus'">{{scope.row[value.key] | prepareStatusFilter}}</div>
+          <div v-if="value.key === 'isShipment'">{{scope.row[value.key] | isShipmentFilter}}</div>
           <div v-else>{{scope.row[value.key]}}</div>
         </template>
       </el-table-column>
@@ -115,6 +129,7 @@
   const defautlTableThead = [
     { key: 'vin', title: '车架号', width: '180' },
     { key: 'storeHouseId', title: '仓库id', width: '120' },
+    { key: 'isShipment', title: '是否有入库指令', width: '120' },
     { key: 'shipmentGid', title: '入库指令', width: '120' },
     { key: 'storeHouseName', title: '仓库名称', width: '120' },
     { key: 'targetStoreHouse', title: '目标仓库', width: '120' },
@@ -155,6 +170,8 @@
           condition: {
             vin: null,
             queryType: 'Y',
+            isShipment: '',
+            stockProperty: '',
             startDate: Utils.parseTime(new Date().getTime(), '{y}-{m}-{d} 00:00:00'),
             endDate: Utils.parseTime(new Date().getTime(), '{y}-{m}-{d} 23:59:59')
           }
@@ -207,6 +224,11 @@
           } else if (v.prepareStatus === '40') {
             v.prepareStatus = '返工厂'
           }
+          if (v.isShipment === 'Y') {
+            v.isShipment = '有'
+          } else if (v.isShipment === 'N') {
+            v.isShipment = '无'
+          }
           return v
         })
       },
@@ -316,6 +338,8 @@
         this.listQuery.condition = {
           vin: null,
           queryType: 'Y',
+          isShipment: '',
+          stockProperty: '',
           startDate: Utils.parseTime(new Date().getTime(), '{y}-{m}-{d} 00:00:00'),
           endDate: Utils.parseTime(new Date().getTime(), '{y}-{m}-{d} 23:59:59')
         }