Browse Source

feat(order): 优化订单模块字段权限控制和买家选择功能

- 在字段权限组件中实现强制必填字段逻辑,系统级必录字段默认必填且不允许取消
- 修复字段可见性与必填状态的联动逻辑,隐藏字段时自动取消必填勾选
- 为订单搜索栏的Buyer字段添加插槽支持,允许页面自定义买家选择功能
- 实现订单页面买家选择弹窗功能,支持从当前客户下选择可用买家
- 调整买家选择弹窗的UI布局,优化列宽和对话框尺寸
- 为enquiry字段添加默认日期设置功能,新增时自动带出当天日期
- 为advance_payment字段添加下拉选项配置,统一Yes/No选项显示格式
- 修改文档发送和电放等字段的初始默认值设置逻辑
master
qiankanghui 3 weeks ago
parent
commit
e8556cde41
  1. 24
      src/views/modules/order/com_poCustomer_FieldAuth.vue
  2. 5
      src/views/modules/order/com_poOrderSearchBar.vue
  3. 62
      src/views/modules/order/poOrder.vue

24
src/views/modules/order/com_poCustomer_FieldAuth.vue

@ -37,7 +37,12 @@
</el-table-column> </el-table-column>
<el-table-column label="必填" width="70"> <el-table-column label="必填" width="70">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-checkbox v-model="row.requiredFlag" :disabled="readonly || !isExtField(row)" true-label="Y" false-label="N" />
<!-- 必填对标准/扩展字段均可维护;必录字段锁定为必填不可取消;只读或字段不可见时禁用 -->
<el-checkbox
v-model="row.requiredFlag"
true-label="Y"
false-label="N"
:disabled="readonly || isForceRequiredField(row) || row.visibleFlag !== 'Y'" />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -48,6 +53,12 @@
<script> <script>
import { listPoCustomerFieldAuth, savePoCustomerFieldAuth } from '@/api/order/poCustomer' import { listPoCustomerFieldAuth, savePoCustomerFieldAuth } from '@/api/order/poCustomer'
// 系统级必录字段:默认必填且不允许取消(与后端 PoFieldAuthSupport.FORCE_REQUIRED_FIELD_CODES 保持一致)
const FORCE_REQUIRED_FIELD_CODES = [
'po_no', 'buyer', 'supplier_name', 'destination', 'ship_via', 'order_date',
'enquiry', 'part_no', 'qty', 'want_receive_date', 'price'
]
export default { export default {
name: 'ComPoCustomerFieldAuth', name: 'ComPoCustomerFieldAuth',
props: { props: {
@ -78,7 +89,7 @@ export default {
displayLabel: r.displayLabel || r.fieldLabel || r.fieldCode, displayLabel: r.displayLabel || r.fieldLabel || r.fieldCode,
dictType: this.isDictTypeEditable(r) ? (r.dictType || '') : '', dictType: this.isDictTypeEditable(r) ? (r.dictType || '') : '',
visibleFlag: ((r.mandatoryFlag || 'N').toUpperCase() === 'Y') ? 'Y' : (r.visibleFlag || 'Y'), visibleFlag: ((r.mandatoryFlag || 'N').toUpperCase() === 'Y') ? 'Y' : (r.visibleFlag || 'Y'),
requiredFlag: r.requiredFlag || 'N'
requiredFlag: this.isForceRequiredField(r) ? 'Y' : (r.requiredFlag || 'N')
})) : [] })) : []
}) })
}, },
@ -96,9 +107,18 @@ export default {
isMandatoryField (row) { isMandatoryField (row) {
return !!(row && String(row.mandatoryFlag || '').toUpperCase() === 'Y') return !!(row && String(row.mandatoryFlag || '').toUpperCase() === 'Y')
}, },
isForceRequiredField (row) {
const code = row && row.fieldCode ? String(row.fieldCode).trim().toLowerCase() : ''
return !!code && FORCE_REQUIRED_FIELD_CODES.indexOf(code) !== -1
},
onVisibleChange (row) { onVisibleChange (row) {
if (this.isMandatoryField(row)) { if (this.isMandatoryField(row)) {
this.$set(row, 'visibleFlag', 'Y') this.$set(row, 'visibleFlag', 'Y')
return
}
// 字段设为不可见时,必填无意义,自动取消勾选,避免出现「隐藏却必填」(必录字段除外,始终锁定为 Y)
if (row.visibleFlag !== 'Y' && !this.isForceRequiredField(row)) {
this.$set(row, 'requiredFlag', 'N')
} }
}, },
normalizeNullable (value) { normalizeNullable (value) {

5
src/views/modules/order/com_poOrderSearchBar.vue

@ -6,7 +6,10 @@
<el-input v-model="searchData.plannerAccount" clearable style="width: 130px" @keyup.enter.native="emitSearch"></el-input> <el-input v-model="searchData.plannerAccount" clearable style="width: 130px" @keyup.enter.native="emitSearch"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="Buyer"> <el-form-item label="Buyer">
<el-input v-model="searchData.buyer" clearable style="width: 130px" @keyup.enter.native="emitSearch"></el-input>
<!-- buyer 插槽:poOrder 页面覆盖为「输入框 + 点击弹出 Buyer 选择表格」,其余页面走默认纯输入框 -->
<slot name="buyer">
<el-input v-model="searchData.buyer" clearable style="width: 130px" @keyup.enter.native="emitSearch"></el-input>
</slot>
</el-form-item> </el-form-item>
<el-form-item label="Supplier"> <el-form-item label="Supplier">
<el-input v-model="searchData.supplierName" clearable style="width: 130px" @keyup.enter.native="emitSearch"></el-input> <el-input v-model="searchData.supplierName" clearable style="width: 130px" @keyup.enter.native="emitSearch"></el-input>

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

@ -13,6 +13,16 @@
:site="searchData.site" :site="searchData.site"
v-model="searchData.customer" v-model="searchData.customer"
@change="onSessionCustomerChange" /> @change="onSessionCustomerChange" />
<!-- Buyer 查询条件:可正常手动输入;点击搜索图标弹出当前 Customer 下的 Buyer 选择表格 -->
<el-input
slot="buyer"
v-model="searchData.buyer"
clearable
placeholder="请输入或选择"
style="width: 130px"
@keyup.enter.native="handleSearch">
<i slot="suffix" class="el-icon-search" style="cursor: pointer" @click.stop="openSearchBuyerSelect"></i>
</el-input>
</com-po-order-search-bar> </com-po-order-search-bar>
<el-form :inline="true" label-position="top" style="margin-top:1px "> <el-form :inline="true" label-position="top" style="margin-top:1px ">
<el-form-item> <el-form-item>
@ -167,8 +177,8 @@
<template v-if="(item.columnProp === 'confirmed' || item.columnProp === 'wantReceiveDate') && !isNewRow(scope.row)"> <template v-if="(item.columnProp === 'confirmed' || item.columnProp === 'wantReceiveDate') && !isNewRow(scope.row)">
<span>{{ scope.row[item.columnProp] }}</span> <span>{{ scope.row[item.columnProp] }}</span>
</template> </template>
<!-- 对于 inspection 和 realCrd 字段,仅在修改时(非新增行)可编辑 -->
<template v-else-if="(item.columnProp === 'inspection' || item.columnProp === 'realCrd') && isNewRow(scope.row)">
<!-- 对于 inspection 字段,仅在修改时(非新增行)可编辑;A_CRD(realCrd) 已放开,按 schema editableFlag 在所有行可编辑 -->
<template v-else-if="item.columnProp === 'inspection' && isNewRow(scope.row)">
<span>{{ scope.row[item.columnProp] }}</span> <span>{{ scope.row[item.columnProp] }}</span>
</template> </template>
<template v-else> <template v-else>
@ -786,8 +796,8 @@
title="选择 Buyer" title="选择 Buyer"
v-drag v-drag
:visible.sync="buyerDialogVisible" :visible.sync="buyerDialogVisible"
width="640px"
top="10vh"
width="480px"
top="20vh"
append-to-body append-to-body
:close-on-click-modal="false" :close-on-click-modal="false"
@closed="resetBuyerDialog"> @closed="resetBuyerDialog">
@ -797,7 +807,7 @@
<el-table <el-table
ref="buyerSelectTable" ref="buyerSelectTable"
:data="buyerDialogRows" :data="buyerDialogRows"
:height="360"
:height="240"
border border
stripe stripe
highlight-current-row highlight-current-row
@ -805,8 +815,8 @@
empty-text="当前 Customer 未维护可用 Buyer" empty-text="当前 Customer 未维护可用 Buyer"
@current-change="onBuyerDialogCurrentChange" @current-change="onBuyerDialogCurrentChange"
@row-dblclick="applyBuyerDialogSelection"> @row-dblclick="applyBuyerDialogSelection">
<el-table-column prop="code" label="Buyer 编码" min-width="180" header-align="center" align="center" />
<el-table-column prop="name" label="Buyer 名称" min-width="280" header-align="center" show-overflow-tooltip />
<el-table-column prop="code" label="Buyer 编码" min-width="120" header-align="center" align="center" />
<el-table-column prop="name" label="Buyer 名称" min-width="200" header-align="center" show-overflow-tooltip />
</el-table> </el-table>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button <el-button
@ -993,7 +1003,8 @@ const ADD_NUMBER_FIELD_CODES = new Set(['price', 'qty', 'ship_qty', 'sum_price']
const ADD_FILTERABLE_SELECT_FIELD_CODES = new Set(['customer', 'buyer', 'departure', 'destination']) const ADD_FILTERABLE_SELECT_FIELD_CODES = new Set(['customer', 'buyer', 'departure', 'destination'])
const ADD_FORCE_DETAIL_FIELD_CODES = new Set(['part_no', 'price', 'qty']) const ADD_FORCE_DETAIL_FIELD_CODES = new Set(['part_no', 'price', 'qty'])
const ADD_READONLY_DEFAULT_TODAY_FIELD_CODES = new Set(['create_date']) const ADD_READONLY_DEFAULT_TODAY_FIELD_CODES = new Set(['create_date'])
const ADD_EDITABLE_DEFAULT_TODAY_FIELD_CODES = new Set(['po_place_date'])
// po_place_date、enquiry(D_Enquiry)在新增表单默认带出录入当天日期,仍可手动修改
const ADD_EDITABLE_DEFAULT_TODAY_FIELD_CODES = new Set(['po_place_date', 'enquiry'])
const ADD_SELECT_OPTIONS_FIELD_CODE_MAP = { const ADD_SELECT_OPTIONS_FIELD_CODE_MAP = {
order_type: 'poOrderTypeOptions', order_type: 'poOrderTypeOptions',
customer: 'poCustomerOptions', customer: 'poCustomerOptions',
@ -1003,6 +1014,7 @@ const ADD_SELECT_OPTIONS_FIELD_CODE_MAP = {
status: 'poOrderStatusValueOptions', // rqrq - 新增状态显示英文,值保留中文 status: 'poOrderStatusValueOptions', // rqrq - 新增状态显示英文,值保留中文
doc_sent: 'yesNoOptions', doc_sent: 'yesNoOptions',
telex_release: 'yesNoOptions', telex_release: 'yesNoOptions',
advance_payment: 'yesNoOptions',
advance_paid: 'yesNoOptions' advance_paid: 'yesNoOptions'
} }
@ -1282,8 +1294,8 @@ export default {
{ label: '陆运 ROAD', value: 'ROAD' } { label: '陆运 ROAD', value: 'ROAD' }
], ],
yesNoOptions: [ yesNoOptions: [
{ label: 'Y', value: 'Y' },
{ label: 'N', value: 'N' }
{ label: 'Yes', value: 'Y' },
{ label: 'No', value: 'N' }
] ]
}, },
dictSelectOptionsMap: {}, dictSelectOptionsMap: {},
@ -2176,8 +2188,8 @@ export default {
columnWidth: 120, columnWidth: 120,
showOverflowTooltip: true, showOverflowTooltip: true,
editAble: true, editAble: true,
editType: 'text',
selectOptionsKey: '',
editType: 'select',
selectOptionsKey: 'yesNoOptions',
selectOptions: null selectOptions: null
}, },
{ {
@ -5077,10 +5089,10 @@ export default {
inspectionResult: '', inspectionResult: '',
flexid: '', flexid: '',
obd: '', obd: '',
docSent: '',
telexRelease: '',
docSent: 'N',
telexRelease: 'N',
advancePayment: 'N', advancePayment: 'N',
advancePaid: '',
advancePaid: 'N',
planner: '', planner: '',
remarkDelay: '', remarkDelay: '',
remark: '', remark: '',
@ -5283,6 +5295,7 @@ export default {
/** /**
* 打开 Buyer 选择弹窗。接口按当前 Site + Customer 查询 po_buyer, * 打开 Buyer 选择弹窗。接口按当前 Site + Customer 查询 po_buyer,
* 因此弹窗不会混入其他 Customer 的 Buyer。 * 因此弹窗不会混入其他 Customer 的 Buyer。
* target:master/detail 回填新增弹窗表单,search 回填顶部筛选 searchData.buyer。
*/ */
openAddBuyerSelect (target = 'master') { openAddBuyerSelect (target = 'master') {
const customer = String(this.searchData.customer || '').trim() const customer = String(this.searchData.customer || '').trim()
@ -5290,7 +5303,7 @@ export default {
this.$message.warning('请先选择 Customer') this.$message.warning('请先选择 Customer')
return return
} }
this.buyerDialogTarget = target === 'detail' ? 'detail' : 'master'
this.buyerDialogTarget = target === 'detail' ? 'detail' : (target === 'search' ? 'search' : 'master')
this.buyerDialogRows = [] this.buyerDialogRows = []
this.buyerDialogSelectedRow = null this.buyerDialogSelectedRow = null
this.buyerDialogVisible = true this.buyerDialogVisible = true
@ -5300,7 +5313,7 @@ export default {
return return
} }
this.buyerDialogRows = Array.isArray(options) ? options : [] this.buyerDialogRows = Array.isArray(options) ? options : []
const targetForm = this.getAddTargetForm(this.buyerDialogTarget)
const targetForm = this.getBuyerDialogForm(this.buyerDialogTarget)
const currentBuyer = String((targetForm && targetForm.buyer) || '').trim() const currentBuyer = String((targetForm && targetForm.buyer) || '').trim()
const selected = this.buyerDialogRows.find(row => row && row.code === currentBuyer) || null const selected = this.buyerDialogRows.find(row => row && row.code === currentBuyer) || null
this.buyerDialogSelectedRow = selected this.buyerDialogSelectedRow = selected
@ -5314,6 +5327,19 @@ export default {
}) })
}, },
/** 顶部筛选 Buyer:点击搜索图标弹出当前 Customer 下的 Buyer 选择表格。 */
openSearchBuyerSelect () {
this.openAddBuyerSelect('search')
},
/** Buyer 弹窗回填目标表单;search 目标为顶部筛选对象本身。 */
getBuyerDialogForm (target) {
if (target === 'search') {
return this.searchData
}
return this.getAddTargetForm(target)
},
onBuyerDialogCurrentChange (row) { onBuyerDialogCurrentChange (row) {
this.buyerDialogSelectedRow = row || null this.buyerDialogSelectedRow = row || null
}, },
@ -5323,7 +5349,7 @@ export default {
if (!row || !row.code) { if (!row || !row.code) {
return return
} }
const targetForm = this.getAddTargetForm(this.buyerDialogTarget)
const targetForm = this.getBuyerDialogForm(this.buyerDialogTarget)
if (targetForm) { if (targetForm) {
this.$set(targetForm, 'buyer', row.code) this.$set(targetForm, 'buyer', row.code)
} }

Loading…
Cancel
Save