Browse Source

订单必填选项放开,新品流程采购自动审核,页面显示修改

master
qiankanghui 2 days ago
parent
commit
da349c91e7
  1. 4
      src/views/modules/order/com_poCustomer_FieldAuth.vue
  2. 4
      src/views/modules/order/poOrder.vue
  3. 45
      src/views/modules/srmPart/partInfoList.vue
  4. 56
      src/views/modules/supplier/supplierPartMoqPrice.vue
  5. 71
      src/views/modules/supplier/supplierPartNewProductAudit.vue

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

@ -37,7 +37,7 @@
</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 }">
<!-- 必填对标准/扩展字段均可维护;必录字段锁定为必填不可取消;只读或字段不可见时禁用 -->
<!-- 必填对标准/扩展字段均可维护;必录字段锁定为必填不可取消;只读或字段不可见时禁用(ship_via 已移出必录名单,可自由勾选) -->
<el-checkbox <el-checkbox
v-model="row.requiredFlag" v-model="row.requiredFlag"
true-label="Y" true-label="Y"
@ -55,7 +55,7 @@ import { listPoCustomerFieldAuth, savePoCustomerFieldAuth } from '@/api/order/po
// 系统级必录字段:默认必填且不允许取消(与后端 PoFieldAuthSupport.FORCE_REQUIRED_FIELD_CODES 保持一致) // 系统级必录字段:默认必填且不允许取消(与后端 PoFieldAuthSupport.FORCE_REQUIRED_FIELD_CODES 保持一致)
const FORCE_REQUIRED_FIELD_CODES = [ const FORCE_REQUIRED_FIELD_CODES = [
'po_no', 'buyer', 'supplier_name', 'destination', 'ship_via', 'order_date',
'po_no', 'buyer', 'supplier_name', 'destination', 'order_date',
'enquiry', 'part_no', 'qty', 'want_receive_date', 'price' 'enquiry', 'part_no', 'qty', 'want_receive_date', 'price'
] ]

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

@ -1091,8 +1091,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'])
// po_place_date、enquiry(D_Enquiry)在新增表单默认带出录入当天日期,仍可手动修改
const ADD_EDITABLE_DEFAULT_TODAY_FIELD_CODES = new Set(['po_place_date', 'enquiry'])
// po_place_date、enquiry(D_Enquiry)、order_date(D_Issue)在新增表单默认带出录入当天日期,仍可手动修改
const ADD_EDITABLE_DEFAULT_TODAY_FIELD_CODES = new Set(['po_place_date', 'enquiry', 'order_date'])
const ADD_SELECT_OPTIONS_FIELD_CODE_MAP = { const ADD_SELECT_OPTIONS_FIELD_CODE_MAP = {
order_type: 'poOrderTypeOptions', order_type: 'poOrderTypeOptions',
customer: 'poCustomerOptions', customer: 'poCustomerOptions',

45
src/views/modules/srmPart/partInfoList.vue

@ -282,7 +282,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="产品规格" prop="partSpec"> <el-form-item label="产品规格" prop="partSpec">
<el-input v-model="currentpart.partSpec" placeholder="无产品规格请填写N/A"></el-input>
<el-input v-model="currentpart.partSpec" placeholder="无产品规格请保持N/A"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -303,9 +303,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item prop="codeNo">
<span style="cursor: pointer" slot="label" @click="getBaseList(527)"><a href="#">属性模板</a></span>
<el-input v-model="currentpart.codeNo" ></el-input>
<el-form-item label="属性模板" prop="codeNo">
<el-select v-model="currentpart.codeNo" clearable filterable placeholder="请选择" style="width: 100%">
<el-option v-for="code in codeNoOptions" :key="code" :label="code" :value="code" />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -471,6 +472,7 @@ import { listPoCurrentTierPrice } from '@/api/order/poOrder'
import { startNewProductAudit } from '@/api/supplier/supplierPartNewProductAudit' import { startNewProductAudit } from '@/api/supplier/supplierPartNewProductAudit'
import excel from '@/utils/excel-util.js' import excel from '@/utils/excel-util.js'
import { fetchSupplierDetail, resolveSupplierShortFieldsFromDetail } from '@/utils/supplierChooselistHelper' import { fetchSupplierDetail, resolveSupplierShortFieldsFromDetail } from '@/utils/supplierChooselistHelper'
import { getChooselistEam, getChooselistDataEam } from '@/api/chooselist/chooselist.js'
import Chooselist from '@/views/modules/common/Chooselist_eam' import Chooselist from '@/views/modules/common/Chooselist_eam'
import basicInfo from './com_part_BasicInfo' import basicInfo from './com_part_BasicInfo'
import specParams from './com_part_SpecParams' import specParams from './com_part_SpecParams'
@ -515,7 +517,7 @@ export default {
this.currentpart.categoryLevel2 = (this.currentpart.categoryLevel2 || '').toUpperCase() this.currentpart.categoryLevel2 = (this.currentpart.categoryLevel2 || '').toUpperCase()
this.currentpart.categoryLevel3 = (this.currentpart.categoryLevel3 || '').toUpperCase() this.currentpart.categoryLevel3 = (this.currentpart.categoryLevel3 || '').toUpperCase()
this.currentpart.unit = this.currentpart.unit.toUpperCase() this.currentpart.unit = this.currentpart.unit.toUpperCase()
this.currentpart.codeNo = this.currentpart.codeNo.toUpperCase()
this.currentpart.codeNo = (this.currentpart.codeNo || '').toUpperCase()
this.currentpart.partDesc = this.currentpart.partDesc.toUpperCase() this.currentpart.partDesc = this.currentpart.partDesc.toUpperCase()
this.currentpart.partSpec = this.currentpart.partSpec.toUpperCase() this.currentpart.partSpec = this.currentpart.partSpec.toUpperCase()
this.currentpart.basePartNo = (this.currentpart.basePartNo || '').toUpperCase() this.currentpart.basePartNo = (this.currentpart.basePartNo || '').toUpperCase()
@ -566,6 +568,8 @@ export default {
categoryLevel1Options: [], categoryLevel1Options: [],
categoryLevel2Options: [], categoryLevel2Options: [],
categoryLevel3Options: [], categoryLevel3Options: [],
// 属性模板下拉选项(来源与 Chooselist 527 同一数据源)
codeNoOptions: [],
tagNo: '', tagNo: '',
mainDataList: [], mainDataList: [],
dataListLoading: false, dataListLoading: false,
@ -1018,9 +1022,6 @@ export default {
site: this.$store.state.user.site, site: this.$store.state.user.site,
}, },
partRules: { partRules: {
partDesc: [
{ required: true, message: ' ', trigger: 'blur' }
],
partSpec: [ partSpec: [
{ required: true, message: ' ', trigger: 'blur' } { required: true, message: ' ', trigger: 'blur' }
], ],
@ -1098,6 +1099,7 @@ export default {
mounted () { mounted () {
this.handleResize() this.handleResize()
window.addEventListener('resize', this.handleResize) window.addEventListener('resize', this.handleResize)
this.loadCodeNoOptions()
}, },
beforeDestroy () { beforeDestroy () {
@ -1594,6 +1596,31 @@ export default {
}) })
}) })
}, },
// 加载属性模板下拉选项:复用 Chooselist 527 的配置数据源,按当前站点过滤取全量 code_no
loadCodeNoOptions () {
const currentSite = (this.$store.state.user.site || '').trim()
getChooselistEam({ tagNo: 527 }).then(({ data }) => {
const config = data && data.data
if (!config || !config.sqlcode) {
this.codeNoOptions = []
return
}
let sql = config.sqlcode
if (currentSite) {
sql += " and site = '" + currentSite + "' "
}
getChooselistDataEam({ sqlcode: sql }).then(({ data: res }) => {
if (res.code === 0) {
const rows = res.baseListData || []
const codes = rows.map(r => r.code_no).filter(v => v !== null && v !== undefined && v !== '')
this.codeNoOptions = Array.from(new Set(codes))
} else {
this.codeNoOptions = []
}
})
})
},
getBaseList (val, type, scene) { getBaseList (val, type, scene) {
this.tagNo = val this.tagNo = val
this.basePickScene = scene || '' this.basePickScene = scene || ''
@ -1860,7 +1887,7 @@ export default {
partSuffix: '', partSuffix: '',
npc: '', npc: '',
partDesc: '', partDesc: '',
partSpec: '',
partSpec: 'N/A',
sku: '', sku: '',
item: '', item: '',
defaultSupplierNo: '', defaultSupplierNo: '',

56
src/views/modules/supplier/supplierPartMoqPrice.vue

@ -2,24 +2,15 @@
<div ref="pageRoot" class="customer-css supplier-part-moq-price"> <div ref="pageRoot" class="customer-css supplier-part-moq-price">
<el-form :inline="true" label-position="top" class="pi-search-form"> <el-form :inline="true" label-position="top" class="pi-search-form">
<el-form-item> <el-form-item>
<span slot="label" style="" @click="getBaseList(520, 'search')"><a href="javascript:void(0)">供应商编号</a></span>
<span slot="label" style="" @click="getBaseList(520, 'search')"><a href="javascript:void(0)">供应商简称</a></span>
<el-input <el-input
v-model="searchData.supplierNo"
placeholder="选择或输入编号"
v-model="searchData.supplierShortName"
placeholder="选择或输入供应商简称"
style="width: 180px" style="width: 180px"
clearable clearable
@keyup.enter.native="searchSupplierPartList" @keyup.enter.native="searchSupplierPartList"
/> />
</el-form-item> </el-form-item>
<el-form-item label="产品编码">
<el-input
v-model="searchData.partNo"
placeholder="产品编码"
style="width: 160px"
clearable
@keyup.enter.native="searchSupplierPartList"
/>
</el-form-item>
<el-form-item label="Item"> <el-form-item label="Item">
<el-input <el-input
v-model="searchData.item" v-model="searchData.item"
@ -38,15 +29,6 @@
@keyup.enter.native="searchSupplierPartList" @keyup.enter.native="searchSupplierPartList"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料名称">
<el-input
v-model="searchData.partDesc"
placeholder="物料名称"
style="width: 180px"
clearable
@keyup.enter.native="searchSupplierPartList"
/>
</el-form-item>
<el-form-item label="是否在用"> <el-form-item label="是否在用">
<el-select v-model="searchData.active" style="width: 120px" clearable> <el-select v-model="searchData.active" style="width: 120px" clearable>
<el-option label="在用" value="Y" /> <el-option label="在用" value="Y" />
@ -81,12 +63,12 @@
<el-table-column prop="supplierCode" label="供应商编号" min-width="120" header-align="center" align="center" /> <el-table-column prop="supplierCode" label="供应商编号" min-width="120" header-align="center" align="center" />
<el-table-column prop="supplierName" label="供应商名称" min-width="180" header-align="center" align="left" show-overflow-tooltip /> <el-table-column prop="supplierName" label="供应商名称" min-width="180" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="supplierShortName" label="供应商简称" min-width="120" header-align="center" align="left" show-overflow-tooltip /> <el-table-column prop="supplierShortName" label="供应商简称" min-width="120" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="currency" label="币种" min-width="90" header-align="center" align="center" />
<!-- <el-table-column prop="currency" label="币种" min-width="90" header-align="center" align="center" />-->
<!-- <el-table-column prop="currencyDesc" label="币种描述" min-width="110" header-align="center" align="center" show-overflow-tooltip />--> <!-- <el-table-column prop="currencyDesc" label="币种描述" min-width="110" header-align="center" align="center" show-overflow-tooltip />-->
<el-table-column prop="partNo" label="产品编码" min-width="140" header-align="center" align="center" />
<!-- <el-table-column prop="partNo" label="产品编码" min-width="140" header-align="center" align="center" />-->
<el-table-column prop="item" label="Item" min-width="120" header-align="center" align="center" show-overflow-tooltip /> <el-table-column prop="item" label="Item" min-width="120" header-align="center" align="center" show-overflow-tooltip />
<el-table-column prop="sku" label="SKU" min-width="120" header-align="center" align="center" show-overflow-tooltip /> <el-table-column prop="sku" label="SKU" min-width="120" header-align="center" align="center" show-overflow-tooltip />
<el-table-column prop="partDesc" label="物料名称" min-width="200" header-align="center" align="left" show-overflow-tooltip />
<!-- <el-table-column prop="partDesc" label="物料名称" min-width="200" header-align="center" align="left" show-overflow-tooltip />-->
<el-table-column prop="moqColor" label="MOQ/COLOR" min-width="120" header-align="center" align="right" :formatter="formatNumberCell" /> <el-table-column prop="moqColor" label="MOQ/COLOR" min-width="120" header-align="center" align="right" :formatter="formatNumberCell" />
<el-table-column prop="moq" label="QTY/PO" min-width="110" header-align="center" align="right" :formatter="formatNumberCell" /> <el-table-column prop="moq" label="QTY/PO" min-width="110" header-align="center" align="right" :formatter="formatNumberCell" />
<el-table-column prop="qtyCarton" label="QTY/CARTON" min-width="120" header-align="center" align="right" :formatter="formatNumberCell" /> <el-table-column prop="qtyCarton" label="QTY/CARTON" min-width="120" header-align="center" align="right" :formatter="formatNumberCell" />
@ -587,6 +569,7 @@ import {
ossUploadNoSaveOSSForYJY, ossUploadNoSaveOSSForYJY,
downLoadObjectFile downLoadObjectFile
} from '@/api/oss/oss' } from '@/api/oss/oss'
import { fetchSupplierDetail, resolveSupplierShortFieldsFromDetail } from '@/utils/supplierChooselistHelper'
export default { export default {
name: 'SupplierPartMoqPrice', name: 'SupplierPartMoqPrice',
@ -602,6 +585,7 @@ export default {
searchData: { searchData: {
site: this.$store.state.user.site, site: this.$store.state.user.site,
supplierNo: '', supplierNo: '',
supplierShortName: '',
partNo: '', partNo: '',
item: '', item: '',
sku: '', sku: '',
@ -748,7 +732,19 @@ export default {
}, },
getBaseData (val) { getBaseData (val) {
if (this.tagNo === 520 && this.tagType === 'search') { if (this.tagNo === 520 && this.tagType === 'search') {
this.searchData.supplierNo = val.supplier_no || ''
// 选择后输入框展示供应商简称(Chooselist 520 不返回简称,需回查主数据);无简称时回退编码;
// 同时保留 supplierNo 作为真实编码供新增预填,查询按 supplierShortName 下发(后端按简称模糊匹配)- rqrq
const code = val.supplier_no || ''
this.searchData.supplierNo = code
this.searchData.supplierShortName = code
if (code) {
fetchSupplierDetail(code, this.$store.state.user.site).then(detail => {
const { shortNpc } = resolveSupplierShortFieldsFromDetail(detail)
if (shortNpc && this.searchData.supplierNo === code) {
this.searchData.supplierShortName = shortNpc
}
})
}
} }
if (this.tagNo === 520 && this.tagType === 'add') { if (this.tagNo === 520 && this.tagType === 'add') {
this.addForm.supplierCode = val.supplier_no || '' this.addForm.supplierCode = val.supplier_no || ''
@ -765,6 +761,7 @@ export default {
this.searchData = { this.searchData = {
site: this.$store.state.user.site, site: this.$store.state.user.site,
supplierNo: '', supplierNo: '',
supplierShortName: '',
partNo: '', partNo: '',
item: '', item: '',
sku: '', sku: '',
@ -784,7 +781,7 @@ export default {
this.topLoading = true this.topLoading = true
const inData = { const inData = {
site: this.$store.state.user.site, site: this.$store.state.user.site,
supplierCode: (this.searchData.supplierNo || '').trim(),
supplierCode: (this.searchData.supplierShortName || '').trim(),
partNo: (this.searchData.partNo || '').trim(), partNo: (this.searchData.partNo || '').trim(),
item: (this.searchData.item || '').trim(), item: (this.searchData.item || '').trim(),
sku: (this.searchData.sku || '').trim(), sku: (this.searchData.sku || '').trim(),
@ -923,7 +920,12 @@ export default {
this.$message.success('新增成功') this.$message.success('新增成功')
this.searchData.supplierNo = inData.supplierCode this.searchData.supplierNo = inData.supplierCode
this.addDialogVisible = false this.addDialogVisible = false
this.searchSupplierPartList()
// 查询按供应商简称过滤,回填该编码对应简称后再刷新 - rqrq
fetchSupplierDetail(inData.supplierCode, this.$store.state.user.site).then(detail => {
const { shortNpc } = resolveSupplierShortFieldsFromDetail(detail)
this.searchData.supplierShortName = shortNpc || ''
this.searchSupplierPartList()
})
} else { } else {
this.$alert((data && data.msg) || '新增失败', '错误', { confirmButtonText: '确定' }) this.$alert((data && data.msg) || '新增失败', '错误', { confirmButtonText: '确定' })
} }

71
src/views/modules/supplier/supplierPartNewProductAudit.vue

@ -91,6 +91,14 @@
@click="searchSupplierPartList" @click="searchSupplierPartList"
>查询</el-button> >查询</el-button>
<el-button class="customer-bun-min" @click="resetSearch">重置</el-button> <el-button class="customer-bun-min" @click="resetSearch">重置</el-button>
<!-- 批量开始审核:勾选多行后一次性发起(仅“未发起”状态可选)- rqrq -->
<el-button
type="primary"
class="customer-bun-min"
:disabled="mainSelection.length === 0"
:loading="batchStarting"
@click="handleBatchStartAudit"
>批量开始审核</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -105,7 +113,9 @@
style="width: 100%" style="width: 100%"
empty-text="点击查询查看数据" empty-text="点击查询查看数据"
@row-click="handleMainRowClick" @row-click="handleMainRowClick"
@selection-change="handleMainSelectionChange"
> >
<el-table-column type="selection" width="45" fixed="left" header-align="center" align="center" :selectable="canRowStartAudit" />
<el-table-column fixed="right" label="操作" width="80" header-align="center" align="center"> <el-table-column fixed="right" label="操作" width="80" header-align="center" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link <el-link
@ -539,6 +549,9 @@ export default {
totalPage: 0, totalPage: 0,
supplierPartList: [], supplierPartList: [],
selectedSupplierPart: null, selectedSupplierPart: null,
// 批量开始审核:多选行与防重复点击状态 - rqrq
mainSelection: [],
batchStarting: false,
activeTab: 'audit', activeTab: 'audit',
auditRecordList: [], auditRecordList: [],
testRecordList: [], testRecordList: [],
@ -862,6 +875,64 @@ export default {
this.$message.error('开始审核失败') this.$message.error('开始审核失败')
}) })
}, },
handleMainSelectionChange (val) {
this.mainSelection = val || []
},
handleBatchStartAudit () {
// 仅对“未发起”状态行执行开始审核(与单选 canRowStartAudit 口径一致)- rqrq
const rows = (this.mainSelection || []).filter(r => this.canRowStartAudit(r))
if (rows.length === 0) {
this.$message.warning('请勾选需要开始审核的物料(仅“未发起”状态可开始)')
return
}
this.$confirm(`确认对选中的 ${rows.length} 条物料批量开始审核?`, '批量开始审核', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.batchStarting = true
let successCount = 0
const failDetails = []
// 串行逐行调用单行接口,避免并发压力- rqrq
const runNext = (idx) => {
if (idx >= rows.length) {
this.batchStarting = false
if (this.$refs.mainTable && this.$refs.mainTable.clearSelection) {
this.$refs.mainTable.clearSelection()
}
this.mainSelection = []
this.searchSupplierPartList()
if (failDetails.length === 0) {
this.$message.success(`批量开始审核完成,成功 ${successCount} 条`)
} else {
const detailMsg = failDetails.slice(0, 5).map(d => `${d.partNo}:${d.reason}`).join(';')
this.$message({
type: 'warning',
message: `成功 ${successCount} 条,失败 ${failDetails.length} 条。${detailMsg}${failDetails.length > 5 ? ' 等' : ''}`
})
}
return
}
const row = rows[idx]
startNewProductAudit({
site: row.site,
supplierCode: row.supplierCode,
partNo: row.partNo
}).then(({ data }) => {
if (data && data.code === 0) {
successCount++
} else {
failDetails.push({ partNo: row.partNo, reason: (data && data.msg) || '开始审核失败' })
}
}).catch(() => {
failDetails.push({ partNo: row.partNo, reason: '开始审核失败' })
}).finally(() => {
runNext(idx + 1)
})
}
runNext(0)
}).catch(() => {})
},
handleRestartAudit (row) { handleRestartAudit (row) {
if (!row) { if (!row) {
this.$message.warning('请先选择供应商可供物料') this.$message.warning('请先选择供应商可供物料')

Loading…
Cancel
Save