lsy/FT577-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

请求逻辑提示信息优化

Browse Source
This commit is contained in:
lsymicc
2026-05-11 14:09:07 +08:00
parent 93d7877620
commit 4566753e09
7 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-ui/src/views/device/ddj/index.vue
View File

@@ -70,6 +70,11 @@
<!-- <el-table-column label="设备名称" prop="name"/>-->
<el-table-column label="任务号" prop="taskNo"/>
<el-table-column label="托盘条码" prop="trayCode"/>
<el-table-column label="入库请求" prop="rkqq">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_rkqq" :value="scope.row.rkqq"/>
</template>
</el-table-column>
<el-table-column label="到位" prop="dw">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_dw" :value="scope.row.dw"/>
@@ -241,7 +246,7 @@ import { listDeviceCar, getDeviceCar, delDeviceCar, addDeviceCar, updateDeviceCa
export default {
name: "deviceMonitor",
dicts: ['ddj_task_status', 'ddj_sbzt', 'ddj_czfs', 'ddj_yxxf', 'ddj_hczt', 'ssj_dw', 'ssj_kx', 'ssj_ex','ssj_allow_put','tray_size','ssj_rkqq'],
dicts: ['ddj_task_status', 'ddj_sbzt', 'ddj_czfs', 'ddj_yxxf', 'ddj_hczt', 'ssj_rkqq', 'ssj_dw', 'ssj_kx', 'ssj_ex','ssj_allow_put','tray_size','ssj_rkqq'],
data() {
return {
// 查询参数

35
ruoyi-ui/src/views/job/mydoJob/index.vue
View File

@@ -116,16 +116,19 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="OuthandFinish"
v-hasPermi="['job:mydoJob:OuthandFinish']">手动完成</el-button>
<el-button type="success" plain icon="el-icon-check" size="mini" :disabled="multiple" @click="outhandFinish"
v-hasPermi="['job:mydoJob:outhandFinish']">手动完成
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-check" size="mini" :disabled="multiple"
@click="handleDelete(scope.row)" v-hasPermi="['job:mydoJob:remove']">手动作废</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
@click="cancelTask" v-hasPermi="['job:mydoJob:remove']">手动作废
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-edit" size="mini" :disabled="single"
@click="onResendTaskClicked" v-hasPermi="['job:mydoJob:resendTaskToEntrance']">入库重新下发</el-button>
@click="onResendTaskClicked" v-hasPermi="['job:mydoJob:resendTaskToEntrance']">入库重新下发
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -369,8 +372,26 @@ export default {
this.$modal.msgSuccess("操作成功")
}).catch(() => { })
},
OuthandFinish() {
cancelTask() {
if (this.ids.length === 0) {
this.$modal.msgError("请选择需要手动作废的任务");
return;
}
console.log(this.ids.join(','))
this.$modal.confirm('是否确认手动作废选中的任务？').then(() => {
return delMydoJob(this.ids.join(','))
}).then(() => {
this.getList();
this.$modal.msgSuccess("手动作废成功");
}).catch(error => {
// console.error('手动作废失败:', error);
// this.$modal.msgError(`手动作废失败：${error.message || '未知错误'}`);
});
},
outhandFinish() {
if (this.ids.length === 0) {
this.$modal.msgError("请选择需要手动完成的任务");
return;
@@ -396,7 +417,7 @@ export default {
this.$modal.confirm('是否确认重新下发选中的任务？').then(() => {
return resendTaskToEntrance(jobId);
}).then(() => {
this.$modal.msgSuccess("手动完成成功");
this.$modal.msgSuccess("重新下发成功");
this.getList();
}).catch(() => { });
},