add：新增手持接口

lms/nladmin-ui/.env.production

@@ -2,6 +2,6 @@ ENV = 'production'
 
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
-VUE_APP_BASE_API  = 'http://10.93.41.201:8010'
+VUE_APP_BASE_API  = 'http://127.0.0.1:8010'
 # 如果接口是 http 形式， wss 需要改为 ws
-VUE_APP_WS_API = 'ws://10.93.41.201:8010'
+VUE_APP_WS_API = 'ws://127.0.0.1:8010'

lms/nladmin-ui/public/config.js

@@ -1,9 +1,9 @@
 window.g = {
   dev: {
-    VUE_APP_BASE_API: 'http://192.168.217.2:8010'
+    VUE_APP_BASE_API: 'http://127.0.0.1:8010'
   },
   prod: {
-    VUE_APP_BASE_API: 'http://192.168.217.2:8010'
+    VUE_APP_BASE_API: 'http://127.0.0.1:8010'
   }
 
 }

lms/nladmin-ui/src/views/system/param/index.vue

@@ -19,6 +19,15 @@
           <el-form-item :label="$t('SysParam.table.name')" prop="name">
             <el-input v-model="form.name" style="width: 370px;" />
           </el-form-item>
+          <el-form-item :label="$t('SysParam.table.name')" prop="zh_name">
+            <el-input v-model="form.zh_name" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item :label="$t('SysParam.table.name')" prop="in_name">
+            <el-input v-model="form.in_name" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item :label="$t('SysParam.table.name')" prop="en_name">
+            <el-input v-model="form.en_name" style="width: 370px;" />
+          </el-form-item>
           <el-form-item :label="$t('SysParam.table.values')" prop="value">
             <el-input v-model="form.value" style="width: 370px;" />
           </el-form-item>
@@ -73,6 +82,9 @@ const defaultForm = {
   id: null,
   code: null,
   name: null,
+  zh_name: null,
+  en_name: null,
+  in_name: null,
   value: null,
   remark: null,
   is_active: true

lms/nladmin-ui/src/views/wms/sch/task/index.vue

@@ -207,7 +207,7 @@
           :min-width="flexWidth('vehicle_code2',crud.data,$t('Task.table.vehicle_code2'))"
         >
           <template slot-scope="scope">
-            {{ scope.row.vehicle_code2 ? scope.row.vehicle_code2 : '-' }}
+            {{ getTypeName(scope.row.vehicle_code2) }}
           </template>
         </el-table-column>
         <el-table-column
@@ -475,11 +475,13 @@ export default {
     return {
       permission: {},
       rules: {},
-      taskStatusList: []
+      taskStatusList: [],
+      taskTypeList: []
     }
   },
   created() {
     this.getTaskStatusList()
+    this.getTaskTypeList()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -501,10 +503,19 @@ export default {
         this.taskStatusList = res.content
       })
     },
+    getTaskTypeList() {
+      crudSchBaseTask.getTaskTypeList().then(res => {
+        this.taskTypeList = res.content
+      })
+    },
     getStatusName(code) {
       const status = this.taskStatusList.find(item => item.code === code)
       return status ? status.name : '-'
     },
+    getTypeName(code) {
+      const status = this.taskTypeList.find(item => item.code === code)
+      return status ? status.name : '-'
+    },
     doOperate(row, command) {
       let method_name = ''
       switch (command) {

lms/nladmin-ui/src/views/wms/sch/task/schBaseTask.js

@@ -31,6 +31,13 @@ export function getTaskStatusList() {
   })
 }
 
+export function getTaskTypeList() {
+  return request({
+    url: 'api/schBaseTask/taskTypeList',
+    method: 'get'
+  })
+}
+
 export function operation(data) {
   return request({
     url: 'api/schBaseTask/operation',
@@ -39,4 +46,4 @@ export function operation(data) {
   })
 }
 
-export default { add, edit, del, getTaskStatusList, operation }
+export default { add, edit, del, getTaskStatusList, getTaskTypeList, operation }