src/utils/wmsDic.js

@@ -93,6 +93,14 @@ export function getOperationCode2List() {
   return operationCode
 }
 
+// 仓库
+const storeList = ['1号立体库', '2号立体库', '3号立体库', '4号立体库', '5号立体库', '6号立体库', '7号立体库', '8号立体库']
+export function getStoreList() {
+  let store = ''
+  store += storeList[parseInt(Math.random() * storeList.length)]
+  return store
+}
+
 // 库区
 const KQList = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N']
 export function getKQList() {
@@ -155,7 +163,63 @@ export function getMaterialCodeList() {
 // 名字
 const nameList = ['张明', '李燕', '王国庆', '张强', '周敏']
 export function getNameList() {
-  let name = 'WL'
+  let name = ''
   name = nameList[parseInt(Math.random() * (nameList.length))]
   return name
 }
+
+// 客户数据
+const compList = ['台玻', 'FUYAO福耀', 'SG南玻', 'XYG信义玻璃', '耀皮', '福莱特玻璃', 'CLFG洛玻', 'SHABO沙玻', 'KIBING旗滨', '金晶玻璃', '济南金昊', '东莞佳美特', '汇中矿产', '文盛新材料', '西点化学', '开源塑胶', '奥驰商贸', '竹中科技', '程龙玻璃']
+export function getCompTyleList() {
+  let comp = ''
+  comp = compList[parseInt(Math.random() * (compList.length))]
+  return comp
+}
+
+// 客户联系人
+const contactList = ['张总', '李总', '王总', '孙总', '赵总', '周总', '钱总', '吴总', '郑总', '杨总', '朱总', '蒋总', '江总', '马总']
+export function getContactList() {
+  let name = ''
+  name = contactList[parseInt(Math.random() * (contactList.length))]
+  return name
+}
+
+// 手机号前三位
+const phoneList = ['139', '138', '137', '136', '135', '134', '159', '158', '157', '150', '151', '152', '188', '187', '182', '183', '184', '178', '130', '131', '132', '156', '155', '186', '185', '176', '133', '153', '189', '180', '181', '177']
+export function getPhoneList() {
+  let name = ''
+  name = phoneList[parseInt(Math.random() * (phoneList.length))]
+  return name
+}
+
+// 物品名称
+const goodsList = ['钢化玻璃', '磨砂玻璃', '喷砂玻璃', '压花玻璃', '夹丝玻璃', '夹层玻璃']
+export function getGoodsList() {
+  let name = ''
+  name = goodsList[parseInt(Math.random() * (goodsList.length))]
+  return name
+}
+
+// 玻璃编码List
+export function getGlassCodeList() {
+  let materialCode = 'SJG'
+  for (let i = 0; i < 4; i++) {
+    materialCode += parseInt(Math.random() * 89 + 10)
+  }
+  return materialCode
+}
+
+// 角色编码List
+export function getRoleCodeList() {
+  let materialCode = 'R'
+  for (let i = 0; i < 4; i++) {
+    materialCode += parseInt(Math.random() * 89 + 10)
+  }
+  return materialCode
+}
+
+// 角色名称List
+export function getRoleNameList() {
+  const materialCode = ['超级管理员', '管理员', '1号线管理员', '2号线管理员', '1号线加工人员', '2号线加工人员', '质检1组', '质检2组', '质检3组', '质检4组']
+  return materialCode
+}

src/views/wmsBasicData/components/customerData-add.vue

@@ -7,10 +7,6 @@
 -->
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter" width="40%" class="dialog" @close="close">
-    <!-- <small-title slot="title">
-      {{ !dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter }}
-    </small-title> -->
-
     <el-form
       ref="dataForm"
       :model="dataForm"
@@ -46,13 +42,6 @@
           clearable
         />
       </el-form-item>
-      <!-- <el-form-item label="ERP代码" prop="name5">
-        <el-input
-          v-model="dataForm.name5"
-          placeholder="请输入ERP代码"
-          clearable
-        />
-      </el-form-item> -->
     </el-form>
 
     <el-row style="text-align: right">
@@ -63,7 +52,6 @@
 </template>
 
 <script>
-// import SmallTitle from '@/components/BaseDrawer/components/SmallTitle.vue'
 
 export default {
   // components: { SmallTitle },
@@ -75,9 +63,7 @@ export default {
         name1: '',
         name2: '',
         name3: '',
-        name4: '',
+        name4: ''
-        name5: '',
-        name6: ''
       },
       dataRule: {
         name1: [
@@ -91,13 +77,23 @@ export default {
     }
   },
   methods: {
-    init(row) {
+    init(val) {
-      this.dataForm = row || ''
+      if (val) {
-      console.log(row)
-      this.visible = true
         this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
+          this.dataForm.name1 = val.name1
+          this.dataForm.name2 = val.name2
+          this.dataForm.name3 = val.name3
+          this.dataForm.name4 = val.name4
         })
+      } else {
+        this.$nextTick(() => {
+          this.dataForm.name1 = ''
+          this.dataForm.name2 = ''
+          this.dataForm.name3 = ''
+          this.dataForm.name4 = ''
+        })
+      }
+      this.visible = true
     },
     // 表单提交
     dataFormSubmit() {
@@ -109,7 +105,6 @@ export default {
             duration: 1500,
             onClose: () => {
               this.visible = false
-              this.$emit('refreshDataList')
             }
           })
         }
@@ -117,7 +112,6 @@ export default {
     },
     close() {
       this.visible = false
-      this.$emit('refreshDataList')
     }
   }
 }

src/views/wmsBasicData/components/goodsAreaData-add.vue

@@ -98,13 +98,27 @@ export default {
     }
   },
   methods: {
-    init(row) {
+    init(val) {
-      this.dataForm = row || ''
+      if (val) {
-      console.log(row)
-      this.visible = true
         this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
+          this.dataForm.name1 = val.name1
+          this.dataForm.name2 = val.name2
+          this.dataForm.name3 = val.name3
+          this.dataForm.name4 = val.name4
+          this.dataForm.name5 = val.name5
+          this.dataForm.name6 = val.name6
         })
+      } else {
+        this.$nextTick(() => {
+          this.dataForm.name1 = ''
+          this.dataForm.name2 = ''
+          this.dataForm.name3 = ''
+          this.dataForm.name4 = ''
+          this.dataForm.name5 = ''
+          this.dataForm.name6 = ''
+        })
+      }
+      this.visible = true
     },
     // 表单提交
     dataFormSubmit() {
@@ -116,7 +130,6 @@ export default {
             duration: 1500,
             onClose: () => {
               this.visible = false
-              this.$emit('refreshDataList')
             }
           })
         }
@@ -124,7 +137,6 @@ export default {
     },
     close() {
       this.visible = false
-      this.$emit('refreshDataList')
     }
   }
 }

src/views/wmsBasicData/components/goodsData-add.vue

@@ -82,13 +82,23 @@ export default {
     }
   },
   methods: {
-    init(row) {
+    init(val) {
-      this.dataForm = row || ''
+      if (val) {
-      console.log(row)
-      this.visible = true
         this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
+          this.dataForm.name1 = val.name1
+          this.dataForm.name2 = val.name2
+          this.dataForm.name3 = val.name3
+          this.dataForm.name4 = val.name4
         })
+      } else {
+        this.$nextTick(() => {
+          this.dataForm.name1 = ''
+          this.dataForm.name2 = ''
+          this.dataForm.name3 = ''
+          this.dataForm.name4 = ''
+        })
+      }
+      this.visible = true
     },
     // 表单提交
     dataFormSubmit() {
@@ -100,7 +110,6 @@ export default {
             duration: 1500,
             onClose: () => {
               this.visible = false
-              this.$emit('refreshDataList')
             }
           })
         }
@@ -108,7 +117,6 @@ export default {
     },
     close() {
       this.visible = false
-      this.$emit('refreshDataList')
     }
   }
 }

src/views/wmsBasicData/components/warehouseData-add.vue

@@ -82,13 +82,23 @@ export default {
     }
   },
   methods: {
-    init(row) {
+    init(val) {
-      this.dataForm = row || ''
+      if (val) {
-      console.log(row)
-      this.visible = true
         this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
+          this.dataForm.name1 = val.name1
+          this.dataForm.name2 = val.name2
+          this.dataForm.name3 = val.name3
+          this.dataForm.name4 = val.name4
         })
+      } else {
+        this.$nextTick(() => {
+          this.dataForm.name1 = ''
+          this.dataForm.name2 = ''
+          this.dataForm.name3 = ''
+          this.dataForm.name4 = ''
+        })
+      }
+      this.visible = true
     },
     // 表单提交
     dataFormSubmit() {
@@ -100,7 +110,6 @@ export default {
             duration: 1500,
             onClose: () => {
               this.visible = false
-              this.$emit('refreshDataList')
             }
           })
         }
@@ -108,7 +117,6 @@ export default {
     },
     close() {
       this.visible = false
-      this.$emit('refreshDataList')
     }
   }
 }

src/views/wmsBasicData/customerData.vue

@@ -42,8 +42,9 @@ import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import { timeFormatter } from '@/filters'
 import i18n from '@/lang'
+import { getCompTyleList, getContactList, getPhoneList } from '@/utils/wmsDic'
+import moment from 'moment'
 /**
  * 表格表头配置项 TypeScript接口注释
  * tableConfig<ConfigItem> = []
@@ -79,8 +80,7 @@ const tableBtn = [
 const tableProps = [
   {
     prop: 'createTime',
-    label: i18n.t('module.basicData.factory.createTime'),
+    label: i18n.t('module.basicData.factory.createTime')
-    filter: timeFormatter
   },
   {
     prop: 'name1',
@@ -162,7 +162,7 @@ export default {
       console.log(raw)
       if (raw.type === 'delete') {
         this.$confirm(
-          `${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`,
+          `${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name1}]?`,
           this.$t('module.basicData.visual.Tips'),
           {
             confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
@@ -182,22 +182,29 @@ export default {
           })
           .catch(() => {})
       } else {
-        this.addNew(raw.data)
+        this.$nextTick(() => {
+          this.addOrUpdateVisible = true
+          this.$refs.addOrUpdate.init(raw.data)
+        })
       }
     },
     getList() {
       this.listLoading = false
       this.listQuery.key = this.headFormValue.name
-      this.list = [
+      const temp = []
-        {
+      const num = 20
-          id: 1,
+      for (let i = 0; i < num; i++) {
-          name1: '东路钢铁公司',
+        const obj = {}
-          name2: '供应商',
+        const sj = Math.floor(Math.random() * 720 + 10)
-          name3: '张总',
+        obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
-          name4: '13768470056',
+        obj.name1 = getCompTyleList()
-          name5: ''
+        obj.name2 = '供应商'
+        obj.name3 = getContactList()
+        obj.name4 = getPhoneList() + parseInt(Math.random() * 89999999 + 10000000)
+        temp.push(obj)
       }
-      ]
+      this.list = temp
+      this.total = num
     },
     btnClick(val) {
       this.headFormValue = val
@@ -208,17 +215,13 @@ export default {
     },
     clickTopBtn(val) {
       if (val === 'add') {
-        this.addNew()
-      }
-    },
-    // 新增 / 修改
-    addNew(row) {
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(row)
+          this.$refs.addOrUpdate.init()
         })
       }
     }
+  }
 }
 </script>
 

src/views/wmsBasicData/goodsAreaData.vue

@@ -42,8 +42,9 @@ import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import { timeFormatter } from '@/filters'
 import i18n from '@/lang'
+import { getHWList } from '@/utils/wmsDic'
+import moment from 'moment'
 /**
  * 表格表头配置项 TypeScript接口注释
  * tableConfig<ConfigItem> = []
@@ -79,8 +80,7 @@ const tableBtn = [
 const tableProps = [
   {
     prop: 'createTime',
-    label: i18n.t('module.basicData.factory.createTime'),
+    label: i18n.t('module.basicData.factory.createTime')
-    filter: timeFormatter
   },
   {
     prop: 'name1',
@@ -166,7 +166,7 @@ export default {
       console.log(raw)
       if (raw.type === 'delete') {
         this.$confirm(
-          `${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`,
+          `${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name1}]?`,
           this.$t('module.basicData.visual.Tips'),
           {
             confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
@@ -186,23 +186,31 @@ export default {
           })
           .catch(() => {})
       } else {
-        this.addNew(raw.data)
+        this.addOrUpdateVisible = true
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(raw.data)
+        })
       }
     },
     getList() {
       this.listLoading = false
       this.listQuery.key = this.headFormValue.name
-      this.list = [
+      const temp = []
-        {
+      const num = 20
-          id: 1,
+      for (let i = 0; i < num; i++) {
-          name1: 'A区',
+        const obj = {}
-          name2: '2022040696',
+        const sj = Math.floor(Math.random() * 720 + 10)
-          name3: '成品',
+        obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
-          name4: '空闲',
+        obj.name2 = getHWList()
-          name5: '开',
+        obj.name1 = obj.name2[2] + '区'
-          name6: '关'
+        obj.name3 = obj.name2
+        obj.name4 = parseInt(Math.random() * 2) ? '有货' : '无货'
+        obj.name5 = parseInt(Math.random() * 2) ? 'Y' : 'N'
+        obj.name6 = parseInt(Math.random() * 2) ? 'Y' : 'N'
+        temp.push(obj)
       }
-      ]
+      this.list = temp
+      this.total = num
     },
     btnClick(val) {
       this.headFormValue = val
@@ -213,17 +221,13 @@ export default {
     },
     clickTopBtn(val) {
       if (val === 'add') {
-        this.addNew()
-      }
-    },
-    // 新增 / 修改
-    addNew(row) {
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(row)
+          this.$refs.addOrUpdate.init()
         })
       }
     }
+  }
 }
 </script>
 

src/views/wmsBasicData/goodsData.vue

@@ -42,8 +42,9 @@ import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import { timeFormatter } from '@/filters'
 import i18n from '@/lang'
+import { getGoodsList, getGlassCodeList } from '@/utils/wmsDic'
+import moment from 'moment'
 /**
  * 表格表头配置项 TypeScript接口注释
  * tableConfig<ConfigItem> = []
@@ -79,8 +80,7 @@ const tableBtn = [
 const tableProps = [
   {
     prop: 'createTime',
-    label: i18n.t('module.basicData.factory.createTime'),
+    label: i18n.t('module.basicData.factory.createTime')
-    filter: timeFormatter
   },
   {
     prop: 'name1',
@@ -158,7 +158,7 @@ export default {
       console.log(raw)
       if (raw.type === 'delete') {
         this.$confirm(
-          `${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`,
+          `${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name1}]?`,
           this.$t('module.basicData.visual.Tips'),
           {
             confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
@@ -178,21 +178,29 @@ export default {
           })
           .catch(() => {})
       } else {
-        this.addNew(raw.data)
+        this.addOrUpdateVisible = true
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(raw.data)
+        })
       }
     },
     getList() {
       this.listLoading = false
       this.listQuery.key = this.headFormValue.name
-      this.list = [
+      const temp = []
-        {
+      const num = 20
-          id: 1,
+      for (let i = 0; i < num; i++) {
-          name1: '清洗液',
+        const obj = {}
-          name2: '20220608684',
+        const sj = Math.floor(Math.random() * 720 + 10)
-          name3: '清洗机',
+        obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
-          name4: ''
+        obj.name1 = getGoodsList()
+        obj.name2 = getGlassCodeList()
+        obj.name3 = '深加工玻璃'
+        obj.name4 = '安全'
+        temp.push(obj)
       }
-      ]
+      this.list = temp
+      this.total = num
     },
     btnClick(val) {
       this.headFormValue = val
@@ -203,17 +211,13 @@ export default {
     },
     clickTopBtn(val) {
       if (val === 'add') {
-        this.addNew()
-      }
-    },
-    // 新增 / 修改
-    addNew(row) {
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(row)
+          this.$refs.addOrUpdate.init()
         })
       }
     }
+  }
 }
 </script>
 

src/views/wmsBasicData/warehouseData.vue

@@ -42,23 +42,9 @@ import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import { timeFormatter } from '@/filters'
 import i18n from '@/lang'
-/**
+import { getKQList, getStoreList } from '@/utils/wmsDic'
- * 表格表头配置项 TypeScript接口注释
+import moment from 'moment'
- * tableConfig<ConfigItem> = []
- *
- * Interface ConfigItem = {
- *  prop: string,
- *  label: string,
- *  width: string,
- *  align: string,
- *  subcomponent: function,
- *  filter: function
- * }
- *
- *
- */
 const topBtnConfig = [
   {
     type: 'add',
@@ -79,8 +65,7 @@ const tableBtn = [
 const tableProps = [
   {
     prop: 'createTime',
-    label: i18n.t('module.basicData.factory.createTime'),
+    label: i18n.t('module.basicData.factory.createTime')
-    filter: timeFormatter
   },
   {
     prop: 'name1',
@@ -158,7 +143,7 @@ export default {
       console.log(raw)
       if (raw.type === 'delete') {
         this.$confirm(
-          `${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`,
+          `${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name1}]?`,
           this.$t('module.basicData.visual.Tips'),
           {
             confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
@@ -178,20 +163,29 @@ export default {
           })
           .catch(() => {})
       } else {
-        this.addNew(raw.data)
+        this.addOrUpdateVisible = true
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(raw.data)
+        })
       }
     },
     getList() {
       this.listLoading = false
       this.listQuery.key = this.headFormValue.name
-      this.list = [
+      const temp = []
-        {
+      const num = 20
-          id: 1,
+      for (let i = 0; i < num; i++) {
-          name1: '东仓库',
+        const obj = {}
-          name2: 'A区',
+        const sj = Math.floor(Math.random() * 720 + 10)
-          name3: '空闲'
+        obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
+        obj.name1 = getStoreList()
+        obj.name2 = getKQList() + '区'
+        obj.name3 = '成品仓'
+        obj.name4 = 'TCP' + sj
+        temp.push(obj)
       }
-      ]
+      this.list = temp
+      this.total = num
     },
     btnClick(val) {
       this.headFormValue = val
@@ -202,17 +196,13 @@ export default {
     },
     clickTopBtn(val) {
       if (val === 'add') {
-        this.addNew()
-      }
-    },
-    // 新增 / 修改
-    addNew(row) {
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(row)
+          this.$refs.addOrUpdate.init()
         })
       }
     }
+  }
 }
 </script>
 

src/views/wmsInventoryManagement/inventory.vue

@@ -22,7 +22,7 @@ import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination'
 import { tableHeight } from '@/utils/index'
-import { getMaterialCodeList, getKQList, getProductSpecList } from '@/utils/wmsDic'
+import { getMaterialCodeList, getKQList, getProductSpecList, getGoodsList } from '@/utils/wmsDic'
 const tableProps = [
   {
     prop: 'productName',
@@ -89,7 +89,7 @@ export default {
       const num = 20
       for (let i = 0; i < num; i++) {
         const obj = {}
-        obj.productName = ''
+        obj.productName = getGoodsList()
         obj.spec = getProductSpecList()
         obj.materialCode = getMaterialCodeList()
         obj.storeArea = getKQList() + '区'

src/views/wmsInventoryManagement/inventoryQuery.vue

@@ -22,7 +22,7 @@ import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination'
 import { tableHeight } from '@/utils/index'
-import { getProductSpecList, getMaterialCodeList, getTrayList, getHWList, getBatchList } from '@/utils/wmsDic'
+import { getProductSpecList, getMaterialCodeList, getTrayList, getHWList, getBatchList, getGoodsList } from '@/utils/wmsDic'
 import moment from 'moment'
 const tableProps = [
   {
@@ -126,10 +126,10 @@ export default {
       const num = 20
       for (let i = 0; i < num; i++) {
         const obj = {}
-        obj.productName = ''
+        obj.productName = getGoodsList()
         const sj = Math.floor(Math.random() * 720 + 10)
         obj.spec = getProductSpecList()
-        obj.status = ''
+        obj.status = parseInt(Math.random() * 2) ? '已分配' : '未分配'
         obj.materialCode = getMaterialCodeList()
         obj.goodsArea = getHWList()
         obj.storeArea = obj.goodsArea[2] + '区'

src/views/wmsInventoryManagement/locationQuery.vue

@@ -24,7 +24,7 @@ import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination'
 import { tableHeight } from '@/utils/index'
-import { getHWList, getKQList } from '@/utils/wmsDic'
+import { getHWList, getStoreList } from '@/utils/wmsDic'
 const tableProps = [
   {
     prop: 'goodsAreaCode',
@@ -115,13 +115,13 @@ export default {
       for (let i = 0; i < num; i++) {
         const obj = {}
         obj.goodsAreaCode = getHWList()
-        obj.goodsAreaName = ''
+        obj.goodsAreaName = obj.goodsAreaCode
-        obj.goodsAreaStatus = ''
+        obj.goodsAreaStatus = parseInt(Math.random() * 2) ? '有货' : '无货'
-        obj.roadway = Math.floor(Math.random() * 5 + 1) + '号巷'
+        obj.roadway = '巷道' + Math.floor(Math.random() * 15 + 1)
         obj.storeArea = obj.goodsAreaCode[2] + '区'
-        obj.store = getKQList() + '仓库'
+        obj.store = getStoreList()
-        obj.warehousingLock = ''
+        obj.warehousingLock = parseInt(Math.random() * 2) ? 'Y' : 'N'
-        obj.outboundLock = ''
+        obj.outboundLock = parseInt(Math.random() * 2) ? 'Y' : 'N'
         temp.push(obj)
       }
       this.list = temp

src/views/wmsInventoryManagement/stockTaking.vue

@@ -24,7 +24,7 @@ import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination'
 import { tableHeight } from '@/utils/index'
-import { getInventoryNoList, getMaterialCodeList, getProductSpecList, getTrayList, getNameList } from '@/utils/wmsDic'
+import { getInventoryNoList, getMaterialCodeList, getProductSpecList, getTrayList, getNameList, getGoodsList } from '@/utils/wmsDic'
 import moment from 'moment'
 const tableProps = [
   {
@@ -120,7 +120,7 @@ export default {
       for (let i = 0; i < num; i++) {
         const obj = {}
         obj.inventoryNumber = getInventoryNoList()
-        obj.productName = ''
+        obj.productName = getGoodsList()
         obj.spec = getProductSpecList()
         obj.materialCode = getMaterialCodeList()
         obj.trayID = getTrayList()

src/views/wmsOutStore/outStoreDocuments.vue

@@ -36,7 +36,7 @@ import Pagination from '@/components/Pagination'
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import { tableHeight } from '@/utils/index'
 import outStoreDocumentsAdd from './components/outStoreDocumentsAdd.vue'
-import { getOutboundNoList, getHCQList, getProductSpecList } from '@/utils/wmsDic'
+import { getOutboundNoList, getHCQList, getProductSpecList, getCompTyleList } from '@/utils/wmsDic'
 import moment from 'moment'
 const topBtnConfig = [
   {
@@ -132,7 +132,7 @@ export default {
       for (let i = 0; i < num; i++) {
         const obj = {}
         obj.outboundOrderNo = getOutboundNoList()
-        obj.customerName = ''
+        obj.customerName = getCompTyleList()
         obj.shipmentCacheArea = getHCQList()
         obj.num = parseInt(Math.random() * 1000)
         obj.spec = getProductSpecList()

src/views/wmsStatisticalReports/inventoryReport.vue

@@ -26,7 +26,7 @@ import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination'
 import { tableHeight } from '@/utils/index'
-import { getReceiptNoList, getProductSpecList, getMaterialCodeList } from '@/utils/wmsDic'
+import { getReceiptNoList, getProductSpecList, getMaterialCodeList, getGoodsList } from '@/utils/wmsDic'
 import moment from 'moment'
 const tableProps = [
   {
@@ -114,8 +114,8 @@ export default {
       for (let i = 0; i < num; i++) {
         const obj = {}
         obj.orderCode = getReceiptNoList()
-        obj.type = ''
+        obj.type = '深加工玻璃'
-        obj.productName = ''
+        obj.productName = getGoodsList()
         const sj = Math.floor(Math.random() * 100)
         obj.spec = getProductSpecList()
         obj.materialCode = getMaterialCodeList()

src/views/wmsStatisticalReports/outStoreReport.vue

@@ -34,7 +34,7 @@ import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination'
 import { tableHeight } from '@/utils/index'
-import { getOutboundNoList, getProductSpecList, getMaterialCodeList } from '@/utils/wmsDic'
+import { getOutboundNoList, getProductSpecList, getMaterialCodeList, getGoodsList } from '@/utils/wmsDic'
 import moment from 'moment'
 const tableProps = [
   {
@@ -122,8 +122,8 @@ export default {
       for (let i = 0; i < num; i++) {
         const obj = {}
         obj.orderCode = getOutboundNoList()
-        obj.type = ''
+        obj.type = '深加工玻璃'
-        obj.productName = ''
+        obj.productName = getGoodsList()
         const sj = Math.floor(Math.random() * 5)
         obj.spec = getProductSpecList()
         obj.materialCode = getMaterialCodeList()

src/views/wmsSystemSettings/roleManagement.vue

@@ -35,7 +35,6 @@
 </template>
 
 <script>
-import basicData from '@/filters/basicData'
 import HeadForm from '@/components/basicData/HeadForm'
 import i18n from '@/lang'
 const topBtnConfig = [
@@ -67,8 +66,7 @@ const tableProps = [{
 }, {
   prop: 'enabled',
   label: i18n.t('roleManage.status'),
-  align: 'center',
+  align: 'center'
-  filter: basicData('enableState')
 },
 // {
 //   prop: 'category',
@@ -88,6 +86,7 @@ import BaseTable from '@/components/BaseTable'
 
 import Pagination from '@/components/Pagination'
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
+import { getRoleCodeList, getRoleNameList } from '@/utils/wmsDic'
 export default {
   name: 'RoleManagement',
   components: { Pagination, BaseTable, MethodBtn, AddForm, EditForm, HeadForm, menuEmpower },
@@ -151,14 +150,18 @@ export default {
       }
     },
     async getList() {
-      this.list = [
+      const temp = []
-        {
+      const num = 10
-          id: 1,
+      for (let i = 0; i < num; i++) {
-          name: '管理员',
+        const obj = {}
-          code: 'R254815254',
+        obj.code = getRoleCodeList()
-          enabled: 1
+        obj.name = getRoleNameList()[i]
+        obj.enabled = parseInt(Math.random() * 2) ? '启用' : '禁用'
+        obj.remark = '无'
+        temp.push(obj)
       }
-      ]
+      this.list = temp
+      this.total = num
     },
     // 新增 / 修改
     addNew() {