FeiDaBaoKai/wms_client_kate_suzhou
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: FeiDaBaoKai:902964a2cffea831912e32a81d48cd32542d75f3
Branches Tags
FeiDaBaoKai:main
..
compare: FeiDaBaoKai:a698ec0e840859921e1a077d208eda689bb42635
Branches Tags
FeiDaBaoKai:main

No commits in common. "902964a2cffea831912e32a81d48cd32542d75f3" and "a698ec0e840859921e1a077d208eda689bb42635" have entirely different histories.
902964a2cf ... a698ec0e84

7 changed files with 478 additions and 645 deletions
Show Stats Expand all files Collapse all files

12
src/api/excel.js
View File

@ -188,15 +188,6 @@ const downloadWorkSummaryExcel = (data) => {
timeout: 600000
})
}
const downloadWorkFlowExcel = (data) => {
return request({
url: '/excel/downloadWorkFlowExcel',
method: 'post',
responseType: 'blob',
data: data,
timeout: 600000
})
}
export {
uploadExcelStock,
@ -218,6 +209,5 @@ export {
uploadExcelBaseGoods,
uploadExcelKanban,
uploadWorkFlow,
uploadExcelWorkDate,
downloadWorkFlowExcel
uploadExcelWorkDate
}

12
src/layout/stationConfig.vue
View File

@ -68,36 +68,36 @@
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="小盒子" prop="smallBox">
<el-input v-model="configFormEntity.smallBox" />
<el-input v-model="configFormEntity.smallBox" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="机型" prop="model">
<el-input v-model="configFormEntity.model" />
<el-input v-model="configFormEntity.model" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="工位" prop="workCenter">
<el-input v-model="configFormEntity.workCenter" />
<el-input v-model="configFormEntity.workCenter" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工位大盒子" prop="bigBox">
<el-input v-model="configFormEntity.bigBox" />
<el-input v-model="configFormEntity.bigBox" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="车辆" prop="vehicle">
<el-input v-model="configFormEntity.vehicle" />
<el-input v-model="configFormEntity.vehicle" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="线边架/车位置" prop="vehicleLocation">
<el-input v-model="configFormEntity.vehicleLocation" />
<el-input v-model="configFormEntity.vehicleLocation" disabled />
</el-form-item>
</el-col>
</el-row>

41
src/layout/stock.vue
View File

@ -20,8 +20,6 @@
:suffix-icon="Search" />
<el-select-v2 v-model="goodsTypeQuery" style="width: 158px; margin-right: 10px;" placeholder="物料类型"
:options="goodsTypeOptions" @change="search()"></el-select-v2>
<el-select-v2 v-model="stockStatusQuery" style="width: 158px; margin-right: 10px;" placeholder="库存状态"
:options="stockStatusSearchOptions" @change="search()"></el-select-v2>
<el-date-picker v-model="createTimeQuery" type="date" placeholder="选择上架日期" :shortcuts="shortcuts"
style="width: 158px; margin-right: 10px;" clearable />
<el-button type="primary" @click="search()">搜索</el-button>
@ -224,7 +222,6 @@ export default {
vehicleIdQuery: '',
locationIdQuery: '',
goodsTypeQuery: '',
stockStatusQuery: -99,
createTimeQuery: null,
shortcuts: [
{
@ -299,40 +296,6 @@ export default {
label: '库存锁定'
}
],
stockStatusSearchOptions: [
{
value: -99,
label: '全部'
},
{
value: 0,
label: '库存正常'
},
{
value: 1,
label: '出库中'
},
{
value: 2,
label: '盘点中'
},
{
value: 3,
label: '移库中'
},
{
value: 4,
label: '拣选中'
},
{
value: 5,
label: '回库中'
},
{
value: 9,
label: '库存锁定'
}
],
goodsList: [],
goodsTypeOptions: [
{
@ -464,7 +427,6 @@ export default {
vehicleId: this.vehicleIdQuery.trim(),
locationId: this.locationIdQuery.trim(),
goodsType: this.goodsTypeQuery.trim(),
stockStatus: this.stockStatusQuery == -99 ? null : this.stockStatusQuery,
createTime: timeFormatter(this.createTimeQuery),
userName: store.getters.getUserName
}
@ -486,8 +448,6 @@ export default {
this.goodsIdQuery = ''
this.vehicleIdQuery = ''
this.locationIdQuery = ''
this.goodsTypeQuery = ''
this.stockStatusQuery = -99
this.createTimeQuery = null
this.search()
},
@ -501,7 +461,6 @@ export default {
vehicleId: this.vehicleIdQuery.trim(),
locationId: this.locationIdQuery.trim(),
goodsType: this.goodsTypeQuery.trim(),
stockStatus: this.stockStatusQuery == -99 ? null : this.stockStatusQuery,
createTime: timeFormatter(this.createTimeQuery),
userName: store.getters.getUserName
}

85
src/layout/taskMonitor.vue
View File

@ -2,8 +2,8 @@
<div style="margin-bottom: 10px">
<el-config-provider :locale="zhCn">
<el-row>
<el-input v-model="goodsIdQuery" style="width: 196px; margin-right: 10px;" placeholder="料号"/>
<el-input v-model="vehicleIdQuery" style="width: 196px; margin-right: 10px;" placeholder="箱号"/>
<el-input v-model="goodsIdQuery" style="width: 196px; margin-right: 10px;" placeholder="料号" />
<el-input v-model="vehicleIdQuery" style="width: 196px; margin-right: 10px;" placeholder="箱号" />
<el-select-v2 v-model="taskTypeQuery" style="width: 196px; margin-right: 10px;" placeholder="请选择任务类型"
:options="taskTypeOptions" @change="search()"></el-select-v2>
<el-select-v2 v-model="taskStatusQuery" style="width: 196px; margin-right: 10px;" placeholder="请选择任务状态"
@ -11,79 +11,75 @@
<el-button type="primary" @click="search()">搜索</el-button>
<el-button type="warning" @click="reset()">重置</el-button>
</el-row>
<br/>
<br />
<el-table :data="tasks" stripe border v-loading="loading" style="width: 100%" max-height="684px"
class="table-class" :header-cell-style="{ 'text-align': 'center' }"
:cell-style="{ 'text-align': 'center' }"
class="table-class" :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }"
@row-click="getCurrentRow">
<el-table-column width="65px" fixed="left">
<template v-slot="scope">
<el-radio :label="scope.row.taskId" v-model="taskId">&nbsp;</el-radio>
</template>
</el-table-column>
<el-table-column prop="taskId" label="任务号" fixed="left" show-overflow-tooltip min-width="120px"/>
<el-table-column prop="taskType" label="任务类型" fixed="left" :formatter="taskTypeFormat" min-width="120px"/>
<el-table-column prop="vehicleId" label="箱号" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="goodsRelated.goodsId" label="料号" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="goodsRelated.goodsName" label="料名" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="taskGroup" label="任务组" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="origin" label="起点" min-width="120px"/>
<el-table-column prop="destination" label="终点" min-width="120px"/>
<el-table-column prop="goodsRelated.opNum" label="操作数量" min-width="120px"/>
<el-table-column prop="goodsRelated.originNum" label="库存数量" min-width="120px"/>
<el-table-column prop="taskPriority" label="任务优先级" min-width="120px"/>
<el-table-column prop="preTask" label="前置任务" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="pickStand" label="下发站台" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px"
show-overflow-tooltip/>
<el-table-column prop="createTime" label="运行时长" :formatter="dueFormat" min-width="120px"
show-overflow-tooltip/>
<el-table-column prop="userName" label="操作人员姓名" min-width="120px"/>
<el-table-column prop="taskId" label="任务号" fixed="left" show-overflow-tooltip min-width="120px" />
<el-table-column prop="taskType" label="任务类型" fixed="left" :formatter="taskTypeFormat" min-width="120px" />
<el-table-column prop="vehicleId" label="箱号" min-width="120px" show-overflow-tooltip />
<el-table-column prop="goodsRelated.goodsId" label="料号" min-width="120px" show-overflow-tooltip />
<el-table-column prop="goodsRelated.goodsName" label="料名" min-width="120px" show-overflow-tooltip />
<el-table-column prop="taskGroup" label="任务组" min-width="120px" show-overflow-tooltip />
<el-table-column prop="origin" label="起点" min-width="120px" />
<el-table-column prop="destination" label="终点" min-width="120px" />
<el-table-column prop="goodsRelated.opNum" label="操作数量" min-width="120px" />
<el-table-column prop="goodsRelated.originNum" label="库存数量" min-width="120px" />
<el-table-column prop="taskPriority" label="任务优先级" min-width="120px" />
<el-table-column prop="preTask" label="前置任务" min-width="120px" show-overflow-tooltip />
<el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px" show-overflow-tooltip />
<el-table-column prop="createTime" label="运行时长" :formatter="dueFormat" min-width="120px" show-overflow-tooltip />
<el-table-column prop="userName" label="操作人员姓名" min-width="120px" />
<el-table-column prop="taskStatus" label="任务状态" fixed="right" :formatter="taskStatusFormat"
min-width="120px" show-overflow-tooltip/>
min-width="120px" show-overflow-tooltip />
<el-table-column fixed="right" label="操作" width="120px">
<template v-slot="scope">
<el-button plain type="primary" @click="editCurrentRowTask(scope.row)">编辑</el-button>
</template>
</el-table-column>
</el-table>
<br/>
<br />
<el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]"
:small="false" :disabled="false" :background="false" :default-page-size="10"
layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
@current-change="search"/>
@current-change="search" />
<el-dialog v-model="dialogVisible" title="任务信息" width="40%" draggable :show-close="false">
<el-form ref="taskFormRef" :model="taskFormEntity" :label-position="labelPosition" label-width="100px"
style="max-width: 100%" :rules="rules" status-icon>
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="任务号" prop="taskId">
<el-input v-model="taskFormEntity.taskId" disabled/>
<el-input v-model="taskFormEntity.taskId" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="任务优先级" prop="taskPriority">
<el-input-number v-model.number="taskFormEntity.taskPriority" controls-position="right"
:min="1" :max="9" disabled/>
:min="1" :max="9" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="料箱号" prop="vehicleId">
<el-input v-model="taskFormEntity.vehicleId" disabled/>
<el-input v-model="taskFormEntity.vehicleId" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="料号" prop="goodsId">
<el-input v-model="taskFormEntity.goodsId" disabled/>
<el-input v-model="taskFormEntity.goodsId" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="起点" prop="origin">
<el-input v-model="taskFormEntity.origin" disabled/>
<el-input v-model="taskFormEntity.origin" disabled />
</el-form-item>
</el-col>
<!-- <el-col :span="12" v-if="taskFormEntity.taskType == 1">
@ -99,7 +95,7 @@
</el-col> -->
<el-col :span="12">
<el-form-item label="终点" prop="destination">
<el-input v-model="taskFormEntity.destination" disabled/>
<el-input v-model="taskFormEntity.destination" disabled />
</el-form-item>
</el-col>
</el-row>
@ -132,13 +128,13 @@
</template>
<script setup>
import {getTasksByPage, updateTaskInfo} from '@/api/task.js'
import {dateFormatter, taskStatusFormatter, timeFormatter, dueFormatter} from '@/utils/formatter.js'
import { getTasksByPage, updateTaskInfo } from '@/api/task.js'
import { dateFormatter, taskStatusFormatter, timeFormatter, dueFormatter } from '@/utils/formatter.js'
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
import {errorBox} from '@/utils/myMessageBox.js'
import {ElMessage} from 'element-plus'
import { errorBox } from '@/utils/myMessageBox.js'
import { ElMessage } from 'element-plus'
import store from '@/store'
import {ref, reactive} from 'vue'
import { ref, reactive } from 'vue'
</script>
<script>
export default {
@ -246,16 +242,11 @@ export default {
},
taskTypeFormat: (row, column, cellValue, index) => {
switch (cellValue) {
case 1:
return '入库'
case 2:
return '出库'
case 3:
return '盘点'
case 9:
return '移库'
default:
return '未知'
case 1: return '入库'
case 2: return '出库'
case 3: return '盘点'
case 9: return '移库'
default: return '未知'
}
},
dueFormat: (row, column, cellValue, index) => {

90
src/layout/workFlow.vue
View File

@ -3,13 +3,13 @@
<el-config-provider :locale="zhCn">
<div style="display: flex;justify-content: space-between;">
<el-row>
<el-input v-model="workOrderQuery" style="width: 158px; margin-right: 10px; height: 32px;" placeholder="工单号"
<el-input v-model="workOrderQuery" style="width: 158px; margin-right: 10px;" placeholder="工单号"
:suffix-icon="Search"/>
<el-input v-model="workCenterQuery" style="width: 158px; margin-right: 10px; height: 32px;" placeholder="工位/小盒子"
<el-input v-model="workCenterQuery" style="width: 158px; margin-right: 10px;" placeholder="工位/小盒子"
:suffix-icon="Search"/>
<el-input v-model="goodsIdQuery" type="textarea" :rows="1" style="width: 158px; margin-right: 10px; height: 32px;"
placeholder="请输入料号，多个料号请换行输入" class="goods-id-textarea" />
<el-input v-model="standIdQuery" style="width: 158px; margin-right: 10px; height: 32px;" placeholder="站台号"
<el-input v-model="goodsIdQuery" style="width: 158px; margin-right: 10px;" placeholder="料号"
:suffix-icon="Search"/>
<el-input v-model="standIdQuery" style="width: 158px; margin-right: 10px;" placeholder="站台号"
:suffix-icon="Search"/>
<el-select-v2 v-model="lightStatusQuery" style="width: 158px; margin-right: 10px;"
placeholder="请选择灯光状态" :options="lightStatusOptions" @change="search()"></el-select-v2>
@ -21,7 +21,6 @@
<el-button type="warning" @click="reset()">重置</el-button>
</el-row>
<el-row>
<el-button style="background-color: #32CD32; color: #000;" @click="exportExcel()">导出</el-button>
<el-button style="background-color: #00CED1; color: #000;"
@click="openUploadDialog()">导入
</el-button>
@ -44,7 +43,6 @@
<el-table-column prop="goodsId" label="料号" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="needNum" label="需求数量" min-width="120px"/>
<el-table-column prop="pickedNum" label="已拣数量" min-width="120px"/>
<el-table-column prop="distributedNum" label="已分配数量" min-width="120px"/>
<el-table-column prop="lightStatus" label="亮灯状态" :formatter="lightStatusFormat" min-width="120px"/>
<el-table-column prop="workStatus" label="工作状态" :formatter="workStatusFormat" min-width="120px"/>
<el-table-column prop="machineType" label="机型" :formatter="machineTypeFormat" min-width="120px"/>
@ -53,7 +51,7 @@
show-overflow-tooltip/>
<el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" min-width="120px"
show-overflow-tooltip/>
<el-table-column prop="opUser" label="操作用户" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="opUser" label="操作用户" min-width="120px"/>
<el-table-column fixed="right" label="操作" width="120px">
<template v-slot="scope">
<el-button plain type="primary" @click="editCurrentRow(scope.row)">编辑</el-button>
@ -123,7 +121,7 @@
</el-row>
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="亮灯状态" prop="lightStatus">
<el-form-item label="任务状态" prop="lightStatus">
<el-select-v2 v-model="workFlowFormEntity.lightStatus" placeholder="请选择亮灯状态"
:options="lightStatusOptions"></el-select-v2>
</el-form-item>
@ -153,13 +151,6 @@
<el-input v-model="workFlowFormEntity.opUser" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="已分配数量" prop="distributedNum">
<el-input-number v-model.number="workFlowFormEntity.distributedNum"
controls-position="right" :min="0" :max="workFlowFormEntity.needNum"
clearable/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
@ -212,7 +203,7 @@ import {ref, reactive} from 'vue'
import {dateFormatter, timeFormatter} from '@/utils/formatter.js'
import {Search} from '@element-plus/icons-vue'
import UploadExcelWorkFlow from '@/excel/UploadExcelWorkFlow.vue'
import {queryUploadRecord, downloadWorkFlowExcel} from '@/api/excel.js'
import {queryUploadRecord} from '@/api/excel.js'
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
</script>
<script>
@ -312,7 +303,7 @@ export default {
workStation: this.standIdQuery.trim(),
workOrder: this.workOrderQuery.trim(),
workCenter: this.workCenterQuery.trim(),
goodsId: this.goodsIdQuery.trim().split('\n').filter(id => id.trim() !== '').join(','),
goodsId: this.goodsIdQuery.trim(),
lightStatus: this.lightStatusQuery == -99 ? null : this.lightStatusQuery,
workStatus: this.workStatusQuery == -99 ? null : this.workStatusQuery,
machineType: this.machineTypeQuery == -99 ? null : this.machineTypeQuery,
@ -352,8 +343,6 @@ export default {
},
workStatusFormat: (row, column, cellValue, index) => {
switch (cellValue) {
case -1:
return '暂存'
case 0:
return '未开始'
case 1:
@ -392,7 +381,6 @@ export default {
goodsId: row.goodsId,
pickedNum: row.pickedNum,
needNum: row.needNum,
distributedNum: row.distributedNum,
lightStatus: row.lightStatus,
workStatus: row.workStatus,
createTime: row.createTime,
@ -405,7 +393,6 @@ export default {
const params = {
workFlowId: formData.workFlowId,
pickedNum: formData.pickedNum,
distributedNum: formData.distributedNum,
lightStatus: formData.lightStatus,
workStatus: formData.workStatus,
userName: store.getters.getUserName
@ -458,41 +445,6 @@ export default {
})
this.uploadDialogVisible = true
},
exportExcel() {
const request = {
workStation: this.standIdQuery.trim(),
workOrder: this.workOrderQuery.trim(),
workCenter: this.workCenterQuery.trim(),
goodsId: this.goodsIdQuery.trim().split('\n').filter(id => id.trim() !== '').join(','),
lightStatus: this.lightStatusQuery == -99 ? null : this.lightStatusQuery,
workStatus: this.workStatusQuery == -99 ? null : this.workStatusQuery,
machineType: this.machineTypeQuery == -99 ? null : this.machineTypeQuery,
userName: store.getters.getUserName
}
downloadWorkFlowExcel(request).then(res => {
const link = document.createElement('a');//创建a标签
try {
let blob = res.data //如果后台返回的直接是blob对象类型，直接获取数据
let _fileName = "工作流报表" + dateFormatter(new Date) + ".xlsx"
link.style.display = 'none'//隐藏
// 兼容不同浏览器的URL对象
const url = window.URL || window.webkitURL || window.moxURL
link.href = url.createObjectURL(blob)
link.setAttribute('download', _fileName.substring(_fileName.lastIndexOf('_') + 1))
document.body.appendChild(link)
link.click()
document.body.removeChild(link)
url.revokeObjectURL(link.href)//移除url对象
} catch (e) {
console.log(e)
errorBox('下载文件失败')
}
}).catch(err => {
console.log(err)
errorBox('导出失败')
})
},
},
}
</script>
@ -542,28 +494,4 @@ export default {
flex-direction: column;
padding: 10px;
}
/* 专门为料号文本域添加样式 */
.goods-id-textarea {
vertical-align: top;
}
.goods-id-textarea :deep(.el-textarea__inner) {
font-size: 12px;
line-height: 1.2;
padding: 5px;
height: 32px !important;
min-height: 32px !important;
resize: none;
}
/* 确保其他输入框保持一致的高度 */
.el-input {
height: 32px;
}
.el-input :deep(.el-input__wrapper) {
height: 32px;
line-height: 32px;
}
</style>

43
src/layout/workSummary.vue
View File

@ -3,13 +3,13 @@
<el-config-provider :locale="zhCn">
<div style="display: flex;justify-content: space-between;">
<el-row>
<el-input v-model="workOrderQuery" style="width: 158px; margin-right: 10px; height: 32px;" placeholder="工单号"
<el-input v-model="workOrderQuery" style="width: 158px; margin-right: 10px;" placeholder="工单号"
:suffix-icon="Search" />
<el-input v-model="workCenterQuery" style="width: 158px; margin-right: 10px; height: 32px;" placeholder="工位/小盒子"
<el-input v-model="workCenterQuery" style="width: 158px; margin-right: 10px;" placeholder="工位/小盒子"
:suffix-icon="Search" />
<el-input v-model="goodsIdQuery" type="textarea" :rows="1" style="width: 158px; margin-right: 10px; height: 32px;"
placeholder="请输入料号，多个料号请换行输入" class="goods-id-textarea" />
<el-input v-model="standIdQuery" style="width: 158px; margin-right: 10px; height: 32px;" placeholder="站台号"
<el-input v-model="goodsIdQuery" style="width: 158px; margin-right: 10px;" placeholder="料号"
:suffix-icon="Search" />
<el-input v-model="standIdQuery" style="width: 158px; margin-right: 10px;" placeholder="站台号"
:suffix-icon="Search" />
<el-date-picker v-model="workDateQuery" type="date" placeholder="工作起始日期" :shortcuts="shortcuts"
style="width: 158px; margin-right: 10px;" clearable />
@ -129,7 +129,7 @@ export default {
workStation: this.standIdQuery.trim(),
workOrder: this.workOrderQuery.trim(),
workCenter: this.workCenterQuery.trim(),
goodsId: this.goodsIdQuery.trim().split('\n').filter(id => id.trim() !== '').join(','),
goodsId: this.goodsIdQuery.trim(),
lackStatus: this.lackStatusQuery == -99 ? null : this.lackStatusQuery,
workDate: timeFormatter(this.workDateQuery),
workEndDate: timeFormatter(this.workEndDateQuery),
@ -193,7 +193,7 @@ export default {
workStation: this.standIdQuery.trim(),
workOrder: this.workOrderQuery.trim(),
workCenter: this.workCenterQuery.trim(),
goodsId: this.goodsIdQuery.trim().split('\n').filter(id => id.trim() !== '').join(','),
goodsId: this.goodsIdQuery.trim(),
lackStatus: this.lackStatusQuery == -99 ? null : this.lackStatusQuery,
workDate: timeFormatter(this.workDateQuery),
workEndDate: timeFormatter(this.workEndDateQuery),
@ -274,33 +274,4 @@ export default {
flex-direction: column;
padding: 10px;
}
/* 专门为料号文本域添加样式 */
.goods-id-container {
display: inline-block;
vertical-align: top;
}
.goods-id-textarea {
vertical-align: top;
}
.goods-id-textarea :deep(.el-textarea__inner) {
font-size: 12px;
line-height: 1.2;
padding: 5px;
height: 32px !important;
min-height: 32px !important;
resize: none;
}
/* 确保其他输入框保持一致的高度 */
.el-input {
height: 32px;
}
.el-input :deep(.el-input__wrapper) {
height: 32px;
line-height: 32px;
}
</style>

24
src/views/login.vue
View File

@ -19,10 +19,10 @@
</template>
<script setup>
import {getUser, loginWithAuth, loginWithoutAuth} from '@/api/login.js'
import {postToGetToken} from "@/api/kateLogin.js";
import {ElMessage, ElLoading} from 'element-plus'
import {reactive, onMounted} from 'vue';
import { getUser, loginWithAuth, loginWithoutAuth } from '@/api/login.js'
import { postToGetToken } from "@/api/kateLogin.js";
import { ElMessage, ElLoading } from 'element-plus'
import { reactive, onMounted } from 'vue';
import store from '@/store'
import router from '@/router'
import crypto from 'crypto'
@ -35,14 +35,12 @@ function base64URLEncode(str) {
.replace(/\//g, '_')
.replace(/=/g, '');
}
var verifier = base64URLEncode(crypto.randomBytes(32));
// Dependency: Node.js crypto module
// https://nodejs.org/api/crypto.html#crypto_crypto
function sha256(buffer) {
return crypto.createHash('sha256').update(buffer).digest();
}
var challenge = base64URLEncode(sha256(verifier));
const loginForm = reactive({
@ -80,7 +78,7 @@ const login = () => {
store.commit('mutationMenu', res.data.returnData.menuList)// 菜单信息
store.commit('mutationStandId', res.data.returnData.standId)
// router.replace({ path: '/' })// 直接跳转到主页
router.replace({path: '/systemCenter'})// 跳转到系统选择的界面
router.replace({ path: '/systemCenter' })// 跳转到系统选择的界面
} else {
ElMessage.error(res.data.message)
}
@ -99,17 +97,13 @@ const loginCate = () => {
// window.open(cateLoginUrl)// 不打开新窗口
}
onMounted(() => {
const urlParams = new URLSearchParams(window.location.search);
const code = urlParams.get('code');
console.log(code); // 输出 ?code= 后面的值
if (code !== undefined && code !== null && code !== '') {
console.log('跳转并尝试登录。code：' + code)
if (router.currentRoute.value.query.code !== undefined) {
loading.open('请求登录中...')
const tokenParam = {
code_verifier: store.getters.getVerify,
client_id: 'f921b5f5-ba70-4bcb-8a4b-f3c7d90ec84e',
client_id: '609f8296-74ab-441e-904f-3a8508030511',
// scope: 'openid',
code: code,
code: router.currentRoute.value.query.code,
redirect_uri: 'https://csclasrs.ecorp.cat.com/wms',
grant_type: 'authorization_code',
// client_secret: 'o6h8Q~iLegnIBG.GzJngXk.03FYdBJzIoCtTtcwj',
@ -127,7 +121,7 @@ onMounted(() => {
store.commit('mutationUser', res.data.returnData.user)// 用户信息
store.commit('mutationMenu', res.data.returnData.menuList)// 菜单信息
store.commit('mutationStandId', res.data.returnData.standId)
router.replace({path: '/systemCenter'})
router.replace({ path: '/systemCenter' })
} else {
ElMessage.error(res.data.message)
}