zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: update frontend authorization and operations

Browse Source
This commit is contained in:
zgw
2026-09-03 16:56:57 +08:00
parent 3ec0931047
commit 690eae9985
26 changed files with 1768 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/.env.development
View File

@@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = "ForTucky WMS system"
VUE_APP_TITLE = "艾度 WMS system"
# 开发环境配置
ENV = 'development'

2
ruoyi-ui/.env.production
View File

@@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = "ForTucky WMS system"
VUE_APP_TITLE = "艾度 WMS system"
# 生产环境配置
ENV = 'production'

2
ruoyi-ui/.env.staging
View File

@@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = "ForTucky WMS system"
VUE_APP_TITLE = "艾度 WMS system"
BABEL_ENV = production

44
ruoyi-ui/src/api/agvPoint/point.js Normal file
View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询agv站点管理列表
export function listPoint(query) {
return request({
url: '/bas/agvPoint/list',
method: 'get',
params: query
})
}
// 查询agv站点管理详细
export function getPoint(id) {
return request({
url: '/bas/agvPoint' + id,
method: 'get'
})
}
// 新增agv站点管理
export function addPoint(data) {
return request({
url: '/bas/agvPoint',
method: 'post',
data: data
})
}
// 修改agv站点管理
export function updatePoint(data) {
return request({
url: '/bas/agvPoint',
method: 'put',
data: data
})
}
// 删除agv站点管理
export function delPoint(id) {
return request({
url: '/bas/agvPoint' + id,
method: 'delete'
})
}

40
ruoyi-ui/src/api/license.js Normal file
View File

@@ -0,0 +1,40 @@
import request from '@/utils/request'
export function listLicense(query) {
return request({
url: '/system/license/list',
method: 'get',
params: query
})
}
export function delLicense(ids) {
return request({
url: '/system/license/remove',
method: 'post',
params: { ids }
})
}
export function activeLicense(licenseCode) {
return request({
url: '/system/license/active',
method: 'post',
params: { licenseCode }
})
}
export function getLicenseInfo() {
return request({
url: '/system/license/info',
method: 'get'
})
}
export function generateLicense(type, projectNo) {
return request({
url: '/system/license/generate',
method: 'get',
params: { type, projectNo }
})
}

24
ruoyi-ui/src/api/requestInterface/log.js
View File

@@ -9,6 +9,30 @@ export function listLog(query) {
})
}
export function getMethod() {
return request({
url: '/requestInterface/log/getMethod',
method: 'get'
})
}
export function getSource() {
return request({
url: '/requestInterface/log/getSource',
method: 'get'
})
}
export function getTarget() {
return request({
url: '/requestInterface/log/getTarget',
method: 'get'
})
}
// 查询接口记录详细
export function getLog(requestId) {
return request({

11
ruoyi-ui/src/api/stock/management.js
View File

@@ -10,10 +10,11 @@ export function listManagement(query) {
}
// 查询库存信息详细
export function getManagement(stockId) {
export function getManagement(stockId, warehouseCode) {
return request({
url: '/stock/management/' + stockId,
method: 'get'
method: 'get',
params: {"warehouseCode": warehouseCode}
})
}
@@ -45,12 +46,14 @@ export function updateManagement(data) {
}
// 删除库存信息
export function delManagement(stockId) {
export function delManagement(stockId, warehouseCode) {
return request({
url: '/stock/management/' + stockId,
method: 'delete'
method: 'delete',
params: {"warehouseCode": warehouseCode}
})
}
//重置盘点记录
export function resetPdRecord() {
return request({

2
ruoyi-ui/src/components/Pagination/index.vue
View File

@@ -36,7 +36,7 @@ export default {
pageSizes: {
type: Array,
default() {
return [10, 20, 30, 50]
return [10, 50, 100, 1000]
}
},
// 移动端页码按钮的数量端默认值5

68
ruoyi-ui/src/layout/components/Navbar.vue
View File

@@ -5,6 +5,11 @@
<breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container" />
<top-nav v-if="topNav" id="topmenu-container" class="topmenu-container" />
<div v-if="licenseWarning" class="license-warning">
<i class="el-icon-warning-outline" />
系统授权将于 {{ licenseExpireText }} 后过期，请及时联系管理员续期
</div>
<div class="right-menu">
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" />
@@ -48,6 +53,7 @@ import Hamburger from '@/components/Hamburger'
import Screenfull from '@/components/Screenfull'
import SizeSelect from '@/components/SizeSelect'
import Search from '@/components/HeaderSearch'
import { getLicenseInfo } from '@/api/license'
// import RuoYiGit from '@/components/RuoYi/Git'
// import RuoYiDoc from '@/components/RuoYi/Doc'
@@ -63,6 +69,13 @@ export default {
// RuoYiGit,
// RuoYiDoc
},
data() {
return {
licenseWarning: false,
licenseExpireText: '',
licenseTimer: null
}
},
computed: {
...mapGetters([
'sidebar',
@@ -81,7 +94,41 @@ export default {
}
}
},
mounted() {
this.checkLicenseExpire()
this.licenseTimer = setInterval(this.checkLicenseExpire, 60 * 1000)
},
beforeDestroy() {
if (this.licenseTimer) {
clearInterval(this.licenseTimer)
}
},
methods: {
checkLicenseExpire() {
getLicenseInfo().then(response => {
this.licenseWarning = false
this.licenseExpireText = ''
if (response.code !== 200 || !response.data || !response.data.expireTime) {
return
}
const expireTime = new Date(response.data.expireTime).getTime()
const diffMs = expireTime - Date.now()
const diffDays = Math.ceil(diffMs / (1000 * 60 * 60 * 24))
if (diffMs <= 0 || diffDays > 30) {
return
}
this.licenseWarning = true
if (diffMs < 1000 * 60 * 60 * 24) {
const hours = Math.floor(diffMs / (1000 * 60 * 60))
const minutes = Math.floor((diffMs % (1000 * 60 * 60)) / (1000 * 60))
this.licenseExpireText = hours > 0 ? `${hours} 小时 ${minutes} 分钟` : `${minutes} 分钟`
} else if (diffDays < 7) {
this.licenseExpireText = `${diffDays} 天`
} else {
this.licenseExpireText = `${Math.ceil(diffDays / 7)} 周`
}
}).catch(() => {})
},
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
@@ -113,6 +160,27 @@ export default {
color: var(--navbar-color, #5a5e66);
box-shadow: 0 1px 4px rgba(0,21,41,.08);
.license-warning {
position: absolute;
left: 50%;
top: 0;
max-width: calc(100% - 420px);
height: 44px;
overflow: hidden;
color: #e6a23c;
font-size: 13px;
font-weight: 500;
line-height: 44px;
pointer-events: none;
text-overflow: ellipsis;
transform: translateX(-50%);
white-space: nowrap;
i {
margin-right: 4px;
}
}
.hamburger-container {
line-height: 46px;
height: 100%;

14
ruoyi-ui/src/store/modules/user.js
View File

@@ -45,6 +45,10 @@ const user = {
const password = userInfo.password
const code = userInfo.code
const uuid = userInfo.uuid
removeToken()
commit('SET_TOKEN', '')
commit('SET_ROLES', [])
commit('SET_PERMISSIONS', [])
return new Promise((resolve, reject) => {
login(username, password, code, uuid).then(res => {
setToken(res.token)
@@ -85,14 +89,18 @@ const user = {
// 退出系统
LogOut({ commit, state }) {
return new Promise((resolve, reject) => {
logout(state.token).then(() => {
const clearLocalSession = () => {
commit('SET_TOKEN', '')
commit('SET_ROLES', [])
commit('SET_PERMISSIONS', [])
removeToken()
}
logout(state.token).then(() => {
clearLocalSession()
resolve()
}).catch(error => {
reject(error)
clearLocalSession()
resolve()
})
})
},
@@ -101,6 +109,8 @@ const user = {
FedLogOut({ commit }) {
return new Promise(resolve => {
commit('SET_TOKEN', '')
commit('SET_ROLES', [])
commit('SET_PERMISSIONS', [])
removeToken()
resolve()
})

6
ruoyi-ui/src/utils/request.js
View File

@@ -74,19 +74,19 @@ service.interceptors.request.use(config => {
// 响应拦截器
service.interceptors.response.use(res => {
// 未设置状态码则默认成功状态
const code = res.status|| 200
const code = res.data && res.data.code !== undefined ? res.data.code : (res.status || 200)
// 获取错误信息
const msg = errorCode[code] || res.data.msg || errorCode['default']
// 二进制数据则直接返回
if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
return res.data
}
if (code === 401) {
if (code === 401 || res.status === 401) {
if (!isRelogin.show) {
isRelogin.show = true
MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
isRelogin.show = false
store.dispatch('LogOut').then(() => {
store.dispatch('FedLogOut').then(() => {
location.href = '/index'
})
}).catch(() => {

314
ruoyi-ui/src/views/agvPoint/point/index.vue Normal file
View File

@@ -0,0 +1,314 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="站点" prop="station">
<el-input
v-model="queryParams.station"
placeholder="请输入站点"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="站点类型" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择单据来源" clearable>
<el-option
v-for="item in typeOption"
:key="item.label"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="1" prop="spare2">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare2"-->
<!-- placeholder="请输入1"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="1" prop="spare3">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare3"-->
<!-- placeholder="请输入1"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['agvPoint:point:add']"
>新增</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['agvPoint:point:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['agvPoint:point:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['agvPoint:point:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" prop="id" />
<el-table-column label="站点" align="center" prop="station" />
<!-- <el-table-column label="站点类型" align="center" prop="type" />-->
<el-table-column label="站点类型" align="center" prop="type" >
<template slot-scope="scope">
<!-- if 判断：type=1 显示入库，type=2 显示出库 -->
<span v-if="scope.row.type === '1'">源站</span>
<span v-else-if="scope.row.type === '2'">目标站</span>
<!-- 兜底：其他值显示未知类型，避免空白 -->
<span v-else>未知类型</span>
</template>
</el-table-column>
<!-- <el-table-column label="1" align="center" prop="remark" />-->
<!-- <el-table-column label="1" align="center" prop="spare1" />-->
<!-- <el-table-column label="1" align="center" prop="spare2" />-->
<!-- <el-table-column label="1" align="center" prop="spare3" />-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['agvPoint:point:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['agvPoint:point:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改agv站点管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="站点" prop="station">
<el-input v-model="form.station" placeholder="请输入站点" />
</el-form-item>
<el-form-item label="站点类型" prop="type">
<el-select v-model="form.type" placeholder="请选择站点类型" clearable>
<el-option
v-for="item in typeOption"
:key="item.label"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="1" prop="spare1">-->
<!-- <el-input v-model="form.spare1" placeholder="请输入1" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="1" prop="spare2">-->
<!-- <el-input v-model="form.spare2" placeholder="请输入1" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="1" prop="spare3">-->
<!-- <el-input v-model="form.spare3" placeholder="请输入1" />-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listPoint, getPoint, delPoint, addPoint, updatePoint } from "@/api/agvPoint/point"
export default {
name: "Point",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// agv站点管理表格数据
pointList: [],
typeOption:[{label:'源站',value:'1'},{label:'目标站',value:'2'}],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
station: null,
type: null,
spare1: null,
spare2: null,
spare3: null
},
// 表单参数
form: {},
// 表单校验
rules: {
}
}
},
created() {
this.getList()
},
methods: {
/** 查询agv站点管理列表 */
getList() {
this.loading = true
listPoint(this.queryParams).then(response => {
this.pointList = response.rows
this.total = response.total
this.loading = false
})
},
// 取消按钮
cancel() {
this.open = false
this.reset()
},
// 表单重置
reset() {
this.form = {
id: null,
station: null,
type: null,
remark: null,
spare1: null,
spare2: null,
spare3: null
}
this.resetForm("form")
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm")
this.handleQuery()
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = "添加agv站点管理"
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const id = row.id || this.ids
getPoint(id).then(response => {
this.form = response.data
this.open = true
this.title = "修改agv站点管理"
})
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updatePoint(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.open = false
this.getList()
})
} else {
addPoint(this.form).then(response => {
this.$modal.msgSuccess("新增成功")
this.open = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids
this.$modal.confirm('是否确认删除agv站点管理编号为"' + ids + '"的数据项？').then(function() {
return delPoint(ids)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
}).catch(() => {})
},
/** 导出按钮操作 */
handleExport() {
this.download('agvPoint/point/export', {
...this.queryParams
}, `point_${new Date().getTime()}.xlsx`)
}
}
}
</script>

72
ruoyi-ui/src/views/bas/traycode/index.vue
View File

@@ -1,22 +1,22 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
<!-- <el-form-item label="格式ID" prop="formatId">-->
<!--&lt;!&ndash; <el-input-->
<!-- v-model="queryParams.formatId"-->
<!-- placeholder="请输入格式ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />&ndash;&gt;-->
<!-- <el-select v-model="queryParams.formatId" placeholder="请选择格式ID">-->
<!-- <el-option-->
<!-- v-for="item in traycodeFormatList"-->
<!-- :key="item.id"-->
<!-- :label="item.remarks"-->
<!-- :value="item.id"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="格式ID" prop="formatId">-->
<!--&lt;!&ndash; <el-input-->
<!-- v-model="queryParams.formatId"-->
<!-- placeholder="请输入格式ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />&ndash;&gt;-->
<!-- <el-select v-model="queryParams.formatId" placeholder="请选择格式ID">-->
<!-- <el-option-->
<!-- v-for="item in traycodeFormatList"-->
<!-- :key="item.id"-->
<!-- :label="item.remarks"-->
<!-- :value="item.id"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="条码" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
@@ -101,16 +101,16 @@
<el-table ref="table" v-loading="loading" :data="traycodeList" @selection-change="handleSelectionChange" max-height="700">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="序号" align="center" prop="id" />-->
<!-- <el-table-column label="格式ID" align="left" prop="formatName" />-->
<!-- <el-table-column label="序号" align="center" prop="id" />-->
<!-- <el-table-column label="格式ID" align="left" prop="formatName" />-->
<el-table-column label="条码" align="center" prop="trayCode" />
<!-- <el-table-column label="Spare Field 1" align="center" prop="spare1" />-->
<!-- <el-table-column label="Spare Field 1" align="center" prop="spare1" />-->
<el-table-column label="是否可用" align="center" prop="spare2" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.spare2"/>
</template>
</el-table-column>
<!-- <el-table-column label="Spare Field 3" align="center" prop="spare3" />-->
<!-- <el-table-column label="Spare Field 3" align="center" prop="spare3" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
<template slot-scope="scope">
<el-button
@@ -161,7 +161,7 @@
</el-select>
</el-form-item>
<el-form-item label="数量" prop="spare1" v-if="form.id == null">
<el-form-item label="数量" prop="spare1" v-if="form.id == null">
<el-input v-model="form.spare1" placeholder="请输入数量" />
</el-form-item>
<el-form-item label="托盘编码" prop="trayCode" v-if="form.id != null" >
@@ -187,14 +187,27 @@
<!-- 打印模板 -->
<!-- <vue-easy-print v-show="true" ref="easyPrint2">-->
<!-- <div v-for="item in printData" :key="item.id" style="page-break-after:always" class="vue-easy-print">-->
<!-- <vue-barcode-->
<!-- :value=item.trayCode-->
<!-- format="CODE39"-->
<!-- width="2"-->
<!-- height="100"-->
<!-- display-value-->
<!-- margin="2"-->
<!-- />-->
<!-- </div>-->
<!-- </vue-easy-print>-->
<vue-easy-print v-show="true" ref="easyPrint2">
<div v-for="item in printData" :key="item.id" style="page-break-after:always" class="vue-easy-print">
<vue-barcode
:value=item.trayCode
format="CODE39"
width="2"
height="100"
format="CODE128"
width="4"
height="150"
display-value
margin="5"
/>
</div>
</vue-easy-print>
@@ -205,6 +218,7 @@
import { listTraycode, getTraycode, delTraycode, addTraycode, updateTraycode } from "@/api/bas/traycode"
import { listTraycodeFormat } from "@/api/bas/traycodeFormat"
import vueEasyPrint from 'vue-easy-print'
import VueQr from 'vue-qr'
import VueBarcode from 'vue-barcode'
export default {
@@ -450,6 +464,11 @@ export default {
font-family: Arial, sans-serif;
}
.vue-qr {
display: block;
margin: 20px auto;
max-width: 100%;
}
@media print {
@page {
@@ -462,7 +481,7 @@ export default {
}
.vue-easy-print {
padding: 5px;
padding: 20px;
}
.num {
@@ -470,5 +489,8 @@ export default {
margin-top: 10px;
}
.vue-qr {
margin: 10px auto;
}
}
</style>

474
ruoyi-ui/src/views/bas/traycode/index1.vue Normal file
View File

@@ -0,0 +1,474 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
<!-- <el-form-item label="格式ID" prop="formatId">-->
<!--&lt;!&ndash; <el-input-->
<!-- v-model="queryParams.formatId"-->
<!-- placeholder="请输入格式ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />&ndash;&gt;-->
<!-- <el-select v-model="queryParams.formatId" placeholder="请选择格式ID">-->
<!-- <el-option-->
<!-- v-for="item in traycodeFormatList"-->
<!-- :key="item.id"-->
<!-- :label="item.remarks"-->
<!-- :value="item.id"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="条码" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
placeholder="请输入条码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否可用" prop="spare2">
<el-select v-model="queryParams.spare2" placeholder="请选择">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['bas:traycode:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['bas:traycode:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['bas:traycode:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['bas:traycode:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="el-icon-printer"
size="mini"
:disabled="multiple"
@click="handleBatchPrint"
v-hasPermi="['bas:traycode:print']"
>批量打印</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table ref="table" v-loading="loading" :data="traycodeList" @selection-change="handleSelectionChange" max-height="700">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="序号" align="center" prop="id" />-->
<!-- <el-table-column label="格式ID" align="left" prop="formatName" />-->
<el-table-column label="条码" align="center" prop="trayCode" />
<!-- <el-table-column label="Spare Field 1" align="center" prop="spare1" />-->
<el-table-column label="是否可用" align="center" prop="spare2" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.spare2"/>
</template>
</el-table-column>
<!-- <el-table-column label="Spare Field 3" align="center" prop="spare3" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['bas:traycode:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['bas:traycode:remove']"
>删除</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-printer"
@click="printBarcode(scope.row)"
v-hasPermi="['bas:traycode:print']"
>打印</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改条码信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="格式ID" prop="formatId">
<el-select v-model="form.formatId" placeholder="请选择格式ID">
<el-option
v-for="item in traycodeFormatList"
:key="item.id"
:label="item.remarks"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="数量" prop="spare1" v-if="form.id == null">
<el-input v-model="form.spare1" placeholder="请输入数量" />
</el-form-item>
<el-form-item label="托盘编码" prop="trayCode" v-if="form.id != null" >
<el-input v-model="form.trayCode" placeholder="请输入托盘编码" disabled/>
</el-form-item>
<el-form-item label="是否可用" prop="spare2" v-if="form.id != null">
<el-select v-model="form.spare2" placeholder="请选择" >
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确定</el-button>
<el-button @click="cancel">取消</el-button>
</div>
</el-dialog>
<!-- 打印模板 -->
<vue-easy-print v-show="true" ref="easyPrint2">
<div v-for="item in printData" :key="item.id" style="page-break-after:always" class="vue-easy-print">
<vue-barcode
:value=item.trayCode
format="CODE39"
width="2"
height="100"
display-value
/>
</div>
</vue-easy-print>
</div>
</template>
<script>
import { listTraycode, getTraycode, delTraycode, addTraycode, updateTraycode } from "@/api/bas/traycode"
import { listTraycodeFormat } from "@/api/bas/traycodeFormat"
import vueEasyPrint from 'vue-easy-print'
import VueBarcode from 'vue-barcode'
export default {
name: "Traycode",
dicts:['sys_yes_no'],
components: {
vueEasyPrint,
VueQr,
VueBarcode
},
data() {
return {
// 设置标题
title: this.$t('traycode.title'),
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 条码信息表格数据
traycodeList: [],
traycodeFormatList: [],
printData:[],
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
formatId: null,
trayCode: null,
spare1: null,
spare2: null,
spare3: null
},
queryTrayCodeFormatParams: {
pageNum: 1,
pageSize: 99,
},
// Form parameters
form: {},
// Form validation
rules: {
formatId: [
{ required: true, message: "请输入格式ID", trigger: "blur" }
],
trayCode: [
{ required: true, message: "请输入托盘编码", trigger: "blur" }
]
}
}
},
created() {
this.getTrayCodeFormatList()
this.getList()
},
methods: {
/** 查询条码信息列表 */
getTrayCodeFormatList() {
this.loading = true
listTraycodeFormat(this.queryTrayCodeFormatParams).then(response => {
this.traycodeFormatList = response.rows
this.total = response.total
this.loading = false
})
},
/** 查询条码信息列表 */
getList() {
this.loading = true
listTraycode(this.queryParams).then(response => {
this.traycodeList = response.rows
this.total = response.total
this.loading = false
})
},
// 取消按钮
cancel() {
this.open = false
this.reset()
},
// 表单重置
reset() {
this.form = {
id: null,
formatId: null,
trayCode: null,
createTime: null,
updateTime: null,
spare1: null,
spare2: null,
spare3: null
}
this.resetForm("form")
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm")
this.handleQuery()
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = "新增托盘编码"
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const id = row.id || this.ids
getTraycode(id).then(response => {
this.form = response.data
this.open = true
this.title = "修改托盘编码"
})
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateTraycode(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.open = false
this.getList()
})
} else {
addTraycode(this.form).then(response => {
this.$modal.msgSuccess("添加成功")
this.open = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids
this.$modal.confirm('是否确认删除选中的数据项？').then(function() {
return delTraycode(ids)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
}).catch(() => {})
},
/** 导出按钮操作 */
handleExport() {
this.download('bas/traycode/export', {
...this.queryParams
}, `traycode_${new Date().getTime()}.xlsx`)
},
/** 打印条码 */
printBarcode: function (row) {
const yesValItem = (this.dict && this.dict.type && this.dict.type.sys_yes_no) ? (this.dict.type.sys_yes_no.find(i => i.label === '是') || this.dict.type.sys_yes_no.find(i => i.value === 'Y' || i.value === '1')) : null
const yesVal = yesValItem ? yesValItem.value : 'Y'
if (row.spare2 !== yesVal) {
this.$modal.msgError("该托盘不可打印：仅“是”可用")
return;
}
this.printData = [row]
this.$nextTick(() => {
setTimeout(() => {
this.$refs.easyPrint2.print()
const noValItem = (this.dict && this.dict.type && this.dict.type.sys_yes_no) ? (this.dict.type.sys_yes_no.find(i => i.label === '否') || this.dict.type.sys_yes_no.find(i => i.value === 'N' || i.value === '0')) : null
const noVal = noValItem ? noValItem.value : 'N'
const data = Object.assign({}, row, { spare2: noVal })
updateTraycode(data).then(() => {
this.$modal.msgSuccess("打印完成，已标记为不可用")
this.getList()
}).catch(() => {})
}, 100)
})
},
/** 批量打印按钮操作 */
handleBatchPrint() {
const selection = this.$refs.table.selection;
if (selection.length === 0) {
this.$modal.msgError("请选择要打印的数据项");
return;
}
const yesValItem = (this.dict && this.dict.type && this.dict.type.sys_yes_no) ? (this.dict.type.sys_yes_no.find(i => i.label === '是') || this.dict.type.sys_yes_no.find(i => i.value === 'Y' || i.value === '1')) : null
const yesVal = yesValItem ? yesValItem.value : 'Y'
const invalid = selection.filter(item => item.spare2 !== yesVal)
if (invalid.length > 0) {
this.$modal.msgError("存在不可打印项（非“是”），请重新选择")
return;
}
this.printData = selection;
this.$nextTick(() => {
setTimeout(() => {
this.$refs.easyPrint2.print()
const noValItem = (this.dict && this.dict.type && this.dict.type.sys_yes_no) ? (this.dict.type.sys_yes_no.find(i => i.label === '否') || this.dict.type.sys_yes_no.find(i => i.value === 'N' || i.value === '0')) : null
const noVal = noValItem ? noValItem.value : 'N'
const updates = selection.map(item => {
const data = Object.assign({}, item, { spare2: noVal })
return updateTraycode(data)
})
Promise.all(updates).then(() => {
this.$modal.msgSuccess("批量打印完成，已标记为不可用")
this.getList()
}).catch(() => {})
}, 100)
});
},
}
}
</script>
<style scoped>
/* 统一表单控件宽度 */
.el-select,
.el-input {
width: 100%;
}
/* 打印样式 */
.vue-easy-print {
text-align: center;
}
.num {
display: block;
text-align: center;
font-size: 16px;
margin-top: 15px;
font-family: Arial, sans-serif;
}
@media print {
@page {
size: 80mm 50mm;
margin: 0;
}
body {
margin: 0;
}
.vue-easy-print {
padding: 5px;
}
.num {
font-size: 14px;
margin-top: 10px;
}
}
</style>

14
ruoyi-ui/src/views/in/job/index.vue
View File

@@ -1,6 +1,11 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="仓库" prop="warehouseId">
<el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable>
<el-option v-for="item in warehouseOptions" :key="item.warehouseId" :label="item.warehouseName" :value="item.warehouseId" />
</el-select>
</el-form-item>
<el-form-item label="作业状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
@@ -293,13 +298,16 @@ export default {
created() {
// 获取字典数据后，设置默认值
this.getList()
//this.getWarehouseList()
this.getWarehouseList()
},
methods: {
/** 获取仓库列表 */
getWarehouseList() {
listWarehouse(this.queryWarehouseParams).then(response => {
this.warehouseOptions = response.rows;
this.warehouseOptions = [
{ warehouseId: '01', warehouseName: '立库' },
{ warehouseId: '02', warehouseName: '平库' }
];
if (this.warehouseOptions.length > 0) {
this.handleQuery();
}
@@ -433,7 +441,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('job/mydoJob/export', {
this.download('job/inmydoJob/export', {
...this.queryParams
}, `mydoJob_${new Date().getTime()}.xlsx`)
},

79
ruoyi-ui/src/views/in/stockIn/index.vue
View File

@@ -31,25 +31,42 @@
/>
</el-select>
</el-form-item>
<el-form-item label="项目号" prop="departmentNo">
<el-form-item label="项目号" prop="spare4">
<el-input
v-model="queryParams.departmentNo"
v-model="queryParams.spare4"
placeholder="请输入项目号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="合同号" prop="spare1">
</el-form-item>
<el-form-item label="条码号" prop="stockinDetailId">
<el-input
v-model="queryParams.spare1"
placeholder="请输入合同号"
v-model="queryParams.stockinDetailId"
placeholder="请输入条码号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="销售订单号" prop="spare2">
<el-form-item label="组件号" prop="cargoNo">
<el-input
v-model="queryParams.cargoNo"
placeholder="请输入组件号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="wms单据号" prop="stockinId">
<el-input
v-model="queryParams.spare2"
v-model="queryParams.stockinId"
placeholder="请输入单据号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="erp单据号" prop="erpBill">
<el-input
v-model="queryParams.erpBill"
placeholder="请输入销售订单号"
clearable
@keyup.enter.native="handleQuery"
@@ -65,15 +82,25 @@
/>
</el-form-item>
<el-form-item label="批次号" prop="lotNo"><!--品名-->
<el-form-item label="存货编码" prop="productId"><!--品名-->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批次号"
v-model="queryParams.productId"
placeholder="请输入存货编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="批次号" prop="lotNo">&lt;!&ndash;品名&ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.lotNo"-->
<!-- placeholder="请输入批次号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item :label="'单据时间'" prop="dateRange">
<el-date-picker
v-model="dateRange"
@@ -170,23 +197,14 @@
<el-table v-loading="loading" :data="stockInList" @selection-change="handleSelectionChange"
@row-click="handleRowClick" max-height="400">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="序号" width="60" align="center">
<template slot-scope="scope">
{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column label="GUID" align="center" prop="stockinGuid" v-if="false"/>
<el-table-column label="入库单据号" align="left" prop="stockinId" width="150" sortable/><!--入库订单-->
<el-table-column label="单据类型" align="left" prop="inType"><!--入库类型-->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<el-table-column label="单据状态" align="left" prop="status"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="单据来源" align="left" prop="stockSource"><!--单据来源-->
<template slot-scope="scope">
<dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
</template>
</el-table-column>
<el-table-column label="erp单据号" align="left" prop="erpBill" width="150" sortable/>
<el-table-column label="仓库" align="left" prop="warehouseName"/><!--仓库-->
<el-table-column label="供应商代码" align="left" prop="supplierNo"/><!--仓库-->
<el-table-column label="供应商名称" align="left" prop="classNo" /><!--供应商-->
@@ -219,8 +237,8 @@
<el-table-column label="单位" align="left" prop="unit"/><!--机型-->
<el-table-column label="规格型号" align="left" prop="spec"/><!--规格-->
<el-table-column label="层级关系" align="left" prop="spare1"/><!--型号-->
<el-table-column label="上层物料" align="left" prop="spare2"/><!--净重-->
<el-table-column label="顶层物料" align="left" prop="spare3"/><!--颜色-->
<el-table-column label="组件号" align="left" prop="cargoNo"/><!--净重-->
<el-table-column label="项目号" align="left" prop="spare4"/><!--颜色-->
<el-table-column label="计划数量" align="left" prop="quantity" sortable/><!--计划数量-->
<el-table-column label="扫码数量" align="left" prop="scanNum" sortable/><!--扫码数量-->
<el-table-column label="实际数量" align="left" prop="assignNum" sortable/><!--实际数量-->
@@ -328,7 +346,10 @@ export default {
spare2: null,
spare4: null,
spare3: null,
spare5: null
spare5: null,
cargoNo:null,
productId:null,
stockinDetailId:null
},
queryDetailParams: {
pageNum: 1,

15
ruoyi-ui/src/views/job/outJobManagement.vue
View File

@@ -60,6 +60,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="项目号" prop="lineId">
<el-input
v-model="queryParams.lineId"
placeholder="请输入存货编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime"> <!-- 开始时间 -->
<el-date-picker clearable
v-model="queryParams.startTime"
@@ -268,7 +276,10 @@ export default {
getWarehouseOptions() {
listWarehouse().then(response => {
this.warehouseOptions = response.rows;
this.warehouseOptions = [
{ warehouseId: '01', warehouseName: '立库' },
{ warehouseId: '02', warehouseName: '平库' }
];
});
},
/** 查询任务表列表 */
@@ -347,7 +358,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('job/mydoJob/export', {
this.download('job/outmydoJob/export', {
...this.queryParams
}, `mydoJob_${new Date().getTime()}.xlsx`)
},

48
ruoyi-ui/src/views/login.vue
View File

@@ -56,8 +56,18 @@
<router-link class="link-type" :to="'/register'">立即注册</router-link>
</div>
</el-form-item>
<el-form-item style="width:100%;">
<el-button size="medium" type="warning" plain class="license-button" @click.native.prevent="openLicenseDialog">激活授权码</el-button>
</el-form-item>
</el-form>
</div>
<el-dialog title="激活授权码" :visible.sync="licenseDialogVisible" width="420px" append-to-body>
<el-input v-model="licenseCode" type="textarea" :rows="4" placeholder="请输入授权码" />
<span slot="footer" class="dialog-footer">
<el-button @click="licenseDialogVisible = false">取 消</el-button>
<el-button type="primary" :loading="licenseLoading" @click="handleActiveLicense">激 活</el-button>
</span>
</el-dialog>
<!-- 底部 -->
<div class="el-login-footer">
<span>{{ $t('login.bottom') }}</span>
@@ -70,6 +80,7 @@ import LangSelect from '@/components/LangSelect'
import { getCodeImg } from "@/api/login";
import Cookies from "js-cookie";
import { encrypt, decrypt } from '@/utils/jsencrypt'
import { activeLicense } from '@/api/license'
export default {
name: "Login",
@@ -98,7 +109,10 @@ export default {
captchaEnabled: true,
// 注册开关
register: false,
redirect: undefined
redirect: undefined,
licenseDialogVisible: false,
licenseCode: '',
licenseLoading: false
};
},
watch: {
@@ -156,6 +170,30 @@ export default {
});
}
});
},
openLicenseDialog() {
this.licenseCode = ''
this.licenseDialogVisible = true
},
handleActiveLicense() {
const licenseCode = this.licenseCode.trim()
if (!licenseCode) {
this.$message.warning('请输入授权码')
return
}
this.licenseLoading = true
activeLicense(licenseCode).then(response => {
if (response.code === 200) {
this.$message.success(response.msg || '授权码激活成功')
this.licenseDialogVisible = false
} else {
this.$message.error(response.msg || '授权码激活失败')
}
}).catch(() => {
this.$message.error('授权码激活失败')
}).finally(() => {
this.licenseLoading = false
})
}
}
};
@@ -177,7 +215,13 @@ export default {
padding: 40px;
padding-top: 50px;
width: 480px;
height: 500px;
min-height: 560px;
}
.license-button {
width: 100%;
height: 40px;
font-size: 15px;
}
.title {

8
ruoyi-ui/src/views/out/addOutStockout.vue
View File

@@ -353,7 +353,13 @@ export default {
pageNum: 1,
pageSize: 100
}).then(response => {
this.warehouseOptions = response.rows;
this.warehouseOptions = response.rows || [];
if (!this.warehouseOptions.some(item => String(item.warehouseId) === '2')) {
this.warehouseOptions.push({
warehouseId: '2',
warehouseName: '平库'
});
}
});
},
/** 打开客商选择弹窗 */

221
ruoyi-ui/src/views/out/outStockoutManage.vue
View File

@@ -25,6 +25,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'erp单据号'" prop="erpStockoutId"> <!-- 出库单编号 -->
<el-input
v-model="queryParams.erpStockoutId"
:placeholder="'请输入erp单据号'"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'出库类型'" prop="outType"> <!-- 出库类型 -->
<el-select v-model="queryParams.outType" :placeholder="'请选择出库类型'" clearable>
<el-option
@@ -53,6 +61,22 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'项目号'" prop="spare4">
<el-input
v-model="queryParams.spare4"
:placeholder="'请输入项目号'"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'存货编码'" prop="productId">
<el-input
v-model="queryParams.productId"
:placeholder="'请输入存货编码'"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'存货名称'" prop="productName">
<el-input
v-model="queryParams.productName"
@@ -74,8 +98,9 @@
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{'搜索'}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{'重置'}}</el-button> <!-- 重置 -->
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ '搜索' }}</el-button>
<!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ '重置' }}</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
@@ -89,7 +114,8 @@
size="mini"
@click="handleAudit(2)"
v-hasPermi="['out:outStockout:changeStatus']"
>{{'单据审核'}}</el-button> <!-- 单据审核 -->
>{{ '单据审核' }}
</el-button> <!-- 单据审核 -->
</el-col>
<el-col :span="1.5">
<el-button
@@ -99,7 +125,8 @@
size="mini"
@click="handleAudit(4)"
v-hasPermi="['out:outStockout:changeStatus']"
>{{'单据确认'}}</el-button> <!-- 单据确认 -->
>{{ '单据确认' }}
</el-button> <!-- 单据确认 -->
</el-col>
<el-col :span="1.5">
<el-button
@@ -109,7 +136,8 @@
size="mini"
@click="handleAudit(5)"
v-hasPermi="['out:outStockout:changeStatus']"
>{{'单据作废'}}</el-button> <!-- 单据作废 -->
>{{ '单据作废' }}
</el-button> <!-- 单据作废 -->
</el-col>
<el-col :span="1.5">
<el-button
@@ -119,7 +147,8 @@
size="mini"
@click="handleAutoAllot"
v-hasPermi="['out:outStockout:autoAllot']"
>{{'自动分配'}}</el-button> <!-- 自动分配 -->
>{{ '自动分配' }}
</el-button> <!-- 自动分配 -->
</el-col>
<el-col :span="1.5">
<el-button
@@ -129,14 +158,22 @@
size="mini"
@click="handleManualAllot"
v-hasPermi="['out:outStockout:manualAllot']"
>{{'手动分配'}}</el-button> <!-- 手动分配 -->
>{{ '手动分配' }}
</el-button> <!-- 手动分配 -->
</el-col>
</el-row>
<!-- 主表数据 -->
<el-table v-loading="loading" :data="outStockoutList" @selection-change="handleSelectionChange" @row-click="handleRowClick" max-height="400">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="'出库单编号'" align="left" prop="stockoutId" />
<el-table v-loading="loading" :data="outStockoutList" @selection-change="handleSelectionChange"
@row-click="handleRowClick" max-height="400">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="序号" width="60" align="center">
<template slot-scope="scope">
{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column :label="'出库单编号'" align="left" prop="stockoutId"/>
<el-table-column :label="'erp单据号'" align="left" prop="erpStockoutId"/>
<el-table-column :label="'出库类型'" align="left" prop="outType">
<template slot-scope="scope">
<dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
@@ -147,10 +184,11 @@
<dict-tag :options="dict.type.out_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="'项目号'" align="left" prop="departmentNo" />
<el-table-column :label="'项目号'" align="left" prop="departmentNo"/>
<el-table-column :label="'客商代号'" align="left" prop="customerNo"/>
<el-table-column :label="'客商名称'" align="left" prop="classNowId"/>
<el-table-column :label="'建单人'" align="left" prop="createManId" />
<el-table-column :label="'建单人'" align="left" prop="createManId"/>
<el-table-column :label="'出库方式'" align="left" prop="carNumber">
<template slot-scope="scope">
<dict-tag :options="dict.type.out_method" :value="scope.row.carNumber"/>
@@ -161,16 +199,17 @@
<dict-tag :options="dict.type.bill_resource" :value="scope.row.stockoutSource"/>
</template>
</el-table-column>
<el-table-column :label="'仓库编码'" align="left" prop="warehouseId"/>
<el-table-column :label="'仓库名称'" align="left" prop="warehouseName"/>
<!-- <el-table-column :label="'合同号'" align="left" prop="spare1" />-->
<!-- <el-table-column :label="'销售订单号'" align="left" prop="spare2" />-->
<el-table-column :label="'审核时间'" align="left" prop="spare3" />
<el-table-column :label="'审核人'" align="left" prop="spare4" />
<el-table-column :label="'审核时间'" align="left" prop="spare3"/>
<el-table-column :label="'审核人'" align="left" prop="spare4"/>
<el-table-column :label="'创建时间'" align="left" prop="createDate" width="160" sortable/>
<el-table-column :label="'开始时间'" align="left" prop="startDate" width="160" sortable/>
<el-table-column :label="'确认时间'" align="left" prop="finishDate" width="160" sortable/>
<el-table-column :label="'备注'" align="left" prop="spare5" />
<el-table-column :label="'备注'" align="left" prop="spare5"/>
</el-table>
<pagination
@@ -182,11 +221,12 @@
/>
<!-- 子表数据 -->
<el-table v-loading="detailLoading" :data="outStockDetailList" style="margin-top: 20px;" @selection-change="handleDetailSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="'出库子单编号'" align="center" prop="stockoutDetailId" width="160" /> <!-- 出库子单编号 -->
<el-table v-loading="detailLoading" :data="outStockDetailList" style="margin-top: 20px;"
@selection-change="handleDetailSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column :label="'出库子单编号'" align="center" prop="stockoutDetailId" width="160"/> <!-- 出库子单编号 -->
<el-table-column :label="'存货编码'" align="center" prop="productId" sortable/>
<el-table-column :label="'存货名称'" align="center" prop="productName" />
<el-table-column :label="'存货名称'" align="center" prop="productName"/>
<el-table-column :label="'批次号'" align="center" prop="lotNo"/>
<el-table-column :label="'供应商编码'" align="center" prop="fid"/>
<el-table-column :label="'计量单位'" align="center" prop="unit"/>
@@ -203,13 +243,13 @@
<!-- <el-table-column :label="'备注'" align="center" prop="remark"/>-->
</el-table>
<!-- <pagination-->
<!-- v-show="detailTotal>0"-->
<!-- :total="detailTotal"-->
<!-- :page.sync="detailQueryParams.pageNum"-->
<!-- :limit.sync="detailQueryParams.pageSize"-->
<!-- @pagination="getDetailList"-->
<!-- />-->
<!-- <pagination-->
<!-- v-show="detailTotal>0"-->
<!-- :total="detailTotal"-->
<!-- :page.sync="detailQueryParams.pageNum"-->
<!-- :limit.sync="detailQueryParams.pageSize"-->
<!-- @pagination="getDetailList"-->
<!-- />-->
<!-- 审核弹窗 -->
<el-dialog :title="'审核'" :visible.sync="auditDialogVisible" width="400px" append-to-body>
@@ -226,8 +266,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitAudit">{{"确认"}}</el-button>
<el-button @click="cancelAudit">{{"取消"}}</el-button>
<el-button type="primary" @click="submitAudit">{{ "确认" }}</el-button>
<el-button @click="cancelAudit">{{ "取消" }}</el-button>
</div>
</el-dialog>
@@ -237,7 +277,9 @@
<el-row style="margin-bottom: 15px; padding: 10px; background-color: #f5f7fa; border-radius: 4px;">
<el-col :span="8">
<span style="font-weight: bold;">计划数量: </span>
<span style="color: #409EFF; font-size: 16px;">{{ selectedDetailRows.length > 0 ? selectedDetailRows[0].quantity : 0 }}</span>
<span style="color: #409EFF; font-size: 16px;">{{
selectedDetailRows.length > 0 ? selectedDetailRows[0].quantity : 0
}}</span>
</el-col>
<el-col :span="8">
<span style="font-weight: bold;">已选库存数量: </span>
@@ -245,7 +287,9 @@
</el-col>
<el-col :span="8">
<span style="font-weight: bold;">剩余可分配: </span>
<span :style="{ color: remainingQuantity >= 0 ? '#67C23A' : '#F56C6C', fontSize: '16px' }">{{ remainingQuantity }}</span>
<span :style="{ color: remainingQuantity >= 0 ? '#67C23A' : '#F56C6C', fontSize: '16px' }">{{
remainingQuantity
}}</span>
</el-col>
</el-row>
@@ -283,27 +327,28 @@
</el-form>
<!-- 库存明细表格 -->
<el-table ref="stockTable" v-loading="stockLoading" :data="stockList" @selection-change="handleStockSelectionChange" max-height="400">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="库存编码" align="center" prop="stockId" />
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="品号" align="center" prop="productId" />
<el-table-column label="品名" align="center" prop="productName" />
<el-table-column label="数量" align="center" prop="quantity" width="80" />
<el-table-column label="规格" align="center" prop="spare1" />
<el-table-column label="单位" align="center" prop="spare3" />
<el-table-column label="型号" align="center" prop="spare4" />
<el-table-column label="颜色" align="center" prop="spare5" />
<el-table-column label="序列号" align="center" prop="spare6" />
<el-table-column label="电压" align="center" prop="voltage" />
<el-table-column label="功率" align="center" prop="power" />
<el-table-column label="相位" align="center" prop="phase" />
<el-table-column label="净重" align="center" prop="netWeight" />
<el-table-column label="毛重" align="center" prop="grossWeight" />
<el-table-column label="分销" align="center" prop="distribution" />
<el-table-column label="机型" align="center" prop="model" />
<el-table-column label="订单号" align="center" prop="orderId" />
<el-table ref="stockTable" v-loading="stockLoading" :data="stockList"
@selection-change="handleStockSelectionChange" max-height="400">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="库存编码" align="center" prop="stockId"/>
<el-table-column label="货位名称" align="center" prop="cargoSpaceName"/>
<el-table-column label="批次号" align="center" prop="lotNo"/>
<el-table-column label="品号" align="center" prop="productId"/>
<el-table-column label="品名" align="center" prop="productName"/>
<el-table-column label="数量" align="center" prop="quantity" width="80"/>
<el-table-column label="规格" align="center" prop="spare1"/>
<el-table-column label="单位" align="center" prop="spare3"/>
<el-table-column label="型号" align="center" prop="spare4"/>
<el-table-column label="颜色" align="center" prop="spare5"/>
<el-table-column label="序列号" align="center" prop="spare6"/>
<el-table-column label="电压" align="center" prop="voltage"/>
<el-table-column label="功率" align="center" prop="power"/>
<el-table-column label="相位" align="center" prop="phase"/>
<el-table-column label="净重" align="center" prop="netWeight"/>
<el-table-column label="毛重" align="center" prop="grossWeight"/>
<el-table-column label="分销" align="center" prop="distribution"/>
<el-table-column label="机型" align="center" prop="model"/>
<el-table-column label="订单号" align="center" prop="orderId"/>
</el-table>
@@ -342,7 +387,7 @@ export default {
// 遮罩层
loading: true,
detailLoading: false,
warehouseOptions:[],
warehouseOptions: [],
// 显示搜索条件
showSearch: true,
// 总条数
@@ -374,13 +419,13 @@ export default {
// 审核表单验证规则
auditRules: {
exitId: [
{ required: true, message: '请选择出口', trigger: 'change' }
{required: true, message: '请选择出口', trigger: 'change'}
]
},
// 出口选项
exitOptions: [
{ exitId: '1', exitName: '一楼'},
{ exitId: '2', exitName: '二楼'},
{exitId: '1', exitName: '一楼'},
{exitId: '2', exitName: '二楼'},
],
@@ -399,14 +444,17 @@ export default {
productName: null,
startDate: null,
finishDate: null,
status: null
status: null,
spare4: null,
erpStockoutId: null,
productId: null
},
// 子表分页参数
detailQueryParams: {
pageNum: 1,
pageSize: 99,
status:null,
stockoutGuid:null
status: null,
stockoutGuid: null
},
warehouseQueryParams: {
@@ -432,7 +480,7 @@ export default {
// 计算选中库存的总数量
selectedStockQuantity() {
return this.selectedStockRows.reduce((total, stock) => {
console.log(total+ + (parseFloat(stock.quantity)))
console.log(total + +(parseFloat(stock.quantity)))
return total + (parseFloat(stock.quantity) || 0)
}, 0)
},
@@ -466,7 +514,7 @@ export default {
// 如果有数据，自动选中第一行
if (this.outStockoutList.length > 0) {
this.handleRowClick(this.outStockoutList[0]);
}else {
} else {
this.outStockDetailList = []
this.detailLoading = false
}
@@ -474,7 +522,7 @@ export default {
})
},
/** 查询子表数据 */
getDetailList(stockoutGuid,status) {
getDetailList(stockoutGuid, status) {
this.detailLoading = true
this.detailQueryParams.stockoutGuid = stockoutGuid
this.detailQueryParams.status = status
@@ -510,7 +558,7 @@ export default {
},
/** 点击行加载明细数据 */
handleRowClick(row) {
this.getDetailList(row.stockoutGuid,row.status)
this.getDetailList(row.stockoutGuid, row.status)
},
/** 多选框选中数据 */
handleSelectionChange(selection) {
@@ -527,22 +575,21 @@ export default {
return
}
for(var i=0;i<this.selectedRows.length;i++){
if (this.selectedRows[i].status != "1" && status == 2) {
this.$modal.msgError(this.selectedRows[i].stockoutId+'单据已审核')
return
}
for (var i = 0; i < this.selectedRows.length; i++) {
if (this.selectedRows[i].status != "1" && status == 2) {
this.$modal.msgError(this.selectedRows[i].stockoutId + '单据已审核')
return
}
if (Number(this.selectedRows[i].status) < 3 && status == 4) {
this.$modal.msgError(this.selectedRows[i].stockoutId+"单据未开始，无法确认")
return
if (Number(this.selectedRows[i].status) < 3 && status == 4) {
this.$modal.msgError(this.selectedRows[i].stockoutId + "单据未开始，无法确认")
return
}
if (this.selectedRows[i].status != "1" && status == 5) {
this.$modal.msgError(this.selectedRows[i].stockoutId + '单据已审核，无法作废')
return;
}
}
if (this.selectedRows[i].status != "1" && status == 5){
this.$modal.msgError(this.selectedRows[i].stockoutId+'单据已审核，无法作废')
return;
}
}
// 如果是审核操作(status=2)，显示弹窗选择出口
@@ -582,15 +629,16 @@ export default {
let outstock = this.selectedRows[0]
if (outstock.status != "2" && outstock.status != "3") {
this.$modal.msgError('请先审核出库单')
return
return
}
let data = {
stockoutId: stockoutIds[0]
}
console.log("进入自动分配")
autoAllot(data).then(response => {
if (response.code !== 200){
if (response.code !== 200) {
this.$modal.msgError(response.msg)
}else {
} else {
this.$modal.msgSuccess(response.msg)
}
this.getList()
@@ -607,7 +655,7 @@ export default {
return
}
// 检查主表状态
if(this.selectedRows.length >1){
if (this.selectedRows.length > 1) {
this.$modal.msgError('只能选择一条主表数据进行手动分配')
return
}
@@ -624,7 +672,7 @@ export default {
this.$modal.msgError('单据已结束，无法手动分配！')
return
}
if(this.selectedDetailRows[0].allotQuantity==this.selectedDetailRows[0].quantity){
if (this.selectedDetailRows[0].allotQuantity == this.selectedDetailRows[0].quantity) {
this.$modal.msgError('该单据已分配完成，无法手动分配')
return
}
@@ -645,7 +693,7 @@ export default {
newStatus: this.currentAuditStatus,
exitId: this.auditForm.exitId
}
// console.log("单据状态修改（含出口信息）：", params)
// console.log("单据状态修改（含出口信息）：", params)
//调用单据状态改变接口
updateOutStockStatus(params).then(response => {
@@ -727,7 +775,7 @@ export default {
},
/** 确认分配 */
confirmStockAllot() {
confirmStockAllot() {
if (this.selectedStockRows.length === 0) {
this.$modal.msgError('请选择要分配的库存')
return
@@ -755,19 +803,18 @@ export default {
console.log('手动分配参数：', allotParams)
// 这里添加实际的分配API调用
manualAllot(allotParams).then(response => {
if(response.code=="200"){
if (response.code == "200") {
this.$modal.msgSuccess('分配成功')
this.stockDialogVisible = false
this.getList()
this.getDetailList(this.selectedRows[0].stockoutGuid, this.selectedRows[0].status)
}else{
} else {
this.$modal.msgError(response.msg)
}
})
},
/** 取消分配 */
@@ -778,8 +825,6 @@ export default {
}
}
}
</script>

219
ruoyi-ui/src/views/requestInterface/log/index.vue
View File

@@ -27,6 +27,44 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="'接口名称'" prop="endpoint">
<el-select v-model="queryParams.endpoint" :placeholder="'请选择接口名称'" clearable>
<el-option
v-for="item in methodOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="'源系统'" prop="sourceSystem">
<el-select v-model="queryParams.sourceSystem" :placeholder="'请选择源系统'" clearable>
<el-option
v-for="item in sourceSystemOption"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="'目标系统'" prop="targetSystem">
<el-select v-model="queryParams.targetSystem" :placeholder="'请选择目标系统'" clearable>
<el-option
v-for="item in targetSystemOption"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ '搜索' }}</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ '重置' }}</el-button>
@@ -34,90 +72,29 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['requestInterface:log:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['requestInterface:log:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['requestInterface:log:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['requestInterface:log:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange" >
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column width="120" :label="'请求ID'" align="left" prop="requestId" show-overflow-tooltip />
<el-table-column width="160" :label="'请求时间'" align="left" prop="requestTime" show-overflow-tooltip />
<el-table-column width="120" :label="'源系统'" align="left" prop="sourceSystem" show-overflow-tooltip />
<el-table-column width="120" :label="'目标系统'" align="left" prop="targetSystem" show-overflow-tooltip />
<el-table-column width="120" :label="'接口名称'" align="left" prop="endpoint" show-overflow-tooltip />
<el-table-column width="300" :label="'请求URL'" align="left" prop="requestUrl" show-overflow-tooltip />
<el-table-column width="120" :label="'请求方法'" align="left" prop="requestMethod" show-overflow-tooltip />
<el-table-column width="120" :label="'请求头'" align="left" prop="requestHeaders" show-overflow-tooltip />
<el-table-column width="300" :label="'请求体'" align="left" prop="requestBody" show-overflow-tooltip />
<el-table-column width="160" :label="'响应时间'" align="left" prop="responseTime" show-overflow-tooltip />
<el-table-column width="120" :label="'响应体'" align="left" prop="responseBody" show-overflow-tooltip />
<el-table-column width="120" :label="'响应状态'" align="left" prop="responseStatus" show-overflow-tooltip />
<el-table-column width="120" :label="'错误详情'" align="left" prop="errorDetails" show-overflow-tooltip />
<el-table-column width="120" :label="'持续时间'" align="left" prop="duration" show-overflow-tooltip />
<el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange">
<el-table-column width="120" :label="'请求ID'" align="left" prop="requestId" show-overflow-tooltip/>
<el-table-column width="160" :label="'请求时间'" align="left" sortable prop="requestTime" show-overflow-tooltip/>
<el-table-column width="120" :label="'源系统'" align="left" prop="sourceSystem" show-overflow-tooltip/>
<el-table-column width="120" :label="'目标系统'" align="left" prop="targetSystem" show-overflow-tooltip/>
<el-table-column width="120" :label="'接口名称'" align="left" prop="endpoint" show-overflow-tooltip/>
<el-table-column width="120" :label="'请求URL'" align="left" prop="requestUrl" show-overflow-tooltip/>
<el-table-column width="120" :label="'请求方法'" align="left" prop="requestMethod" show-overflow-tooltip/>
<!-- <el-table-column width="120" :label="'请求头'" align="left" prop="requestHeaders" show-overflow-tooltip/>-->
<el-table-column width="300" :label="'请求体'" align="left" prop="requestBody" show-overflow-tooltip/>
<el-table-column width="160" :label="'响应时间'" align="left" prop="responseTime" show-overflow-tooltip/>
<el-table-column width="120" :label="'响应体'" align="left" prop="responseBody" show-overflow-tooltip/>
<el-table-column width="120" :label="'响应状态'" align="left" prop="responseStatus" show-overflow-tooltip/>
<!-- <el-table-column width="120" :label="'错误详情'" align="left" prop="errorDetails" show-overflow-tooltip/>-->
<el-table-column width="120" :label="'持续时间'" align="left" prop="duration" show-overflow-tooltip/>
<el-table-column width="120" :label="'是否成功'" align="left" prop="isSuccessful" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.is_available" :value="scope.row.isSuccessful"/>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['requestInterface:log:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['requestInterface:log:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
@@ -132,34 +109,34 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item :label="'源系统'" prop="sourceSystem">
<el-input v-model="form.sourceSystem" type="textarea" :placeholder="'请输入内容'" />
<el-input v-model="form.sourceSystem" type="textarea" :placeholder="'请输入内容'"/>
</el-form-item>
<el-form-item :label="'目标系统'" prop="targetSystem">
<el-input v-model="form.targetSystem" type="textarea" :placeholder="'请输入内容'" />
<el-input v-model="form.targetSystem" type="textarea" :placeholder="'请输入内容'"/>
</el-form-item>
<el-form-item :label="'接口名称'" prop="endpoint">
<el-input v-model="form.endpoint" type="textarea" :placeholder="'请输入内容'" />
<el-input v-model="form.endpoint" type="textarea" :placeholder="'请输入内容'"/>
</el-form-item>
<el-form-item :label="'请求URL'" prop="requestUrl">
<el-input v-model="form.requestUrl" type="textarea" :placeholder="'请输入内容'" />
<el-input v-model="form.requestUrl" type="textarea" :placeholder="'请输入内容'"/>
</el-form-item>
<el-form-item :label="'请求方法'" prop="requestMethod">
<el-input v-model="form.requestMethod" type="textarea" :placeholder="'请输入内容'" />
<el-input v-model="form.requestMethod" type="textarea" :placeholder="'请输入内容'"/>
</el-form-item>
<el-form-item :label="'请求头'" prop="requestHeaders">
<el-input v-model="form.requestHeaders" type="textarea" :placeholder="'请输入内容'" />
<el-input v-model="form.requestHeaders" type="textarea" :placeholder="'请输入内容'"/>
</el-form-item>
<el-form-item :label="'请求体'" prop="requestBody">
<el-input v-model="form.requestBody" :placeholder="'请输入请求参数'" />
<el-input v-model="form.requestBody" :placeholder="'请输入请求参数'"/>
</el-form-item>
<el-form-item :label="'响应体'" prop="responseBody">
<el-input v-model="form.responseBody" type="textarea" :placeholder="'请输入内容'" />
<el-input v-model="form.responseBody" type="textarea" :placeholder="'请输入内容'"/>
</el-form-item>
<el-form-item :label="'错误详情'" prop="errorDetails">
<el-input v-model="form.errorDetails" :placeholder="'请输入错误信息'" />
<el-input v-model="form.errorDetails" :placeholder="'请输入错误信息'"/>
</el-form-item>
<el-form-item :label="'持续时间'" prop="duration">
<el-input v-model="form.duration" type="textarea" :placeholder="'请输入内容'" />
<el-input v-model="form.duration" type="textarea" :placeholder="'请输入内容'"/>
</el-form-item>
<el-form-item :label="'是否成功'" prop="isSuccessful">
<el-select v-model="form.isSuccessful" :placeholder="'请选择是否成功'">
@@ -181,32 +158,25 @@
</template>
<script>
import { listLog, getLog, delLog, addLog, updateLog } from "@/api/requestInterface/log"
import {listLog, getLog, delLog, addLog, updateLog, getMethod, getSource, getTarget} from "@/api/requestInterface/log"
export default {
name: "Log",
dicts: ['is_available'],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
methodOptions: [], // 下拉框选项
sourceSystemOption:[],
targetSystemOption:[],
total: 0,
// 接口记录表格数据
logList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
@@ -225,15 +195,15 @@ export default {
duration: null,
isSuccessful: null
},
// 表单参数
form: {},
// 表单校验
rules: {
}
rules: {}
}
},
created() {
this.getList()
this.getMethod() // 现在可以正常调用了
this.getSource()
this.getTarget()
},
methods: {
/** 查询接口记录列表 */
@@ -245,6 +215,43 @@ export default {
this.loading = false
})
},
// ✅ 【核心修复】getMethod 移入 methods 内部
getMethod() {
getMethod().then(response => {
console.log("接口返回：", response.data)
// 后端返回 String数组，转换为 el-select 需要的 label/value 格式
this.methodOptions = response.data.map(item => ({
label: item,
value: item
}))
}).catch(err => {
console.error("获取方法列表失败：", err)
})
},
getSource() {
getSource().then(response => {
console.log("接口返回：", response.data)
// 后端返回 String数组，转换为 el-select 需要的 label/value 格式
this.sourceSystemOption = response.data.map(item => ({
label: item,
value: item
}))
}).catch(err => {
console.error("获取方法列表失败：", err)
})
},
getTarget() {
getTarget().then(response => {
console.log("接口返回：", response.data)
// 后端返回 String数组，转换为 el-select 需要的 label/value 格式
this.targetSystemOption = response.data.map(item => ({
label: item,
value: item
}))
}).catch(err => {
console.error("获取方法列表失败：", err)
})
},
// 取消按钮
cancel() {
this.open = false
@@ -284,7 +291,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.requestId)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
@@ -326,12 +333,13 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const requestIds = row.requestId || this.ids
this.$modal.confirm('是否确认删除接口记录编号为"' + requestIds + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除接口记录编号为"' + requestIds + '"的数据项？').then(function () {
return delLog(requestIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
}).catch(() => {})
}).catch(() => {
})
},
/** 导出按钮操作 */
handleExport() {
@@ -342,3 +350,6 @@ export default {
}
}
</script>
<style scoped>
</style>

9
ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
View File

@@ -1,6 +1,11 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="仓库" prop="warehouseId">
<el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable>
<el-option v-for="item in warehouseOptions" :key="item.warehouseId" :label="item.warehouseName" :value="item.warehouseId" />
</el-select>
</el-form-item>
<el-form-item label="作业ID" prop="jobId">
<el-input
v-model="queryParams.jobId"
@@ -702,6 +707,10 @@ export default {
total: 0,
// 入库作业流水表格数据
ViewInJobFlowList: [],
warehouseOptions: [
{ warehouseId: '01', warehouseName: '立库' },
{ warehouseId: '02', warehouseName: '平库' }
],
// 弹出层标题
title: "",
// 是否显示弹出层

9
ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
View File

@@ -1,6 +1,11 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="仓库" prop="warehouseId">
<el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable>
<el-option v-for="item in warehouseOptions" :key="item.warehouseId" :label="item.warehouseName" :value="item.warehouseId" />
</el-select>
</el-form-item>
<el-form-item label="作业ID" prop="jobId">
<el-input
v-model="queryParams.jobId"
@@ -701,6 +706,10 @@ export default {
total: 0,
// 出库作业流水表格数据
ViewOutJobFlowList: [],
warehouseOptions: [
{ warehouseId: '01', warehouseName: '立库' },
{ warehouseId: '02', warehouseName: '平库' }
],
// 弹出层标题
title: "",
// 是否显示弹出层

192
ruoyi-ui/src/views/stock/management/index.vue
View File

@@ -25,6 +25,43 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="托盘条码" prop="trayCode"><!-- 货位id -->
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘条码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="项目号" prop="spare4"><!-- 货位id -->
<el-input
v-model="queryParams.spare4"
placeholder="请输入组件号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="存货编码" prop="productId"><!-- 货位id -->
<el-input
v-model="queryParams.productId"
placeholder="请输入存货编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="托盘类型" prop="ktpType"><!-- 库存状态 -->
<el-select v-model="queryParams.ktpType" placeholder="请选择托盘类型" clearable>
<el-option
v-for="item in ktpType"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="库存状态" prop="stockStatus"><!-- 库存状态 -->
<el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
<el-option
@@ -36,14 +73,36 @@
</el-select>
</el-form-item>
<!-- <el-form-item label="入库时间" prop="startDate">&lt;!&ndash; 入库时间 &ndash;&gt;
<el-date-picker clearable
v-model="queryParams.inDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择入库时间">
</el-date-picker>
</el-form-item>-->
<el-form-item label="物料类型" prop="model"><!--单据来源-->
<el-select v-model="queryParams.model" placeholder="请选择单据来源" clearable>
<el-option
v-for="dict in productType"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="仓库选择" prop="warehouseCode"><!--单据来源-->
<el-select v-model="queryParams.warehouseCode" placeholder="请选择单据来源" clearable>
<el-option
v-for="item in warehouseCodeOptions"
:key="item.label"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="入库时间" prop="startDate">&lt;!&ndash; 入库时间 &ndash;&gt;
<el-date-picker clearable
v-model="queryParams.inDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择入库时间">
</el-date-picker>
</el-form-item>-->
<el-form-item label="存货名称" prop="productName"><!-- 存货名称 -->
@@ -99,36 +158,36 @@
</el-row>
<el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" align="center" />
<el-table-column type="selection" align="center"/>
<el-table-column label="库存编码" align="left" prop="stockId" width="180" sortable/>
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="180"/>
<el-table-column width="180" label="库存状态" align="center" prop="stockStatus" >
<el-table-column width="180" label="库存状态" align="center" prop="stockStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column width="180" label="物料编码" align="left" prop="productId" />
<el-table-column width="180" label="物料名称" align="left" prop="productName" />
<el-table-column width="180" label="批次号" align="left" prop="lotNo" />
<!-- <el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/>-->
<el-table-column width="180" label="入库时间" align="left" prop="inDate" sortable/>
<el-table-column width="180" label="物料编码" align="left" prop="productId"/>
<el-table-column width="180" label="物料名称" align="left" prop="productName"/>
<el-table-column width="180" label="批次号" align="left" prop="lotNo"/>
<!-- <el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/>-->
<el-table-column width="180" label="入库时间" align="left" prop="inDate" sortable/>
<el-table-column width="100" label="数量" align="left" prop="quantity" sortable/>
<el-table-column width="180" label="作业ID" align="left" prop="jobId" sortable/>
<el-table-column width="180" label="出库数量" align="left" prop="outQuantity" />
<el-table-column width="180" label="入库单ID" align="left" prop="stockinId" sortable/>
<el-table-column width="180" label="作业ID" align="left" prop="jobId" sortable/>
<el-table-column width="180" label="出库数量" align="left" prop="outQuantity"/>
<el-table-column width="180" label="入库单ID" align="left" prop="stockinId" sortable/>
<el-table-column width="180" label="入库子单ID" align="left" prop="stockinDetailId" sortable/>
<!-- <el-table-column label="入库类型" align="center" prop="inType" />-->
<!-- <el-table-column label="仓库编码" align="center" prop="warehouseId" />-->
<el-table-column width="180" label="层级关系" align="left" prop="spare1" />
<el-table-column width="180" label="上层物料" align="left" prop="spare2" />
<el-table-column width="180" label="顶层物料" align="left" prop="spare3" />
<el-table-column width="180" label="项目号" align="left" prop="spare4" />
<el-table-column width="180" label="合同号" align="left" prop="spare5" />
<el-table-column width="180" label="销售订单" align="left" prop="spare6" />
<el-table-column width="180" label="供应商编码" align="left" prop="voltage" />
<el-table-column width="180" label="规格型号" align="left" prop="power" />
<el-table-column width="180" label="计量单位" align="left" prop="phase" />
<!-- <el-table-column label="净重" align="center" prop="netWeight" />-->
<!-- <el-table-column label="入库类型" align="center" prop="inType" />-->
<!-- <el-table-column label="仓库编码" align="center" prop="warehouseId" />-->
<el-table-column width="180" label="托盘条码" align="left" prop="trayCode"/>
<!-- <el-table-column width="180" label="上层物料" align="left" prop="spare2"/>-->
<!-- <el-table-column width="180" label="顶层物料" align="left" prop="spare3"/>-->
<el-table-column width="180" label="项目号" align="left" prop="spare4"/>
<!-- <el-table-column width="180" label="合同号" align="left" prop="spare5"/>-->
<!-- <el-table-column width="180" label="销售订单" align="left" prop="spare6"/>-->
<el-table-column width="180" label="供应商编码" align="left" prop="voltage"/>
<el-table-column width="180" label="规格型号" align="left" prop="power"/>
<el-table-column width="180" label="计量单位" align="left" prop="phase"/>
<!-- <el-table-column label="净重" align="center" prop="netWeight" />-->
<el-table-column width=120 label="操作" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
@@ -160,12 +219,12 @@
<!-- 添加或修改库存信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<!-- <el-form-item label="库存ID" prop="stockId"> &lt;!&ndash; 库存id &ndash;&gt;-->
<!-- <el-input v-model="form.stockId" placeholder="请输入库存ID" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="货位ID" prop="cargoSpaceId"> &lt;!&ndash; 货位id &ndash;&gt;-->
<!-- <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="库存ID" prop="stockId"> &lt;!&ndash; 库存id &ndash;&gt;-->
<!-- <el-input v-model="form.stockId" placeholder="请输入库存ID" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="货位ID" prop="cargoSpaceId"> &lt;!&ndash; 货位id &ndash;&gt;-->
<!-- <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />-->
<!-- </el-form-item>-->
<el-form-item label="物料" prop="productId"> <!-- 物料 -->
<el-input
@@ -207,7 +266,7 @@
</el-form-item>
<el-form-item label="库存数量" prop="quantity"> <!-- 库存数量 -->
<el-input v-model="form.quantity" placeholder="请输入库存数量" />
<el-input v-model="form.quantity" placeholder="请输入库存数量"/>
</el-form-item>
</el-form>
@@ -248,11 +307,11 @@
@row-click="handleProductRowClick"
highlight-current-row
max-height="400">
<el-table-column label="品号" align="center" prop="productId" />
<el-table-column label="品名" align="center" prop="productName" />
<el-table-column label="规格" align="center" prop="spec" />
<el-table-column label="型号" align="center" prop="spare1" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="品号" align="center" prop="productId"/>
<el-table-column label="品名" align="center" prop="productName"/>
<el-table-column label="规格" align="center" prop="spec"/>
<el-table-column label="型号" align="center" prop="spare1"/>
<el-table-column label="单位" align="center" prop="unit"/>
</el-table>
<pagination
@@ -288,7 +347,7 @@
@keyup.enter.native="getCargoSpaceList"
/>
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-form-item label="仓库" prop="warehouseCode">
<el-select v-model="cargoSpaceQueryParams.warehouseId" placeholder="请选择仓库" clearable>
<el-option
v-for="item in warehouseOptions"
@@ -310,17 +369,17 @@
@row-click="handleCargoSpaceRowClick"
highlight-current-row
max-height="400">
<el-table-column label="货位编码" align="center" prop="cargoSpaceId" />
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
<el-table-column label="货位编码" align="center" prop="cargoSpaceId"/>
<el-table-column label="货位名称" align="center" prop="cargoSpaceName"/>
<el-table-column label="仓库名称" align="center" prop="warehouseName"/>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="排" align="center" prop="thePlatoon" />
<el-table-column label="列" align="center" prop="theColumn" />
<el-table-column label="层" align="center" prop="theFloor" />
<el-table-column label="排" align="center" prop="thePlatoon"/>
<el-table-column label="列" align="center" prop="theColumn"/>
<el-table-column label="层" align="center" prop="theFloor"/>
</el-table>
<pagination
@@ -340,13 +399,14 @@
</template>
<script>
import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management"
import {listManagement, getManagement, delManagement, addManagement, updateManagement} from "@/api/stock/management"
import {listWarehouse} from "@/api/bas/warehouse"
import { listBasProduct } from "@/api/bas/BasProduct"
import { listCargoSpace } from "@/api/bas/cargoSpace"
import {listBasProduct} from "@/api/bas/BasProduct"
import {listCargoSpace} from "@/api/bas/cargoSpace"
export default {
name: "Management",
dicts: ['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status'],
dicts: ['product_status', 'stock_status', 'cargo_space_status', 'cargo_space_lock_status'],
data() {
return {
// 遮罩层
@@ -365,6 +425,9 @@ export default {
managementList: [],
// 仓库选项
warehouseOptions: [],
warehouseCodeOptions: [{label: '立库', value: '1'}, {label: '平库', value: '2'}],
productType:[{label:"满托",value:'1'},{label:"半托",value:'0'}],
ktpType:[{label:"物料",value:'2'},{label:"托盘",value:'1'}],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -397,10 +460,15 @@ export default {
spare3: null,
spare4: null,
spare5: null,
spare6: null
spare6: null,
model: null,
ktpType: "1",
warehouseCode: "1",
},
queryWarehouse: {
pageNum:1,
pageNum: 1,
pageSize: 99
},
// 表单参数
@@ -511,7 +579,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.stockId)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
@@ -524,7 +592,8 @@ export default {
handleUpdate(row) {
this.reset()
const stockId = row.stockId || this.ids
getManagement(stockId).then(response => {
const warehouseCode=this.queryParams.warehouseCode;
getManagement(stockId,warehouseCode).then(response => {
this.form = response.data
this.open = true
this.title = "修改库存信息" // 修改库存信息
@@ -535,6 +604,7 @@ export default {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.stockId != null) {
this.form.warehouseCode=this.queryParams.warehouseCode;
updateManagement(this.form).then(response => {
this.$modal.msgSuccess("修改成功") // 修改成功
this.open = false
@@ -553,12 +623,14 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const stockIds = row.stockId || this.ids
this.$modal.confirm("是否确认删除库存信息编号为" + stockIds).then(function() { // 是否确认删除库存信息编号为
return delManagement(stockIds)
const warehouseCode =this.queryParams.warehouseCode;
this.$modal.confirm("是否确认删除库存信息编号为" + stockIds).then(function () { // 是否确认删除库存信息编号为
return delManagement(stockIds,warehouseCode)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功") // 删除成功
}).catch(() => {})
}).catch(() => {
})
},
/** 导出按钮操作 */
handleExport() {

205
ruoyi-ui/src/views/system/license/index.vue Normal file
View File

@@ -0,0 +1,205 @@
<template>
<div class="app-container">
<el-form ref="queryForm" :model="queryParams" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="授权码" prop="licenseCode">
<el-input v-model="queryParams.licenseCode" placeholder="请输入授权码" clearable style="width: 260px" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable style="width: 160px">
<el-option label="未激活" value="0" />
<el-option label="已激活" value="1" />
<el-option label="已过期" value="2" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-key" size="mini" @click="handleActive" v-hasPermi="['system:license:add']">激活授权码</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-plus" size="mini" @click="handleGenerate" v-hasPermi="['system:license:add']">生成授权码</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:license:remove']">删除</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
</el-row>
<el-table v-loading="loading" :data="licenseList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="授权ID" align="center" prop="licenseId" width="90" />
<el-table-column label="授权码" align="center" prop="licenseCode" min-width="360" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status" width="100">
<template slot-scope="scope">
<el-tag :type="statusTagType(scope.row.status)">{{ statusText(scope.row.status) }}</el-tag>
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" prop="startTime" width="180">
<template slot-scope="scope"><span>{{ parseTime(scope.row.startTime) }}</span></template>
</el-table-column>
<el-table-column label="过期时间" align="center" prop="expireTime" width="180">
<template slot-scope="scope"><span>{{ parseTime(scope.row.expireTime) }}</span></template>
</el-table-column>
<el-table-column label="激活时间" align="center" prop="activeTime" width="180">
<template slot-scope="scope"><span>{{ parseTime(scope.row.activeTime) }}</span></template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:license:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
<el-dialog title="激活授权码" :visible.sync="activeOpen" width="520px" append-to-body>
<el-input v-model="activeForm.licenseCode" type="textarea" :rows="5" placeholder="请输入授权码" />
<div slot="footer" class="dialog-footer">
<el-button @click="activeOpen = false">取消</el-button>
<el-button type="primary" :loading="activeLoading" @click="submitActive">确定</el-button>
</div>
</el-dialog>
<el-dialog title="生成授权码" :visible.sync="generateOpen" width="560px" append-to-body>
<el-form ref="generateForm" :model="generateForm" :rules="generateRules" label-width="100px">
<el-form-item label="授权类型" prop="type">
<el-select v-model="generateForm.type" placeholder="请选择授权类型" style="width: 100%">
<el-option label="5分钟测试" value="TEST" />
<el-option label="1个月授权" value="MONTH" />
<el-option label="3个月授权" value="THREE" />
<el-option label="1年授权" value="YEAR" />
<el-option label="5年授权" value="FIVE" />
<el-option label="长期授权" value="FOREVER" />
</el-select>
</el-form-item>
<el-form-item label="项目编号" prop="projectNo">
<el-input v-model="generateForm.projectNo" placeholder="请输入项目编号，如 FT546" />
</el-form-item>
<el-form-item v-if="generatedCode" label="授权码">
<el-input v-model="generatedCode" type="textarea" :rows="5" readonly />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="generateOpen = false">关闭</el-button>
<el-button type="primary" :loading="generateLoading" @click="submitGenerate">生成</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listLicense, delLicense, activeLicense, generateLicense } from '@/api/license'
export default {
name: 'License',
data() {
return {
loading: true,
activeLoading: false,
generateLoading: false,
ids: [],
multiple: true,
showSearch: true,
total: 0,
licenseList: [],
activeOpen: false,
generateOpen: false,
generatedCode: '',
queryParams: { pageNum: 1, pageSize: 10, licenseCode: undefined, status: undefined },
activeForm: { licenseCode: '' },
generateForm: { type: 'YEAR', projectNo: 'FT546' },
generateRules: {
type: [{ required: true, message: '请选择授权类型', trigger: 'change' }],
projectNo: [{ required: true, message: '请输入项目编号', trigger: 'blur' }]
}
}
},
created() {
this.getList()
},
methods: {
getList() {
this.loading = true
listLicense(this.queryParams).then(response => {
this.licenseList = response.rows
this.total = response.total
}).finally(() => {
this.loading = false
})
},
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
resetQuery() {
this.resetForm('queryForm')
this.handleQuery()
},
handleSelectionChange(selection) {
this.ids = selection.map(item => item.licenseId)
this.multiple = !selection.length
},
handleActive() {
this.activeForm.licenseCode = ''
this.activeOpen = true
},
submitActive() {
const licenseCode = this.activeForm.licenseCode.trim()
if (!licenseCode) {
this.$modal.msgWarning('请输入授权码')
return
}
this.activeLoading = true
activeLicense(licenseCode).then(response => {
if (response.code !== 200) {
this.$modal.msgError(response.msg || '授权码激活失败')
return
}
this.$modal.msgSuccess(response.msg || '授权码激活成功')
this.activeOpen = false
this.getList()
}).finally(() => {
this.activeLoading = false
})
},
handleGenerate() {
this.generatedCode = ''
this.generateForm = { type: 'YEAR', projectNo: 'FT546' }
this.generateOpen = true
this.$nextTick(() => this.resetForm('generateForm'))
},
submitGenerate() {
this.$refs.generateForm.validate(valid => {
if (!valid) return
this.generateLoading = true
generateLicense(this.generateForm.type, this.generateForm.projectNo.trim()).then(response => {
if (response.code === 200) {
this.generatedCode = response.data
this.$modal.msgSuccess(response.msg || '授权码生成成功')
}
}).finally(() => {
this.generateLoading = false
})
})
},
handleDelete(row) {
const licenseIds = row.licenseId || this.ids
this.$modal.confirm(`确认删除授权编号为【${licenseIds}】的数据项？`).then(() => delLicense(licenseIds)).then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {})
},
statusText(status) {
return { '0': '未激活', '1': '已激活', '2': '已过期' }[status] || '未知'
},
statusTagType(status) {
return { '0': 'info', '1': 'success', '2': 'danger' }[status] || 'warning'
}
}
}
</script>

2
ruoyi-ui/vue.config.js
View File

@@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
const baseUrl = 'http://localhost:8080' // 后端接口
const baseUrl = 'http://127.0.0.1:8080' // 后端接口
const port = process.env.port || process.env.npm_config_port || 80 // 端口