bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui

This commit is contained in:
hongchao 2025-08-05 18:19:01 +08:00
parent 8aa5bbd678 d20808da3f
commit 1e9f623cfa
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/material/back/component/addReturn.vue
View File

@ -717,6 +717,8 @@ export default {
// 获取 设备树结构数据 // 获取 设备树结构数据
async GetDeviceTypeTreeFn(agreementId) { async GetDeviceTypeTreeFn(agreementId) {
const params = { const params = {
unitId: this.queryParams.unitId,
proId: this.queryParams.proId,
agreementId: agreementId agreementId: agreementId
} }
const res = await getDeviceTreeByAgreementId(params) const res = await getDeviceTreeByAgreementId(params)
@ -950,7 +952,9 @@ export default {
backPerson: this.queryParams.backPerson, backPerson: this.queryParams.backPerson,
phone: this.queryParams.phone, phone: this.queryParams.phone,
remark: this.queryParams.remark, remark: this.queryParams.remark,
agreementId: this.queryParams.agreementId unitId: this.queryParams.unitId,
proId: this.queryParams.proId,
agreementId: this.queryParams.agreementId,
// backTime: this.queryParams.backTime, // backTime: this.queryParams.backTime,
// createBy: this.queryParams.createBy, // createBy: this.queryParams.createBy,
// companyId: this.queryParams.companyId, // companyId: this.queryParams.companyId,

9
src/views/material/back/component/home.vue
View File

@ -323,12 +323,12 @@ export default {
onDictReady(dict) { onDictReady(dict) {
// 获取back_task_status的所有选项 // 获取back_task_status的所有选项
const validOptions = dict.type.back_task_status || [] const validOptions = dict.type.back_task_status || []
// 如果有有效选项，设置第一个为默认值 // 如果有有效选项，设置第一个为默认值
if (validOptions.length > 0) { if (validOptions.length > 0) {
this.queryParams.status = validOptions[0].value this.queryParams.status = validOptions[0].value
} }
// 执行查询 // 执行查询
this.getList() this.getList()
}, },
@ -457,10 +457,13 @@ export default {
// }, // },
handleSubmit(row){ handleSubmit(row){
console.log(row)
this.$modal.confirm('是否确认提交所选择的退料任务？') .then(() => { this.$modal.confirm('是否确认提交所选择的退料任务？') .then(() => {
let param = { let param = {
id:row.id, id:row.id,
taskId:row.taskId taskId:row.taskId,
proId:row.proId,
unitId:row.unitId,
} }
submitBackApply(param).then((res) => { submitBackApply(param).then((res) => {
this.getList() this.getList()

1
src/views/material/back/component/queryReturn.vue
View File

@ -587,6 +587,7 @@ export default {
async GetDeviceTypeTreeFn(agreementId) { async GetDeviceTypeTreeFn(agreementId) {
const params = { const params = {
agreementId: agreementId, agreementId: agreementId,
unitId: this.queryParams.unitId,
} }
const res = await getDeviceTreeByAgreementId(params) const res = await getDeviceTreeByAgreementId(params)
console.log('resgetUseTypeTreee==========', res) console.log('resgetUseTypeTreee==========', res)

7
src/views/materialsStation/toolsBack/back/component/addReturn.vue
View File

@ -137,7 +137,7 @@
<el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
<el-table-column type="selection" min-width="55" align="center" :selectable="selectable" /> <el-table-column type="selection" min-width="55" align="center" :selectable="selectable" />
<el-table-column label="序号" type="index" align="center" min-width="80" /> <el-table-column label="序号" type="index" align="center" min-width="80" />
<el-table-column label="类型名称" align="center" prop="materialName" :show-overflow-tooltip="true" /> <el-table-column label="类型名称" align="center" prop="maTypeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" /> <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" /> <el-table-column label="计量单位" align="center" prop="unitName" />
<el-table-column label="当前在用量" align="center" prop="num"></el-table-column> <el-table-column label="当前在用量" align="center" prop="num"></el-table-column>
@ -206,13 +206,13 @@
<el-table-column label="序号" type="index" width="55" align="center" /> <el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column <el-table-column
label="类型名称" label="类型名称"
prop="typeName" prop="materialName"
align="center" align="center"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="规格型号" label="规格型号"
prop="materialName" prop="typeName"
align="center" align="center"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
@ -566,6 +566,7 @@ export default {
type: 'success' type: 'success'
}) })
} }
console.log('🚀 ~ handleTypeChange ~ this.equipmentList:', this.equipmentList)
} }
// 清空临时选中值 // 清空临时选中值