root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-01-06 14:32:53 +08:00
parent 2cda82fa09 e05823a488
commit 8eb2294792
11 changed files with 109 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
View File

@@ -108,7 +108,7 @@
<el-table-column prop="bill_status" label="状态" align="center" width="110px" :formatter="bill_statusFormat" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center" />
<el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center" width="140px" />
<el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次" align="center" />
<el-table-column show-overflow-tooltip prop="plan_qty" label="重量" :formatter="crud.formatNum3" align="center" />
<el-table-column show-overflow-tooltip prop="assign_qty" label="已分配重量" :formatter="crud.formatNum3" align="center" />
@@ -528,6 +528,9 @@ export default {
this.currentDis.point_code = this.form2.point_code
checkoutbill.oneSetPoint(this.currentDis).then(res => {
this.queryTableDdis(this.currentDis.iostorinvdtl_id)
this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.INFO)
}).catch(() => {
this.currentDis.point_code = ''
})
}
},

37
lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue
View File

@@ -82,7 +82,7 @@
>
标示完成
</el-button>
<el-button
<!-- <el-button
slot="left"
class="filter-item"
type="primary"
@@ -92,7 +92,7 @@
@click="cancleTaskfinish"
>
取消完成
</el-button>
</el-button>-->
</span>
</div>
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
@@ -107,20 +107,20 @@
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@current-change="handleDisCurrentChange"
>
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column show-overflow-tooltip prop="pcsn" label="子卷批次号" align="center" />
<el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次号" align="center" />
<el-table-column show-overflow-tooltip prop="box_no" label="箱号" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" width="130px" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" width="130px" />
<el-table-column show-overflow-tooltip prop="pcsn" label="子卷批次号" align="center" width="140px" />
<el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次号" align="center" width="120px" />
<el-table-column show-overflow-tooltip prop="box_no" label="箱号" align="center" width="250px" />
<el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column show-overflow-tooltip prop="struct_code" label="起始位置" align="center" />
<el-table-column show-overflow-tooltip prop="next_point_code" label="目的位置" align="center" />
<el-table-column show-overflow-tooltip prop="struct_code" label="起始位置" align="center" width="120px" />
<el-table-column show-overflow-tooltip prop="next_point_code" label="目的位置" align="center" width="120px" />
<el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" />
<el-table-column prop="task_type" label="任务类型" align="center" width="150px" :formatter="taskdtl_typeFormat" />
<el-table-column prop="task_status" label="状态" align="center" width="110px" :formatter="task_statusFormat" />
<el-table-column show-overflow-tooltip prop="task_type_name" label="任务类型" align="center" width="150px" />
<el-table-column show-overflow-tooltip prop="task_status" label="状态" align="center" width="120px" :formatter="task_statusFormat" min-width="150px" />
<el-table-column align="center" label="操作" width="160" fixed="right">
<template scope="scope">
<el-button :disabled="tabledisabled(scope.row)" type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.row)">删除</el-button>
<el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -130,7 +130,7 @@
<script>
import { crud } from '@crud/crud'
import CRUD, { crud } from '@crud/crud'
import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
export default {
@@ -199,9 +199,6 @@ export default {
bill_statusFormat(row) {
return this.dict.label.io_bill_status[row.bill_status]
},
taskdtl_typeFormat(row) {
return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
},
task_statusFormat(row) {
return this.dict.label.task_status[row.task_status]
},
@@ -213,8 +210,12 @@ export default {
}
},
deleteRow(row) {
checkoutbill.allCancel(row).then(res => {
if (!'00,01'.includes(row.work_status)) {
return this.crud.notify('任务不可删除！', CRUD.NOTIFICATION_TYPE.INFO)
}
checkoutbill.cancelTask(row).then(res => {
this.queryTableDtl()
this.crud.notify('任务删除成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
issueTask() {
@@ -222,6 +223,7 @@ export default {
this.fullscreenLoading = true
checkoutbill.issueTask(this.currentDis).then(res => {
this.queryTableDdis()
this.crud.notify('下发成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.fullscreenLoading = false
}).catch(() => {
this.fullscreenLoading = false
@@ -233,6 +235,7 @@ export default {
this.fullscreenLoading = true
checkoutbill.finishTask(this.currentDis).then(res => {
this.queryTableDdis()
this.crud.notify('操作成功成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.fullscreenLoading = false
}).catch(() => {
this.fullscreenLoading = false

9
lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js
View File

@@ -204,4 +204,11 @@ export function getOutBillTask2(data) {
data
})
}
export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel }
export function cancelTask(data) {
return request({
url: '/api/checkoutbill/cancelTask',
method: 'post',
data
})
}
export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask }