This commit is contained in:
parent
3ff6086baa
commit
dd7f6f00ee
|
|
@ -538,11 +538,11 @@ export default {
|
||||||
// },
|
// },
|
||||||
// ],
|
// ],
|
||||||
phone: [
|
phone: [
|
||||||
{
|
// {
|
||||||
required: true,
|
// required: true,
|
||||||
trigger: 'blur',
|
// trigger: 'blur',
|
||||||
message: '请输入班组长的手机号'
|
// message: '请输入班组长的手机号'
|
||||||
},
|
// },
|
||||||
{
|
{
|
||||||
pattern: /^1[3456789]\d{9}$/,
|
pattern: /^1[3456789]\d{9}$/,
|
||||||
message: '请输入正确的手机号码',
|
message: '请输入正确的手机号码',
|
||||||
|
|
|
||||||
|
|
@ -93,7 +93,8 @@ export default {
|
||||||
if (this.rowData.maCodeList && this.rowData.maCodeList.length > 0) {
|
if (this.rowData.maCodeList && this.rowData.maCodeList.length > 0) {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.outCodeList.forEach(row => {
|
this.outCodeList.forEach(row => {
|
||||||
const isSelected = this.rowData.maCodeList.some(item => item.maCode === row.maCode)
|
const isSelected = this.rowData.maCodeList.some(item => item.maCode == row.maCode)
|
||||||
|
console.log('🚀 ~ this.$nextTick ~ isSelected:', isSelected)
|
||||||
if (isSelected) {
|
if (isSelected) {
|
||||||
this.$refs.multipleTable.toggleRowSelection(row, true)
|
this.$refs.multipleTable.toggleRowSelection(row, true)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -609,8 +609,8 @@ export default {
|
||||||
this.equipmentList = response.data.leaseApplyDetailsList || []
|
this.equipmentList = response.data.leaseApplyDetailsList || []
|
||||||
if (this.equipmentList.length > 0) {
|
if (this.equipmentList.length > 0) {
|
||||||
this.equipmentList.forEach(item => {
|
this.equipmentList.forEach(item => {
|
||||||
item.preNum = item.preNum || 0
|
// item.preNum = item.preNum || 0
|
||||||
item.outNum = item.outNum || 0
|
item.outNum = item.preNum || 0
|
||||||
})
|
})
|
||||||
this.parentId = this.equipmentList[0].parentId
|
this.parentId = this.equipmentList[0].parentId
|
||||||
console.log('🚀 ~ awaitgetApplyInfo ~ this.parentId:', this.parentId)
|
console.log('🚀 ~ awaitgetApplyInfo ~ this.parentId:', this.parentId)
|
||||||
|
|
@ -701,10 +701,11 @@ export default {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
this.equipmentList.forEach(item => {
|
||||||
|
item.preNum = item.outNum
|
||||||
|
})
|
||||||
console.log('projectId', this.projectTemp)
|
console.log('projectId', this.projectTemp)
|
||||||
this.maForm.taskId = this.taskId
|
this.maForm.taskId = this.taskId
|
||||||
// this.maForm.checkDetailsList = this.equipmentList
|
|
||||||
await this.$modal
|
await this.$modal
|
||||||
.confirm('是否确认保存当前页面')
|
.confirm('是否确认保存当前页面')
|
||||||
.then(function () {})
|
.then(function () {})
|
||||||
|
|
@ -715,12 +716,12 @@ export default {
|
||||||
console.log('编辑')
|
console.log('编辑')
|
||||||
this.loading = true
|
this.loading = true
|
||||||
updateApplyInfo({
|
updateApplyInfo({
|
||||||
leaseOutDetailsList: this.equipmentList,
|
leaseApplyDetailsList: this.equipmentList,
|
||||||
leaseApplyInfo: this.maForm
|
leaseApplyInfo: this.maForm
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
if (response.code == 200) {
|
if (response.code == 200) {
|
||||||
this.$modal.msgSuccess('出库成功')
|
this.$modal.msgSuccess('操作成功')
|
||||||
this.$emit('addToolsSuccess')
|
this.$emit('addToolsSuccess')
|
||||||
}
|
}
|
||||||
this.loading = false
|
this.loading = false
|
||||||
|
|
@ -736,7 +737,7 @@ export default {
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
if (response.code == 200) {
|
if (response.code == 200) {
|
||||||
this.$modal.msgSuccess('出库成功')
|
this.$modal.msgSuccess('操作成功')
|
||||||
this.$emit('addToolsSuccess')
|
this.$emit('addToolsSuccess')
|
||||||
}
|
}
|
||||||
this.loading = false
|
this.loading = false
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue