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

Reviewed-on: #3

src/utils/wmsDic.js

@@ -0,0 +1,225 @@
+import moment from 'moment'
+// 托盘List
+export function getTrayList() {
+  let trayID = 'TP'
+  for (let i = 0; i < 3; i++) {
+    trayID += parseInt(Math.random() * 89 + 10)
+  }
+  return trayID
+}
+// 成品内控码List
+export function getProductList() {
+  let prodCode = 'CP'
+  for (let i = 0; i < 5; i++) {
+    prodCode += parseInt(Math.random() * 89 + 10)
+  }
+  return prodCode
+}
+
+// 客户标签号List
+export function getCustomerCodeList() {
+  let customerCode = '2022'
+  for (let i = 0; i < 5; i++) {
+    customerCode += parseInt(Math.random() * 89 + 10)
+  }
+  return customerCode
+}
+
+// 成品规格List
+export function getProductSpecList() {
+  const list = ['50*50mm', '70*50mm', '70*70mm', '100*50mm', '100*70mm', '100*100mm', '100*120mm', '120*120mm']
+  const spec = list[parseInt(Math.random() * (list.length))]
+  return spec
+}
+
+// 批次List
+export function getBatchList() {
+  let batch = '2022'
+  for (let i = 0; i < 8; i++) {
+    batch += parseInt(Math.random() * 89 + 10)
+  }
+  return batch
+}
+
+// 包装机List
+export function getPackList() {
+  let batch = '0'
+  batch += parseInt(Math.random() * 8 + 1)
+  return batch
+}
+
+// 入库单号List
+export function getReceiptNoList() {
+  let receiptNo = 'RQD2022'
+  for (let i = 0; i < 3; i++) {
+    receiptNo += parseInt(Math.random() * 89 + 10)
+  }
+  return receiptNo
+}
+
+// 出库单号List
+export function getOutboundNoList() {
+  let receiptNo = 'CKD2022'
+  for (let i = 0; i < 3; i++) {
+    receiptNo += parseInt(Math.random() * 89 + 10)
+  }
+  return receiptNo
+}
+
+// 盘点单号List
+export function getInventoryNoList() {
+  let inventoryNumber = 'PD2022'
+  for (let i = 0; i < 3; i++) {
+    inventoryNumber += parseInt(Math.random() * 89 + 10)
+  }
+  return inventoryNumber
+}
+
+// 入库作业号List
+export function getOperationCodeList() {
+  let operationCode = 'RQ'
+  for (let i = 0; i < 5; i++) {
+    operationCode += parseInt(Math.random() * 89 + 10)
+  }
+  return operationCode
+}
+
+// 出库库作业号List
+export function getOperationCode2List() {
+  let operationCode = 'CQ'
+  for (let i = 0; i < 5; i++) {
+    operationCode += parseInt(Math.random() * 89 + 10)
+  }
+  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() {
+  let KQ = ''
+  KQ += KQList[parseInt(Math.random() * KQList.length)]
+  return KQ
+}
+// 货位
+export function getHWList() {
+  let HW = 'HW'
+  HW += KQList[parseInt(Math.random() * KQList.length)]
+  for (let i = 0; i < 2; i++) {
+    HW += parseInt(Math.random() * 9)
+    HW += parseInt(Math.random() * 8 + 1)
+  }
+  return HW
+}
+
+// 缓存区
+export function getHCQList() {
+  let HW = 'HCQ'
+  HW += KQList[parseInt(Math.random() * KQList.length)]
+  for (let i = 0; i < 2; i++) {
+    HW += parseInt(Math.random() * 9)
+    HW += parseInt(Math.random() * 8 + 1)
+  }
+  return HW
+}
+
+// 司机/AGB编号List
+export function getDriverCodeList() {
+  let driverCode = 'D'
+  for (let i = 0; i < 5; i++) {
+    driverCode += parseInt(Math.random() * 89 + 10)
+  }
+  return driverCode
+}
+
+// 随机生成开始和结束时间
+export function getTimeArr() {
+  const sj = parseInt(Math.random() * 365)
+  const sj2 = sj + parseInt(Math.random() * 60 + 1)
+  const temp = []
+  const start = moment().subtract(sj2, 'days').subtract(sj2, 'hour').subtract(sj2, 'minutes').subtract(sj2, 'seconds').format('YYYY-MM-DD hh:mm:ss')
+  temp.push(start)
+  const end = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
+  temp.push(end)
+  return temp
+}
+
+// 物料编码List
+export function getMaterialCodeList() {
+  let materialCode = 'WL'
+  for (let i = 0; i < 4; i++) {
+    materialCode += parseInt(Math.random() * 89 + 10)
+  }
+  return materialCode
+}
+
+// 名字
+const nameList = ['张明', '李燕', '王国庆', '张强', '周敏']
+export function getNameList() {
+  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: '',
-        name5: '',
-        name6: ''
+        name4: ''
       },
       dataRule: {
         name1: [
@@ -91,13 +77,23 @@ export default {
     }
   },
   methods: {
-    init(row) {
-      this.dataForm = row || ''
-      console.log(row)
+    init(val) {
+      if (val) {
+        this.$nextTick(() => {
+          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
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-      })
     },
     // 表单提交
     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) {
-      this.dataForm = row || ''
-      console.log(row)
+    init(val) {
+      if (val) {
+        this.$nextTick(() => {
+          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
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-      })
     },
     // 表单提交
     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) {
-      this.dataForm = row || ''
-      console.log(row)
+    init(val) {
+      if (val) {
+        this.$nextTick(() => {
+          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
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-      })
     },
     // 表单提交
     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) {
-      this.dataForm = row || ''
-      console.log(row)
+    init(val) {
+      if (val) {
+        this.$nextTick(() => {
+          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
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-      })
     },
     // 表单提交
     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'),
-    filter: timeFormatter
+    label: i18n.t('module.basicData.factory.createTime')
   },
   {
     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 = [
-        {
-          id: 1,
-          name1: '东路钢铁公司',
-          name2: '供应商',
-          name3: '张总',
-          name4: '13768470056',
-          name5: ''
-        }
-      ]
+      const temp = []
+      const num = 20
+      for (let i = 0; i < num; i++) {
+        const obj = {}
+        const sj = Math.floor(Math.random() * 720 + 10)
+        obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
+        obj.name1 = getCompTyleList()
+        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,15 +215,11 @@ export default {
     },
     clickTopBtn(val) {
       if (val === 'add') {
-        this.addNew()
+        this.addOrUpdateVisible = true
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init()
+        })
       }
-    },
-    // 新增 / 修改
-    addNew(row) {
-      this.addOrUpdateVisible = true
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(row)
-      })
     }
   }
 }

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'),
-    filter: timeFormatter
+    label: i18n.t('module.basicData.factory.createTime')
   },
   {
     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 = [
-        {
-          id: 1,
-          name1: 'A区',
-          name2: '2022040696',
-          name3: '成品',
-          name4: '空闲',
-          name5: '开',
-          name6: '关'
-        }
-      ]
+      const temp = []
+      const num = 20
+      for (let i = 0; i < num; i++) {
+        const obj = {}
+        const sj = Math.floor(Math.random() * 720 + 10)
+        obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
+        obj.name2 = getHWList()
+        obj.name1 = obj.name2[2] + '区'
+        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,15 +221,11 @@ export default {
     },
     clickTopBtn(val) {
       if (val === 'add') {
-        this.addNew()
+        this.addOrUpdateVisible = true
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init()
+        })
       }
-    },
-    // 新增 / 修改
-    addNew(row) {
-      this.addOrUpdateVisible = true
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(row)
-      })
     }
   }
 }

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'),
-    filter: timeFormatter
+    label: i18n.t('module.basicData.factory.createTime')
   },
   {
     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 = [
-        {
-          id: 1,
-          name1: '清洗液',
-          name2: '20220608684',
-          name3: '清洗机',
-          name4: ''
-        }
-      ]
+      const temp = []
+      const num = 20
+      for (let i = 0; i < num; i++) {
+        const obj = {}
+        const sj = Math.floor(Math.random() * 720 + 10)
+        obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
+        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,15 +211,11 @@ export default {
     },
     clickTopBtn(val) {
       if (val === 'add') {
-        this.addNew()
+        this.addOrUpdateVisible = true
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init()
+        })
       }
-    },
-    // 新增 / 修改
-    addNew(row) {
-      this.addOrUpdateVisible = true
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(row)
-      })
     }
   }
 }

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'
-/**
- * 表格表头配置项 TypeScript接口注释
- * tableConfig<ConfigItem> = []
- *
- * Interface ConfigItem = {
- *  prop: string,
- *  label: string,
- *  width: string,
- *  align: string,
- *  subcomponent: function,
- *  filter: function
- * }
- *
- *
- */
+import { getKQList, getStoreList } from '@/utils/wmsDic'
+import moment from 'moment'
 const topBtnConfig = [
   {
     type: 'add',
@@ -79,8 +65,7 @@ const tableBtn = [
 const tableProps = [
   {
     prop: 'createTime',
-    label: i18n.t('module.basicData.factory.createTime'),
-    filter: timeFormatter
+    label: i18n.t('module.basicData.factory.createTime')
   },
   {
     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 = [
-        {
-          id: 1,
-          name1: '东仓库',
-          name2: 'A区',
-          name3: '空闲'
-        }
-      ]
+      const temp = []
+      const num = 20
+      for (let i = 0; i < num; i++) {
+        const obj = {}
+        const sj = Math.floor(Math.random() * 720 + 10)
+        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,15 +196,11 @@ export default {
     },
     clickTopBtn(val) {
       if (val === 'add') {
-        this.addNew()
+        this.addOrUpdateVisible = true
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init()
+        })
       }
-    },
-    // 新增 / 修改
-    addNew(row) {
-      this.addOrUpdateVisible = true
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(row)
-      })
     }
   }
 }

src/views/wmsInStore/acceptGoods.vue

@@ -36,6 +36,7 @@ import Pagination from '@/components/Pagination'
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import { tableHeight } from '@/utils/index'
 import accetpGoodsAdd from './components/accetpGoodsAdd.vue'
+import { getTrayList, getProductList, getCustomerCodeList, getProductSpecList, getBatchList, getPackList } from '@/utils/wmsDic'
 const topBtnConfig = [
   {
     type: 'add',
@@ -127,18 +128,15 @@ export default {
     getList() {
       const temp = []
       const num = 20
-      const spcList = ['50*50m', '100*50m', '100*100m', '70*100m', '100*120m']
-      const packCodeList = ['01', '02', '03', '04', '05']
       for (let i = 0; i < num; i++) {
         const obj = {}
-        obj.trayID = '1020' + i
-        obj.internalControlCode = '202210200001' + i
-        obj.customerCode = '20221020100' + i
-        obj.num = parseInt(Math.random() * 200 + 100)
-        const sj = Math.floor(Math.random() * 5)
-        obj.productDpec = spcList[sj]
-        obj.batch = '20221003' + i
-        obj.packCode = packCodeList[sj]
+        obj.trayID = getTrayList()
+        obj.internalControlCode = getProductList()
+        obj.customerCode = getCustomerCodeList()
+        obj.num = parseInt(Math.random() * 1000)
+        obj.productDpec = getProductSpecList()
+        obj.batch = getBatchList()
+        obj.packCode = getPackList()
         temp.push(obj)
       }
       this.list = temp

src/views/wmsInStore/inStoreDocuments.vue

@@ -36,6 +36,7 @@ import Pagination from '@/components/Pagination'
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import { tableHeight } from '@/utils/index'
 import inStoreDocumentsAdd from './components/inStoreDocumentsAdd.vue'
+import { getTrayList, getReceiptNoList, getProductList, getCustomerCodeList, getProductSpecList, getBatchList, getPackList } from '@/utils/wmsDic'
 const topBtnConfig = [
   {
     type: 'add',
@@ -131,19 +132,16 @@ export default {
     getList() {
       const temp = []
       const num = 20
-      const spcList = ['50*50m', '100*50m', '100*100m', '70*100m', '100*120m']
-      const packCodeList = ['01', '02', '03', '04', '05']
       for (let i = 0; i < num; i++) {
         const obj = {}
-        obj.receiptNo = '200101' + i
-        obj.trayID = '1020' + i
-        obj.internalControlCode = '202210200001' + i
-        obj.customerCode = '20221020100' + i
-        obj.num = parseInt(Math.random() * 200 + 100)
-        const sj = Math.floor(Math.random() * 5)
-        obj.productDpec = spcList[sj]
-        obj.batch = '20221003' + i
-        obj.packCode = packCodeList[sj]
+        obj.receiptNo = getReceiptNoList()
+        obj.trayID = getTrayList()
+        obj.internalControlCode = getProductList()
+        obj.customerCode = getCustomerCodeList()
+        obj.num = parseInt(Math.random() * 1000)
+        obj.productDpec = getProductSpecList()
+        obj.batch = getBatchList()
+        obj.packCode = getPackList()
         temp.push(obj)
       }
       this.list = temp

src/views/wmsInStore/warehouseOperation.vue

@@ -24,6 +24,7 @@ import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination'
 import { tableHeight } from '@/utils/index'
+import { getOperationCodeList, getReceiptNoList, getHWList, getDriverCodeList, getTimeArr } from '@/utils/wmsDic'
 const tableProps = [
   {
     prop: 'operationCode',
@@ -105,12 +106,13 @@ export default {
       const num = 20
       for (let i = 0; i < num; i++) {
         const obj = {}
-        obj.operationCode = '200101' + i
-        obj.receiptNo = '1020' + i
-        obj.goodsArea = '1-1-' + i
-        obj.startTime = '2022-10-' + (i + 1)
-        obj.endTime = '2022-10-' + (i + 2)
-        obj.driverCode = 'd20152' + i
+        const timeArrList = getTimeArr()
+        obj.operationCode = getOperationCodeList()
+        obj.receiptNo = getReceiptNoList()
+        obj.goodsArea = getHWList()
+        obj.startTime = timeArrList[0]
+        obj.endTime = timeArrList[1]
+        obj.driverCode = getDriverCodeList()
         temp.push(obj)
       }
       this.list = temp

src/views/wmsInventoryManagement/inventory.vue

@@ -7,8 +7,6 @@
       :height="tableH"
       :table-config="tableProps"
       :table-data="list"
-      :is-loading="listLoading"
-      @clickTopBtn="clickTopBtn"
     />
     <pagination
       v-show="total > 0"
@@ -24,6 +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, getGoodsList } from '@/utils/wmsDic'
 const tableProps = [
   {
     prop: 'productName',
@@ -88,15 +87,12 @@ export default {
     getList() {
       const temp = []
       const num = 20
-      const spcList = ['50*50m', '100*50m', '100*100m', '70*100m', '100*120m']
-      const storeAreaList = ['A区', 'B区', 'C区', 'D区', 'E区']
       for (let i = 0; i < num; i++) {
         const obj = {}
-        obj.productName = i + 1
-        const sj = Math.floor(Math.random() * 5)
-        obj.spec = spcList[sj]
-        obj.materialCode = '20314655' + i
-        obj.storeArea = storeAreaList[sj]
+        obj.productName = getGoodsList()
+        obj.spec = getProductSpecList()
+        obj.materialCode = getMaterialCodeList()
+        obj.storeArea = getKQList() + '区'
         obj.num = Math.floor(Math.random() * 2000)
         temp.push(obj)
       }

src/views/wmsInventoryManagement/inventoryQuery.vue

@@ -7,8 +7,6 @@
       :height="tableH"
       :table-config="tableProps"
       :table-data="list"
-      :is-loading="listLoading"
-      @clickTopBtn="clickTopBtn"
     />
     <pagination
       v-show="total > 0"
@@ -24,6 +22,8 @@ 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, getGoodsList } from '@/utils/wmsDic'
+import moment from 'moment'
 const tableProps = [
   {
     prop: 'productName',
@@ -63,7 +63,8 @@ const tableProps = [
   },
   {
     prop: 'batch',
-    label: '批次号'
+    label: '批次号',
+    minWidth: 200
   },
   {
     prop: 'num',
@@ -123,22 +124,19 @@ export default {
     getList() {
       const temp = []
       const num = 20
-      const spcList = ['50*50m', '100*50m', '100*100m', '70*100m', '100*120m']
-      const statusList = ['已分配', '未分配', '状态1', '状态2', '状态3']
-      const storeAreaList = ['A区', 'B区', 'C区', 'D区', 'E区']
       for (let i = 0; i < num; i++) {
         const obj = {}
-        obj.productName = i + 1
-        const sj = Math.floor(Math.random() * 5)
-        obj.spec = spcList[sj]
-        obj.status = statusList[sj]
-        obj.materialCode = '20314655' + i
-        obj.storeArea = storeAreaList[sj]
-        obj.goodsArea = '1-1-' + i
-        obj.trayID = '10210' + i
-        obj.productionTime = '2022-10-' + (i + 2)
-        obj.validityTime = Math.floor(Math.random() * 36) + '个月'
-        obj.batch = '202210255643' + i
+        obj.productName = getGoodsList()
+        const sj = Math.floor(Math.random() * 720 + 10)
+        obj.spec = getProductSpecList()
+        obj.status = parseInt(Math.random() * 2) ? '已分配' : '未分配'
+        obj.materialCode = getMaterialCodeList()
+        obj.goodsArea = getHWList()
+        obj.storeArea = obj.goodsArea[2] + '区'
+        obj.trayID = getTrayList()
+        obj.productionTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
+        obj.validityTime = parseInt(sj / 5) + '个月'
+        obj.batch = getBatchList()
         obj.num = Math.floor(Math.random() * 2000)
         temp.push(obj)
       }

src/views/wmsInventoryManagement/locationQuery.vue

@@ -24,6 +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, getStoreList } from '@/utils/wmsDic'
 const tableProps = [
   {
     prop: 'goodsAreaCode',
@@ -113,14 +114,14 @@ export default {
       const num = 20
       for (let i = 0; i < num; i++) {
         const obj = {}
-        obj.goodsAreaCode = '3200101' + i
-        obj.goodsAreaName = '3200101' + i
-        obj.goodsAreaStatus = i + 1
-        obj.roadway = Math.floor(Math.random() * 5 + 1)
-        obj.storeArea = i
-        obj.store = i
-        obj.warehousingLock = i
-        obj.outboundLock = i
+        obj.goodsAreaCode = getHWList()
+        obj.goodsAreaName = obj.goodsAreaCode
+        obj.goodsAreaStatus = parseInt(Math.random() * 2) ? '有货' : '无货'
+        obj.roadway = '巷道' + Math.floor(Math.random() * 15 + 1)
+        obj.storeArea = obj.goodsAreaCode[2] + '区'
+        obj.store = getStoreList()
+        obj.warehousingLock = parseInt(Math.random() * 2) ? 'Y' : 'N'
+        obj.outboundLock = parseInt(Math.random() * 2) ? 'Y' : 'N'
         temp.push(obj)
       }
       this.list = temp

src/views/wmsInventoryManagement/stockTaking.vue

@@ -24,6 +24,8 @@ 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, getGoodsList } from '@/utils/wmsDic'
+import moment from 'moment'
 const tableProps = [
   {
     prop: 'inventoryNumber',
@@ -115,20 +117,18 @@ export default {
     getList() {
       const temp = []
       const num = 20
-      const spcList = ['50*50m', '100*50m', '100*100m', '70*100m', '100*120m']
-      const nameList = ['张明', '李燕', '王一', '张强', '王四']
       for (let i = 0; i < num; i++) {
         const obj = {}
-        obj.inventoryNumber = '200101' + i
-        obj.productName = i + 1
-        const sj = Math.floor(Math.random() * 5)
-        obj.spec = spcList[sj]
-        obj.materialCode = '20314655' + i
-        obj.trayID = '1020' + i
+        obj.inventoryNumber = getInventoryNoList()
+        obj.productName = getGoodsList()
+        obj.spec = getProductSpecList()
+        obj.materialCode = getMaterialCodeList()
+        obj.trayID = getTrayList()
         obj.num = Math.floor(Math.random() * 2000)
-        obj.takeNum = Math.floor(Math.random() * 2000)
-        obj.takeTime = '2022-10-' + (i + 2)
-        obj.operator = nameList[sj]
+        obj.takeNum = parseInt(Math.random() * 2) ? obj.num + Math.floor(Math.random() * 20 - 10) : obj.num
+        const sj = Math.floor(Math.random() * 5)
+        obj.takeTime = moment().add(sj, 'days').add(sj, 'hour').add(sj, 'minutes').add(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
+        obj.operator = getNameList()
         temp.push(obj)
       }
       this.list = temp

src/views/wmsOutStore/outStoreDocuments.vue

@@ -36,6 +36,8 @@ 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, getCompTyleList } from '@/utils/wmsDic'
+import moment from 'moment'
 const topBtnConfig = [
   {
     type: 'add',
@@ -127,16 +129,15 @@ export default {
     getList() {
       const temp = []
       const num = 20
-      const spcList = ['50*50m', '100*50m', '100*100m', '70*100m', '100*120m']
       for (let i = 0; i < num; i++) {
         const obj = {}
-        obj.outboundOrderNo = '1020' + i
-        obj.customerName = '客户' + i
-        obj.shipmentCacheArea = '20221020100' + i
-        obj.num = parseInt(Math.random() * 200 + 100)
-        const sj = Math.floor(Math.random() * 5)
-        obj.spec = spcList[sj]
-        obj.deliveryTime = '2022-10-' + (i + 1)
+        obj.outboundOrderNo = getOutboundNoList()
+        obj.customerName = getCompTyleList()
+        obj.shipmentCacheArea = getHCQList()
+        obj.num = parseInt(Math.random() * 1000)
+        obj.spec = getProductSpecList()
+        const sj = Math.floor(Math.random() * 100)
+        obj.deliveryTime = moment().add(sj, 'days').add(sj, 'hour').add(sj, 'minutes').add(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
         temp.push(obj)
       }
       this.list = temp

src/views/wmsOutStore/outStoreOperation.vue

@@ -34,6 +34,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 { getOperationCode2List, getOutboundNoList, getHWList, getHCQList, getTimeArr, getDriverCodeList } from '@/utils/wmsDic'
 const tableProps = [
   {
     prop: 'operationCode',
@@ -131,16 +132,18 @@ export default {
       const num = 20
       for (let i = 0; i < num; i++) {
         const obj = {}
-        obj.operationCode = '200101' + i
-        obj.outboundOrderNo = '1020' + i
-        obj.goodsArea = '1-1-' + i
-        obj.shipmentCacheArea = '20221020100' + i
-        obj.startTime = '2022-10-' + (i + 1)
-        obj.endTime = '2022-10-' + (i + 2)
-        obj.driverCode = 'd20152' + i
+        const timeArrList = getTimeArr()
+        obj.operationCode = getOperationCode2List()
+        obj.outboundOrderNo = getOutboundNoList()
+        obj.goodsArea = getHWList()
+        obj.shipmentCacheArea = getHCQList()
+        obj.startTime = timeArrList[0]
+        obj.endTime = timeArrList[1]
+        obj.driverCode = getDriverCodeList()
         temp.push(obj)
       }
       this.list = temp
+      console.log(this.list)
       this.total = num
     },
     btnClick(val) {

src/views/wmsStatisticalReports/inventoryReport.vue

@@ -1,11 +1,3 @@
-<!--/*
-* @Author: zwq
-* @Date: 2020-12-29 15:41:11
-* @LastEditTime: 2022-04-15
-* @LastEditors: juzi
-* @Description: 拆分了搜索区和功能按钮区，增加了toptitle
-*/
--->
 <template>
   <div class="app-container">
     <head-form :form-config="headFormConfig" @headBtnClick="btnClick" />
@@ -18,8 +10,6 @@
       :height="tableH"
       :table-config="tableProps"
       :table-data="list"
-      :is-loading="listLoading"
-      @clickTopBtn="clickTopBtn"
     />
     <pagination
       v-show="total > 0"
@@ -36,6 +26,8 @@ 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, getGoodsList } from '@/utils/wmsDic'
+import moment from 'moment'
 const tableProps = [
   {
     prop: 'orderCode',
@@ -119,18 +111,16 @@ export default {
     getList() {
       const temp = []
       const num = 20
-      const spcList = ['50*50m', '100*50m', '100*100m', '70*100m', '100*120m']
       for (let i = 0; i < num; i++) {
         const obj = {}
-        obj.orderCode = '20314655' + i
-        const sj = Math.floor(Math.random() * 5)
-        obj.spec = spcList[sj]
-        obj.materialCode = '20314655' + i
-        obj.productName = '10210' + i
-        obj.time = '2022-10-' + (i + 2)
-        obj.type = Math.floor(Math.random() * 36) + '型'
-        obj.batch = '202210255643' + i
-        obj.num = Math.floor(Math.random() * 2000)
+        obj.orderCode = getReceiptNoList()
+        obj.type = '深加工玻璃'
+        obj.productName = getGoodsList()
+        const sj = Math.floor(Math.random() * 100)
+        obj.spec = getProductSpecList()
+        obj.materialCode = getMaterialCodeList()
+        obj.num = Math.floor(Math.random() * 2000 + 200)
+        obj.time = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
         temp.push(obj)
       }
       this.list = temp

src/views/wmsStatisticalReports/outStoreReport.vue

@@ -18,8 +18,6 @@
       :height="tableH"
       :table-config="tableProps"
       :table-data="list"
-      :is-loading="listLoading"
-      @clickTopBtn="clickTopBtn"
     />
     <pagination
       v-show="total > 0"
@@ -36,6 +34,8 @@ 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, getGoodsList } from '@/utils/wmsDic'
+import moment from 'moment'
 const tableProps = [
   {
     prop: 'orderCode',
@@ -119,18 +119,16 @@ export default {
     getList() {
       const temp = []
       const num = 20
-      const spcList = ['50*50m', '100*50m', '100*100m', '70*100m', '100*120m']
       for (let i = 0; i < num; i++) {
         const obj = {}
-        obj.orderCode = '20314655' + i
+        obj.orderCode = getOutboundNoList()
+        obj.type = '深加工玻璃'
+        obj.productName = getGoodsList()
         const sj = Math.floor(Math.random() * 5)
-        obj.spec = spcList[sj]
-        obj.materialCode = '20314655' + i
-        obj.productName = '10210' + i
-        obj.time = '2022-10-' + (i + 2)
-        obj.type = Math.floor(Math.random() * 36) + '型'
-        obj.batch = '202210255643' + i
-        obj.num = Math.floor(Math.random() * 2000)
+        obj.spec = getProductSpecList()
+        obj.materialCode = getMaterialCodeList()
+        obj.time = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
+        obj.num = Math.floor(Math.random() * 2000 + 200)
         temp.push(obj)
       }
       this.list = temp

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',
-  filter: basicData('enableState')
+  align: 'center'
 },
 // {
 //   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 = [
-        {
-          id: 1,
-          name: '管理员',
-          code: 'R254815254',
-          enabled: 1
-        }
-      ]
+      const temp = []
+      const num = 10
+      for (let i = 0; i < num; i++) {
+        const obj = {}
+        obj.code = getRoleCodeList()
+        obj.name = getRoleNameList()[i]
+        obj.enabled = parseInt(Math.random() * 2) ? '启用' : '禁用'
+        obj.remark = '无'
+        temp.push(obj)
+      }
+      this.list = temp
+      this.total = num
     },
     // 新增 / 修改
     addNew() {