From 8018c37db43a2f098381aef803fdfbf7aa16fed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=AD=90=E5=8E=9A?= <ming34902@sina.com>
Date: Mon, 2 Dec 2019 09:51:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E5=A4=87=E6=96=99?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=A1=B5-=E6=98=AF=E5=90=A6=E6=9C=89?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=8C=87=E4=BB=A4=20isShipment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/dev.env.js                               |  7 ++++---
 src/filter/customFilters.js                     | 11 +++++++++++
 .../factoryPreparation/preparationStock.vue     | 17 ++++++++++++++++-
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/config/dev.env.js b/config/dev.env.js
index 2de7198..aa15fe2 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 c28a0bf..cd00560 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 fa4e07b..de752da 100644
--- a/src/views/factoryPreparation/preparationStock.vue
+++ b/src/views/factoryPreparation/preparationStock.vue
@@ -48,6 +48,13 @@
                     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-date-picker class="w200" v-model="listQuery.condition.startDate" type="datetime" placeholder="选择日期时间"
                           value-format="yyyy-MM-dd HH:mm:ss"
@@ -83,7 +90,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 +122,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 +163,7 @@
           condition: {
             vin: null,
             queryType: 'Y',
+            isShipment: '',
             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 +216,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 +330,7 @@
         this.listQuery.condition = {
           vin: null,
           queryType: 'Y',
+          isShipment: '',
           startDate: Utils.parseTime(new Date().getTime(), '{y}-{m}-{d} 00:00:00'),
           endDate: Utils.parseTime(new Date().getTime(), '{y}-{m}-{d} 23:59:59')
         }
-- 
Gitee


From 9de044823df5d4604dd8d6b12ac8f548e8c3f4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=AD=90=E5=8E=9A?= <ming34902@sina.com>
Date: Mon, 2 Dec 2019 11:31:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E6=9C=AA=E5=A4=87?=
 =?UTF-8?q?=E6=96=99=E5=BA=93=E5=AD=98=E9=A1=B5-=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/factoryPreparation/preparationStock.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/views/factoryPreparation/preparationStock.vue b/src/views/factoryPreparation/preparationStock.vue
index de752da..9ea4020 100644
--- a/src/views/factoryPreparation/preparationStock.vue
+++ b/src/views/factoryPreparation/preparationStock.vue
@@ -55,6 +55,13 @@
             <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"
@@ -164,6 +171,7 @@
             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')
           }
@@ -331,6 +339,7 @@
           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')
         }
-- 
Gitee