root/liaoNingShengHua2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 工单下发

Browse Source
This commit is contained in:
张江玮
2023-04-23 10:25:43 +08:00
parent 27b0ec1436
commit c4ca99ad3c
16 changed files with 330 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lms/nladmin-ui/src/views/login.vue
View File

@@ -98,9 +98,9 @@ export default {
})
},
getCookie() {
const username = Cookies.get('username')
let password = Cookies.get('password')
const rememberMe = Cookies.get('rememberMe')
const username = Cookies.get('lms-username')
let password = Cookies.get('lms-password')
const rememberMe = Cookies.get('lms-rememberMe')
// 保存cookie里面的加密后的密码
this.cookiePass = password === undefined ? '' : password
password = password === undefined ? this.loginForm.password : password
@@ -124,13 +124,13 @@ export default {
if (valid) {
this.loading = true
if (user.rememberMe) {
Cookies.set('username', user.username, { expires: Config.passCookieExpires })
Cookies.set('password', this.loginForm.password, { expires: Config.passCookieExpires })
Cookies.set('rememberMe', user.rememberMe, { expires: Config.passCookieExpires })
Cookies.set('lms-username', user.username, { expires: Config.passCookieExpires })
Cookies.set('lms-password', this.loginForm.password, { expires: Config.passCookieExpires })
Cookies.set('lms-rememberMe', user.rememberMe, { expires: Config.passCookieExpires })
} else {
Cookies.remove('username')
Cookies.remove('password')
Cookies.remove('rememberMe')
Cookies.remove('lms-username')
Cookies.remove('lms-password')
Cookies.remove('lms-rememberMe')
}
this.$store.dispatch('Login', user).then(() => {
this.loading = false

3
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -370,6 +370,9 @@ export default {
title: '点位',
url: 'api/point',
idField: 'point_id',
query: {
is_used: '1'
},
optShow: {
add: true,
edit: false,

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

@@ -28,12 +28,12 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="起点终点">
<el-form-item label="起点/终点">
<el-input
v-model="query.point_code"
clearable
style="width: 180px"
placeholder="起点终点"
placeholder="起点/终点"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@@ -84,35 +84,37 @@
<el-table-column type="selection" width="50" />
<el-table-column v-if="false" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
<el-table-column v-if="false" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
<el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')" />
<el-table-column v-if="false" prop="task_type" label="任务类型" />
<el-table-column v-if="false" prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip >
<template slot-scope="scope">
{{ dict.label.acs_task_type[scope.row.acs_task_type] }}
</template>
</el-table-column>
<el-table-column prop="task_name" label="任务名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="task_name" label="任务类型" :min-width="flexWidth('task_name',crud.data,'任务类型')" />
<el-table-column v-if="false" prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_status" label="任务状态" />
<el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
<el-table-column prop="point1_name" label="起点" width="150" />
<el-table-column prop="point1_region_name" label="起点区域" width="80" />
<el-table-column prop="point2_name" label="终点" min-width="150" show-overflow-tooltip />
<el-table-column prop="point2_region_name" label="终点区域" min-width="80" show-overflow-tooltip />
<el-table-column prop="vehicle_type" label="载具类型" min-width="80" show-overflow-tooltip >
<el-table-column prop="task_status_name" label="任务状态" :min-width="flexWidth('task_status_name',crud.data,'任务状态')" />
<el-table-column prop="point1_name" label="起点" :min-width="flexWidth('point1_name',crud.data,'起点')" />
<el-table-column prop="point1_region_name" label="起点区域" :min-width="flexWidth('point1_region_name',crud.data,'起点区域')" />
<el-table-column prop="point2_name" label="终点" :min-width="flexWidth('point2_name',crud.data,'终点')" />
<el-table-column prop="point2_region_name" label="终点区域" :min-width="flexWidth('point2_region_name',crud.data,'终点区域')" />
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型')">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="material_code" label="物料编码" min-width="260" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<!--<el-table-column prop="point_code3" label="点位3" min-width="100" show-overflow-tooltip />
<el-table-column prop="point3_region_name" label="区域3" min-width="120" show-overflow-tooltip />-->
<!--<el-table-column prop="point_code3" label="点位3" width="85" />
<el-table-column prop="point_code4" label="点位4" width="85" />-->
<el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
<el-table-column prop="create_time" label="创建时间" width="135" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" show-overflow-tooltip />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_optname" label="修改人" :min-width="flexWidth('update_optname',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column
v-permission="['admin','instruction:edit','instruction:del']"
fixed="right"