Browse Source

新品流程OK

master
常熟吴彦祖 4 months ago
parent
commit
df04a82879
  1. 18
      src/views/modules/inspection/inspectionRequestList.vue
  2. 5
      src/views/modules/order/com_inspectionDetailList.vue
  3. 38
      src/views/modules/order/com_poOrderAdvancedQuery.vue
  4. 275
      src/views/modules/order/poOrder.vue
  5. 45
      src/views/modules/order/poOrderAdvancedQueryHelper.js
  6. 17
      src/views/modules/order/poOrderStatusOptions.js
  7. 74
      src/views/modules/order/poOrder_search.vue
  8. 26
      src/views/modules/port/portTransit.vue
  9. 36
      src/views/modules/sys/user.vue

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

@ -398,8 +398,8 @@
highlight-current-row
@current-change="onPoSupplierCurrentChange"
@row-dblclick="onPoSupplierRowDblClick">
<el-table-column prop="supplierNo" label="供应商编码" header-align="center" align="left" min-width="140" />
<el-table-column prop="supplierName" label="供应商名称" header-align="center" align="left" min-width="220" />
<el-table-column prop="supplierNo" label="供应商编码" header-align="center" align="left" min-width="140" show-overflow-tooltip />
<el-table-column prop="supplierName" label="供应商名称" header-align="center" align="left" min-width="220" show-overflow-tooltip />
<el-table-column prop="poDetailCount" label="PO明细数" header-align="center" align="right" min-width="120" />
</el-table>
@ -485,10 +485,10 @@
@current-change="onOrderSupplierCurrentChange"
@row-dblclick="onOrderSupplierRowDblClick"
:default-sort="{ prop: 'crd', order: 'descending' }">
<el-table-column prop="supplierNo" label="供应商编码" header-align="center" align="left" min-width="120" fixed="left" />
<el-table-column prop="supplierName" label="供应商名称" header-align="center" align="left" min-width="180" fixed="left" />
<el-table-column prop="orderRef1" label="PO号" header-align="center" align="center" min-width="120" />
<el-table-column prop="orderRef2" label="PO行号" header-align="center" align="center" min-width="80" />
<el-table-column prop="supplierNo" label="供应商编码" header-align="center" align="left" min-width="120" fixed="left" show-overflow-tooltip />
<el-table-column prop="supplierName" label="供应商名称" header-align="center" align="left" min-width="180" fixed="left" show-overflow-tooltip />
<el-table-column prop="orderRef1" label="PO号" header-align="center" align="center" min-width="120" show-overflow-tooltip />
<el-table-column prop="orderRef2" label="PO行号" header-align="center" align="center" min-width="80" show-overflow-tooltip />
<el-table-column prop="partNo" label="产品编码" header-align="center" align="left" min-width="140" show-overflow-tooltip />
<el-table-column prop="item" label="Item" header-align="center" align="left" min-width="120" show-overflow-tooltip />
<el-table-column prop="sku" label="SKU" header-align="center" align="left" min-width="140" show-overflow-tooltip />
@ -1988,7 +1988,11 @@ export default {
.po-section {
/deep/ .el-table .cell {
overflow: visible !important;
height: auto;
line-height: 20px;
overflow: hidden !important;
text-overflow: ellipsis;
white-space: nowrap;
padding-left: 4px;
padding-right: 4px;
}

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

@ -146,6 +146,11 @@ export default {
// 查询数据
searchTable() {
if (!this.searchData.orderNo) {
this.dataList = []
this.totalPage = 0
return
}
this.dataListLoading = true
const params = {
...this.searchData,

38
src/views/modules/order/com_poOrderAdvancedQuery.vue

@ -35,7 +35,7 @@
<template slot-scope="{ row }">
<el-select v-model="row.operator" style="width: 100%;">
<el-option
v-for="op in getOperatorsByDataType(row.dataType)"
v-for="op in getOperatorOptions(row)"
:key="op.value"
:label="op.label"
:value="op.value" />
@ -111,9 +111,44 @@ export default {
},
methods: {
getOperatorsByDataType,
normalizeOperatorSet (operatorSet) {
if (!Array.isArray(operatorSet)) {
return []
}
return operatorSet
.map(item => String(item || '').trim().toLowerCase())
.filter(Boolean)
},
getOperatorOptions (row) {
const baseOptions = this.getOperatorsByDataType(row && row.dataType)
const operatorSet = this.normalizeOperatorSet(row && row.operatorSet)
if (!operatorSet.length) {
return baseOptions
}
return baseOptions.filter(op => operatorSet.includes(op.value))
},
ensureRowOperator (row) {
if (!row) {
return
}
const options = this.getOperatorOptions(row)
if (!options.length) {
row.operator = ''
return
}
const exists = options.some(op => op.value === row.operator)
if (!exists) {
row.operator = options[0].value
}
},
ensureAllRowsOperator () {
const rows = (this.advancedQueryData && this.advancedQueryData.rows) || []
rows.forEach(row => this.ensureRowOperator(row))
},
handleOpen () {
this.calcTableHeight()
window.addEventListener('resize', this.calcTableHeight)
this.ensureAllRowsOperator()
},
calcTableHeight () {
this.$nextTick(() => {
@ -125,6 +160,7 @@ export default {
},
handleReset () {
resetAdvancedQueryData(this.advancedQueryData)
this.ensureAllRowsOperator()
this.$emit('reset')
},
handleQuery () {

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

@ -296,7 +296,7 @@
@query="handleSearch" />
<!-- 新增 PO 订单(主记录 + 明细暂存) -->
<el-dialog title="新增 PO 订单" :visible.sync="addDialogVisible" width="1180px" top="4vh"
<el-dialog title="新增 PO 订单" v-drag :visible.sync="addDialogVisible" width="1180px" top="4vh"
:close-on-click-modal="false" append-to-body>
<div class="po-add-form-wrap">
<el-form ref="addMasterFormRef" :model="addForm" label-position="top" size="small">
@ -353,20 +353,21 @@
</el-row>
</el-form>
<div class="po-add-detail-toolbar">
<span class="po-add-detail-title">明细暂存列表</span>
<div>
<el-button type="primary" size="mini" @click="openAddDetailDialog">新增</el-button>
<el-button size="mini" :disabled="!hasSelectedAddDetailRow" @click="openEditAddDetailDialog">修改</el-button>
<el-button size="mini" :disabled="!hasSelectedAddDetailRow" @click="removeAddDetailRow">删除</el-button>
<el-button size="mini" :disabled="!hasSelectedAddDetailRow" @click="openCopyAddDetailDialog">复制</el-button>
</div>
</div>
<el-form :inline="true" label-position="top" style="text-align: right;margin-top:0px ">
<el-form-item style="text-align: right;">
<el-button type="primary" @click="openAddDetailDialog">新增</el-button>
<el-button :disabled="!hasSelectedAddDetailRow" @click="openCopyAddDetailDialog">复制</el-button>
<el-button :disabled="!hasSelectedAddDetailRow" @click="openEditAddDetailDialog">修改</el-button>
<el-button :disabled="!hasSelectedAddDetailRow" @click="removeAddDetailRow">删除</el-button>
</el-form-item>
</el-form>
<el-table
ref="addDetailTable"
:data="addDetailRows"
:height="320"
:height="280"
border
stripe
highlight-current-row
@ -374,14 +375,18 @@
@current-change="onAddDetailCurrentChange"
@row-click="onAddDetailRowClick">
<el-table-column type="index" label="#" width="50" header-align="center" align="center" />
<el-table-column prop="partNo" :label="getAddTableColumnLabel('part_no', '产品编码')" min-width="150" header-align="center" align="center" />
<el-table-column prop="item" :label="getAddTableColumnLabel('item', 'Item')" min-width="120" header-align="center" align="center" />
<el-table-column prop="sku" :label="getAddTableColumnLabel('sku', 'SKU')" min-width="120" header-align="center" align="center" />
<el-table-column prop="qty" :label="getAddTableColumnLabel('qty', 'PO Qty')" min-width="110" header-align="center" align="right" />
<el-table-column prop="price" :label="getAddTableColumnLabel('price', 'Unit Price')" min-width="120" header-align="center" align="right" />
<el-table-column prop="value" :label="getAddTableColumnLabel('value', 'PO Value')" min-width="120" header-align="center" align="right" />
<el-table-column prop="wantReceiveDate" :label="getAddTableColumnLabel('want_receive_date', 'Promise Date')" min-width="130" header-align="center" align="center" />
<el-table-column prop="remark" :label="getAddTableColumnLabel('remark', 'Comments')" min-width="220" header-align="center" align="left" show-overflow-tooltip />
<el-table-column
v-for="field in addDetailTableFields"
:key="`detail-col-${field.fieldCode}`"
:label="field.fieldLabel"
:min-width="getAddDetailTableColumnWidth(field)"
header-align="center"
:align="getAddDetailTableColumnAlign(field)"
show-overflow-tooltip>
<template slot-scope="{ row }">
{{ getAddDetailTableCellDisplay(row, field) }}
</template>
</el-table-column>
</el-table>
</div>
<div slot="footer" class="dialog-footer">
@ -392,6 +397,7 @@
<!-- 新增明细弹窗 -->
<el-dialog
v-drag
:title="addDetailDialogTitle"
:visible.sync="addDetailDialogVisible"
width="1000px"
@ -627,7 +633,9 @@ export default {
addDialogVisible: false,
addFormSaving: false,
addDialogSchemaLoading: false,
addFormSchemaFields: [],
addDictSelectOptionsMap: {},
pickContext: '',
eamTagNo: '',
eamPickField: '',
@ -1710,7 +1718,7 @@ export default {
return []
}
const sortedFields = this.addFormSchemaFields
.filter(f => f && f.visibleFlag === 'Y' && !this.isExtSchemaField(f))
.filter(f => f && f.visibleFlag === 'Y' && !this.isExtSchemaField(f) && this.getAddFieldCode(f) !== 'crd_ori')
.slice()
.sort((a, b) => {
const sa = Number(a && a.sortNo)
@ -1736,6 +1744,27 @@ export default {
addDetailBaseFields () {
return this.addBaseFields.filter(field => !this.isAddMasterField(field))
},
addDetailTableFields () {
const merged = []
const seen = new Set()
const pushField = (field) => {
if (!field) {
return
}
const code = this.getAddFieldCode(field)
if (!code || seen.has(code)) {
return
}
seen.add(code)
merged.push({
...field,
fieldLabel: field.fieldLabel || this.getAddTableColumnLabel(code, code)
})
}
this.addDetailBaseFields.forEach(pushField)
this.addDetailExtFields.forEach(pushField)
return merged
},
hasSelectedAddDetailRow () {
if (!this.addDetailCurrentDraftId) {
return false
@ -1916,7 +1945,24 @@ export default {
return false
}
const mandatoryFlag = String((field && field.mandatoryFlag) || '').trim().toUpperCase()
return mandatoryFlag === 'Y'
if (mandatoryFlag === 'Y') {
return true
}
// 与 PO_No 同口径:优先走字段元数据分层,不做单字段特判。
const bizLevel = String((field && field.bizLevel) || '').trim().toUpperCase()
if (bizLevel === 'HEADER') {
return true
}
// VIRTUAL 中位于 Part No 之前的字段(如供应商简称)归入主记录区。
if (bizLevel === 'VIRTUAL') {
const virtualSortNo = Number(field && field.sortNo)
const partField = this.getSchemaFieldByCode('part_no')
const partSortNo = Number(partField && partField.sortNo)
if (Number.isFinite(virtualSortNo) && Number.isFinite(partSortNo) && virtualSortNo < partSortNo) {
return true
}
}
return false
},
getSchemaFieldByCode (fieldCode) {
const normalizedCode = String(fieldCode || '').trim().toLowerCase()
@ -1929,6 +1975,62 @@ export default {
const field = this.getSchemaFieldByCode(fieldCode)
return (field && field.fieldLabel) || fallback || fieldCode
},
getAddDetailTableColumnAlign (field) {
if (this.isAddNumberField(field)) {
return 'right'
}
if (this.isAddDateField(field)) {
return 'center'
}
return 'left'
},
getAddDetailTableColumnWidth (field) {
const code = this.getAddFieldCode(field)
if (ADD_FULL_ROW_FIELD_CODES.has(code)) {
return 220
}
if (this.isAddDateField(field)) {
return 140
}
if (this.isAddNumberField(field)) {
return 120
}
if (code === 'part_no') {
return 150
}
return 140
},
getAddDetailTableCellDisplay (row, field) {
if (!row || !field) {
return ''
}
const code = this.getAddFieldCode(field)
let value = ''
if (this.isExtSchemaField(field)) {
value = this.getFormExtValue(row, code)
} else {
const prop = this.getAddFieldProp(field)
value = prop ? row[prop] : ''
}
if (value === null || value === undefined || value === '') {
return ''
}
if (this.isAddDateField(field)) {
if (value instanceof Date) {
const pad = (num) => String(num).padStart(2, '0')
return `${value.getFullYear()}-${pad(value.getMonth() + 1)}-${pad(value.getDate())}`
}
const text = String(value)
return text.length >= 10 ? text.substring(0, 10) : text
}
if (this.isAddNumberField(field)) {
const normalized = this.normalizeAddNumericValue(value)
if (normalized !== '') {
return normalized
}
}
return value
},
snakeToCamel (text) {
return String(text || '').replace(/_([a-z0-9])/g, (_, c) => c.toUpperCase())
},
@ -1964,19 +2066,29 @@ export default {
getAddFieldSelectOptions (field) {
const code = this.getAddFieldCode(field)
const optionsKey = ADD_SELECT_OPTIONS_FIELD_CODE_MAP[code]
if (!optionsKey) {
return []
}
if (Array.isArray(this[optionsKey])) {
return this[optionsKey]
if (optionsKey) {
if (Array.isArray(this[optionsKey])) {
return this[optionsKey]
}
if (this.columnSelectOptions && Array.isArray(this.columnSelectOptions[optionsKey])) {
return this.columnSelectOptions[optionsKey]
}
}
if (this.columnSelectOptions && Array.isArray(this.columnSelectOptions[optionsKey])) {
return this.columnSelectOptions[optionsKey]
if (this.isAddDictSelectField(field)) {
const dictType = String((field && field.dictType) || '').trim()
if (!dictType) {
return []
}
return this.addDictSelectOptionsMap[dictType] || []
}
return []
},
isAddDictSelectField (field) {
const editorType = String((field && field.editorType) || '').trim().toLowerCase()
return editorType === 'dict-select' || editorType === 'dict_select'
},
isAddSelectField (field) {
return this.getAddFieldSelectOptions(field).length > 0
return this.isAddDictSelectField(field) || this.getAddFieldSelectOptions(field).length > 0
},
isAddFilterableSelectField (field) {
return ADD_FILTERABLE_SELECT_FIELD_CODES.has(this.getAddFieldCode(field))
@ -2317,6 +2429,53 @@ export default {
this.dictSelectOptionsMap = nextMap
})
},
preloadAddDictSelectOptions (schemaFields) {
const site = this.searchData.site || this.$store.state.user.site
if (!site || !Array.isArray(schemaFields) || schemaFields.length === 0) {
this.addDictSelectOptionsMap = {}
return Promise.resolve()
}
const dictTypeSet = new Set()
schemaFields.forEach(field => {
if (!this.isAddDictSelectField(field)) {
return
}
const dictType = String((field && field.dictType) || '').trim()
if (dictType) {
dictTypeSet.add(dictType)
}
})
const dictTypes = Array.from(dictTypeSet)
if (dictTypes.length === 0) {
this.addDictSelectOptionsMap = {}
return Promise.resolve()
}
const nextMap = {}
const loaders = dictTypes.map(dictType => {
return selectDictDataList({
site,
dictType,
dictTypeList: [],
status: 'Y'
}).then(({ data }) => {
if (data && data.code === 0) {
nextMap[dictType] = (data.rows || []).map(item => ({
label: item.dictLabel || item.dictValue,
value: item.dictValue
}))
} else {
nextMap[dictType] = []
this.$message.error((data && data.msg) || `字典加载失败: ${dictType}`)
}
}).catch(() => {
nextMap[dictType] = []
this.$message.error(`字典加载失败: ${dictType}`)
})
})
return Promise.all(loaders).then(() => {
this.addDictSelectOptionsMap = nextMap
})
},
buildQueryRequest() {
return buildPoOrderQueryParams({
@ -2331,6 +2490,7 @@ export default {
this.searchData.customer = customer
this.selectedCustomerScope = customerOption || null
this.dictSelectOptionsMap = {}
this.advancedQueryData.rows = []
this.getBuyerOptions(customer)
this.pageIndex = 1
this.masterRows = []
@ -2339,6 +2499,7 @@ export default {
if (!customer) {
this.selectedCustomerScope = null
this.fieldSchemaFields = []
this.advancedQueryData.rows = []
this.poBuyerOptions = []
this.columnSelectOptions.poBuyerOptions = []
this.refreshTableLayout()
@ -2363,12 +2524,14 @@ export default {
return this.preloadDictSelectOptions(this.fieldSchemaFields)
} else {
this.fieldSchemaFields = []
this.advancedQueryData.rows = []
this.$message.error((data && data.msg) || '加载字段权限失败')
}
}).then(() => {
this.refreshTableLayout()
}).catch(() => {
this.fieldSchemaFields = []
this.advancedQueryData.rows = []
this.$message.error('加载字段权限失败')
this.refreshTableLayout()
})
@ -3248,6 +3411,9 @@ export default {
this.$message.warning('请选择customer')
return
}
if (this.addDialogSchemaLoading) {
return
}
if (this.addPriceLookupTimer) {
clearTimeout(this.addPriceLookupTimer)
this.addPriceLookupTimer = null
@ -3255,14 +3421,25 @@ export default {
this.addPriceLookupSeq += 1
this.addForm = this.createEmptyAddForm(this.resolveAddOrderTypeByCustomer())
this.addForm.customer = this.searchData.customer
this.addFormSchemaFields = []
this.addDictSelectOptionsMap = {}
this.addDetailRows = []
this.addDetailCurrentDraftId = ''
this.addDetailDialogMode = 'create'
this.addDetailDialogVisible = false
this.addDetailEditingDraftId = ''
this.addDetailForm = this.createEmptyAddDetailForm()
this.addDialogVisible = true
this.loadAddFieldSchema(this.searchData.customer)
this.addDetailForm = this.createEmptyAddForm(this.addForm.orderType || this.resolveAddOrderTypeByCustomer())
this.addDialogVisible = false
this.addDialogSchemaLoading = true
this.loadAddFieldSchema(this.searchData.customer).then(success => {
if (!success) {
return
}
this.addDetailForm = this.createEmptyAddDetailForm()
this.addDialogVisible = true
}).finally(() => {
this.addDialogSchemaLoading = false
})
if (!this.poPartNoOptions.length) {
this.getPartNoOptions()
}
@ -3281,12 +3458,18 @@ export default {
if (data && data.code === 0 && data.data) {
this.addFormSchemaFields = data.data.fields || []
this.applyAddDefaultDateBySchema()
this.addDetailForm = this.createEmptyAddDetailForm()
return this.preloadAddDictSelectOptions(this.addFormSchemaFields).then(() => true)
} else {
this.addFormSchemaFields = []
this.addDictSelectOptionsMap = {}
this.$message.error((data && data.msg) || '加载新增字段权限失败')
return false
}
}).catch(() => {
this.addFormSchemaFields = []
this.addDictSelectOptionsMap = {}
this.$message.error('加载新增字段权限失败')
return false
})
},
@ -3422,6 +3605,7 @@ export default {
buildAddDetailRowFromForm () {
const row = this.cloneAddDraftRow(this.addDetailForm)
this.removeAddMasterFieldValuesFromDetailRow(row)
if (!row._draftId) {
this.addDetailDraftSeq += 1
row._draftId = `DRAFT_${Date.now()}_${this.addDetailDraftSeq}`
@ -3430,6 +3614,21 @@ export default {
return row
},
removeAddMasterFieldValuesFromDetailRow (row) {
if (!row || typeof row !== 'object') {
return
}
this.addMasterBaseFields.forEach(field => {
const prop = this.getAddFieldProp(field)
if (!prop) {
return
}
if (Object.prototype.hasOwnProperty.call(row, prop)) {
delete row[prop]
}
})
},
getSelectedAddDetailRow () {
if (!this.addDetailCurrentDraftId) {
return null
@ -3759,19 +3958,11 @@ export default {
<style scoped lang="scss">
.po-add-form-wrap {
max-height: calc(100vh - 210px);
overflow-y: scroll;
overflow-y: auto;
overflow-x: hidden;
padding: 0 12px 8px;
}
/* 预留滚动槽位,避免滚动条出现/消失导致表单宽度抖动 */
@supports (scrollbar-gutter: stable) {
.po-add-form-wrap {
overflow-y: auto;
scrollbar-gutter: stable both-edges;
}
}
/* 防止滚动条切换时标签换行,进一步降低布局抖动 */
.po-add-form-wrap /deep/ .el-form--label-top .el-form-item__label {
white-space: nowrap;

45
src/views/modules/order/poOrderAdvancedQueryHelper.js

@ -1,16 +1,45 @@
import { PO_ADVANCED_QUERY_FIELD_CONFIG } from './poOrderAdvancedQueryConfig.js'
function normalizeOperatorSet (operatorSet) {
if (!Array.isArray(operatorSet)) {
return []
}
return operatorSet
.map(item => String(item || '').trim().toLowerCase())
.filter(Boolean)
}
function getCandidateOperatorsByDataType (dataType) {
return dataType === 'string'
? ['contains', 'eq', 'gt', 'lt', 'gte', 'lte']
: ['eq', 'gt', 'lt', 'gte', 'lte']
}
function resolveDefaultOperator (dataType, operatorSet) {
const candidates = getCandidateOperatorsByDataType(dataType)
const normalizedSet = normalizeOperatorSet(operatorSet)
if (!normalizedSet.length) {
return dataType === 'string' ? 'contains' : 'eq'
}
const matched = candidates.find(op => normalizedSet.includes(op))
if (matched) {
return matched
}
return normalizedSet[0]
}
/** 从 fieldSchema 构建高级查询行 */
export function createAdvancedQueryDataFromSchema (schemaFields) {
if (!Array.isArray(schemaFields) || schemaFields.length === 0) {
return createAdvancedQueryData()
if (!Array.isArray(schemaFields)) {
return { rows: [] }
}
return {
rows: schemaFields.map(item => ({
field: item.field,
label: item.label,
dataType: item.dataType,
operator: item.dataType === 'string' ? 'contains' : 'eq',
operatorSet: normalizeOperatorSet(item.operatorSet),
operator: resolveDefaultOperator(item.dataType, item.operatorSet),
value: ''
}))
}
@ -26,7 +55,8 @@ export function createAdvancedQueryData () {
label: item.label,
dataType: item.dataType,
sqlColumn: item.sqlColumn,
operator: item.dataType === 'string' ? 'contains' : 'eq',
operatorSet: [],
operator: resolveDefaultOperator(item.dataType, []),
value: ''
}))
}
@ -38,12 +68,13 @@ export function resetAdvancedQueryData (advancedQueryData) {
return
}
if (!Array.isArray(advancedQueryData.rows) || advancedQueryData.rows.length === 0) {
advancedQueryData.rows = createAdvancedQueryData().rows
advancedQueryData.rows = []
return
}
advancedQueryData.rows = advancedQueryData.rows.map(row => ({
...row,
operator: row && row.dataType === 'string' ? 'contains' : 'eq',
operatorSet: normalizeOperatorSet(row && row.operatorSet),
operator: resolveDefaultOperator(row && row.dataType, row && row.operatorSet),
value: ''
}))
}
@ -57,7 +88,7 @@ export function getActiveAdvancedConditions (advancedQueryData) {
.filter(r => r.value != null && String(r.value).trim() !== '')
.map(r => ({
field: r.field,
operator: r.operator,
operator: r.operator || resolveDefaultOperator(r && r.dataType, r && r.operatorSet),
value: String(r.value).trim()
}))
}

17
src/views/modules/order/poOrderStatusOptions.js

@ -57,26 +57,27 @@ export function canIssuePoOrder (status) {
/**
* 打开时根据验货数量推算恢复状态(与后端 PoDetailStatusSupport 规则一致)
* 说明:
* - 验货完成以 inspectQty(检验数量)是否达到 qty 为准;
* - inspectApproveQty 继续用于记录“验货成功数量”。
*/
export function resolvePoOrderStatusByInspectQty (row) {
const toInspect = Number(row.toInspectQty != null ? row.toInspectQty : 0)
const inspected = Number(row.inspectQty != null ? row.inspectQty : 0)
const approve = Number(row.inspectApproveQty != null ? row.inspectApproveQty : (row.inspectionCompletedQty != null ? row.inspectionCompletedQty : 0))
const qty = Number(row.qty != null ? row.qty : 0)
if (toInspect === 0) {
return '已下达'
}
if (toInspect > 0 && approve === 0) {
return '待验货'
}
if (qty > 0 && approve === qty) {
if (qty > 0 && inspected >= qty) {
return '验货完成'
}
if (approve > 0 && (qty === 0 || approve < qty)) {
return '验货中'
if (toInspect > 0 && inspected === 0 && approve === 0) {
return '待验货'
}
if (approve > 0 && qty > 0 && approve >= qty) {
return '验货完成'
if (inspected > 0 || approve > 0) {
return '验货中'
}
return '待验货'
}

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

@ -612,12 +612,15 @@ export default {
onSessionCustomerChange (customer) {
this.searchData.customer = customer
this.advancedQueryData.rows = []
this.pageIndex = 1
this.dataList = []
this.totalPage = 0
this.currentRow = {}
this.clearDetailTabs()
if (!customer) {
this.fieldSchemaFields = []
this.advancedQueryData.rows = []
this.refreshTableLayout()
return
}
@ -638,11 +641,13 @@ export default {
this.advancedQueryData.rows = createAdvancedQueryDataFromSchema(queryFields).rows
} else {
this.fieldSchemaFields = []
this.advancedQueryData.rows = []
this.$message.error((data && data.msg) || '加载字段权限失败')
}
this.refreshTableLayout()
}).catch(() => {
this.fieldSchemaFields = []
this.advancedQueryData.rows = []
this.$message.error('加载字段权限失败')
this.refreshTableLayout()
})
@ -664,6 +669,7 @@ export default {
})
} else {
this.currentRow = {}
this.clearDetailTabs()
}
} else {
this.$message.error((data && data.msg) || '获取列表失败')
@ -676,6 +682,7 @@ export default {
this.dataList = []
this.totalPage = 0
this.currentRow = {}
this.clearDetailTabs()
this.refreshTableLayout()
return
}
@ -741,6 +748,10 @@ export default {
},
// 导出
exportExcel () {
if (!this.searchData.customer) {
this.$message.warning('请先选择 Customer')
return
}
const now = new Date()
const year = now.getFullYear()
const month = String(now.getMonth() + 1).padStart(2, '0')
@ -792,14 +803,20 @@ export default {
// 行点击事件(模仿 supplierList.vue 的 changeData 模式)
changeData(row) {
if (!row) {
this.currentRow = {}
this.clearDetailTabs()
return
}
this.currentRow = JSON.parse(JSON.stringify(row))
this.refreshCurrentTabTable()
},
// 刷新当前页签的表格数据(模仿 supplierList.vue 的 refreshCurrentTabTable)
refreshCurrentTabTable() {
if (this.currentRow === '' || this.currentRow === null) {
this.currentRow = { flexid: '', supplierNo: '' }
if (!this.hasCurrentRowData()) {
this.clearDetailTabs()
return
}
if (this.activeTab === 'orderDetail') {
// 订单详情不需要刷新,直接显示 currentRow
@ -814,29 +831,76 @@ export default {
this.refreshPartAttribute()
}
},
getDetailTabHeight () {
return Number(this.height) - 20
},
hasCurrentRowData () {
return !!(this.currentRow && typeof this.currentRow === 'object' && Object.keys(this.currentRow).length > 0)
},
clearDetailTabs () {
const site = this.searchData.site || this.$store.state.user.site
const height = this.getDetailTabHeight()
if (this.$refs.logisticsPoList && this.$refs.logisticsPoList.init) {
this.$refs.logisticsPoList.init({
flexId: '',
supplierNo: '',
site,
height
})
}
if (this.$refs.inspectionDetailList && this.$refs.inspectionDetailList.init) {
this.$refs.inspectionDetailList.init({
site,
orderNo: '',
itemNo: null,
height
})
}
if (this.$refs.partAttributeTab && this.$refs.partAttributeTab.init) {
this.$refs.partAttributeTab.init({
site,
partNo: '',
codeNo: '',
functionType: 'P',
height
})
}
},
// 刷新物流页签表格(模仿 supplierList.vue 的 refreshShareTable)
refreshLogisticsTable() {
if (!this.hasCurrentRowData()) {
this.clearDetailTabs()
return
}
let inData = {
flexId: this.currentRow.flexid,
supplierNo: this.currentRow.supplierNo,
site: this.$store.state.user.site,
height: Number(this.height) - 20
height: this.getDetailTabHeight()
}
this.$refs.logisticsPoList.init(inData)
},
// 刷新验货明细页签表格
refreshInspectionTable() {
if (!this.hasCurrentRowData()) {
this.clearDetailTabs()
return
}
let inData = {
site: this.$store.state.user.site,
orderNo: this.currentRow.orderNo || '',
itemNo: this.currentRow.itemNo || null,
height: Number(this.height) - 20
height: this.getDetailTabHeight()
}
this.$refs.inspectionDetailList.init(inData)
},
refreshPartAttribute () {
if (!this.hasCurrentRowData()) {
this.clearDetailTabs()
return
}
const site = this.currentRow.site || this.$store.state.user.site
const partNo = this.currentRow.partNo || ''
const inData = {
@ -844,7 +908,7 @@ export default {
partNo,
codeNo: this.currentRow.codeNo || '',
functionType: 'P',
height: Number(this.height) - 20
height: this.getDetailTabHeight()
}
if (!partNo) {
this.initPartAttributeTab(inData)

26
src/views/modules/port/portTransit.vue

@ -242,13 +242,13 @@ export default {
uploadFile: null,
uploadPreviewList: [],
columnList: [
{ columnProp: 'departure', headerAlign: 'center', align: 'left', columnLabel: '始发港ID', columnWidth: 120, fixed: '', columnHidden: false, columnSortable: false },
{ columnProp: 'departureName', headerAlign: 'center', align: 'left', columnLabel: '始发港', columnWidth: 150, fixed: '', columnHidden: false, columnSortable: false },
{ columnProp: 'destination', headerAlign: 'center', align: 'left', columnLabel: '目的港口ID', columnWidth: 120, fixed: '', columnHidden: false, columnSortable: false },
{ columnProp: 'destinationName', headerAlign: 'center', align: 'left', columnLabel: '目的港口名称', columnWidth: 150, fixed: '', columnHidden: false, columnSortable: false },
{ columnProp: 'luyun', headerAlign: 'center', align: 'center', columnLabel: '陆运周期', columnWidth: 100, fixed: '', columnHidden: false, columnSortable: true },
{ columnProp: 'haiyun', headerAlign: 'center', align: 'center', columnLabel: '海运周期', columnWidth: 100, fixed: '', columnHidden: false, columnSortable: true },
{ columnProp: 'kongyun', headerAlign: 'center', align: 'center', columnLabel: '空运周期', columnWidth: 100, fixed: '', columnHidden: false, columnSortable: true }
{ columnProp: 'departure', headerAlign: 'center', align: 'left', columnLabel: '始发港ID', columnWidth: 120, fixed: '', columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'departureName', headerAlign: 'center', align: 'left', columnLabel: '始发港', columnWidth: 150, fixed: '', columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'destination', headerAlign: 'center', align: 'left', columnLabel: '目的港口ID', columnWidth: 120, fixed: '', columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'destinationName', headerAlign: 'center', align: 'left', columnLabel: '目的港口名称', columnWidth: 150, fixed: '', columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'luyun', headerAlign: 'center', align: 'center', columnLabel: '陆运周期', columnWidth: 100, fixed: '', columnHidden: false, columnSortable: true, showOverflowTooltip: true },
{ columnProp: 'haiyun', headerAlign: 'center', align: 'center', columnLabel: '海运周期', columnWidth: 100, fixed: '', columnHidden: false, columnSortable: true, showOverflowTooltip: true },
{ columnProp: 'kongyun', headerAlign: 'center', align: 'center', columnLabel: '空运周期', columnWidth: 100, fixed: '', columnHidden: false, columnSortable: true, showOverflowTooltip: true }
]
}
},
@ -541,7 +541,17 @@ export default {
justify-content: center;
padding: 0;
height: 100%;
overflow: visible; /* 允许边框溢出 */
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
::v-deep .el-table td .cell > span {
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
/* 输入框样式 */

36
src/views/modules/sys/user.vue

@ -1308,8 +1308,9 @@ export default {
},
// 岗位
businessRoleAuthorize () {
const currentSite = this.$store.state.user.site
this.businessRoleData = {
site: '',
site: currentSite,
roleNo: '',
roleDesc: '',
active: '',
@ -1317,7 +1318,11 @@ export default {
}
this.businessRoleSelections1 = null
this.businessRoleSelections2 = null
getBusinessRoleList(this.selectUser).then(({data}) => {
const roleQuery = {
username: this.selectUser.username,
site: currentSite
}
getBusinessRoleList(roleQuery).then(({data}) => {
this.businessRoleList1 = data.row1
this.businessRoleList2 = data.row2
})
@ -1328,6 +1333,7 @@ export default {
*/
getBusinessRole () {
this.businessRoleData.username = this.selectUser.username
this.businessRoleData.site = this.$store.state.user.site
getBusinessRole(this.businessRoleData).then(({data}) => {
if (data.code === 0) {
this.businessRoleList1 = data.rows
@ -1354,13 +1360,22 @@ export default {
this.$message.warning('请选择可选角色!')
return
}
const currentSite = this.$store.state.user.site
let inData = {
site: currentSite,
username: this.selectUser.username,
businessRoleList: this.businessRoleSelections1
businessRoleList: this.businessRoleSelections1.map(item => ({
roleNo: item.roleNo,
roleDesc: item.roleDesc,
site: currentSite
}))
}
addUserBusinessRole(inData).then(({data}) => {
if (data && data.code === 0) {
getBusinessRoleList(this.selectUser).then(({data}) => {
getBusinessRoleList({
username: this.selectUser.username,
site: currentSite
}).then(({data}) => {
this.businessRoleList1 = data.row1
this.businessRoleList2 = data.row2
})
@ -1378,13 +1393,22 @@ export default {
this.$message.warning('请选择已有角色!')
return
}
const currentSite = this.$store.state.user.site
let inData = {
site: currentSite,
username: this.selectUser.username,
businessRoleList: this.businessRoleSelections2
businessRoleList: this.businessRoleSelections2.map(item => ({
roleNo: item.roleNo,
roleDesc: item.roleDesc,
site: currentSite
}))
}
delUserBusinessRole(inData).then(({data}) => {
if (data && data.code === 0) {
getBusinessRoleList(this.selectUser).then(({data}) => {
getBusinessRoleList({
username: this.selectUser.username,
site: currentSite
}).then(({data}) => {
this.businessRoleList1 = data.row1
this.businessRoleList2 = data.row2
})

Loading…
Cancel
Save