Merge pull request '11-wms-zjl' (#22) from 11-wms-zjl into master

Reviewed-on: http://git.picaiba.com/mt-fe-group/11-wms/pulls/22

src/utils/wmsDic.js

@@ -189,7 +189,7 @@ export function getPhoneList() {
 }
 
 // 物品名称
-const goodsList = ['钢化玻璃', '磨砂玻璃', '喷砂玻璃', '压花玻璃', '夹丝玻璃', '夹层玻璃']
+const goodsList = ['盖板玻璃', '背板玻璃']
 export function getGoodsList() {
   let name = ''
   name = goodsList[parseInt(Math.random() * (goodsList.length))]

src/views/wmsInventoryManagement/inventory.vue

@@ -26,7 +26,7 @@ import { getMaterialCodeList, getKQList, getProductSpecList, getGoodsList } from
 const tableProps = [
   {
     prop: 'productName',
-    label: '盖板玻璃或背板玻璃'
+    label: '品名'
   },
   {
     prop: 'spec',
@@ -54,7 +54,7 @@ export default {
         {
           type: 'input',
           label: '关键字',
-          placeholder: '盖板玻璃或背板玻璃,物料编码,库区',
+          placeholder: '品名,物料编码,库区',
           param: 'name',
           width: 250
         },

src/views/wmsInventoryManagement/inventoryQuery.vue

@@ -27,7 +27,7 @@ import moment from 'moment'
 const tableProps = [
   {
     prop: 'productName',
-    label: '盖板玻璃或背板玻璃'
+    label: '品名'
   },
   {
     prop: 'spec',

src/views/wmsInventoryManagement/stockTaking.vue

@@ -33,7 +33,7 @@ const tableProps = [
   },
   {
     prop: 'productName',
-    label: '盖板玻璃或背板玻璃'
+    label: '品名'
   },
   {
     prop: 'spec',
@@ -73,7 +73,7 @@ export default {
         {
           type: 'input',
           label: '关键字',
-          placeholder: '盘点单号,盖板玻璃或背板玻璃,物料编码',
+          placeholder: '盘点单号,品名,物料编码',
           param: 'name',
           width: 250
         },