From 348f97168ac70c1234e2f1a6622b184b03ed2b23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=AD=90=E5=8E=9A?= <ming34902@sina.com>
Date: Tue, 3 Dec 2019 17:27:13 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=9C=AA=E5=A4=87=E6=96=99=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E9=A1=B5-=E5=BA=93=E4=BD=8D=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factoryPreparation/factoryPreparation.js  |  26 +++
 .../factoryPreparation/preparationStock.vue   |  66 +++++++-
 .../storeChangeEdit.vue                       | 157 ++++++++++++++++++
 3 files changed, 244 insertions(+), 5 deletions(-)
 create mode 100644 src/views/factoryPreparation/preparationStockConfig/storeChangeEdit.vue

diff --git a/src/api/factoryPreparation/factoryPreparation.js b/src/api/factoryPreparation/factoryPreparation.js
index 5e35142..e8a058a 100644
--- a/src/api/factoryPreparation/factoryPreparation.js
+++ b/src/api/factoryPreparation/factoryPreparation.js
@@ -63,3 +63,29 @@ export function queryFactoryStock(data) {
   })
 }
 
+// 首页 必办事项   storeHouseId
+export function queryMustMatter(data) {
+  return fetch({
+    url: '/factoryStock/queryMustMatter',
+    method: 'post',
+    data: data
+  })
+}
+
+//  工厂未备料库存页 库位调整
+export function updateFactoryLocation(data) {
+  return fetch({
+    url: '/stock/updateFactoryLocation',
+    method: 'post',
+    data: data
+  })
+}
+
+//  工厂未备料库存页 库位列表查询
+export function queryMovementArea(data) {
+  return fetch({
+    url: '/storeLocation/queryMovementArea',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/views/factoryPreparation/preparationStock.vue b/src/views/factoryPreparation/preparationStock.vue
index 9ea4020..ab557ab 100644
--- a/src/views/factoryPreparation/preparationStock.vue
+++ b/src/views/factoryPreparation/preparationStock.vue
@@ -7,6 +7,9 @@
           <el-button class="filter-item ml10" size="small" style="margin-left: 10px;" type="primary" v-waves
                      @click="outClickFunc" icon="el-icon-edit">出库
           </el-button>
+          <el-button class="filter-item ml10" size="small" style="margin-left: 10px;" type="primary" v-waves
+                     @click="editClickFunc" icon="el-icon-edit">库位调整
+          </el-button>
         </el-col>
         <el-col :span="10" style="text-align: right">
           <el-input size="small" style="width: 200px" class="filter-item fsc-search" placeholder="车架号"
@@ -118,6 +121,15 @@
       @edit-confirm="outBoundConfirm"
       @edit-close="outBoundClose"
     ></out-bound-edit>
+    <!--库区调整面板-->
+    <store-change-edit
+      :edit_flag="storeChangeFlag"
+      :edit_main_title="storeChangeMainTitle"
+      :edit_select_row="storeChangeRowData"
+      ref="storeChangeEditRef"
+      @edit-confirm="storeChangeConfirm"
+      @edit-close="storeChangeClose"
+    ></store-Change-edit>
   </div>
 </template>
 <script>
@@ -126,6 +138,7 @@
   import * as Utils from '@/utils/index'
   import { export_json_to_excel } from '@/vendor/Export2Excel'
   import OutBoundEdit from './fpInBoundConfig/outBoundEdit'
+  import StoreChangeEdit from './preparationStockConfig/storeChangeEdit'
   const defautlTableThead = [
     { key: 'vin', title: '车架号', width: '180' },
     { key: 'storeHouseId', title: '仓库id', width: '120' },
@@ -145,7 +158,7 @@
   ]
   export default {
     name: 'stockQuery',
-    components: { OutBoundEdit },
+    components: { OutBoundEdit, StoreChangeEdit },
     directives: {
       waves
     },
@@ -171,8 +184,8 @@
             vin: null,
             queryType: 'Y',
             isShipment: '',
-            stockProperty: '',
-            startDate: Utils.parseTime(new Date().getTime(), '{y}-{m}-{d} 00:00:00'),
+            stockProperty: 'Y',
+            startDate: '',
             endDate: Utils.parseTime(new Date().getTime(), '{y}-{m}-{d} 23:59:59')
           }
         },
@@ -186,6 +199,9 @@
         outBoundFlag: false, // 出库面板 显示
         outBoundRowData: [], // 传入 出库面板 的当前列
         outBoundMainTitle: '', // 出库面板 标题
+        storeChangeFlag: false, // 库区调整 显示
+        storeChangeRowData: [], // 传入 库区调整 面板 的当前列
+        storeChangeMainTitle: '', // 库区调整 面板 标题
         downloadLoading: false
       }
     },
@@ -264,6 +280,26 @@
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]))
       },
+      // 库区调整面板 打开
+      editClickFunc() {
+        if (this.checkSelect(this.multipleSelection) && this.checkSameStoreSelect(this.multipleSelection, 'storeHouseId', '仓库')) {
+          if (this.multipleSelection.length === 1) {
+            this.storeChangeMainTitle = '单个'
+          } else {
+            this.storeChangeMainTitle = '多个'
+          }
+          this.$refs.storeChangeEditRef.getHouseList(this.multipleSelection[0].storeHouseId)
+          this.storeChangeRowData = this.multipleSelection
+          this.storeChangeFlag = true
+        }
+      },
+      storeChangeConfirm() {
+        this.storeChangeFlag = false
+        this.getList()
+      },
+      storeChangeClose() {
+        this.storeChangeFlag = false
+      },
       // 出库面板打开
       outClickFunc() {
         if (this.checkSelect(this.multipleSelection)) {
@@ -339,12 +375,32 @@
           vin: null,
           queryType: 'Y',
           isShipment: '',
-          stockProperty: '',
-          startDate: Utils.parseTime(new Date().getTime(), '{y}-{m}-{d} 00:00:00'),
+          stockProperty: 'Y',
+          startDate: '',
           endDate: Utils.parseTime(new Date().getTime(), '{y}-{m}-{d} 23:59:59')
         }
         this.getList()
       },
+      // 校验是否是 检查 同一仓库
+      checkSameStoreSelect(arr, str, type) {
+        if (arr.length > 1) {
+          for (let c = 0; c + 1 < arr.length; c++) {
+            // console.log('arr[c]', arr[c], 'arr[c + 1]', arr[c + 1])
+            if (arr[c][str] !== arr[c + 1][str]) {
+              // let val = arr[c][str]
+              // if (str === 'billProperty') { val = payBillProperty(arr[c][str]) } // filter
+              this.$message({
+                message: '请选择是相同(' + type + ')的数据',
+                type: 'warning',
+                duration: 2000
+              })
+              return false
+            }
+          }
+          return true
+        }
+        return true
+      },
       // 检查是否选择单条
       checkSelect(data) {
         const l = data.length
diff --git a/src/views/factoryPreparation/preparationStockConfig/storeChangeEdit.vue b/src/views/factoryPreparation/preparationStockConfig/storeChangeEdit.vue
new file mode 100644
index 0000000..b639102
--- /dev/null
+++ b/src/views/factoryPreparation/preparationStockConfig/storeChangeEdit.vue
@@ -0,0 +1,157 @@
+<template>
+  <div style="margin-bottom: 20px;">
+    <el-dialog title="库区调整" append-to-body v-dialogDrag :visible.sync="edit_flag"
+               @open="handleOpenConfig" :before-close="handleClose" width="500px">
+      <el-form class="ml30" ref="sendMsgRef" :rules="rules" :model="createObj" label-width="100px">
+        <el-form-item v-if="edit_main_title === '单个'" label="仓库">
+          <el-input v-model="createObj.storeHouseName" class="w200" :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item v-if="edit_main_title === '单个'" label="原库区编码">
+          <el-input v-model="createObj.oldAreaName" class="w200"  :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item v-if="edit_main_title === '单个'" label="原库位编码">
+          <el-input v-model="createObj.oldLocationNo" class="w200"  :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="库区" prop="newAreaId">
+          <el-select v-model="createObj.newAreaId" class="dialog_input"
+                     filterable reserve-keyword placeholder="请选择">
+            <el-option v-for="item in newLocationList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-row type="flex" justify="end">
+        <el-button type="primary" @click="handleClose">取消</el-button>
+        <el-button type="primary" :disabled="createConfirmBtnFlag" @click="createConfirmClick">确定</el-button>
+      </el-row>
+      <div style="height:20px"></div>
+    </el-dialog>
+  </div>
+</template>
+
+<script type="text/javascript">
+  import * as FactoryPreparationAPI from '@/api/factoryPreparation/factoryPreparation'
+  export default {
+    name: '',
+    components: {
+    },
+    props: ['edit_flag', 'edit_main_title', 'edit_select_row', 'edit_params'],
+    data() {
+      return {
+        title_data: {},
+        table_data: [],
+        createConfirmBtnFlag: false, // 按钮
+        newLocationList: [], //  库位
+        createObj: {
+          storeHouseName: null, // 仓库 名称
+          oldAreaName: null, // 旧 库区 名称
+          oldLocationNo: null, // 旧 库位 名称
+          storeHouseId: null, // 仓库 id
+          newAreaId: null // 库区 id
+        },
+        rules: {
+          newAreaId: [
+            { required: true, message: '请选择库区', trigger: 'change' }
+          ]
+        }
+      }
+    },
+    methods: {
+      // 弹窗页打开初始
+      handleOpenConfig() {
+        console.log('this.edit_select_row', this.edit_select_row)
+        const { storeHouseName, areaName, locationNo, storeHouseId } = this.edit_select_row[0]
+        this.createObj = {
+          storeHouseName: storeHouseName,
+          oldAreaName: areaName,
+          oldLocationNo: locationNo,
+          newAreaId: null,  // 目的库区的id
+          storeHouseId: storeHouseId // 仓库 id
+        }
+        this.newLocationList = []
+        // this.createDialogVisible = true
+        this.createConfirmBtnFlag = false
+      },
+      // 仓库-库区查询
+      getHouseList(storeHouseId) {
+        FactoryPreparationAPI.queryMovementArea({ storeHouseId: storeHouseId }).then(result => {
+          if (result.code === 0) {
+            if (result.data && result.data.length > 0) {
+              this.newLocationList = result.data
+            } else {
+              this.$message({
+                message: '查询结果无库区',
+                type: 'error',
+                duration: 2000
+              })
+            }
+          } else {
+            this.$message({
+              title: '错误提示',
+              message: result.message,
+              type: 'error',
+              duration: 2000
+            })
+          }
+        })
+      },
+      // 库位调整 提交
+      createConfirmClick() {
+        const that = this
+        that.$refs['sendMsgRef'].validate(valid => {
+          if (valid && that.checkObj(that.createObj)) {
+            that.createConfirmBtnFlag = true
+            const now_arr = []
+            that.edit_select_row.map(item => now_arr.push(item.id)) // factoryId  ： 无单主键id
+            const toParams = {
+              houseId: that.createObj.storeHouseId,
+              newAreaId: that.createObj.newAreaId,
+              factoryId: now_arr.length > 1 ? now_arr.join(',') : now_arr[0]
+            }
+            FactoryPreparationAPI.updateFactoryLocation(toParams).then(result => {
+              if (result.code === 0) {
+                this.$message({
+                  message: '库位调整提交成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.createConfirmBtnFlag = false
+                // this.createDialogVisible = false
+                // this.getList()
+                this.$emit('edit-confirm', false)
+              } else {
+                this.$message({
+                  title: '错误提示',
+                  message: result.message,
+                  type: 'error',
+                  duration: 2000
+                })
+                this.createConfirmBtnFlag = false
+              }
+            }).catch(() => {
+              this.createConfirmBtnFlag = false
+            })
+          }
+        })
+      },
+      checkObj(obj) {
+        const { newAreaId } = obj
+        // console.log('newAreaId', newAreaId)
+        if (!newAreaId) {
+          this.$message({
+            message: '请选择库区',
+            type: 'warning',
+            duration: 2000
+          })
+          return false
+        }
+        return true
+      },
+      handleClose() {
+        this.$emit('edit-close', false)
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
-- 
Gitee


From c619ba482a53752bfa925621c6b08d44905f570a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=AD=90=E5=8E=9A?= <ming34902@sina.com>
Date: Tue, 3 Dec 2019 17:27:46 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E8=BD=AE=E8=AF=A2?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=E6=8F=90=E7=A4=BA=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/layout/Layout.vue | 81 ++++++++++++++++++++++++++++++++-----
 1 file changed, 72 insertions(+), 9 deletions(-)

diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
index 41c0463..c6d062c 100644
--- a/src/views/layout/Layout.vue
+++ b/src/views/layout/Layout.vue
@@ -7,17 +7,25 @@
         <img src="~assets/image/unlcn.svg" alt="仓储管理">
       </div>
       <top-nav></top-nav>
-      <!--用户/退出-->
-      <logout></logout>
-      <!--发运库-->
-      <el-dropdown @command="handleCommand" style="margin-right: 30px;">
+      <div class="flex l-center a-right">
+        <!--未完成提示-->
+        <span class="c-fff" v-if="marqueeShow">提示信息:</span>
+        <marquee v-if="marqueeShow" class="unfinished" id="marquee1" direction="left" scrollamount=6 onmouseover="this.stop()" onmouseout="this.start()">
+          <!--目前只在这里a的长度刚好为marquee的两倍，（在chrome 40、opera 27.0中）实际上a的长度只要大于这个值都可以保证无缝滚动，多出的部分不参与滚动；firefox 37.0.2中完全不滚动，ie 11中还是会出现空隙-->
+          <span @click="toPreparationStock">{{marqueeText}}</span>
+        </marquee>
+        <!--用户/退出-->
+        <logout></logout>
+        <!--发运库-->
+        <el-dropdown @command="handleCommand" style="margin-right: 30px;">
         <span class="el-dropdown-link" style="color: white">
           {{houseName}} <i class="el-icon-caret-bottom" style="color: #1f2d3d"></i>
         </span>
-        <el-dropdown-menu slot="dropdown" class="hidden-scroll" style="height:30%;">
-          <el-dropdown-item v-for="(item, index) in storehousesList" :command="item" :key="index" >{{item.name}}</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
+          <el-dropdown-menu slot="dropdown" class="hidden-scroll" style="height:30%;">
+            <el-dropdown-item v-for="(item, index) in storehousesList" :command="item" :key="index" >{{item.name}}</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
     </div>
     <div class="sidebar-wrapper">
       <hamburger class="hamburger-container" :toggleClick="toggleSideBar" :isActive="sidebar.opened"></hamburger>
@@ -37,7 +45,7 @@
   import { mapGetters } from 'vuex'
   import Hamburger from '@/components/Hamburger'
   import { Sidebar, AppMain, Logout, TopNav, TabsView } from '@/views/layout'
-
+  import * as FactoryPreparationAPI from '@/api/factoryPreparation/factoryPreparation'
 export default {
     name: 'layout',
     components: {
@@ -63,11 +71,14 @@ export default {
     },
     data() {
       return {
+        marqueeText: '',
+        marqueeShow: false,
         storehousesList: [],
         houseName: ''
       }
     },
     mounted() {
+      const that = this
       if (this.currentStorehouse) {
         this.houseName = this.currentStorehouse.name
       } else {
@@ -77,8 +88,55 @@ export default {
       if (this.storehousesList.length < 1) {
         this.dialogAlert()
       }
+      // 定时器 任务提示
+      const halfHour = 3600 * 1000 / 2
+      that.mustMatter()
+      // 某些定时器操作
+      const timer = setInterval(() => {
+        that.mustMatter()
+      }, halfHour)
+      // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
+      that.$once('hook:beforeDestroy', () => {
+        clearInterval(timer)
+      })
     },
     methods: {
+      toPreparationStock() {
+        this.$router.push({ path: '/preparationStock' })
+      },
+      // 未完成 查询
+      mustMatter() {
+        const that = this
+        let sum = 0
+        this.marqueeText = ''
+        this.marqueeShow = false
+        const storeHouseId = this.$store.getters.currentStorehouse.id
+        FactoryPreparationAPI.queryMustMatter({ storeHouseId }).then(result => {
+          if (result.code === 0) {
+            sum = result.data.mustCount
+            if (sum > 0) {
+              that.$confirm('当前无单库存有[' + sum + ']台已收到工厂备料提车指令,请及时处理，详情请点击跳转！', '提示', {
+                confirmButtonText: '跳转',
+                cancelButtonText: '确定',
+                showCancelButton: true,
+                type: 'warning'
+              }).then(() => {
+                that.$router.push({ path: '/preparationStock' })
+              }).catch(() => {
+                that.marqueeText = '当前无单库存有[' + sum + ']台已收到工厂备料提车指令,请及时处理，详情请点击'
+                that.marqueeShow = true
+              })
+            }
+          } else {
+            that.$message({
+              title: '错误提示',
+              message: result.message,
+              type: 'error',
+              duration: 2000
+            })
+          }
+        })
+      },
       dialogAlert() {
         setTimeout(() => {
           this.$confirm('你未关联任何仓库，请联系管理员添加仓库！', '警告提示', {
@@ -249,4 +307,9 @@ export default {
     .layout-el-header{
       color: #333;line-height: 60px;background-color: #409EFF;text-align: right;padding: 0;
     }
+  /*跑马灯*/
+    .unfinished {
+      color: white;
+      width: 140px;
+    }
 </style>
-- 
Gitee


From 1562e06a704ee3d43b00bd42f1aca508f2cfd00b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=AD=90=E5=8E=9A?= <ming34902@sina.com>
Date: Tue, 3 Dec 2019 18:37:08 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E8=B7=91=E9=A9=AC?=
 =?UTF-8?q?=E7=81=AF=E5=AD=97=E5=8F=B7=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/layout/Layout.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
index c6d062c..67005ec 100644
--- a/src/views/layout/Layout.vue
+++ b/src/views/layout/Layout.vue
@@ -9,8 +9,8 @@
       <top-nav></top-nav>
       <div class="flex l-center a-right">
         <!--未完成提示-->
-        <span class="c-fff" v-if="marqueeShow">提示信息:</span>
-        <marquee v-if="marqueeShow" class="unfinished" id="marquee1" direction="left" scrollamount=6 onmouseover="this.stop()" onmouseout="this.start()">
+        <span class="c-fff f14" v-if="marqueeShow">提示信息:</span>
+        <marquee v-if="marqueeShow" class="unfinished f14" id="marquee1" direction="left" scrollamount=6 onmouseover="this.stop()" onmouseout="this.start()">
           <!--目前只在这里a的长度刚好为marquee的两倍，（在chrome 40、opera 27.0中）实际上a的长度只要大于这个值都可以保证无缝滚动，多出的部分不参与滚动；firefox 37.0.2中完全不滚动，ie 11中还是会出现空隙-->
           <span @click="toPreparationStock">{{marqueeText}}</span>
         </marquee>
-- 
Gitee


From 07b793513b9b14997c790dc4f514e33809f0c469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=AD=90=E5=8E=9A?= <ming34902@sina.com>
Date: Wed, 4 Dec 2019 15:06:40 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E6=9C=AA=E5=A4=87?=
 =?UTF-8?q?=E6=96=99=E9=A1=B5-=E4=BA=A4=E8=88=92=E6=86=A8=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/filter/customFilters.js                                   | 2 ++
 src/views/factoryPreparation/fpInBoundConfig/outBoundEdit.vue | 1 +
 src/views/factoryPreparation/fpOutBound.vue                   | 1 +
 3 files changed, 4 insertions(+)

diff --git a/src/filter/customFilters.js b/src/filter/customFilters.js
index cd00560..ad16fde 100644
--- a/src/filter/customFilters.js
+++ b/src/filter/customFilters.js
@@ -529,6 +529,8 @@ Vue.filter('prepareStatusFilter', (v) => {
     return '返工厂'
   } else if (v === '10') {
     return '工厂未备料入库'
+  } else if (v === '60') {
+    return '交舒憨头'
   } else {
     return v
   }
diff --git a/src/views/factoryPreparation/fpInBoundConfig/outBoundEdit.vue b/src/views/factoryPreparation/fpInBoundConfig/outBoundEdit.vue
index 710785a..614677a 100644
--- a/src/views/factoryPreparation/fpInBoundConfig/outBoundEdit.vue
+++ b/src/views/factoryPreparation/fpInBoundConfig/outBoundEdit.vue
@@ -8,6 +8,7 @@
             <el-option key="1" label="移实顺" value="20"></el-option>
             <el-option key="2" label="提车指令出库" value="30"></el-option>
             <el-option key="3" label="返工厂" value="40"></el-option>
+            <el-option key="4" label="交舒憨头" value="60"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label='备注：' prop="remarks">
diff --git a/src/views/factoryPreparation/fpOutBound.vue b/src/views/factoryPreparation/fpOutBound.vue
index d458872..5b23eac 100644
--- a/src/views/factoryPreparation/fpOutBound.vue
+++ b/src/views/factoryPreparation/fpOutBound.vue
@@ -52,6 +52,7 @@
             <el-option label="移实顺" value="20"></el-option>
             <el-option label="提车指令出库" value="30"></el-option>
             <el-option label="返工厂" value="40"></el-option>
+            <el-option label="交舒憨头" value="60"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="无单出库时间:">
-- 
Gitee


From ed347187cda9b502a1432ab6eaf4495023f50627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=AD=90=E5=8E=9A?= <ming34902@sina.com>
Date: Wed, 4 Dec 2019 15:07:19 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=BA=8B=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factoryPreparation/preparationStock.vue   |  4 +-
 src/views/layout/Layout.vue                   | 60 ++++++++++++-------
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/src/views/factoryPreparation/preparationStock.vue b/src/views/factoryPreparation/preparationStock.vue
index ab557ab..5778c9c 100644
--- a/src/views/factoryPreparation/preparationStock.vue
+++ b/src/views/factoryPreparation/preparationStock.vue
@@ -59,7 +59,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="库存转换状态">
-          <el-select v-model="listQuery.condition.stockProperty" placeholder="请选择状态">
+          <el-select v-model="listQuery.condition.stockProperty" disabled placeholder="请选择状态">
             <el-option label="未选择" value=""></el-option>
             <el-option label="已转换" value="Y"></el-option>
             <el-option label="未转换" value="N"></el-option>
@@ -184,7 +184,7 @@
             vin: null,
             queryType: 'Y',
             isShipment: '',
-            stockProperty: 'Y',
+            stockProperty: 'N',
             startDate: '',
             endDate: Utils.parseTime(new Date().getTime(), '{y}-{m}-{d} 23:59:59')
           }
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
index 67005ec..c2bf50a 100644
--- a/src/views/layout/Layout.vue
+++ b/src/views/layout/Layout.vue
@@ -8,16 +8,15 @@
       </div>
       <top-nav></top-nav>
       <div class="flex l-center a-right">
-        <!--未完成提示-->
-        <span class="c-fff f14" v-if="marqueeShow">提示信息:</span>
-        <marquee v-if="marqueeShow" class="unfinished f14" id="marquee1" direction="left" scrollamount=6 onmouseover="this.stop()" onmouseout="this.start()">
+        <span></span>
+        <marquee class="unfinished f14" id="marquee1" direction="left" scrollamount=6 onmouseover="this.stop()" onmouseout="this.start()">
           <!--目前只在这里a的长度刚好为marquee的两倍，（在chrome 40、opera 27.0中）实际上a的长度只要大于这个值都可以保证无缝滚动，多出的部分不参与滚动；firefox 37.0.2中完全不滚动，ie 11中还是会出现空隙-->
-          <span @click="toPreparationStock">{{marqueeText}}</span>
+          {{marqueeText}}
         </marquee>
         <!--用户/退出-->
         <logout></logout>
         <!--发运库-->
-        <el-dropdown @command="handleCommand" style="margin-right: 30px;">
+        <el-dropdown @command="handleCommand" style="margin-right: 20px;">
         <span class="el-dropdown-link" style="color: white">
           {{houseName}} <i class="el-icon-caret-bottom" style="color: #1f2d3d"></i>
         </span>
@@ -25,6 +24,17 @@
             <el-dropdown-item v-for="(item, index) in storehousesList" :command="item" :key="index" >{{item.name}}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
+        <!--待办事项-->
+        <el-dropdown v-if="marqueeShow" @command="handleCommand2" style="margin-right: 30px;position: relative;">
+          <span class="el-dropdown-link" style="color: white">
+            待办事项<i class="el-icon-caret-bottom" style="color: #1f2d3d"></i>
+          </span>
+          <el-dropdown-menu slot="dropdown" class="hidden-scroll unfinished-el-dropdown" style="height:16%;top:40px;">
+            <el-dropdown-item v-for="(item, index) in unfinishedList" :command="item" :key="index" >
+              {{item.message}}
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
       </div>
     </div>
     <div class="sidebar-wrapper">
@@ -73,7 +83,8 @@ export default {
       return {
         marqueeText: '',
         marqueeShow: false,
-        storehousesList: [],
+        storehousesList: [], // 仓库列表
+        unfinishedList: [], // 待办事项
         houseName: ''
       }
     },
@@ -104,6 +115,11 @@ export default {
       toPreparationStock() {
         this.$router.push({ path: '/preparationStock' })
       },
+      handleCommand2(item) {
+        // this.houseName = item.name
+        // 存储 currentStorehouse
+        this.$router.push({ path: item.router })
+      },
       // 未完成 查询
       mustMatter() {
         const that = this
@@ -113,19 +129,23 @@ export default {
         const storeHouseId = this.$store.getters.currentStorehouse.id
         FactoryPreparationAPI.queryMustMatter({ storeHouseId }).then(result => {
           if (result.code === 0) {
-            sum = result.data.mustCount
-            if (sum > 0) {
-              that.$confirm('当前无单库存有[' + sum + ']台已收到工厂备料提车指令,请及时处理，详情请点击跳转！', '提示', {
-                confirmButtonText: '跳转',
-                cancelButtonText: '确定',
-                showCancelButton: true,
-                type: 'warning'
-              }).then(() => {
-                that.$router.push({ path: '/preparationStock' })
-              }).catch(() => {
-                that.marqueeText = '当前无单库存有[' + sum + ']台已收到工厂备料提车指令,请及时处理，详情请点击'
-                that.marqueeShow = true
+            if (result.data && result.data.length > 0) {
+              sum = result.data.length
+              result.data.map(item => {
+                if (item.linkType === '10') {
+                  that.unfinishedList.push({
+                    message: item.message,
+                    router: '/preparationStock'
+                  })
+                } else {
+                  that.unfinishedList.push({
+                    message: item.message,
+                    router: '/'
+                  })
+                }
               })
+              that.marqueeShow = true
+              that.marqueeText = '您当前有[' + sum + ']条待办事项,请关注'
             }
           } else {
             that.$message({
@@ -309,7 +329,7 @@ export default {
     }
   /*跑马灯*/
     .unfinished {
-      color: white;
-      width: 140px;
+      color: #F6D4AD;
+      max-width: 140px;
     }
 </style>
-- 
Gitee