mt-ck/mt-qj-wms-ui
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

对接后台，部分已完成

Browse Source
This commit is contained in:
朱文强
2021-12-08 14:54:13 +08:00
parent ab898dda04
commit ee44a9f77f
32 changed files with 1556 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/views/common/home.vue
View File

@@ -25,7 +25,7 @@
<el-table
:data="dataList"
border
height="600px"
height="500px"
v-loading="dataListLoading"
style="width: 100%"
>
@@ -37,70 +37,96 @@
width="50"
></el-table-column>
<el-table-column
prop="id"
prop="taskCode"
header-align="center"
align="center"
label="任务编号"
>
</el-table-column>
<el-table-column
prop="username"
prop="idens"
header-align="center"
align="center"
label="标识卡"
>
<template slot-scope="scope">
<span>{{
scope.row.idens.join("|")
}}</span>
</template>
</el-table-column>
<el-table-column
prop="operation"
prop="materials"
header-align="center"
align="center"
label="物料名"
>
<template slot-scope="scope">
<span>{{
scope.row.materials.join("|")
}}</span>
</template>
</el-table-column>
<el-table-column
prop="method"
prop="customers"
header-align="center"
align="center"
label="客户"
>
<template slot-scope="scope">
<span>{{
scope.row.customers.join("|")
}}</span>
</template>
</el-table-column>
<el-table-column
prop="params11"
prop="kilnName"
header-align="center"
align="center"
label="窑炉"
>
</el-table-column>
<el-table-column
prop="time"
prop="status"
header-align="center"
align="center"
label="当前状态"
>
</el-table-column>
<el-table-column
prop="ip"
prop="taskType"
header-align="center"
align="center"
label="任务类型"
>
<template slot-scope="scope">
<span>{{
scope.row.taskType === 0
? "缓存到窑炉加工"
: scope.row.taskType === 1
? "出炉到缓存"
: scope.row.taskType === 2
? "缓存出库"
: "入库缓存"
}}</span>
</template>
</el-table-column>
<el-table-column
prop="createDate"
prop="startPosition"
header-align="center"
align="center"
label="开始位置"
>
</el-table-column>
<el-table-column
prop="createDate"
prop="targetPosition"
header-align="center"
align="center"
label="目标位置"
>
</el-table-column>
<el-table-column
prop="createDate"
prop="locationName"
header-align="center"
align="center"
label="库位"
@@ -117,7 +143,7 @@ export default {
return {
dataList: [],
pageIndex: 1,
pageSize: 10,
pageSize: 500,
dataListLoading: false
}
},
@@ -129,15 +155,15 @@ export default {
getDataList () {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/sys/log/list'),
method: 'get',
params: this.$http.adornParams({
page: this.pageIndex,
limit: this.pageSize
url: this.$http.adornUrl('currTask/mainCurrentTaskNow'),
method: 'post',
data: this.$http.adornData({
current: this.pageIndex,
size: this.pageSize
})
}).then(({ data }) => {
if (data && data.code === 0) {
this.dataList = data.page.list
this.dataList = data.data.records
} else {
this.dataList = []
}

44
src/views/common/login.vue
View File

@@ -9,23 +9,12 @@
<div class="login-main">
<h3 class="login-title">管理员登录</h3>
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" status-icon>
<el-form-item prop="userName">
<el-input v-model="dataForm.userName" placeholder="帐号"></el-input>
<el-form-item prop="mobile">
<el-input v-model="dataForm.mobile" placeholder="帐号"></el-input>
</el-form-item>
<el-form-item prop="password">
<el-input v-model="dataForm.password" type="password" placeholder="密码"></el-input>
</el-form-item>
<el-form-item prop="captcha">
<el-row :gutter="20">
<el-col :span="14">
<el-input v-model="dataForm.captcha" placeholder="验证码">
</el-input>
</el-col>
<el-col :span="10" class="login-captcha">
<img :src="captchaPath" @click="getCaptcha()" alt="">
</el-col>
</el-row>
</el-form-item>
<el-form-item>
<el-button class="login-btn-submit" type="primary" @click="dataFormSubmit()">登录</el-button>
</el-form-item>
@@ -37,32 +26,25 @@
</template>
<script>
import { getUUID } from '@/utils'
export default {
data () {
return {
dataForm: {
userName: '',
password: '',
uuid: '',
captcha: ''
mobile: '',
password: ''
},
dataRule: {
userName: [
mobile: [
{ required: true, message: '帐号不能为空', trigger: 'blur' }
],
password: [
{ required: true, message: '密码不能为空', trigger: 'blur' }
],
captcha: [
{ required: true, message: '验证码不能为空', trigger: 'blur' }
]
},
captchaPath: ''
}
},
created () {
this.getCaptcha()
},
methods: {
// 提交表单
@@ -70,17 +52,18 @@
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.$http({
url: this.$http.adornUrl('/sys/login'),
url: this.$http.adornUrl('passport/login'),
method: 'post',
data: this.$http.adornData({
'username': this.dataForm.userName,
'mobile': this.dataForm.mobile,
'password': this.dataForm.password,
'uuid': this.dataForm.uuid,
'captcha': this.dataForm.captcha
'appType': 1,
'userType': 1,
'openId': 13588441519
})
}).then(({data}) => {
if (data && data.code === 0) {
this.$cookie.set('token', data.token)
this.$cookie.set('token', data.data.token)
this.$router.replace({ name: 'home' })
} else {
this.getCaptcha()
@@ -89,11 +72,6 @@
})
}
})
},
// 获取验证码
getCaptcha () {
this.dataForm.uuid = getUUID()
this.captchaPath = this.$http.adornUrl(`/captcha.jpg?uuid=${this.dataForm.uuid}`)
}
}
}

1
src/views/common/order-process.vue
View File

@@ -1,5 +1,6 @@
<template>
<div class="mod-config">
<div style="color:#67c23a;background:#f0f9eb;padding:5px;margin-bottom:5px;text-align:center">录入托盘标识卡信息</div>
<el-form :inline="true">
<el-form-item>
<el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>