diff --git a/src/views/modules/order/poBuyer.vue b/src/views/modules/order/poBuyer.vue
index 88021bb..b3585fb 100644
--- a/src/views/modules/order/poBuyer.vue
+++ b/src/views/modules/order/poBuyer.vue
@@ -391,6 +391,10 @@ export default {
},
saveData () {
+ if (this.modalData.flag === '1' && !String(this.modalData.customerCode || '').trim()) {
+ this.$refs.modalForm.validateField('customerCode')
+ return
+ }
this.$refs.modalForm.validate(valid => {
if (!valid) return
const payload = {
diff --git a/src/views/modules/order/poOrder.vue b/src/views/modules/order/poOrder.vue
index d106e21..dcfe6a4 100644
--- a/src/views/modules/order/poOrder.vue
+++ b/src/views/modules/order/poOrder.vue
@@ -100,27 +100,37 @@
-
-
+
-
-
+ @change="onCellChange(scope.row)">
+
+
-
-
+
-
-
+ @change="onCellChange(scope.row)">
+
+
String(num).padStart(2, '0')
@@ -2422,7 +2446,9 @@ export default {
return editorType === 'dict-select' || editorType === 'dict_select'
},
isAddSelectField (field) {
- return this.isAddDictSelectField(field) || this.getAddFieldSelectOptions(field).length > 0
+ const code = this.getAddFieldCode(field)
+ return code === 'departure' || code === 'destination' ||
+ this.isAddDictSelectField(field) || this.getAddFieldSelectOptions(field).length > 0
},
isAddFilterableSelectField (field) {
return ADD_FILTERABLE_SELECT_FIELD_CODES.has(this.getAddFieldCode(field))
@@ -3481,30 +3507,28 @@ export default {
this.$message.error('操作失败: ' + error.message)
})
},
- getPortOptions(){
- console.log('获取港口选项')
- searchTransportOptions(
- {
- site: this.$store.state.user.site
- }
- ).then(({data}) => {
- if (data && data.code === 0) {
- console.log('接口返回的rows:', data.rows) // 查看返回数据
-
- this.transportOptions = (data.rows || []).map(item => ({
- label: item.supplierName,
- value: item.supplierNo,
- destination: item.destination,
- departure: item.departure,
- shipVia: item.shipVia,
- etc: item.eta
- }))
-
- } else {
- this.$message.error(data.msg || '操作失败')
+ getPortOptions () {
+ return searchPortList({}).then(({ data }) => {
+ if (!data || data.code !== 0) {
+ throw new Error((data && data.msg) || '加载港口失败')
}
+ const rows = Array.isArray(data.rows) ? data.rows : []
+ const names = {}
+ rows.forEach(port => {
+ if (port.portCode && port.portName) {
+ names[port.portCode] = port.portName
+ }
+ })
+ this.portNameByCode = names
+ const activePorts = rows.filter(port => port.active === 'Y' && port.portCode && port.portName)
+ this.poDepartureOptions = activePorts
+ .filter(port => port.isDeparturePort === 'Y')
+ .map(port => ({ value: port.portCode, label: port.portName }))
+ this.poDestinationOptions = activePorts
+ .filter(port => port.isDestinationPort === 'Y')
+ .map(port => ({ value: port.portCode, label: port.portName }))
}).catch(error => {
- this.$message.error('操作失败: ' + error.message)
+ this.$message.error((error && error.message) || '加载港口失败')
})
},
// 保存订单信息
diff --git a/src/views/modules/supplier/priceSheetReport.vue b/src/views/modules/supplier/priceSheetReport.vue
index 1f71be1..287b64f 100644
--- a/src/views/modules/supplier/priceSheetReport.vue
+++ b/src/views/modules/supplier/priceSheetReport.vue
@@ -98,6 +98,7 @@
+