Browse Source

验货申请

master
常熟吴彦祖 2 weeks ago
parent
commit
c9d1ca89d0
  1. 11
      src/views/modules/inspection/inspectionRequestList.vue
  2. 4
      src/views/modules/order/poOrder.vue
  3. 8
      src/views/modules/order/poOrder_search.vue
  4. 8
      src/views/modules/order/poOrder_search_en.vue

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

@ -1942,7 +1942,11 @@ export default {
this.searchData.planEndDateStr = this.searchData.planEndDate || ''
this.dataListLoading = true
searchInspectionRequestHeaderList(this.searchData).then(({ data }) => {
// rqrq - 每次查询从页面模式生成范围,重置条件不会清除本人限制。
searchInspectionRequestHeaderList({
...this.searchData,
currentPlannerOnly: !this.isSupplierPageMode
}).then(({ data }) => {
if (data.code === 0) {
this.mainDataList = data.page.list
@ -2319,6 +2323,7 @@ export default {
// 加载新增PO选择列表
loadAddPoSelectList () {
const params = {
currentPlannerOnly: !this.isSupplierPageMode, // rqrq - 补选 PO 同样限定本人
site: this.$store.state.user.site,
supplierNo: this.addFormData.supplierNo,
orderRef1: this.addPoSearch.orderRef1 || '',
@ -2897,6 +2902,7 @@ export default {
// 查询新增弹窗专用供应商列表
loadPoSupplierList () {
const params = {
currentPlannerOnly: !this.isSupplierPageMode, // rqrq - 本人负责的供应商
site: this.$store.state.user.site,
supplierNo: this.poSupplierSearch.supplierNo || '',
supplierName: this.poSupplierSearch.supplierName || '',
@ -3089,6 +3095,7 @@ export default {
// 加载订单来源供应商分页列表(专用后端方法)
loadOrderSupplierList () {
const params = {
currentPlannerOnly: !this.isSupplierPageMode, // rqrq - 本人负责的订单
site: this.$store.state.user.site,
page: this.orderSupplierPageIndex,
limit: this.orderSupplierPageSize,
@ -3220,6 +3227,7 @@ export default {
const params = {
supplierNo: this.addFormData.supplierNo,
site: this.$store.state.user.site,
currentPlannerOnly: !this.isSupplierPageMode, // rqrq - 供应商模式保持原有 PO 范围
page: 1,
limit: 1000
}
@ -3609,6 +3617,7 @@ export default {
// 获取当前查询条件
const exportParams = {
...this.searchData,
currentPlannerOnly: !this.isSupplierPageMode, // rqrq - 导出与主表查询范围一致
limit: 99999,
page: 1
}

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

@ -1034,7 +1034,7 @@ export default {
sortLv: 0,
status: true,
fixed: '',
columnWidth: 180,
columnWidth: 90,
showOverflowTooltip: true,
editAble: true,
editType: 'select',
@ -2039,7 +2039,7 @@ export default {
const source = this.baseColumnList || this.columnList
const applied = applyFieldSchemaToColumns(source, this.fieldSchemaFields)
const cols = applied.filter(c => !c.columnHidden)
const leadProps = ['poNo', 'orderType']
const leadProps = ['poNo', 'status', 'orderType']
const leading = leadProps.map(p => cols.find(c => c.columnProp === p)).filter(Boolean)
const rest = cols.filter(c => !leadProps.includes(c.columnProp))
return [...leading, ...rest]

8
src/views/modules/order/poOrder_search.vue

@ -209,7 +209,7 @@ export default {
columnProp: 'customer',
columnLabel: 'Customer',
align: 'center',
columnWidth: 180,
columnWidth: 90,
showOverflowTooltip: true,
headerAlign: 'center'
},
@ -548,7 +548,11 @@ export default {
visibleColumns() {
const source = this.baseColumnList || this.columnList
const applied = applyFieldSchemaToColumns(source, this.fieldSchemaFields)
return applied.filter(c => !c.columnHidden)
const cols = applied.filter(c => !c.columnHidden)
const leadProps = ['poNo', 'status', 'orderType']
const leading = leadProps.map(p => cols.find(c => c.columnProp === p)).filter(Boolean)
const rest = cols.filter(c => !leadProps.includes(c.columnProp))
return [...leading, ...rest]
}
},
created() {

8
src/views/modules/order/poOrder_search_en.vue

@ -210,7 +210,7 @@ export default {
columnProp: 'customer',
columnLabel: 'Customer',
align: 'center',
columnWidth: 180,
columnWidth: 90,
showOverflowTooltip: true,
headerAlign: 'center'
},
@ -549,7 +549,11 @@ export default {
visibleColumns() {
const source = this.baseColumnList || this.columnList
const applied = applyFieldSchemaToColumns(source, this.fieldSchemaFields)
return applied.filter(c => !c.columnHidden)
const cols = applied.filter(c => !c.columnHidden)
const leadProps = ['poNo', 'status', 'orderType']
const leading = leadProps.map(p => cols.find(c => c.columnProp === p)).filter(Boolean)
const rest = cols.filter(c => !leadProps.includes(c.columnProp))
return [...leading, ...rest]
}
},
created() {

Loading…
Cancel
Save