root/hht-xinrui-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

矿用软废组桶修改

Browse Source
This commit is contained in:
蔡玲
2024-11-07 11:21:57 +08:00
parent 1b9ed56b63
commit a45072e242
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/config/getData3.js
View File

@@ -21,3 +21,8 @@ export const bucketCheckCode = (code, bk, pcsn) => post('api/pda/set/bucket/chec
bucketunique: bk, bucketunique: bk,
pcsn: pcsn pcsn: pcsn
}) })
// 1.4 确定组桶（点击确定组桶按钮）
export const confirmGroupBucketAndBag = (mst, dtl) => post('api/pda/set/bucket/confirmGroupBucketAndBag', {
mst: mst,
dtl: dtl
})

16
src/pages/xinrui/storage/settings/MiningSoftWasteBarrel.vue
View File

@@ -111,8 +111,8 @@
import NavBar from '@components/NavBar.vue' import NavBar from '@components/NavBar.vue'
import SearchBox from '@components/SearchBox.vue' import SearchBox from '@components/SearchBox.vue'
import DropdownMenu from '@components/DropdownMenu.vue' import DropdownMenu from '@components/DropdownMenu.vue'
import { confirmGroupBucket, bucketPrint, bucketDelete, bucketGetLevel } from '@config/getData2.js' import { bucketPrint, bucketDelete, bucketGetLevel } from '@config/getData2.js'
import { bucketCheckCode } from '@config/getData3.js' import { bucketCheckCode, confirmGroupBucketAndBag } from '@config/getData3.js'
import {accAdd, submitPackUp} from '@config/mUtils.js' import {accAdd, submitPackUp} from '@config/mUtils.js'
import {toPrint} from '@config/print.js' import {toPrint} from '@config/print.js'
export default { export default {
@@ -251,14 +251,14 @@ export default {
this.disabled4 = false this.disabled4 = false
return return
} }
this._confirmGroupBucket() this._confirmGroupBucketAndBag()
}, },
async _confirmGroupBucket () { async _confirmGroupBucketAndBag () {
try { try {
let accountId = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).account_id : '' 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 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 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') { if (res.code === '1') {
this.toast(res.desc) this.toast(res.desc)
this.val1 = '' this.val1 = ''
@@ -287,14 +287,14 @@ export default {
this.disabled1 = false this.disabled1 = false
return return
} }
this._confirmGroupBucketPrint() this._confirmGroupBucketAndBagPrint()
}, },
async _confirmGroupBucketPrint () { async _confirmGroupBucketAndBagPrint () {
try { try {
let accountId = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).account_id : '' 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 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 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') { if (res.code === '1') {
this.toast(res.desc) this.toast(res.desc)
if (JSON.stringify(res.result) !== '{}') { if (JSON.stringify(res.result) !== '{}') {