Merge pull request 'gtz' (#61 ) from gtz into test

Reviewed-on: #61
Merge branch 'develop' into gtz
2022-03-15 16:59:59 +08:00 · 2022-03-15 16:59:11 +08:00 · 2022-03-15 16:58:48 +08:00 · 2022-03-15 14:38:09 +08:00 · 2022-03-15 14:37:40 +08:00 · 2022-03-15 11:21:10 +08:00
24 changed files with 1498 additions and 2103 deletions
--- a/src/lang/i18n/en/module/basicData.js
+++ b/src/lang/i18n/en/module/basicData.js
@@ -1,13 +1,8 @@
 /*
 * @Author: gtz
 * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-11 11:13:47
-=======
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-12 14:22:52
->>>>>>> develop
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-15 10:17:01
 * @Description: file content
 */
 export default {
@@ -186,7 +181,10 @@ export default {
    remark: 'Remark',
    PositionNo: 'PositionNo',
    PositionCode: 'PositionCode',
-    PositionCodeAlias: 'PositionCodeAlias'
+    PositionCodeAlias: 'PositionCodeAlias',
+    scrapped: 'Scrapped',
+    normal: 'Normal',
+    repairing: 'Repairing'
  },
  equipment: {
    EquipmentName: 'Equipment Name',
--- a/src/lang/i18n/en/module/dashboard.js
+++ b/src/lang/i18n/en/module/dashboard.js
@@ -0,0 +1,16 @@
+/*
+ * @Author: gtz
+ * @Date: 2022-03-15 16:42:34
+ * @LastEditors: gtz
+ * @LastEditTime: 2022-03-15 16:58:26
+ * @Description: file content
+ * @FilePath: \mt-ck-wms-ui\src\lang\i18n\en\module\dashboard.js
+ */
+
+export default {
+  first: 'First Row',
+  second: 'Second Row',
+  title: 'WMS Inventory Information',
+  pageHeader: 'No.',
+  pageFooter: ' Page'
+}
--- a/src/lang/i18n/en/module/index.js
+++ b/src/lang/i18n/en/module/index.js
@@ -2,7 +2,7 @@
 * @Author: gtz
 * @Date: 2021-03-04 16:12:46
 * @LastEditors: gtz
- * @LastEditTime: 2021-04-22 19:49:39
+ * @LastEditTime: 2022-03-15 16:44:11
 * @Description: file content
 */

@@ -17,6 +17,7 @@ import quality from './quality'
 import factory from './factory'
 import formManage from './formManage'
 import report from './report'
+import dashboard from './dashboard'

 export default {
  basicData,
@@ -29,5 +30,6 @@ export default {
  quality,
  factory,
  formManage,
-  report
+  report,
+  dashboard
 }
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/src/lang/i18n/zh/module/basicData.js
@@ -1,14 +1,8 @@
 /*
 * @Author: gtz
 * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-11 11:13:22
- * @Description: file content
-=======
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-12 14:23:06
->>>>>>> develop
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-15 10:16:52
 */
 export default {
  visual: {
@@ -177,7 +171,11 @@ export default {
    remark: '备注',
    PositionNo: '位置序号',
    PositionCode: '位置编码',
-    PositionCodeAlias: '位置编码别名'
+    PositionCodeAlias: '位置编码别名',
+    scrapped: '报废',
+    normal: '正常',
+    repairing: '维修中'
+
  },
  equipment: {
    shortName: '名称缩写',
--- a/src/lang/i18n/zh/module/dashboard.js
+++ b/src/lang/i18n/zh/module/dashboard.js
@@ -0,0 +1,16 @@
+/*
+ * @Author: gtz
+ * @Date: 2022-03-15 16:42:34
+ * @LastEditors: gtz
+ * @LastEditTime: 2022-03-15 16:58:30
+ * @Description: file content
+ * @FilePath: \mt-ck-wms-ui\src\lang\i18n\zh\module\dashboard.js
+ */
+
+export default {
+  first: '第一排',
+  second: '第二排',
+  title: 'WMS库存信息',
+  pageHeader: '第',
+  pageFooter: '页'
+}
--- a/src/lang/i18n/zh/module/index.js
+++ b/src/lang/i18n/zh/module/index.js
@@ -2,7 +2,7 @@
 * @Author: gtz
 * @Date: 2021-03-04 16:12:46
 * @LastEditors: gtz
- * @LastEditTime: 2021-04-22 19:49:47
+ * @LastEditTime: 2022-03-15 16:44:05
 * @Description: file content
 */

@@ -17,6 +17,7 @@ import quality from './quality'
 import factory from './factory'
 import formManage from './formManage'
 import report from './report'
+import dashboard from './dashboard'

 export default {
  basicData,
@@ -29,5 +30,6 @@ export default {
  quality,
  factory,
  formManage,
-  report
+  report,
+  dashboard
 }
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -218,9 +218,9 @@ export const constantRoutes = [
        meta: { title: routerTitle.basicData.teamManage.staff?.[language] || routerTitle.basicData.teamManage.staff.en, icon: 'form', affix: true, required: true, requireToken: true }
      },
      {
-        path: '/dataDictionary',
+        path: '/DataDictionary',
        component: () => import('@/views/basicData/index'),
-        name: 'dataDictionary',
+        name: 'DataDictionary',
        meta: { title: routerTitle.basicData.dataDictionaryType.dataDictionary?.[language] || routerTitle.basicData.dataDictionaryType.dataDictionary.en, icon: 'form', affix: true, required: true, requireToken: true },
        children: [{
          path: 'dataDictionary',
@@ -260,7 +260,7 @@ export const constantRoutes = [
      {
        path: 'processList',
        component: () => import('@/views/art/processList'),
-        name: 'Process',
+        name: 'processList',
        meta: { title: routerTitle.technology.processList?.[language] || routerTitle.technology.processList.en, icon: 'form', affix: true, required: true, requireToken: true }
      }
    ]
@@ -268,7 +268,7 @@ export const constantRoutes = [
  {
    path: '/Warehouse',
    component: Layout,
-    redirect: '/Warehouse/workOrderManage',
+    redirect: '/Warehouse/StorageBoxInfo',
    name: 'Warehouse',
    meta: { title: routerTitle.Warehouse?.[language] || routerTitle.Warehouse.en, icon: 'form', iconPart: 'orderManage', affix: true, required: true, requireToken: true },
    children: [
@@ -497,7 +497,7 @@ export const constantRoutes = [
    path: '/basic',
    component: Layout,
    redirect: '/user/manager',
-    name: 'ArticleManager',
+    name: 'basic',
    meta: { title: routerTitle.basic?.[language] || routerTitle.basic.en, icon: 'form', iconPart: 'ArticleManager', affix: true, required: true, requireToken: true },
    children: [
      {
--- a/src/views/basicData/Cache/components/location-add.vue
+++ b/src/views/basicData/Cache/components/location-add.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-11 11:14:02
+ * @LastEditTime: 2022-03-15 09:45:30
 * @Description:
 -->
 <template>
@@ -157,7 +157,7 @@ export default {
    this.listQuery.shelfId = this.$route.query.id
    this.shCode = this.$route.query.code
    this.shName = this.$route.query.shelfName
-    this.num = this.$route.query.columnNum
+    this.num = this.$route.query.total
    this.getList()
  },
  methods: {
--- a/src/views/basicData/Cache/components/locationAttr-add.vue
+++ b/src/views/basicData/Cache/components/locationAttr-add.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-11 11:03:31
+ * @LastEditTime: 2022-03-15 09:54:52
 * @Description:
 -->
 <template>
@@ -20,11 +20,14 @@
      <el-form-item :label="$t('module.basicData.cache.anotherName')" prop="locationNameAlias">
        <el-input v-model="dataForm.locationNameAlias" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.anotherName')])" clearable />
      </el-form-item>
-      <el-form-item :label="$t('module.basicData.cache.rowMark')" prop="layers">
+      <!-- <el-form-item :label="$t('module.basicData.cache.rowMark')" prop="layers">
        <el-input v-model="dataForm.layers" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.rowMark')])" clearable />
+      </el-form-item> -->
+      <el-form-item :label="$t('module.basicData.cache.rowMark')" prop="layers">
+        <el-input-number v-model="dataForm.layers" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.rowMark')])" clearable />
      </el-form-item>
      <el-form-item :label="$t('module.basicData.cache.columnMark')" prop="columns">
-        <el-input v-model="dataForm.columns" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.columnMark')])" clearable />
+        <el-input-number v-model="dataForm.columns" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.columnMark')])" clearable />
      </el-form-item>
      <!-- <el-form-item :label="$t('module.basicData.cache.locationType')" prop="locationType">
        <el-input v-model="dataForm.locationType" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.locationType')])" clearable />
@@ -71,8 +74,6 @@ export default {
        code: '',
        locationNameAlias: '',
        rowNum: '',
-        columns: 0,
-        layers: 0,
        status: null,
        locationType: ''
      },
@@ -96,17 +97,13 @@ export default {
        ],
        code: [
          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.LocationCode')]), trigger: 'blur' }
+        ],
+        layers: [
+          { pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' }
+        ],
+        columns: [
+          { pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' }
        ]
-        // layers: [{
-        // type: 'number',
-        // message: this.$t('module.basicData.cache.warning'),
-        // trigger: "blur"
-        // }],
-        // columns:  [{
-        // type: 'number',
-        // message: this.$t('module.basicData.cache.warning'),
-        // trigger: "blur"
-        // }]
      }
    }
  },
@@ -119,7 +116,7 @@ export default {
        if (this.dataForm.id) {
          locationDetail(this.dataForm.id).then(res => {
            this.dataForm = res.data
-            console.log(this.dataForm)
+            // console.log(this.dataForm)
          })
        } else {
          locationCode().then(res => {
@@ -173,6 +170,28 @@ export default {
        }
      })
    }
+    // isInt(value){
+    //   for(var i = 0; i < value.length; i++) {
+    //     if(charAt[i] == '.'){
+    //     }
+    //   }
+    // }
+    // isInt(value) {
+    //   let zero = /^0+\d*$/ // 过滤以0开头的数据(不含小数点)
+    //   let dublue = /^0{2,}\.\d+$/ // 过滤小数点前有两个以上0的数字
+    //   let point = /^\d+\.?\d+$/ //  以数字开头,可以允许出现一次或0次小数点,以数字结尾(这里的数字必须有两个)
+    //   let reg = /^[1-9]{1}$/ // 匹配只有一个数字的情况
+    //   if (!value) {
+    //     return false
+    //   }
+    //   if (zero.test(value) || dublue.test(value)) { // 首先过滤掉错误的数据
+    //     return false
+    //   } else if (point.test(value) || reg.test(value)) { // 匹配数据,如果输入的数字只有一位数时用reg匹配
+    //     return true
+    //   } else {
+    //     return false
+    //   }
+    // }
  }
 }
 </script>
--- a/src/views/basicData/Cache/components/locationBtn.vue
+++ b/src/views/basicData/Cache/components/locationBtn.vue
@@ -1,7 +1,7 @@
 <!--
 * @Date: 2021-01-07 20:09:37
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 20:20:44
+ * @LastEditTime: 2022-03-15 09:48:09
 * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
 * @Description:
 -->
@@ -26,7 +26,7 @@ export default {
        query: {
          id: this.injectData.id,
          code: this.injectData.code,
-          columnNum: this.injectData.columnNum,
+          total: this.injectData.total,
          shelfName: this.injectData.shelfName
        }
      })
--- a/src/views/basicData/Cache/components/storageBox-add.vue
+++ b/src/views/basicData/Cache/components/storageBox-add.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-09 16:53:31
+ * @LastEditTime: 2022-03-14 16:23:19
 * @Description:
 -->
 <template>
@@ -59,15 +59,15 @@ export default {
      options: [
        {
          value: 0,
-          label: '正常'
+          label: this.$t('module.basicData.storageBox.normal')
        },
        {
          value: 1,
-          label: '维修中'
+          label: this.$t('module.basicData.storageBox.repairing')
        },
        {
          value: 2,
-          label: '报废'
+          label: this.$t('module.basicData.storageBox.scrapped')
        }
      ],
      dataRule: {
--- a/src/views/basicData/Equipment/components/equipmentInfo-add.vue
+++ b/src/views/basicData/Equipment/components/equipmentInfo-add.vue
@@ -58,7 +58,7 @@
              <el-input v-model="dataForm.equipmentType" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.EquipmentType')])" clearable :style="{width: '100%'}" />
            </el-form-item> -->
            <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="EquipmentType">
-              <el-select v-model="dataForm.equipmentType" :placeholder="dataForm.equipmentType">
+              <el-select v-model="dataForm.equipmentType" :placeholder="this.$t('module.basicData.cache.logisticsEquipment')" default>
                <el-option
                  v-for="item in options"
                  :key="item.value"
@@ -399,7 +399,7 @@ export default {
        code: '',
        enName: '',
        abbr: '',
-        equipmentType: '',
+        equipmentType: this.$t('module.basicData.cache.logisticsEquipment'),
        spec: '',
        createTime: '',
        enterTime: '',
--- a/src/views/basicData/Warehouse/CurrentTask.vue
+++ b/src/views/basicData/Warehouse/CurrentTask.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-12 14:21:37
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-14 10:35:17
 * @Description:
 -->
 <template>
@@ -86,7 +86,7 @@ import i18n from '@/lang'
 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 { timeFormatter } from '@/filters'
 /**
 * 表格表头配置项 TypeScript接口注释
 * tableConfig<ConfigItem> = []
@@ -118,6 +118,7 @@ const tableProps = [
  {
    prop: 'createTime',
    label: i18n.t('module.basicData.Warehouse.ExecutionTime'),
+    filter: timeFormatter,
    align: 'center'
  },
  {
--- a/src/views/basicData/Warehouse/HistoricalTask.vue
+++ b/src/views/basicData/Warehouse/HistoricalTask.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: zwq
- * @LastEditTime: 2022-01-13 15:49:01
+ * @LastEditTime: 2022-03-14 10:37:13
 * @Description:
 -->
 <template>
@@ -44,7 +44,7 @@
          />
        </el-select>
      </el-form-item>
-      <el-form-item :label="$t('module.basicData.Warehouse.TimeSlot')" prop="time">
+      <!-- <el-form-item :label="$t('module.basicData.Warehouse.TimeSlot')" prop="time">
        <el-date-picker
          v-model="formData.timeSlot"
          type="daterange"
@@ -55,7 +55,7 @@
          :range-separator="$t('module.orderManage.order.To')"
          clearable
        />
-      </el-form-item>
+      </el-form-item> -->
      <el-form-item>
        <el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
      </el-form-item>
@@ -92,7 +92,7 @@ import i18n from '@/lang'
 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 { timeFormatter } from '@/filters'
 /**
 * 表格表头配置项 TypeScript接口注释
 * tableConfig<ConfigItem> = []
@@ -124,31 +124,27 @@ const tableProps = [
  {
    prop: 'createTime',
    label: i18n.t('module.basicData.Warehouse.ExecutionTime'),
+    filter: timeFormatter,
    align: 'center'
  },
  {
-    prop: 'status',
-    label: i18n.t('module.basicData.Warehouse.TaskStatus'),
+    prop: 'taskSource',
+    label: i18n.t('module.basicData.Warehouse.TaskSource'),
    align: 'center'
  },
-  // {
-  //   prop: 'taskType',
-  //   label: i18n.t('module.basicData.Warehouse.TaskType'),
-  //   align: 'center'
-  // },
  {
-    prop: 'name',
-    label: i18n.t('module.basicData.Warehouse.VehicleName'),
+    prop: 'taskType',
+    label: i18n.t('module.basicData.Warehouse.TaskType'),
    align: 'center'
  },
-  // {
-  //   prop: 'substrateNo',
-  //   label: i18n.t('module.basicData.Warehouse.BoxStatus'),
-  //   align: 'center'
-  // },
  {
-    prop: 'wcode',
-    label: i18n.t('module.basicData.Warehouse.BoxNumber'),
+    prop: 'fullCode',
+    label: i18n.t('module.basicData.Warehouse.TaskBoxNumber'),
+    align: 'center'
+  },
+  {
+    prop: 'emptyCode',
+    label: i18n.t('module.basicData.Warehouse.FullBoxNumber'),
    align: 'center'
  },
  {
@@ -162,19 +158,24 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'updateTime',
-    label: i18n.t('module.basicData.Warehouse.CompletionTime'),
-    align: 'center'
-  },
-  {
-    prop: 'currLocation',
+    prop: 'anotherCurrLocation',
    label: i18n.t('module.basicData.Warehouse.StartLocation'),
    align: 'center'
  },
  {
-    prop: 'targetLocation',
+    prop: 'anotherTargetLocation',
    label: i18n.t('module.basicData.Warehouse.TargetLocation'),
    align: 'center'
+  },
+  {
+    prop: 'currLocation',
+    label: i18n.t('module.basicData.Warehouse.FullBoxStartLocation'),
+    align: 'center'
+  },
+  {
+    prop: 'name',
+    label: i18n.t('module.basicData.Warehouse.VehicleName'),
+    align: 'center'
  }
 ]

@@ -194,9 +195,9 @@ export default {
        taskType: '',
        status: '',
        equipmentId: '',
-        timeSlot: [],
-        endTime: '',
-        startTime: '',
+        // timeSlot: [],
+        // endTime: '',
+        // startTime: '',
        current: 1,
        size: 10
      },
@@ -231,13 +232,13 @@ export default {
  },
  methods: {
    getList() {
-      if (this.formData.timeSlot) {
-        this.formData.startTime = this.formData.timeSlot[0]
-        this.formData.endTime = this.formData.timeSlot[1]
-      } else {
-        this.formData.startTime = ''
-        this.formData.endTime = ''
-      }
+      // if (this.formData.timeSlot) {
+      //   this.formData.startTime = this.formData.timeSlot[0]
+      //   this.formData.endTime = this.formData.timeSlot[1]
+      // } else {
+      //   this.formData.startTime = ''
+      //   this.formData.endTime = ''
+      // }
      this.listLoading = true
      HistoricalTaskList(this.formData).then(response => {
        if (response.data.records) {
--- a/src/views/basicData/Warehouse/ProcessStorageManagement.vue
+++ b/src/views/basicData/Warehouse/ProcessStorageManagement.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-11 10:31:39
+ * @LastEditTime: 2022-03-14 10:35:21
 * @Description:
 -->
 <template>
@@ -15,9 +15,9 @@
      size="medium"
      label-width="100px"
    >
-      <el-form-item :label="$t('module.art.processList.processName')" prop="processId">
+      <el-form-item :label="$t('module.art.processList.processName')" prop="key">
        <el-select
-          v-model="listQuery.processId"
+          v-model="listQuery.key"
          :placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.processName')])"
          clearable
          filterable
@@ -27,7 +27,7 @@
            v-for="(item, index) in processArr"
            :key="index"
            :label="item.name"
-            :value="item.id"
+            :value="item.name"
          />
        </el-select>
      </el-form-item>
@@ -65,6 +65,7 @@ import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import i18n from '@/lang'
+import { timeFormatter } from '@/filters'
 /**
 * 表格表头配置项 TypeScript接口注释
 * tableConfig<ConfigItem> = []
@@ -101,6 +102,7 @@ const tableProps = [
  {
    prop: 'createTime',
    label: i18n.t('module.art.eqName'),
+    filter: timeFormatter,
    align: 'center'
  }
 ]
@@ -131,7 +133,7 @@ export default {
      listQuery: {
        current: 1,
        size: 10,
-        processId: ''
+        key: ''
      }
    }
  },
--- a/src/views/basicData/Warehouse/StorageBoxInfo.vue
+++ b/src/views/basicData/Warehouse/StorageBoxInfo.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: zwq
- * @LastEditTime: 2022-01-18 14:30:25
+ * @LastEditTime: 2022-03-14 09:33:28
 * @Description:
 -->
 <template>
@@ -92,7 +92,7 @@ const tableProps = [
 ]

 export default {
-  name: 'StorageBoxInfo',
+  name: 'ScrapInfo',
  components: { Pagination, BaseTable },
  filters: {
    statusFilter(status) {
@@ -123,15 +123,18 @@ export default {
  },
  created() {
    this.getList()
-    const listQuery1 = {
-      current: 1,
-      size: 100
-    }
-    StorageBoxRackCode(listQuery1).then(res => {
-      this.storageBoxList = res.data.records
-    })
+    this.init()
  },
  methods: {
+    init() {
+      const listQuery1 = {
+        current: 1,
+        size: 100
+      }
+      StorageBoxRackCode(listQuery1).then(res => {
+        this.storageBoxList = res.data.records
+      })
+    },
    getList() {
      this.listLoading = true
      StorageBoxInfoList(this.listQuery).then(response => {
--- a/src/views/basicData/Warehouse/components/CurrentTask-add.vue
+++ b/src/views/basicData/Warehouse/components/CurrentTask-add.vue
@@ -2,12 +2,12 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 11:05:23
+ * @LastEditTime: 2022-03-14 10:55:22
 * @Description:
 -->
 <template>
  <el-dialog
-    :title="'btn.see' | i18nFilter"
+    :title="$t('module.basicData.Warehouse.PerformTaskManual')"
    :visible.sync="visible"
  >
    <el-row :gutter="10">
@@ -22,27 +22,66 @@
          <el-row>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.TaskBoxNumber')" prop="taskCode">
-                <el-input v-model="dataForm.taskCode" readonly :style="{width: '100%'}" />
+                <el-select
+                  v-model="dataForm.taskCode"
+                  :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.StorageBoxNumber')])"
+                  clearable
+                  filterable
+                  :style="{width: '100%'}"
+                >
+                  <el-option
+                    v-for="(item, index) in storageBoxList"
+                    :key="index"
+                    :label="item.code"
+                    :value="item.code"
+                  />
+                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.FullBoxNumber')" prop="orderName">
-                <el-input v-model="dataForm.orderName" readonly :style="{width: '100%'}" />
+                <el-input v-model="dataForm.orderName" :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.ExecutionOperation')" prop="fullCode">
-                <el-input v-model="dataForm.fullCode" readonly :style="{width: '100%'}" />
+                <el-select
+                  v-model="dataForm.fullCode"
+                  :placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.processName')])"
+                  clearable
+                  filterable
+                  :style="{width: '100%'}"
+                >
+                  <el-option
+                    v-for="(item, index) in processArr"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="name">
-                <el-input v-model="dataForm.name" readonly :style="{width: '100%'}" />
+              <el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="TaskStatus">
+                <el-select
+                  v-model="dataForm.TaskStatus"
+                  :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.TaskStatus')])"
+                  clearable
+                  filterable
+                  :style="{width: '100%'}"
+                >
+                  <el-option
+                    v-for="(item, index) in TaskStatusArr"
+                    :key="index"
+                    :label="item.dataName"
+                    :value="item.dataCode"
+                  />
+                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.ScrapInfo.remark')" prop="remark">
-                <el-input v-model="dataForm.remark" readonly :style="{width: '100%'}" />
+                <el-input v-model="dataForm.remark" :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -51,26 +90,35 @@
          <el-row>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.TaskLocation')" prop="createTime">
-                <el-input v-model="dataForm.createTime" readonly :style="{width: '100%'}" />
+                <el-input v-model="dataForm.createTime" :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.FullBoxStartLocation')" prop="taskType">
-                <el-input v-model="dataForm.taskType" readonly :style="{width: '100%'}" />
+                <el-input v-model="dataForm.taskType" :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.Priority')" prop="emptyCode">
-                <el-input v-model="dataForm.emptyCode" readonly :style="{width: '100%'}" />
+                <el-input v-model="dataForm.emptyCode" :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.NextOperation')" prop="anotherCurrLocation">
-                <el-input
+                <el-select
                  v-model="dataForm.anotherCurrLocation"
-                  readonly
+                  :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.NextOperation')])"
+                  clearable
+                  filterable
                  :style="{width: '100%'}"
-                />
+                >
+                  <el-option
+                    v-for="(item, index) in processArr"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
              </el-form-item>
            </el-col>
          </el-row>
@@ -86,17 +134,23 @@

 <script>
 // import { CurrentTaskDetail } from '@/api/basicData/Warehouse/HistoricalTask'
+import { list } from '@/api/art-manage/process'
+import { dataDictionaryDataList } from '@/api/basicData/dataDictionary'
+import { StorageBoxRackCode } from '@/api/basicData/Warehouse/StorageBoxInfo'

 export default {
  data() {
    return {
      visible: false,
+      processArr: [],
+      TaskStatusArr: [],
+      storageBoxList: [],
      dataForm: {
        id: '',
        taskCode: undefined,
        orderName: undefined,
        fullCode: undefined,
-        name: undefined,
+        TaskStatus: undefined,
        remark: undefined,
        field119: undefined,
        createTime: undefined,
@@ -116,6 +170,32 @@ export default {
    init(id) {
      this.dataForm.id = id
      this.visible = true
+      const lparams = {
+        current: 1,
+        size: 999
+      }
+      list(lparams).then(response => {
+        if (response.data.records) {
+          this.processArr = response.data.records
+        } else {
+          this.processArr.splice(0, this.list.length)
+        }
+        this.total = response.data.total
+      })
+      StorageBoxRackCode(lparams).then(res => {
+        this.storageBoxList = res.data.records
+      })
+      dataDictionaryDataList({
+        current: 1,
+        size: 999,
+        dictTypeId: '6'
+      }).then(response => {
+        if (response.data.records) {
+          this.TaskStatusArr = response.data.records
+        } else {
+          this.TaskStatusArr.splice(0, this.scrapsArr.length)
+        }
+      })
      this.$nextTick(() => {
        this.$refs['dataForm'].resetFields()
      })
--- a/src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue
+++ b/src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-11 16:29:46
+ * @LastEditTime: 2022-03-15 14:15:30
 * @Description:
 -->
 <template>
@@ -33,7 +33,6 @@ import { locationByProcessList } from '@/api/basicData/Warehouse/StorageBoxInfo'
 import i18n from '@/lang'
 import BaseTable from '@/components/BaseTable'
 // import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import { timeFormatter } from '@/filters'
 /**
 * 表格表头配置项 TypeScript接口注释
 * tableConfig<ConfigItem> = []
@@ -60,7 +59,6 @@ const tableProps = [
  {
    prop: 'code',
    label: i18n.t('module.basicData.cache.LocationCode'),
-    filter: timeFormatter,
    align: 'center'
  },
  {
--- a/src/views/basicData/Warehouse/components/processStorageLink.vue
+++ b/src/views/basicData/Warehouse/components/processStorageLink.vue
@@ -2,7 +2,7 @@
 * @Author: gtz
 * @Date: 2022-03-03 09:16:10
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-11 16:33:41
+ * @LastEditTime: 2022-03-15 14:27:57
 * @Description: file content
 * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
 -->
@@ -117,26 +117,8 @@
                      )
                    "
                  >
-                    <div
-                      v-if="
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
-                      "
-                      class="dashboard-layout-item-cricle"
-                      :style="{
-                        background:
-                          cassetteStatusObj[
-                            z.portList[
-                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                            ].cassetteList[0].status
-                          ]
-                      }"
-                    />
-                    {{
-                      z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
-                        .name
-                    }}
+                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
+                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                  </div>
                </el-col>
              </el-row>
@@ -216,26 +198,8 @@
                      )
                    "
                  >
-                    <div
-                      v-if="
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
-                      "
-                      class="dashboard-layout-item-cricle"
-                      :style="{
-                        background:
-                          cassetteStatusObj[
-                            z.portList[
-                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                            ].cassetteList[0].status
-                          ]
-                      }"
-                    />
-                    {{
-                      z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
-                        .name
-                    }}
+                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
+                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                  </div>
                </el-col>
              </el-row>
@@ -283,26 +247,8 @@
                      )
                    "
                  >
-                    <div
-                      v-if="
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
-                      "
-                      class="dashboard-layout-item-cricle"
-                      :style="{
-                        background:
-                          cassetteStatusObj[
-                            z.portList[
-                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                            ].cassetteList[0].status
-                          ]
-                      }"
-                    />
-                    {{
-                      z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
-                        .name
-                    }}
+                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
+                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                  </div>
                </el-col>
              </el-row>
@@ -330,7 +276,7 @@ import testdata from './testdata'
 import processStorageType from './processStorageType'

 export default {
-  name: 'Dashboard',
+  name: 'ProcessStorageLink1',
  components: { processStorageType },
  data() {
    return testdata
@@ -353,13 +299,13 @@ export default {
        } else {
          this.typeVisible = true
          this.$nextTick(() => {
-            this.$refs.typeRef.init(item.id)
+            this.$refs.typeRef.init(item.id, item.name)
          })
        }
      }
    },
-    setStorageList(locationId, dataForm) {
-      const obj = Object.assign({ locationId }, dataForm)
+    setStorageList(locationId, locationName, dataForm) {
+      const obj = Object.assign({ locationId, locationName }, dataForm)
      this.selectStorageList.push(obj)
    },
    handleChange(v) {
@@ -367,10 +313,10 @@ export default {
    },
    submitLinkList() {
      const tipArr = this.selectStorageList.map(item => {
-        return item.locationId
+        return item.locationName
      })
      const obj = {
-        id: this.id,
+        workSequenId: this.id,
        processLocationStorageList: this.selectStorageList
      }
      this.$confirm(`${this.$t('module.basicData.visual.TipsStorageBefore')}[${tipArr.join(',')}]?`, this.$t('module.basicData.visual.Tips'), {
--- a/src/views/basicData/Warehouse/components/processStorageType.vue
+++ b/src/views/basicData/Warehouse/components/processStorageType.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-11 14:48:18
+ * @LastEditTime: 2022-03-15 11:02:46
 * @Description:
 -->
 <template>
@@ -49,6 +49,7 @@ export default {
    return {
      visible: false,
      locationId: '',
+      locationName: '',
      dataForm: {
        portAttrId: 1,
        storageId: ''
@@ -65,8 +66,9 @@ export default {
    }
  },
  methods: {
-    init(id) {
+    init(id, name) {
      this.locationId = id
+      this.locationName = name
      const listQuery = {
        current: 1,
        size: 999
@@ -78,6 +80,9 @@ export default {
          this.storageBoxArr.splice(0, this.list.length)
        }
      })
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+      })
      this.visible = true
    },
    // 表单提交
@@ -85,7 +90,7 @@ export default {
      this.$refs['dataForm'].validate((valid) => {
        if (valid) {
          this.visible = false
-          this.$emit('refreshDataList', this.locationId, this.dataForm)
+          this.$emit('refreshDataList', this.locationId, this.locationName, this.dataForm)
        }
      })
    }
--- a/src/views/basicData/Warehouse/components/testdata.js
+++ b/src/views/basicData/Warehouse/components/testdata.js
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,7 +2,7 @@
 * @Author: gtz
 * @Date: 2022-03-03 09:16:10
 * @LastEditors: gtz
- * @LastEditTime: 2022-03-11 09:06:18
+ * @LastEditTime: 2022-03-15 16:47:57
 * @Description: file content
 * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
 -->
@@ -11,7 +11,7 @@
    <el-card class="dashboard-main">
      <el-row class="dashboard-title">
        <div class="dashboard-header-line" />
-        <div class="dashboard-header-title">WMS库存信息</div>
+        <div class="dashboard-header-title">{{ $t('module.dashboard.title') }}</div>
      </el-row>
      <el-row class="dashboard-legend">
        <div v-for="item in cassetteStatusList" :key="'cassette' + item.id" class="dashboard-legend-cassette">
@@ -24,7 +24,7 @@
        </div>
        <div class="dashboard-legend-search">
          <el-select v-model="current" size="mini" placeholder="请选择库存范围" @change="handleChange">
-            <el-option v-for="item in totalPage" :key="'select' + item" :label="'第' + item + '页'" :value="item" />
+            <el-option v-for="item in totalPage" :key="'select' + item" :label="$t('module.dashboard.pageHeader') + item + $t('module.dashboard.pageFooter')" :value="item" />
          </el-select>
        </div>
      </el-row>
@@ -35,13 +35,13 @@
              <el-row>
                <el-col v-for="z in i.rowList" :key="item + 'shelf' + i + 'row' + z.id" :span="12" class="dashboard-layout-row">
                  <div v-for="x in 20" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}">
-                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status]}" />
-                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name }}
+                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
+                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                  </div>
                </el-col>
              </el-row>
              <div class="dashboard-layout-footer">
-                {{ '第' + rowIndex[index] + '排(' + ((current - 1) * 4 + item) + ')' }}
+                {{ $t(rowIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
              </div>
            </el-col>
          </el-row>
@@ -54,21 +54,21 @@
              <el-row v-if="item < Math.ceil((shelfList[0].rowList[0].portList.length - (current - 1) * 80) / 20)">
                <el-col v-for="z in i.rowList" :key="item + 'shelf' + i + 'row' + z.id" :span="12" class="dashboard-layout-row">
                  <div v-for="x in 20" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}">
-                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status]}" />
-                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name }}
+                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
+                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                  </div>
                </el-col>
              </el-row>
              <el-row v-else>
                <el-col v-for="z in i.rowList" :key="item + 'shelf' + i + 'row' + z.id" :span="12" class="dashboard-layout-row">
                  <div v-for="x in shelfList[0].rowList[0].portList.length - (item - 1) * 20 - (current - 1) * 80" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}">
-                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status]}" />
-                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name }}
+                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
+                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                  </div>
                </el-col>
              </el-row>
              <div class="dashboard-layout-footer">
-                {{ '第' + rowIndex[index] + '排(' + ((current - 1) * 4 + item) + ')' }}
+                {{ $t(rowIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
              </div>
            </el-col>
          </el-row>
--- a/src/views/dashboard/testdata.js
+++ b/src/views/dashboard/testdata.js
--- a/src/views/orderManage/components/ExecutionInfoDetail.vue
+++ b/src/views/orderManage/components/ExecutionInfoDetail.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-11 09:05:38
+ * @LastEditTime: 2022-03-15 10:50:00
 * @Description:
 -->
 <template>
@@ -114,7 +114,7 @@
 </template>

 <script>
-import { ProcessInfoDetail } from '@/api/orderManage/00A'
+import { ExecutionInfoDetail } from '@/api/orderManage/00A'

 export default {
  data() {
@@ -146,7 +146,7 @@ export default {
      this.$nextTick(() => {
        this.$refs['dataForm'].resetFields()
        if (this.dataForm.id) {
-          ProcessInfoDetail(this.dataForm.id).then(res => {
+          ExecutionInfoDetail(this.dataForm.id).then(res => {
            res.data.status = this.statusfilter('orderStatus', res.data.status)
            res.data.type = this.statusfilter('orderType', res.data.type)
            res.data.priority = this.statusfilter('priority', res.data.priority)
Author	SHA1	Message	Date
高天泽	251d507db7	Merge pull request 'gtz' (#61 ) from gtz into test Reviewed-on: #61	2022-03-15 16:59:59 +08:00
gtz217	8502f5d7d1	Merge branch 'develop' into gtz	2022-03-15 16:59:11 +08:00
gtz217	9eea286c08	i18n dashboard	2022-03-15 16:58:48 +08:00
朱文强	d4e0384e10	Merge pull request '修改bug' (#60 ) from zwq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #60	2022-03-15 14:38:09 +08:00
zwq	983be7801c	修改bug	2022-03-15 14:37:40 +08:00
朱文强	d725cb7a0c	Merge pull request '修改bug' (#59 ) from zwq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #59	2022-03-15 11:21:10 +08:00
zwq	ef8a7ef497	修改bug	2022-03-15 11:20:36 +08:00
朱文强	6ac3fcb572	Merge pull request 'fzq' (#58 ) from fzq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #58	2022-03-15 10:09:07 +08:00
Fanzink	3e6389f0eb	'更新'	2022-03-15 09:55:49 +08:00
Fanzink	afde4d5225	'更新'	2022-03-15 09:12:22 +08:00
高天泽	8da50584fc	Merge pull request 'gtz' (#57 ) from gtz into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #57	2022-03-14 17:00:11 +08:00
gtz217	2351e96c9e	Merge branch 'develop' into gtz	2022-03-14 16:59:06 +08:00
gtz217	5277788174	update	2022-03-14 16:58:27 +08:00
朱文强	127092be26	Merge pull request '修改bug' (#56 ) from zwq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #56	2022-03-14 11:00:08 +08:00
zwq	21d45adf22	修改bug	2022-03-14 10:59:13 +08:00
朱文强	3d3c802d01	Merge pull request 'fzq' (#55 ) from fzq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #55	2022-03-14 10:56:52 +08:00