yangxueqian/fengshang_yangzhou
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

前端改动

Browse Source
This commit is contained in:
杨学谦 2025-12-09 11:14:08 +08:00
parent 2550458b0f
commit b456252541
8 changed files with 324 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
board/CODE/src/App.vue
View File

@ -36,6 +36,9 @@ import PickP2 from "@/views/PickP2.vue";
import PickP3 from "@/views/PickP3.vue";
import InboundP2 from "@/views/InboundP2.vue";
import InboundP3 from "@/views/InboundP3.vue";
import QualityP7 from "@/views/QualityP7.vue";
import QualityP9 from "@/views/QualityP9.vue";
import QualityP8 from "@/views/QualityP8.vue";
const debounce = (fn, delay) => {
let timer = null;
@ -64,7 +67,10 @@ export default {
InboundP3,
PickP1,
PickP2,
PickP3
PickP3,
QualityP7,
QualityP8,
QualityP9
},
setup() {
const route = useRoute();
@ -78,12 +84,15 @@ export default {
// 动态标题映射
const titleMapping = {
'1': ' 1 号入库',
'2': ' 2 号入库',
'3': ' 3 号入库',
'4': 'P1 站台拣选',
'5': 'P2 站台拣选',
'6': 'P3 站台拣选',
'1': ' 立库 1 号入库',
'2': ' 立库 2 号入库',
'3': ' 立库 3 号入库',
'4': '立库 P1 站台拣选',
'5': '立库 P2 站台拣选',
'6': '立库 P3 站台拣选',
'7': '海关 P7 站台收货质检',
'8': '海关 P8 站台收货质检',
'9': '海关 P9 站台收货质检',
};
// 动态标题
@ -95,7 +104,7 @@ export default {
}
const operation = titleMapping[standId];
if (operation) {
return `丰尚立库 ${operation} 状态一览表`;
return `丰尚 ${operation} 状态一览表`;
}
// 如果standId不在映射中，显示默认标题
return '丰尚立库　状态一览表';
@ -110,6 +119,9 @@ export default {
if (standId === '4') return 'PickP1';
if (standId === '5') return 'PickP2';
if (standId === '6') return 'PickP3';
if (standId === '7') return 'QualityP7';
if (standId === '8') return 'QualityP8';
if (standId === '9') return 'QualityP9';
return 'Inbound'; // 默认显示入库组件
});

72
dev_wms_client/src/layout/goods.vue
View File

@ -179,6 +179,7 @@ import UploadExcelBaseGoods from '@/excel/UploadExcelBaseGoods.vue'
import UploadExcelKanban from '@/excel/UploadExcelKanban.vue'
import {exportGoodsExcel} from "@/api/excel";
import {dateFormatter} from "@/utils/formatter";
import { getUserPermission } from '@/api/user.js'
/**
* 常量定义
@ -245,14 +246,38 @@ const handleSelectionChange = (row) => {
selectedRows.value = selectedRows.value.filter(item => item.goodsId !== row.goodsId)
}
}
// 批量编辑处理
// 修改批量编辑处理函数
const handleBatchEdit = () => {
const permissionParams = {
loginAccountUpdate: store.getters.getUser.loginAccount,
roleIdOp: store.getters.getUser.roleId,
userName: USER_NAME
}
getUserPermission(permissionParams).then(res => {
if (res.data.code === 0) {
// 解析权限字符串，检查是否包含"D"（批量修改时间权限）
const permissionStr = res.data.message || ''
if (!permissionStr.includes('B')) {
// 无批量修改时间权限提示
ElMessage.error('您没有批量修改时间的权限')
return
}
// 有权限，继续执行原有逻辑
if (selectedRows.value.length === 0) {
ElMessage.warning('请至少选择一条记录')
return
}
batchEditForm.pickingDate = ''
showBatchEditDialog.value = true
} else {
ElMessage.error(res.data.message || '权限检查失败')
}
}).catch(err => {
console.log(err)
ElMessage.error('权限检查失败')
})
}
const handleSelectAllChange = (val) => {
@ -328,13 +353,29 @@ const saveEdit = (editForm) => {
// 添加优先级
// 修改加急处理函数
const handleDelete = (row) => {
//
const permissionParams = {
loginAccountUpdate: store.getters.getUser.loginAccount,
roleIdOp: store.getters.getUser.roleId,
userName: USER_NAME
}
getUserPermission(permissionParams).then(res => {
if (res.data.code === 0) {
// 解析权限字符串，检查是否包含"C"（加急权限）
const permissionStr = res.data.message || ''
if (!permissionStr.includes('B')) {
// 无加急权限提示
ElMessage.error('您没有加急操作的权限')
return
}
// 有权限，继续执行原有逻辑
let request = {
taskId: row.taskId,
}
upOutsType( request).then((res) => {
upOutsType(request).then((res) => {
if (res.data.code === 0) {
ElMessage({
message: '操作成功',
@ -348,6 +389,13 @@ const handleDelete = (row) => {
});
}
})
} else {
ElMessage.error(res.data.message || '权限检查失败')
}
}).catch(err => {
console.log(err)
ElMessage.error('权限检查失败')
})
}
// 编辑弹窗相关
const showEditDialog = ref(false)
@ -359,10 +407,26 @@ const editFormRef = ref()
// 打开编辑弹窗
const handleEdit = (row) => {
const permissionParams = {
loginAccountUpdate: store.getters.getUser.loginAccount,
roleIdOp: store.getters.getUser.roleId,
userName: USER_NAME
}
getUserPermission(permissionParams).then(res => {
if (res.data.code === 0) {
// 解析权限字符串，检查是否包含"C"（下发盘点权限）
const permissionStr = res.data.message || ''
if (!permissionStr.includes('B')) {
// 无下发盘点权限提示
ElMessage.error('您没有编辑时间的权限')
return
}
editForm.taskId = row.taskId
// 使用 formatDateToDay 处理日期，避免时区问题
editForm.pickingDate = row.pickingDate ? formatDateToDay(row.pickingDate) : ''
showEditDialog.value = true
}
})
}
const formatDateToDay = (dateString) => {

104
dev_wms_client/src/layout/goodsOut.vue
View File

@ -2,59 +2,59 @@
<el-config-provider :locale="zhCn">
<el-container class="content">
<div class="work-area">
<!-- <fieldset class="search-area">-->
<!-- <el-form ref="outTaskRef" :model="outTaskEntity" :label-position="labelPosition" label-width="158px"-->
<!-- style="max-width: 100%" :rules="requestRules" status-icon>-->
<!-- <div style="display: flex; justify-content: space-between;">-->
<!-- <el-row>-->
<!-- &lt;!&ndash; <el-form-item label="出库类型" prop="outType">-->
<!-- <el-select-v2 style="width: 196px" v-model="outTaskEntity.outType" placeholder="请选择入库类型"-->
<!-- :options="outTypeOptions"></el-select-v2>-->
<!-- </el-form-item> &ndash;&gt;-->
<!-- <el-form-item label="料号" prop="goodsId">-->
<!-- <el-input v-model="outTaskEntity.goodsId" @blur="getLackQty()" clearable/>-->
<!-- </el-form-item>-->
<fieldset class="search-area">
<el-form ref="outTaskRef" :model="outTaskEntity" :label-position="labelPosition" label-width="158px"
style="max-width: 100%" :rules="requestRules" status-icon>
<div style="display: flex; justify-content: space-between;">
<el-row>
<!-- <el-form-item label="出库类型" prop="outType">
<el-select-v2 style="width: 196px" v-model="outTaskEntity.outType" placeholder="请选择入库类型"
:options="outTypeOptions"></el-select-v2>
</el-form-item> -->
<el-form-item label="料号" prop="goodsId">
<el-input v-model="outTaskEntity.goodsId" @blur="getLackQty()" clearable/>
</el-form-item>
<!-- <el-form-item label="数量" prop="needNum">-->
<!-- <el-input-number style="width: 196px" v-model.number="outTaskEntity.needNum"-->
<!-- controls-position="right" :min="1" clearable/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="箱号" prop="vehicleId">-->
<!-- <el-input v-model="outTaskEntity.vehicleId" clearable/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="特殊库存" prop="specialStock">-->
<!-- <el-input v-model="outTaskEntity.specialStock" ref="specialStock" clearable/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="特殊库存号" prop="specialStockNo">-->
<!-- <el-input v-model="outTaskEntity.specialStockNo" ref="specialStockNo" clearable/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="特殊库存item号" prop="specialStockItemNo">-->
<!-- <el-input v-model="outTaskEntity.specialStockItemNo" ref="specialStockItemNo" clearable/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="批次号" prop="batchNo">-->
<!-- <el-input v-model="outTaskEntity.batchNo" ref="batchNo" clearable/>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; <el-form-item label="原因" prop="reason" v-if="outTaskEntity.outType === 9">-->
<!-- <el-select-v2 style="width: 196px" v-model="outTaskEntity.reason" placeholder="请选择紧急出库原因"-->
<!-- :options="reasonOptions"></el-select-v2>-->
<!-- </el-form-item> &ndash;&gt;-->
<!-- <el-form-item label="工单" prop="workOrder" v-if="outTaskEntity.reason === '缺料'">-->
<!-- <el-input v-model="outTaskEntity.workOrder" @blur="getLackQty()" clearable/>-->
<!-- </el-form-item>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-button type="primary"-->
<!-- style="height: 50px; width: 100px; margin: auto 5px auto 5px; font-size: large; color: black;"-->
<!-- @click="confirmOut()">确认出库-->
<!-- </el-button>-->
<!-- <el-button type="warning"-->
<!-- style="height: 50px; width: 100px; margin: auto 5px auto 5px; font-size: large; color: black;"-->
<!-- @click="clearInput()">清除输入-->
<!-- </el-button>-->
<!-- </el-row>-->
<!-- </div>-->
<!-- </el-form>-->
<!-- </fieldset>-->
<el-form-item label="数量" prop="needNum">
<el-input-number style="width: 196px" v-model.number="outTaskEntity.needNum"
controls-position="right" :min="1" clearable/>
</el-form-item>
<el-form-item label="箱号" prop="vehicleId">
<el-input v-model="outTaskEntity.vehicleId" clearable/>
</el-form-item>
<el-form-item label="特殊库存" prop="specialStock">
<el-input v-model="outTaskEntity.specialStock" ref="specialStock" clearable/>
</el-form-item>
<el-form-item label="特殊库存号" prop="specialStockNo">
<el-input v-model="outTaskEntity.specialStockNo" ref="specialStockNo" clearable/>
</el-form-item>
<el-form-item label="特殊库存item号" prop="specialStockItemNo">
<el-input v-model="outTaskEntity.specialStockItemNo" ref="specialStockItemNo" clearable/>
</el-form-item>
<el-form-item label="批次号" prop="batchNo">
<el-input v-model="outTaskEntity.batchNo" ref="batchNo" clearable/>
</el-form-item>
<!-- <el-form-item label="原因" prop="reason" v-if="outTaskEntity.outType === 9">
<el-select-v2 style="width: 196px" v-model="outTaskEntity.reason" placeholder="请选择紧急出库原因"
:options="reasonOptions"></el-select-v2>
</el-form-item> -->
<el-form-item label="工单" prop="workOrder" v-if="outTaskEntity.reason === '缺料'">
<el-input v-model="outTaskEntity.workOrder" @blur="getLackQty()" clearable/>
</el-form-item>
</el-row>
<el-row>
<el-button type="primary"
style="height: 50px; width: 100px; margin: auto 5px auto 5px; font-size: large; color: black;"
@click="confirmOut()">确认出库
</el-button>
<el-button type="warning"
style="height: 50px; width: 100px; margin: auto 5px auto 5px; font-size: large; color: black;"
@click="clearInput()">清除输入
</el-button>
</el-row>
</div>
</el-form>
</fieldset>
<!-- 修改confirm-area为竖直布局，表单项两两一排 -->
<!-- 修改confirm-area为竖直布局，表单项两两一排 -->
<div style="display: flex; margin-top: 10px;">

36
dev_wms_client/src/layout/inventory.vue
View File

@ -118,6 +118,9 @@ import {confirmInventory, getInventoryConfirm, requestInventory} from "@/api/tas
import {labelPosition} from "@/constant/form";
import UploadExcelInventory from "@/excel/UploadExcelInventory.vue";
import {loading} from "@/utils/loading";
// 在文件顶部导入必要的模块（如果还没有导入的话）
import { getUserPermission } from '@/api/user.js'
const STAND_ID = store.getters.getStandId
const USER_NAME = store.getters.getUserName
@ -294,16 +297,36 @@ const clearConfirmEntity = (index) => {
// 下发盘点任务
const sendInventoryRequest = () => {
// 先检查用户是否有下发盘点权限(A权限)
const permissionParams = {
loginAccountUpdate: store.getters.getUser.loginAccount,
roleIdOp: store.getters.getUser.roleId,
userName: USER_NAME
}
getUserPermission(permissionParams).then(res => {
if (res.data.code === 0) {
// 解析权限字符串，检查是否包含"A"（下发盘点权限）
const permissionStr = res.data.message || ''
if (!permissionStr.includes('A')) {
// 无下发盘点权限提示
ElMessage.error('您没有下发盘点任务的权限')
return
}
// 有权限，继续执行原有逻辑
inventoryRequestFormEntity.goodsId = inventoryRequestFormEntity.goodsId.trim().toUpperCase()
inventoryRequestFormEntity.vehicleId = inventoryRequestFormEntity.vehicleId.trim().toUpperCase()
inventoryRequestFormEntity.specialStock = inventoryRequestFormEntity.specialStock.trim().toUpperCase()
inventoryRequestFormEntity.specialStockNo = inventoryRequestFormEntity.specialStockNo.trim().toUpperCase()
inventoryRequestFormEntity.specialStockItemNo = inventoryRequestFormEntity.specialStockItemNo.trim().toUpperCase()
inventoryRequestFormEntity.batchNo = inventoryRequestFormEntity.batchNo.trim().toUpperCase()
if (inventoryRequestFormEntity.goodsId === '') {
ElMessage.error("料号为必须项。")
return
}
const request = {
goodsId: inventoryRequestFormEntity.goodsId,
vehicleId: inventoryRequestFormEntity.vehicleId,
@ -314,6 +337,7 @@ const sendInventoryRequest = () => {
standId: STAND_ID,
userName: USER_NAME
}
loading.open('处理中...')
requestInventory(request).then(res => {
const response = res.data
@ -329,8 +353,16 @@ const sendInventoryRequest = () => {
}).finally(() => {
loading.close()
})
} else {
ElMessage.error(res.data.message || '权限检查失败')
}
}).catch(err => {
console.log(err)
ElMessage.error('权限检查失败')
})
}
// 确认/放行 (修改为支持索引)
const confirmOrRelease = (index) => {
const entity = confirmEntities[index]
@ -340,6 +372,10 @@ const confirmOrRelease = (index) => {
goodsId: entity.goodsId,
vehicleId: entity.vehicleId,
confirmNum: entity.confirmNum,
specialStock: entity.specialStock,
specialStockNo: entity.specialStockNo,
specialStockItemNo: entity.specialStockItemNo,
batchNo: entity.batchNo,
standId: getChildStandIdByIndex(index),
userName: USER_NAME
}

12
dev_wms_client/src/layout/pda.vue
View File

@ -24,12 +24,12 @@
</el-col>
<el-col :span="22" :offset="1">
<el-form-item label="本次实际拣选：" required>
<el-input class="form-input large-center-input" v-model="bindingData.planPickQty" clearable/>
<el-input class="form-input large-center-input" v-model="bindingData.planPickQty" clearable readonly/>
</el-form-item>
</el-col>
<el-col :span="22" :offset="1">
<el-form-item label="实际剩余数量：" required>
<el-input class="form-input large-center-input" v-model="bindingData.realRemainQty" clearable/>
<el-input class="form-input large-center-input" v-model="bindingData.realRemainQty" clearable readonly/>
</el-form-item>
</el-col>
<el-col :span="22" :offset="1">
@ -204,6 +204,10 @@ export default {
realRemainQty: this.bindingData.realRemainQty,
isOut: this.bindingData.isOut,
putArea: this.bindingData.putArea,
specialStock: this.bindingData.specialStock,
specialStockNo: this.bindingData.specialStockNo,
specialStockItemNo: this.bindingData.specialStockItemNo,
batchNo: this.bindingData.batchNo
},
standId: this.bindingData.standId,
userName: USER_NAME
@ -313,6 +317,10 @@ export default {
this.bindingData.putArea = result.stockConfirm.putArea || ''
this.bindingData.warningQty = result.stockConfirm.warningQty
this.bindingData.remark = result.stockConfirm.remark
this.bindingData.specialStock = result.stockConfirm.specialStock
this.bindingData.specialStockNo = result.stockConfirm.specialStockNo
this.bindingData.specialStockItemNo = result.stockConfirm.specialStockItemNo
this.bindingData.batchNo = result.stockConfirm.batchNo
}
console.log(this.bindingData)
} else {

27
dev_wms_client/src/layout/pickTaskMonitor.vue
View File

@ -128,6 +128,7 @@ import {pickingTaskStatusOptions} from '@/constant/options.js'
import { addAllOptionOfOptions } from '@/utils/generator.js'
import { loading } from '@/utils/loading'
import {errorBox} from "@/utils/myMessageBox";
import { getUserPermission } from '@/api/user.js'
/**
* 常量定义
*/
@ -177,6 +178,24 @@ const resizeHeight = () => {
}
const editCurrentRowFormEntity = (row) => {
// 检查用户是否有编辑拣选任务权限(F权限)
const permissionParams = {
loginAccountUpdate: store.getters.getUser.loginAccount,
roleIdOp: store.getters.getUser.roleId,
userName: USER_NAME
}
getUserPermission(permissionParams).then(res => {
if (res.data.code === 0) {
// 解析权限字符串，检查是否包含"F"（编辑拣选任务权限）
const permissionStr = res.data.message || ''
if (!permissionStr.includes('D')) {
// 无编辑权限提示
ElMessage.error('您没有编辑拣选任务的权限')
return
}
// 有权限，继续执行原有逻辑
pickId = row.pickId
Object.assign(pickTaskFormEntity, {
pickId: row.pickId,
@ -186,9 +205,17 @@ const editCurrentRowFormEntity = (row) => {
})
console.log('编辑行数据:', pickTaskFormEntity) // 调试信息
dialogVisible.value = true
} else {
ElMessage.error(res.data.message || '权限检查失败')
}
}).catch(err => {
console.log(err)
ElMessage.error('权限检查失败')
})
}
const submitInfo = (formData) => {
const params = {
pickId: formData.pickId,

27
dev_wms_client/src/layout/vehicle.vue
View File

@ -133,6 +133,7 @@ import { addAllOptionOfOptions } from '@/utils/generator.js'
import { loading } from '@/utils/loading'
import {requireStockOutEmpty} from "@/api/task";
import {errorBox} from "@/utils/myMessageBox";
import { getUserPermission } from '@/api/user.js'
// 修改导入语句，添加正确的API函数
/**
@ -328,8 +329,34 @@ const submitUpdateRow = (rowFormEntity) => {
/**
* 出空箱功能相关方法
*/
// 修改出空箱对话框打开函数
const openEmptyBoxDialog = () => {
// 检查用户是否有出空箱权限(E权限)
const permissionParams = {
loginAccountUpdate: store.getters.getUser.loginAccount,
roleIdOp: store.getters.getUser.roleId,
userName: USER_NAME
}
getUserPermission(permissionParams).then(res => {
if (res.data.code === 0) {
// 解析权限字符串，检查是否包含"E"（出空箱权限）
const permissionStr = res.data.message || ''
if (!permissionStr.includes('C')) {
// 无出空箱权限提示
ElMessage.error('您没有出空箱操作的权限')
return
}
// 有权限，继续执行原有逻辑
emptyBoxDialogVisible.value = true
} else {
ElMessage.error(res.data.message || '权限检查失败')
}
}).catch(err => {
console.log(err)
ElMessage.error('权限检查失败')
})
}
const cancelEmptyBox = () => {

26
dev_wms_client/src/views/SystemCenter.vue
View File

@ -30,6 +30,8 @@
<script setup>
import store from '@/store'
import router from '@/router'
import { getUserPermission } from '@/api/user.js'
import { ElMessage } from 'element-plus'
const user = store.getters.getUserName// 用户名
const token = store.getters.getToken// 密码
@ -39,7 +41,31 @@ const loginToWms = () => {
}
// 登录到PDA系统
const PdaToWms = () => {
// 先检查用户是否有PDA权限
const params = {
loginAccountUpdate: store.getters.getUser.loginAccount, // 使用登录账户
roleIdOp: store.getters.getUser.roleId,
userName: user
}
getUserPermission(params).then(res => {
if (res.data.code === 0) {
// 解析权限字符串，检查是否包含"E"（PDA权限）
const permissionStr = res.data.message || ''
if (permissionStr.includes('E')) {
// 有PDA权限，允许进入PDA系统
router.replace({ path: '/pda' })
} else {
// 无PDA权限提示
ElMessage.error('您没有访问PDA系统的权限')
}
} else {
ElMessage.error(res.data.message || '权限检查失败')
}
}).catch(err => {
console.log(err)
ElMessage.error('权限检查失败')
})
}
// 登录到工作图纸系统
const loginToImage = () => {