diff --git a/src/views/common/home.vue b/src/views/common/home.vue index c6430d7..fc5bc89 100644 --- a/src/views/common/home.vue +++ b/src/views/common/home.vue @@ -271,13 +271,14 @@ export default { if (data && data.code === 0) { const count = data.count || 0 const hasPermission = !!data.hasPermission + // 展示与否由菜单权限决定(已常驻);此处仅回填数量: + // 有 SRM0005 权限返回全站口径,无权限返回本人发起的审核中数量(无数据则为0) this.newProductAuditPendingCount = count this.newProductAuditHasPermission = hasPermission - // 有 SRM0005 权限:常驻展示全站口径;无权限:仅当本人发起的审核中数量>0 才展示 - this.homeTileShow.newProductAuditPending = hasPermission || count > 0 } }).catch(() => { - this.homeTileShow.newProductAuditPending = false + this.newProductAuditPendingCount = 0 + this.newProductAuditHasPermission = false }) }, goNewProductAuditPendingList () { @@ -345,8 +346,12 @@ export default { if (this.homeTileShow.inspectionChangeApplying) { this.loadInspectionChangeApplyingReminder() } - // 未审核新品提醒:调用后端计数接口,按 SRM0005 权限分支展示 - rqrq - this.loadNewProductAuditPendingReminder() + // 未审核新品提醒:只要能看到 supplierPartNewProductAudit 菜单就常驻展示(默认0), + // 具体数量数据仍由后端按 SRM0005 权限分支返回(无权限且无本人数据则为0) - rqrq + this.homeTileShow.newProductAuditPending = this.hasRouteMenuAccess('supplier-supplierPartNewProductAudit') + if (this.homeTileShow.newProductAuditPending) { + this.loadNewProductAuditPendingReminder() + } }, watch: { 'homeTileShow.supplierDocExpire'(v) { diff --git a/src/views/modules/inspection/com_inspectionRequestDetailTab.vue b/src/views/modules/inspection/com_inspectionRequestDetailTab.vue index 93b2c0b..32dae31 100644 --- a/src/views/modules/inspection/com_inspectionRequestDetailTab.vue +++ b/src/views/modules/inspection/com_inspectionRequestDetailTab.vue @@ -15,6 +15,7 @@ + diff --git a/src/views/modules/inspection/inspectionRequestList.vue b/src/views/modules/inspection/inspectionRequestList.vue index 7a43e64..b84f1cc 100644 --- a/src/views/modules/inspection/inspectionRequestList.vue +++ b/src/views/modules/inspection/inspectionRequestList.vue @@ -312,7 +312,6 @@
{{ isEditDialogMode ? 'PO明细' : '批量选择PO' }} - 新增
@@ -357,6 +356,54 @@ 查询 + 查询 + + +
+ + +
+ + + + + + + + +
+ + to + +
+
+ + 查询 + 新增
@@ -428,7 +475,7 @@ @@ -874,17 +921,62 @@ width="80%" append-to-body :close-on-click-modal="false"> + +
+ + + + + + + + +
+ + to + +
+
+ + 查询 + +
+
@@ -1194,10 +1286,18 @@ export default { poList: [], filteredPoList: [], editPoDetailList: [], + filteredEditPoDetailList: [], + editPoFilter: { + orderNo: '', + item: '', + crdStart: '', + crdEnd: '' + }, editPoDetailLoading: false, editPoEditMode: false, // 编辑PO明细的编辑模式 addPoDialogVisible: false, // 新增PO弹窗 addPoSelectList: [], // 新增PO选择列表 + filteredAddPoSelectList: [], // 新增PO选择列表(筛选后展示) addPoSelectLoading: false, // 新增PO加载状态 addPoSelectPageIndex: 1, // 新增PO当前页 addPoSelectPageSize: 20, // 新增PO每页条数 @@ -1209,6 +1309,12 @@ export default { sku: '', partDesc: '' }, + addPoSelectFilter: { + orderNo: '', + item: '', + crdStart: '', + crdEnd: '' + }, addPoFilter: { orderNo: '', partNo: '', @@ -2128,12 +2234,26 @@ export default { this.poList = [] this.filteredPoList = [] this.editPoDetailList = [] + this.filteredEditPoDetailList = [] + this.editPoFilter = { + orderNo: '', + item: '', + crdStart: '', + crdEnd: '' + } this.originalEditPoDetailList = [] // 保存原始PO列表,用于区分新增和修改 this.deletedPoKeys = new Set() // 记录用户手动删除的PO key this.editPoDetailLoading = false this.editPoEditMode = false this.addPoDialogVisible = false this.addPoSelectList = [] + this.filteredAddPoSelectList = [] + this.addPoSelectFilter = { + orderNo: '', + item: '', + crdStart: '', + crdEnd: '' + } this.addPoSelectLoading = false this.addPoSelectPageIndex = 1 this.addPoSelectPageSize = 20 @@ -2309,6 +2429,7 @@ export default { console.error('加载编辑PO明细失败:', error) this.$message.error('加载PO明细失败,请稍后重试') } finally { + this.filterEditPoList() this.editPoDetailLoading = false } }, @@ -2319,13 +2440,18 @@ export default { }, // 删除编辑PO明细中的某一行(仅缓存,保存时一并提交) - deleteEditPoRow (index) { + deleteEditPoRow (row) { this.$confirm('确定要删除这条PO明细吗?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { - const deletedRow = this.editPoDetailList[index] + const deletedRow = row + // 筛选后行序号与源列表不一致,按引用定位真实索引 + const index = this.editPoDetailList.indexOf(deletedRow) + if (index === -1) { + return + } // 记录被删除的PO的key和itemNo,用于保存时判断 const key = `${deletedRow.orderRef1 || ''}_${deletedRow.orderRef2 || ''}` @@ -2345,6 +2471,7 @@ export default { // 从列表中移除该行(仅前端移除,不立即调用后端接口) this.editPoDetailList.splice(index, 1) + this.filterEditPoList() this.$message.success('已标记删除,点击保存后生效') }).catch(() => { // 取消删除 @@ -2360,6 +2487,13 @@ export default { this.addPoDialogVisible = true this.addPoSelectPageIndex = 1 this.addPoSelectedRows = [] + this.addPoSelectFilter = { + orderNo: '', + item: '', + crdStart: '', + crdEnd: '' + } + this.filteredAddPoSelectList = [] this.resetAddPoSearch() this.loadAddPoSelectList() }, @@ -2427,10 +2561,42 @@ export default { this.addPoSelectTotal = 0 this.$message.error('加载PO列表失败') }).finally(() => { + this.filterAddPoSelectList() this.addPoSelectLoading = false }) }, + // 选择PO明细弹窗-前端筛选(与新增一致:PO、Item、D_CRD) + filterAddPoSelectList () { + let result = [...this.addPoSelectList] + const filter = this.addPoSelectFilter || {} + const orderNoKeyword = String(filter.orderNo || '').toLowerCase().trim() + const itemKeyword = String(filter.item || '').toLowerCase().trim() + const crdStart = String(filter.crdStart || '').trim() + const crdEnd = String(filter.crdEnd || '').trim() + + if (orderNoKeyword) { + result = result.filter(item => { + const orderRef1 = String(item.orderRef1 || '').toLowerCase() + const orderNo = String(item.orderNo || item.order_no || '').toLowerCase() + return orderRef1.includes(orderNoKeyword) || orderNo.includes(orderNoKeyword) + }) + } + if (itemKeyword) { + result = result.filter(item => String(item.item || '').toLowerCase().includes(itemKeyword)) + } + if (crdStart || crdEnd) { + result = result.filter(item => { + const crd = String(item.crd || '').slice(0, 10) + if (!crd) return false + if (crdStart && crd < crdStart) return false + if (crdEnd && crd > crdEnd) return false + return true + }) + } + this.filteredAddPoSelectList = result + }, + // 搜索新增PO列表 searchAddPoList () { this.addPoSelectPageIndex = 1 @@ -2501,6 +2667,7 @@ export default { // 将新PO明细添加到编辑列表中 this.editPoDetailList = [...this.editPoDetailList, ...newItems] + this.filterEditPoList() this.$message.success(`成功添加${newItems.length}条PO明细`) @@ -3297,7 +3464,7 @@ export default { supplierNo: item.supplierNo || item.supplier_no || this.addFormData.supplierNo || '', supplierName: item.supplierName || item.supplier_name || this.addFormData.supplierName || '', planner: item.planner || '', - inspectQty: item.qty || 0, // 此次验货数量默认=订单数量(A_Qty),上限同订单数量 + inspectQty: item.customer === '其他验货' ? 1 : (item.qty || 0), // “其他验货”客户默认此次验货数量为1(可改);其余默认=订单数量(A_Qty) shipMethod: item.shipMethod || '',// 运输方式 crd: item.crd ? item.crd.split(' ')[0] : '' })) @@ -3393,6 +3560,37 @@ export default { this.filteredPoList = result }, + // 编辑验货申请-PO明细筛选(与新增一致:PO、Item、D_CRD) + filterEditPoList () { + let result = [...this.editPoDetailList] + const filter = this.editPoFilter || {} + const orderNoKeyword = String(filter.orderNo || '').toLowerCase().trim() + const itemKeyword = String(filter.item || '').toLowerCase().trim() + const crdStart = String(filter.crdStart || '').trim() + const crdEnd = String(filter.crdEnd || '').trim() + + if (orderNoKeyword) { + result = result.filter(item => { + const orderRef1 = String(item.orderRef1 || '').toLowerCase() + const orderNo = String(item.orderNo || item.order_no || '').toLowerCase() + return orderRef1.includes(orderNoKeyword) || orderNo.includes(orderNoKeyword) + }) + } + if (itemKeyword) { + result = result.filter(item => String(item.item || '').toLowerCase().includes(itemKeyword)) + } + if (crdStart || crdEnd) { + result = result.filter(item => { + const crd = String(item.crd || '').slice(0, 10) + if (!crd) return false + if (crdStart && crd < crdStart) return false + if (crdEnd && crd > crdEnd) return false + return true + }) + } + this.filteredEditPoDetailList = result + }, + // 新增验货申请-PO筛选重置 resetAddPoFilter () { this.addPoFilter = { @@ -4300,6 +4498,15 @@ export default { margin-bottom: 8px; } +/* 选择PO明细弹窗日期筛选:与 po-section 一致,隐藏日历小图标 */ +.po-select-filter-form /deep/ .el-date-editor .el-input__prefix { + display: none; +} + +.po-select-filter-form /deep/ .el-date-editor .el-input__inner { + padding-left: 10px; +} + /* 新增PO明细弹窗表格单元格高度调整 */ /deep/ .el-dialog__body .el-table--small .el-table__row td { padding: 8px 0; diff --git a/src/views/modules/order/poOrder_search.vue b/src/views/modules/order/poOrder_search.vue index 98d2868..f53b47a 100644 --- a/src/views/modules/order/poOrder_search.vue +++ b/src/views/modules/order/poOrder_search.vue @@ -13,6 +13,16 @@ :site="searchData.site" v-model="searchData.customer" @change="onSessionCustomerChange" /> + + + + @@ -91,11 +101,47 @@ @refresh-status-options="loadPoStatusMappings" @query="handleSearch" /> + + +
+ Customer:{{ searchData.customer }} +
+ + + + + +
+