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

优化

This commit is contained in:
bb_pan 2025-06-06 16:51:25 +08:00
parent dd7f6f00ee
commit a6564d5bc5
3 changed files with 42 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -829,25 +829,29 @@ export default {
// 获取 任务详情数据 // 获取 任务详情数据
async GetViewByApply(params) { async GetViewByApply(params) {
const res = await getBackApplyInfo(this.rowId) const res = await getBackApplyInfo(this.rowId)
console.log('🚀 ~ GetViewByApply ~ res:', res)
if (res.msg && res.msg != '操作成功') { if (res.msg && res.msg != '操作成功') {
this.$message.warning(res.msg) this.$message.warning(res.msg)
} }
console.log(res)
const data = res.data const data = res.data
this.queryParams.teamId = data.backApplyInfo.teamId console.log('🚀 ~ GetViewByApply ~ data:', data)
this.queryParams = data.backApplyInfo
// this.unitId = this.treeParentsById(this.unitList, this.queryParams.unitId) // this.unitId = this.treeParentsById(this.unitList, this.queryParams.unitId)
this.GetProData() // this.GetProData()
setTimeout(() => { // setTimeout(() => {
this.queryParams.proId = data.backApplyInfo.proId // this.queryParams.proId = data.backApplyInfo.proId
}, 500) // }, 500)
// this.projectId = this.treeParentsById(this.proList, this.queryParams.proId) // this.projectId = this.treeParentsById(this.proList, this.queryParams.proId)
this.queryParams.phone = data.backApplyInfo.phone // this.queryParams.phone = data.backApplyInfo.phone
this.queryParams.backPerson = data.backApplyInfo.backPerson // this.queryParams.backPerson = data.backApplyInfo.backPerson
this.queryParams.agreementId = data.backApplyInfo.agreementId // this.queryParams.agreementId = data.backApplyInfo.agreementId
this.queryParams.remark = data.backApplyInfo.remark // this.queryParams.remark = data.backApplyInfo.remark
this.equipmentList = data.backApplyDetailsList this.equipmentList = data.backApplyDetailsList
this.equipmentList.forEach(item => { this.equipmentList.forEach(item => {
item.tempMaCodeList = item.maCodeList item.tempMaCodeList = item.maCodeList
const temp = item.typeName
item.typeName = item.materialName
item.typeModel = temp
}) })
this.GetDeviceTypeTreeFn(data.backApplyInfo.agreementId) this.GetDeviceTypeTreeFn(data.backApplyInfo.agreementId)
}, },
@ -915,7 +919,8 @@ export default {
phone: this.queryParams.phone, phone: this.queryParams.phone,
remark: this.queryParams.remark, remark: this.queryParams.remark,
agreementId: this.queryParams.agreementId, agreementId: this.queryParams.agreementId,
isBack isBack,
taskId: this.queryParams.taskId,
// backTime: this.queryParams.backTime, // backTime: this.queryParams.backTime,
// createBy: this.queryParams.createBy, // createBy: this.queryParams.createBy,
// companyId: this.queryParams.companyId, // companyId: this.queryParams.companyId,

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

@ -10,18 +10,18 @@
label-width="100px" label-width="100px"
> >
<el-row> <el-row>
<el-form-item label="退料单位" prop="proName"> <el-form-item label="退料班组" prop="teamName">
<el-input <el-input
v-model="queryParams.proName" v-model="queryParams.teamName"
placeholder="退料单位" placeholder="退料单位"
clearable clearable
style="width: 240px" style="width: 240px"
:disabled="isView" :disabled="isView"
/> />
</el-form-item> </el-form-item>
<el-form-item label="退料工程" prop="unitName"> <el-form-item label="退料工程" prop="proName">
<el-input <el-input
v-model="queryParams.unitName" v-model="queryParams.proName"
placeholder="退料工程" placeholder="退料工程"
clearable clearable
style="width: 240px" style="width: 240px"
@ -446,32 +446,8 @@ export default {
type: 'number', type: 'number',
}, },
], ],
backPerson: [
{
required: true,
message: '请输入班组长',
trigger: 'blur',
},
],
// backTime: [
// {
// required: true,
// message: '请选择退料时间',
// trigger: 'change',
// },
// ],
phone: [
{
required: true,
trigger: 'blur',
message: '请输入班组长的手机号',
},
{
pattern: /^1[3456789]\d{9}$/,
message: '请输入正确的手机号码',
trigger: 'blur',
},
],
}, },
unitList: [], //单位 集合 unitList: [], //单位 集合
proList: [], // 工程 集合 proList: [], // 工程 集合
@ -498,8 +474,8 @@ export default {
} }
}, },
mounted() { mounted() {
this.GetUnitData() // this.GetUnitData()
this.GetProData() // this.GetProData()
if (this.backId) {//编辑 if (this.backId) {//编辑
console.log(this.backId) console.log(this.backId)
@ -636,16 +612,22 @@ export default {
console.log(res) console.log(res)
const data = res.data const data = res.data
console.log(data) console.log(data)
this.queryParams.teamId = data.backApplyInfo.teamId this.queryParams = data.backApplyInfo
this.queryParams.proId = data.backApplyInfo.proId // this.queryParams.teamId = data.backApplyInfo.teamId
this.queryParams.unitName = data.backApplyInfo.unitName // this.queryParams.proId = data.backApplyInfo.proId
this.queryParams.proName = data.backApplyInfo.proName // this.queryParams.unitName = data.backApplyInfo.unitName
this.queryParams.phone = data.backApplyInfo.phone // this.queryParams.proName = data.backApplyInfo.proName
this.queryParams.backPerson = data.backApplyInfo.backPerson // this.queryParams.phone = data.backApplyInfo.phone
this.queryParams.agreementId = data.backApplyInfo.agreementId // this.queryParams.backPerson = data.backApplyInfo.backPerson
this.queryParams.remark = data.backApplyInfo.remark // this.queryParams.agreementId = data.backApplyInfo.agreementId
// this.queryParams.remark = data.backApplyInfo.remark
this.equipmentList = data.backApplyDetailsList this.equipmentList = data.backApplyDetailsList
this.GetDeviceTypeTreeFn(data.backApplyInfo.agreementId) // this.GetDeviceTypeTreeFn(data.backApplyInfo.agreementId)
this.equipmentList.forEach((item) => {
const temp = item.typeName
item.typeName = item.materialName
item.typeModel = temp
})
// this.$set(this.queryParams, 'phone', data.phone) // this.$set(this.queryParams, 'phone', data.phone)
// this.queryParams.backPerson = data.backPerson // this.queryParams.backPerson = data.backPerson
// this.queryParams.backTime = data.backTime // this.queryParams.backTime = data.backTime

3
src/views/material/lease/outBound/component/addToolsApply.vue
View File

@ -601,6 +601,9 @@ export default {
async getTaskInfo() { async getTaskInfo() {
// this.loading = true; // this.loading = true;
await getApplyInfo(this.id).then(response => { await getApplyInfo(this.id).then(response => {
if (response.msg && response.msg != '操作成功') {
this.$message.warning(response.msg)
}
this.maForm = response.data.leaseApplyInfo this.maForm = response.data.leaseApplyInfo
this.maForm.teamId = response.data.leaseApplyInfo.teamId this.maForm.teamId = response.data.leaseApplyInfo.teamId
this.maForm.projectId = response.data.leaseApplyInfo.projectId this.maForm.projectId = response.data.leaseApplyInfo.projectId