Compare commits

...

2 Commits

Author SHA1 Message Date
d6099a781f Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X 2026-05-29 16:27:28 +08:00
e23098b766 feat(wms/report): 给成品线圈查询添加按创建时间筛选条件,并增加备注搜索项
1.  在wms报表模板页面的成品线圈查询中,补充byCreateTimeStart和byCreateTimeEnd参数,替换原有的startTime和endTime参数
2.  在CoilSelector组件中新增备注搜索输入框,仅在orderBy存在时显示
2026-05-29 16:27:25 +08:00
2 changed files with 5 additions and 1 deletions

View File

@@ -79,6 +79,10 @@
canSelectDisabled :clearInput="false" clearable />
</el-form-item>
<el-form-item label="备注" prop="remark" v-if="orderBy">
<el-input v-model="queryParams.remark" placeholder="请输入备注" clearable size="small" />
</el-form-item>
<el-form-item>
<el-button v-if="multiple" type="primary" size="small" icon="el-icon-check"

View File

@@ -654,7 +654,7 @@ export default {
const [lossRes, outRes] = await Promise.all([
listCoilWithIds({ ...this.queryParams, actionIds: lossActionIds.join(',') || '', startTime: '', endTime: '', selectType: 'raw_material' }),
listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '', startTime: '', endTime: '', selectType: 'product' }),
listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '', byCreateTimeStart: this.queryParams.startTime, byCreateTimeEnd: this.queryParams.endTime, selectType: 'product' }),
]);
this.lossList = lossRes.rows.map(item => {