diff --git a/src/views/material/back/component/addReturn.vue b/src/views/material/back/component/addReturn.vue index e84693ea..eb2183e4 100644 --- a/src/views/material/back/component/addReturn.vue +++ b/src/views/material/back/component/addReturn.vue @@ -538,11 +538,11 @@ export default { // }, // ], phone: [ - { - required: true, - trigger: 'blur', - message: '请输入班组长的手机号' - }, + // { + // required: true, + // trigger: 'blur', + // message: '请输入班组长的手机号' + // }, { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码', diff --git a/src/views/material/lease/outBound/component/OutCodeDlg.vue b/src/views/material/lease/outBound/component/OutCodeDlg.vue index ab83c70a..0c0f61f0 100644 --- a/src/views/material/lease/outBound/component/OutCodeDlg.vue +++ b/src/views/material/lease/outBound/component/OutCodeDlg.vue @@ -93,7 +93,8 @@ export default { if (this.rowData.maCodeList && this.rowData.maCodeList.length > 0) { this.$nextTick(() => { 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) { this.$refs.multipleTable.toggleRowSelection(row, true) } diff --git a/src/views/material/lease/outBound/component/addToolsApply.vue b/src/views/material/lease/outBound/component/addToolsApply.vue index 84294bb6..01e15208 100644 --- a/src/views/material/lease/outBound/component/addToolsApply.vue +++ b/src/views/material/lease/outBound/component/addToolsApply.vue @@ -609,8 +609,8 @@ export default { this.equipmentList = response.data.leaseApplyDetailsList || [] if (this.equipmentList.length > 0) { this.equipmentList.forEach(item => { - item.preNum = item.preNum || 0 - item.outNum = item.outNum || 0 + // item.preNum = item.preNum || 0 + item.outNum = item.preNum || 0 }) this.parentId = this.equipmentList[0].parentId console.log('🚀 ~ awaitgetApplyInfo ~ this.parentId:', this.parentId) @@ -701,10 +701,11 @@ export default { return } } - + this.equipmentList.forEach(item => { + item.preNum = item.outNum + }) console.log('projectId', this.projectTemp) this.maForm.taskId = this.taskId - // this.maForm.checkDetailsList = this.equipmentList await this.$modal .confirm('是否确认保存当前页面') .then(function () {}) @@ -715,12 +716,12 @@ export default { console.log('编辑') this.loading = true updateApplyInfo({ - leaseOutDetailsList: this.equipmentList, + leaseApplyDetailsList: this.equipmentList, leaseApplyInfo: this.maForm }) .then(response => { if (response.code == 200) { - this.$modal.msgSuccess('出库成功') + this.$modal.msgSuccess('操作成功') this.$emit('addToolsSuccess') } this.loading = false @@ -736,7 +737,7 @@ export default { }) .then(response => { if (response.code == 200) { - this.$modal.msgSuccess('出库成功') + this.$modal.msgSuccess('操作成功') this.$emit('addToolsSuccess') } this.loading = false