diff --git a/src/config/getData3.js b/src/config/getData3.js index ced6f74..b91a94d 100644 --- a/src/config/getData3.js +++ b/src/config/getData3.js @@ -21,3 +21,8 @@ export const bucketCheckCode = (code, bk, pcsn) => post('api/pda/set/bucket/chec bucketunique: bk, pcsn: pcsn }) +// 1.4 确定组桶(点击确定组桶按钮) +export const confirmGroupBucketAndBag = (mst, dtl) => post('api/pda/set/bucket/confirmGroupBucketAndBag', { + mst: mst, + dtl: dtl +}) diff --git a/src/pages/xinrui/storage/settings/MiningSoftWasteBarrel.vue b/src/pages/xinrui/storage/settings/MiningSoftWasteBarrel.vue index fd76096..da6c76d 100644 --- a/src/pages/xinrui/storage/settings/MiningSoftWasteBarrel.vue +++ b/src/pages/xinrui/storage/settings/MiningSoftWasteBarrel.vue @@ -111,8 +111,8 @@ import NavBar from '@components/NavBar.vue' import SearchBox from '@components/SearchBox.vue' import DropdownMenu from '@components/DropdownMenu.vue' -import { confirmGroupBucket, bucketPrint, bucketDelete, bucketGetLevel } from '@config/getData2.js' -import { bucketCheckCode } from '@config/getData3.js' +import { bucketPrint, bucketDelete, bucketGetLevel } from '@config/getData2.js' +import { bucketCheckCode, confirmGroupBucketAndBag } from '@config/getData3.js' import {accAdd, submitPackUp} from '@config/mUtils.js' import {toPrint} from '@config/print.js' export default { @@ -251,14 +251,14 @@ export default { this.disabled4 = false return } - this._confirmGroupBucket() + this._confirmGroupBucketAndBag() }, - async _confirmGroupBucket () { + async _confirmGroupBucketAndBag () { try { let accountId = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).account_id : '' let user = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).user_name : '' let newObj = Object.assign({}, this.result, {storage_qty: this.val5, accountId: accountId, user: user, is_active: this.option[this.active].value, ivt_level: this.option1[this.active1].value}) - let res = await confirmGroupBucket(newObj, this.dataList) + let res = await confirmGroupBucketAndBag(newObj, this.dataList) if (res.code === '1') { this.toast(res.desc) this.val1 = '' @@ -287,14 +287,14 @@ export default { this.disabled1 = false return } - this._confirmGroupBucketPrint() + this._confirmGroupBucketAndBagPrint() }, - async _confirmGroupBucketPrint () { + async _confirmGroupBucketAndBagPrint () { try { let accountId = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).account_id : '' let user = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).user_name : '' let newObj = Object.assign({}, this.result, {storage_qty: this.val5, accountId: accountId, user: user, is_active: this.option[this.active].value, ivt_level: this.option1[this.active1].value}) - let res = await confirmGroupBucket(newObj, this.dataList) + let res = await confirmGroupBucketAndBag(newObj, this.dataList) if (res.code === '1') { this.toast(res.desc) if (JSON.stringify(res.result) !== '{}') {