修复:移除发货报表无效状态筛选
This commit is contained in:
@@ -283,7 +283,7 @@ const reportPageContracts = {
|
|||||||
permission: 'report:shipment:list',
|
permission: 'report:shipment:list',
|
||||||
queryKeys: [
|
queryKeys: [
|
||||||
'pageNum', 'pageSize', 'beginTime', 'endTime', 'shipmentNo',
|
'pageNum', 'pageSize', 'beginTime', 'endTime', 'shipmentNo',
|
||||||
'sourceWarehouseId', 'targetSiteId', 'palletCode', 'status'
|
'sourceWarehouseId', 'targetSiteId', 'palletCode'
|
||||||
],
|
],
|
||||||
columnKeys: [
|
columnKeys: [
|
||||||
'shipmentNo', 'confirmedAt', 'sourceWarehouseName', 'customerName',
|
'shipmentNo', 'confirmedAt', 'sourceWarehouseName', 'customerName',
|
||||||
@@ -799,6 +799,14 @@ test('六个只读报表页面逐页满足 API、权限、筛选、列和异步
|
|||||||
'palletTrace 变更后位置必须同时传入仓库、现场和产线的名称与 ID'
|
'palletTrace 变更后位置必须同时传入仓库、现场和产线的名称与 ID'
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
if (resource === 'shipment') {
|
||||||
|
assert.doesNotMatch(source, /\bDRAFT\b/, 'shipment 报表只展示已确认事实,不得提供草稿筛选')
|
||||||
|
assert.doesNotMatch(
|
||||||
|
source,
|
||||||
|
/queryParams\.status|prop=["']status["']|\bstatus\s*:/,
|
||||||
|
'shipment 报表不得提交与固定 CONFIRMED 范围冲突的状态筛选'
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
assert.match(source, /<el-date-picker\b[\s\S]*?type="daterange"[\s\S]*?value-format="YYYY-MM-DD"/)
|
assert.match(source, /<el-date-picker\b[\s\S]*?type="daterange"[\s\S]*?value-format="YYYY-MM-DD"/)
|
||||||
assert.match(source, /<el-table\b[^>]*v-loading="loading"[^>]*:data="reportList"/)
|
assert.match(source, /<el-table\b[^>]*v-loading="loading"[^>]*:data="reportList"/)
|
||||||
|
|||||||
@@ -16,12 +16,6 @@
|
|||||||
<el-form-item label="托盘编号" prop="palletCode">
|
<el-form-item label="托盘编号" prop="palletCode">
|
||||||
<el-input v-model="queryParams.palletCode" placeholder="请输入托盘编号" clearable maxlength="64" @keyup.enter="handleQuery" />
|
<el-input v-model="queryParams.palletCode" placeholder="请输入托盘编号" clearable maxlength="64" @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="单据状态" prop="status">
|
|
||||||
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable style="width: 160px">
|
|
||||||
<el-option label="草稿" value="DRAFT" />
|
|
||||||
<el-option label="已确认" value="CONFIRMED" />
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="Search" @click="handleQuery" v-hasPermi="['report:shipment:list']">搜索</el-button>
|
<el-button type="primary" icon="Search" @click="handleQuery" v-hasPermi="['report:shipment:list']">搜索</el-button>
|
||||||
<el-button icon="Refresh" @click="resetQuery" v-hasPermi="['report:shipment:list']">重置</el-button>
|
<el-button icon="Refresh" @click="resetQuery" v-hasPermi="['report:shipment:list']">重置</el-button>
|
||||||
@@ -77,8 +71,7 @@ const queryParams = ref({
|
|||||||
shipmentNo: undefined,
|
shipmentNo: undefined,
|
||||||
sourceWarehouseId: undefined,
|
sourceWarehouseId: undefined,
|
||||||
targetSiteId: undefined,
|
targetSiteId: undefined,
|
||||||
palletCode: undefined,
|
palletCode: undefined
|
||||||
status: undefined
|
|
||||||
})
|
})
|
||||||
let listGeneration = 0
|
let listGeneration = 0
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user