Browse Source

2026-06-12

RoHs优化
master
fengyuan_yang 2 days ago
parent
commit
421f6da5f1
  1. 2
      src/api/rohs/rohs.js
  2. 25
      src/views/modules/rohs/rohsRecord.vue

2
src/api/rohs/rohs.js

@ -6,7 +6,7 @@ export const getRohsList = params => createAPI(`/rohs/list`, 'get', params);
// 获取详情 // 获取详情
export const getRohsDetail = (site, referenceNo) => createAPI(`/rohs/info`, 'get', { site, referenceNo }); export const getRohsDetail = (site, referenceNo) => createAPI(`/rohs/info`, 'get', { site, referenceNo });
// 查询项目物料(用于RoHs材料明细选择)
// 查询物料(用于RoHs材料明细选择)
export const getRohsProjectMaterialList = params => createAPI(`/rohs/projectMaterialList`, 'get', params); export const getRohsProjectMaterialList = params => createAPI(`/rohs/projectMaterialList`, 'get', params);
// 新增 // 新增

25
src/views/modules/rohs/rohsRecord.vue

@ -593,7 +593,7 @@
</el-footer> </el-footer>
</el-dialog> </el-dialog>
<el-dialog title="选择项目物料" top="15vh" width="75%" :close-on-click-modal="false" v-drag :visible.sync="projectMaterialDialogFlag">
<el-dialog title="选择物料" top="15vh" width="50%" :close-on-click-modal="false" v-drag :visible.sync="projectMaterialDialogFlag">
<el-form :inline="true" label-position="top" :model="projectMaterialSearchData"> <el-form :inline="true" label-position="top" :model="projectMaterialSearchData">
<el-form-item label="IFS物料编码/Final Part No."> <el-form-item label="IFS物料编码/Final Part No.">
<el-input v-model="projectMaterialSearchData.finalPartNo" clearable style="width: 150px"></el-input> <el-input v-model="projectMaterialSearchData.finalPartNo" clearable style="width: 150px"></el-input>
@ -619,9 +619,9 @@
:height="320" :height="320"
style="width: 100%"> style="width: 100%">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="finalPartNo" label="IFS物料编码/Final Part No." min-width="150" header-align="center" align="left" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="finalPartNo" label="IFS物料编码/Final Part No." min-width="120" header-align="center" align="left" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="partDesc" label="描述/Part Desc." min-width="250" header-align="center" align="left" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="partDesc" label="描述/Part Desc." min-width="250" header-align="center" align="left" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="partStatus" label="状态/Part Status" min-width="100" header-align="center" align="left" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="partStatus" label="状态/Part Status" min-width="80" header-align="center" align="left" :show-overflow-tooltip="true"></el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
style="margin-top: 10px" style="margin-top: 10px"
@ -2842,31 +2842,16 @@ export default {
this.$message.warning('当前状态不允许编辑材料') this.$message.warning('当前状态不允许编辑材料')
return return
} }
if (!this.modalData.projectId) {
this.$message.warning('请先选择项目编码')
return
}
if (!this.modalData.endCustomer) {
this.$message.warning('请先选择最终客户')
return
}
this.projectMaterialDialogFlag = true this.projectMaterialDialogFlag = true
this.projectMaterialPageIndex = 1 this.projectMaterialPageIndex = 1
this.searchProjectMaterialList() this.searchProjectMaterialList()
}, },
searchProjectMaterialList () { searchProjectMaterialList () {
if (!this.modalData.projectId) {
this.projectMaterialList = []
this.projectMaterialTotal = 0
return
}
this.projectMaterialLoading = true this.projectMaterialLoading = true
const params = { const params = {
page: this.projectMaterialPageIndex, page: this.projectMaterialPageIndex,
limit: this.projectMaterialPageSize, limit: this.projectMaterialPageSize,
site: this.$store.state.user.site, site: this.$store.state.user.site,
projectId: this.modalData.projectId,
endCustomer: this.modalData.endCustomer,
partDesc: this.projectMaterialSearchData.partDesc, partDesc: this.projectMaterialSearchData.partDesc,
finalPartNo: this.projectMaterialSearchData.finalPartNo, finalPartNo: this.projectMaterialSearchData.finalPartNo,
partStatus: this.projectMaterialSearchData.partStatus partStatus: this.projectMaterialSearchData.partStatus
@ -2883,7 +2868,7 @@ export default {
} else { } else {
this.projectMaterialList = [] this.projectMaterialList = []
this.projectMaterialTotal = 0 this.projectMaterialTotal = 0
this.$message.error(data.msg || '项目物料查询失败')
this.$message.error(data.msg || '物料查询失败')
} }
this.projectMaterialLoading = false this.projectMaterialLoading = false
}).catch(() => { }).catch(() => {
@ -2910,7 +2895,7 @@ export default {
return return
} }
if (!this.projectMaterialSelections || this.projectMaterialSelections.length === 0) { if (!this.projectMaterialSelections || this.projectMaterialSelections.length === 0) {
this.$message.warning('请至少选择一条项目物料')
this.$message.warning('请至少选择一条物料')
return return
} }
const appendResult = this.appendMaterialRows(this.projectMaterialSelections) const appendResult = this.appendMaterialRows(this.projectMaterialSelections)

Loading…
Cancel
Save