Browse Source

订单新增回滚状态功能

master
qiankanghui 1 week ago
parent
commit
4d0ce2af87
  1. 3
      src/api/order/poOrder.js
  2. 19
      src/views/modules/inspection/com_inspectionRequestDetail.vue
  3. 2
      src/views/modules/inspection/inspectionRequestList.vue
  4. 56
      src/views/modules/order/poOrder.vue

3
src/api/order/poOrder.js

@ -31,6 +31,9 @@ export const issuePoDetail = (data) => createAPI(`/pODetail/issuePoDetail`, 'pos
/** 回滚 PO 订单行(已下达 → 草稿) */
export const rollbackPoDetail = (data) => createAPI(`/pODetail/rollbackPoDetail`, 'post', data)
/** 回滚订单状态(SRM0007):无验货申请明细时回滚为已下达(Confirm)并清空验货过程数量 */
export const rollbackStatusPoDetail = (data) => createAPI(`/pODetail/rollbackStatusPoDetail`, 'post', data)
/** 发货弹窗预览(返回订单数量、可发货数量、默认本次发货数量) */
export const shipPoDetailPreview = (data) => createAPI(`/pODetail/shipPoDetailPreview`, 'post', data)

19
src/views/modules/inspection/com_inspectionRequestDetail.vue

@ -206,6 +206,20 @@
</el-col>
</el-row>
<!-- Planner与备注展示:仅调用页开启 showPlannerRemark 时显示(如验货申请列表基本信息页签) - rqrq -->
<el-row v-if="showPlannerRemark" :gutter="20">
<el-col :span="6">
<el-form-item label="Planner">
<el-input v-model="detailData.planner" disabled placeholder=" " />
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item label="备注">
<el-input v-model="detailData.remark" disabled placeholder=" " />
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
@ -282,6 +296,11 @@ export default {
detailData: {
type: Object,
default: () => ({})
},
// 是否在查看模式展示 Planner 与备注(默认不展示,保持其他引用页不变) - rqrq
showPlannerRemark: {
type: Boolean,
default: false
}
},
data() {

2
src/views/modules/inspection/inspectionRequestList.vue

@ -169,7 +169,7 @@
<!-- 基本信息 -->
<el-tab-pane label="基本信息" name="base">
<div class="tab-pane-content" :style="tabPaneContentStyle">
<inspection-request-detail ref="inspectionRequestDetail" :detail-data="currentRow" @update-success="getMainData"/>
<inspection-request-detail ref="inspectionRequestDetail" :detail-data="currentRow" :show-planner-remark="true" @update-success="getMainData"/>
</div>
</el-tab-pane>
<!-- 验货明细 -->

56
src/views/modules/order/poOrder.vue

@ -68,6 +68,10 @@
v-if="canIssuePoOrder(scope.row.status)"
type="primary"
@click.stop="handleIssuePoOrder(scope.row)">下达</el-link>
<el-link
v-if="hasRollbackStatusPermission && canRollbackStatusPoOrder(scope.row.status)"
type="warning"
@click.stop="handleRollbackStatus(scope.row)">回滚状态</el-link>
<el-link
v-if="canRollbackPoOrder(scope.row.status)"
type="warning"
@ -1012,6 +1016,7 @@ import {
openPoDetail,
issuePoDetail,
rollbackPoDetail,
rollbackStatusPoDetail,
shipPoDetailPreview,
shipPoDetail,
splitPoDetail,
@ -1063,6 +1068,7 @@ import {
} from '@/utils/supplierChooselistHelper.js'
import { searchTransportOptions } from '@/api/port/portTransit.js'
import { searchPortList } from '@/api/port/portInfo.js'
import { getPermissionValue } from '@/api/sys/specialSecurity.js'
import ComPoOrderSearchBar from './com_poOrderSearchBar.vue'
import ChooselistEam from '@/views/modules/common/Chooselist_eam.vue'
import PoOrderAdvancedQuery from './com_poOrderAdvancedQuery.vue'
@ -1208,6 +1214,8 @@ export default {
return {
// ===== 页面基础状态 =====
loading: false,
// SRM0007 特殊权限:是否允许显示“回滚状态”按钮 - rqrq
hasRollbackStatusPermission: false,
masterRows: [],
// 主页面「同步运输周期」勾选行
syncSelection: [],
@ -2605,6 +2613,7 @@ export default {
},
mounted () {
this.updateTableHeight()
this.checkRollbackStatusPermission()
window.addEventListener('resize', this.onWindowResize)
},
activated () {
@ -3175,6 +3184,53 @@ export default {
}).catch(() => {})
},
// SRM0007 回滚状态按钮显隐:草稿/已下达(Confirm)状态下不显示 - rqrq
canRollbackStatusPoOrder (status) {
return status !== '草稿' && status !== '已下达'
},
// 查询 SRM0007 特殊权限:是否允许显示“回滚状态”按钮 - rqrq
checkRollbackStatusPermission () {
const username = this.$store.state.user.name || ''
if (!username) {
this.hasRollbackStatusPermission = false
return
}
getPermissionValue(username, 'SRM0007').then(({ data }) => {
if (data && data.code === 0) {
this.hasRollbackStatusPermission = String(data.value).trim() === 'Y'
} else {
this.hasRollbackStatusPermission = false
}
}).catch(error => {
console.error('查询回滚状态权限失败:', error)
this.hasRollbackStatusPermission = false
})
},
// 回滚状态(SRM0007):无验货申请明细时回滚为 Confirm(已下达)并清空验货过程数量,后端二次校验兑底 - rqrq
handleRollbackStatus (row) {
const params = buildPoDetailActionParams(row, this.$store.state.user.site)
if (!params.id && !(params.orderNo && params.site && params.itemNo != null)) {
this.$message.error('无法识别订单行,请刷新后重试')
return
}
const poLabel = row.poNo ? `PO ${row.poNo}` : '该订单'
const itemLabel = row.itemNo != null ? ` 行 ${row.itemNo}` : ''
this.$confirm(`确定将${poLabel}${itemLabel}回滚为Confirm状态,并清空已申请验货/已验货/验货成功数量?`, '提示', { type: 'warning' }).then(() => {
rollbackStatusPoDetail(params).then(({ data }) => {
if (data && data.code === 0) {
this.$message.success('回滚状态成功')
this.getDataList()
} else {
this.$message.error((data && data.msg) || '回滚状态失败')
}
}).catch(err => {
this.$message.error((err && err.message) || '回滚状态失败')
})
}).catch(() => {})
},
/**
* 生成发货弹窗默认模型。
* 说明:所有数量字段默认按 0 初始化,避免出现 null 导致的显示/比较异常。

Loading…
Cancel
Save