@@ -287,6 +290,13 @@
style="width: 100px"
@keyup.enter.native="filterAddPoList"/>
+
+
+
查询
@@ -309,6 +319,7 @@
+
@@ -469,6 +480,13 @@
style="width: 200px"
@keyup.enter.native="searchOrderSupplierByPo"/>
+
+
+
查询
重置
@@ -487,6 +505,7 @@
:default-sort="{ prop: 'crd', order: 'descending' }">
+
@@ -624,7 +643,8 @@ export default {
item: '',
sku: '',
partDesc: '',
- supplierName: ''
+ supplierName: '',
+ planner: ''
},
selectedPoList: [],
poSupplierDialogVisible: false,
@@ -651,7 +671,8 @@ export default {
item: '',
sku: '',
partDesc: '',
- supplierName: ''
+ supplierName: '',
+ planner: ''
},
pendingAutoSelectPoRow: null,
// 上传相关
@@ -663,6 +684,7 @@ export default {
requestNo: '',
supplierNo: '',
supplierName: '',
+ planner: '',
status: '',
qcOperator: '',
createBy: '',
@@ -771,6 +793,24 @@ export default {
status: true,
fixed: false
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: this.functionId,
+ serialNumber: 'InspectionTable1Planner',
+ tableId: 'InspectionTable1',
+ tableName: '检验申请单',
+ columnProp: 'planner',
+ headerAlign: 'center',
+ align: 'left',
+ columnLabel: 'Planner',
+ columnWidth: '120',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: false
+ },
{
userId: this.$store.state.user.name,
functionId: this.functionId,
@@ -1112,7 +1152,8 @@ export default {
item: '',
sku: '',
partDesc: '',
- supplierName: ''
+ supplierName: '',
+ planner: ''
}
this.poSupplierDialogVisible = false
this.poSupplierLoading = false
@@ -1138,7 +1179,8 @@ export default {
item: '',
sku: '',
partDesc: '',
- supplierName: ''
+ supplierName: '',
+ planner: ''
}
this.pendingAutoSelectPoRow = null
if (this.$refs.addFormData) {
@@ -1294,7 +1336,8 @@ export default {
item: '',
sku: '',
partDesc: '',
- supplierName: ''
+ supplierName: '',
+ planner: ''
}
this.poSupplierDialogVisible = false
this.orderSupplierDialogVisible = false
@@ -1357,7 +1400,8 @@ export default {
item: '',
sku: '',
partDesc: '',
- supplierName: ''
+ supplierName: '',
+ planner: ''
}
this.loadOrderSupplierList()
},
@@ -1379,7 +1423,8 @@ export default {
item: this.orderSupplierSearch.item || '',
sku: this.orderSupplierSearch.sku || '',
partDesc: this.orderSupplierSearch.partDesc || '',
- supplierName: this.orderSupplierSearch.supplierName || ''
+ supplierName: this.orderSupplierSearch.supplierName || '',
+ planner: this.orderSupplierSearch.planner || ''
}
this.orderSupplierLoading = true
queryPoSupplierOrderPage(params).then(({ data }) => {
@@ -1388,6 +1433,7 @@ export default {
...item,
supplierNo: item.supplierNo || item.supplier_no || '',
supplierName: item.supplierName || item.supplier_name || '',
+ planner: item.planner || '',
crd: item.crd ? String(item.crd).split(' ')[0] : ''
}))
this.orderSupplierList = list
@@ -1430,7 +1476,8 @@ export default {
item: '',
sku: '',
partDesc: '',
- supplierName: ''
+ supplierName: '',
+ planner: ''
}
this.orderSupplierPageIndex = 1
this.loadOrderSupplierList()
@@ -1509,6 +1556,7 @@ export default {
...item,
supplierNo: item.supplierNo || item.supplier_no || this.addFormData.supplierNo || '',
supplierName: item.supplierName || item.supplier_name || this.addFormData.supplierName || '',
+ planner: item.planner || '',
inspectQty: item.waitInspectQty || 0, // 默认值为未验货数量
shipMethod: item.shipMethod || '',// 运输方式
crd: item.crd ? item.crd.split(' ')[0] : ''
@@ -1544,6 +1592,7 @@ export default {
const skuKeyword = (filter.sku || '').toLowerCase().trim()
const partDescKeyword = (filter.partDesc || '').toLowerCase().trim()
const supplierNameKeyword = (filter.supplierName || '').toLowerCase().trim()
+ const plannerKeyword = (filter.planner || '').toLowerCase().trim()
if (orderNoKeyword) {
result = result.filter(item => {
@@ -1567,6 +1616,9 @@ export default {
if (supplierNameKeyword) {
result = result.filter(item => String(item.supplierName || '').toLowerCase().includes(supplierNameKeyword))
}
+ if (plannerKeyword) {
+ result = result.filter(item => String(item.planner || '').toLowerCase().includes(plannerKeyword))
+ }
this.filteredPoList = result
},
@@ -1578,7 +1630,8 @@ export default {
item: '',
sku: '',
partDesc: '',
- supplierName: ''
+ supplierName: '',
+ planner: ''
}
this.filterAddPoList()
},
diff --git a/src/views/modules/order/poOrder.vue b/src/views/modules/order/poOrder.vue
index 65037e1..9bdf963 100644
--- a/src/views/modules/order/poOrder.vue
+++ b/src/views/modules/order/poOrder.vue
@@ -565,7 +565,7 @@ import ComPoOrderCustomerPicker from './com_poOrder_CustomerPicker.vue'
import ComPoOrderDynamicFieldRenderer from './com_poOrder_DynamicFieldRenderer.vue'
const ADD_CHOOSER_FIELD_CODES = new Set(['supplier_name', 'part_no', 'departure', 'destination', 'ship_via'])
-const ADD_DISPLAY_ONLY_FIELD_CODES = new Set(['short_office', 'short_npc', 'item', 'category_name', 'sku', 'value', 'status', 'crd_ori'])
+const ADD_DISPLAY_ONLY_FIELD_CODES = new Set(['short_office', 'short_npc', 'item', 'category_name', 'sku', 'value', 'status', 'planner', 'crd_ori'])
const ADD_TEXTAREA_FIELD_CODES = new Set(['remark'])
const ADD_FULL_ROW_FIELD_CODES = new Set(['remark'])
const ADD_NUMBER_FIELD_CODES = new Set(['price', 'qty', 'ship_qty', 'sum_price'])
@@ -3266,12 +3266,13 @@ export default {
this.openEamList(SUPPLIER_CHOOSELIST_TAG, '', conSql, 'row', 'supplier')
},
- applySupplierSelection (target, supplierNo, supplierName, shortOffice, shortNpc, markChanged) {
+ applySupplierSelection (target, supplierNo, supplierName, shortOffice, shortNpc, planner, markChanged) {
if (!target) return
this.$set(target, 'supplierName', supplierName)
this.$set(target, 'supplierNo', supplierNo)
this.$set(target, 'shortOffice', shortOffice)
this.$set(target, 'shortNpc', shortNpc)
+ this.$set(target, 'planner', planner || '')
if (markChanged) {
this.$set(target, 'changeFlag', 1)
}
@@ -3281,10 +3282,18 @@ export default {
if (!target || !supplierNo) {
return Promise.resolve()
}
- this.applySupplierSelection(target, supplierNo, supplierName, target.shortOffice || '', target.shortNpc || '', markChanged)
+ this.applySupplierSelection(
+ target,
+ supplierNo,
+ supplierName,
+ target.shortOffice || '',
+ target.shortNpc || '',
+ target.planner || '',
+ markChanged
+ )
return fetchSupplierDetail(supplierNo, this.$store.state.user.site).then(detail => {
- const { shortOffice, shortNpc } = resolveSupplierShortFieldsFromDetail(detail)
- this.applySupplierSelection(target, supplierNo, supplierName, shortOffice, shortNpc, markChanged)
+ const { shortOffice, shortNpc, planner } = resolveSupplierShortFieldsFromDetail(detail)
+ this.applySupplierSelection(target, supplierNo, supplierName, shortOffice, shortNpc, planner, markChanged)
}).catch(() => {})
},
diff --git a/src/views/modules/srmSupplier/supplierList.vue b/src/views/modules/srmSupplier/supplierList.vue
index 90c05cb..85ab69d 100644
--- a/src/views/modules/srmSupplier/supplierList.vue
+++ b/src/views/modules/srmSupplier/supplierList.vue
@@ -17,6 +17,9 @@
+
+
+
查询
新增
@@ -190,18 +193,7 @@
/>
-
-
-
-
-
-
-
-
+
@@ -210,13 +202,19 @@
采购员
-
+
Sourcing专员
-
+
+
+
+
+
+ Planner
+
@@ -224,6 +222,18 @@