From 0b9457dc434d2cd2cb4fe1c1775b3e2b3c9ad0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?= <8702040+cai-ling@user.noreply.gitee.com> Date: Wed, 25 Dec 2024 13:19:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/getData.js | 5 +-- src/main.js | 6 ++-- src/pages/index.vue | 30 ++++++++++------ src/pages/task.vue | 80 +++++++++++++++++++++++++++++++------------ src/style/layout.styl | 42 +++++++++++++---------- 5 files changed, 109 insertions(+), 54 deletions(-) diff --git a/src/config/getData.js b/src/config/getData.js index 8c798f9..c9d78c3 100644 --- a/src/config/getData.js +++ b/src/config/getData.js @@ -24,8 +24,9 @@ export const sendWork = (code) => post('api/pda/sendWork', { work_code: code }) // 补发配料作业 -export const reSendWork = (code) => post('api/pda/reSendWork', { - work_code: code +export const reSendWork = (code, num) => post('api/pda/reSendWork', { + work_code: code, + require_num: num }) // 完成配料作业 export const finishWork = (code) => post('api/pda/finishWork', { diff --git a/src/main.js b/src/main.js index af78d0a..bbe1a83 100644 --- a/src/main.js +++ b/src/main.js @@ -7,15 +7,17 @@ import store from './vuex/store' import '@config/rem.js' import '@style/reset.css' import '@style/layout.styl' -import { MessageBox, Message, Select, Option } from 'element-ui' +import { Dialog, Button, Message, Select, Option, InputNumber } from 'element-ui' import scroll from 'vue-seamless-scroll' import JSEncrypt from 'jsencrypt' -Vue.prototype.$confirm = MessageBox.confirm Vue.prototype.$message = Message +Vue.use(Dialog) +Vue.use(Button) Vue.use(Select) Vue.use(Option) Vue.use(scroll) +Vue.use(InputNumber) Vue.config.productionTip = false const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANL378k3RiZHWx5AfJqdH9xRNBmD9wGD\n' + diff --git a/src/pages/index.vue b/src/pages/index.vue index 4c62b56..4db4471 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -42,9 +42,9 @@ {{ e.status }}
- - - + + +
@@ -69,7 +69,8 @@ export default { value: '', options: [], dataList: [], - disabled: false + disabled1: false, + disabled2: false } }, beforeRouteLeave (to, from, next) { @@ -94,6 +95,9 @@ export default { async _queryOrders (e) { let res = await queryOrders(e) this.dataList = [...res] + this.dataList.map(el => { + this.$set(el, 'checked', false) + }) }, selectChange (e) { if (e) { @@ -101,11 +105,13 @@ export default { } }, async _startOrder (e) { - this.disabled = true + this.disabled1 = true + e.checked = true try { let res = await startOrder(this.value, e.mfg_order_name) if (res.message) { - this.disabled = false + this.disabled1 = false + e.checked = false this.$store.dispatch('setKeepAlive', ['index']) this.$router.push({ path: '/task', @@ -113,7 +119,8 @@ export default { }) } } catch (e) { - this.disabled = false + this.disabled1 = false + e.checked = false } }, toJump (e) { @@ -124,7 +131,8 @@ export default { }) }, async _forceFinish (e) { - this.disabled = true + this.disabled2 = true + e.checked = true try { let res = await forceFinish(e.mfg_order_name) this._queryOrders(this.value) @@ -132,9 +140,11 @@ export default { message: res.message, type: 'success' }) - this.disabled = false + this.disabled2 = false + e.checked = false } catch (e) { - this.disabled = false + this.disabled2 = false + e.checked = false } } } diff --git a/src/pages/task.vue b/src/pages/task.vue index 2419a8e..12056b0 100644 --- a/src/pages/task.vue +++ b/src/pages/task.vue @@ -31,11 +31,10 @@ {{ e.status }}
- - - - - + + + +
@@ -43,6 +42,16 @@ + +
+
补发桶数
+ +
+
+ 取 消 + 确 定 +
+ @@ -59,8 +68,13 @@ export default { return { timer: null, dataList: [], - pkId: '', - disabled: false + pkObj: '', + disabled1: false, + disabled2: false, + disabled3: false, + disabled4: false, + dialogVisible: false, + inputNumber: 1 } }, mounted () { @@ -70,9 +84,13 @@ export default { async _queryWorks () { let res = await queryWorks(this.$route.query.order) this.dataList = [...res] + this.dataList.map(el => { + this.$set(el, 'checked', false) + }) }, async _sendWork (e) { - this.disabled = true + this.disabled1 = true + e.checked = true try { let res = await sendWork(e.work_code) this._queryWorks() @@ -80,27 +98,33 @@ export default { message: res.message, type: 'success' }) - this.disabled = false + this.disabled1 = false + e.checked = false } catch (e) { - this.disabled = false + this.disabled1 = false + e.checked = false } }, - async _reSendWork (e) { - this.disabled = true + async _reSendWork (e, num) { + this.disabled2 = true + e.checked = true try { - let res = await reSendWork(e.work_code) + let res = await reSendWork(e.work_code, num) this._queryWorks() this.$message({ message: res.message, type: 'success' }) - this.disabled = false + this.disabled2 = false + e.checked = false } catch (e) { - this.disabled = false + this.disabled2 = false + e.checked = false } }, async _pdaPause (e) { - this.disabled = true + this.disabled3 = true + e.checked = true try { let res = await pdaPause(e.work_code) this._queryWorks() @@ -108,13 +132,16 @@ export default { message: res.message, type: 'success' }) - this.disabled = false + this.disabled3 = false + e.checked = false } catch (e) { - this.disabled = false + this.disabled3 = false + e.checked = false } }, async _finishWork (e) { - this.disabled = true + this.disabled4 = true + e.checked = true try { let res = await finishWork(e.work_code) this._queryWorks() @@ -122,10 +149,21 @@ export default { message: res.message, type: 'success' }) - this.disabled = false + this.disabled4 = false + e.checked = false } catch (e) { - this.disabled = false + this.disabled4 = false + e.checked = false } + }, + openDialog (e) { + this.dialogVisible = true + this.inputNumber = 1 + this.pkObj = e + }, + handleConfirm () { + this.dialogVisible = false + this._reSendWork(this.pkObj, this.inputNumber) } } } diff --git a/src/style/layout.styl b/src/style/layout.styl index 4c6cd7d..be111ef 100644 --- a/src/style/layout.styl +++ b/src/style/layout.styl @@ -170,7 +170,7 @@ header margin 0 .1rem; background: transparent; border: 0; - &:disabled +.grid_button_disabled color: #ff803c // 下拉框 @@ -235,22 +235,26 @@ header font-size: .28rem } -// 提示框 -.el-message-box { - background-color: rgba(7, 22, 69, .85); - border-color: #0b5deb; -} -.el-message-box__title, .el-message-box__headerbtn .el-message-box__close, .el-message-box__content { +// 弹窗 +.el-dialog + background linear-gradient(45deg, rgba(28, 95, 161, 70%), rgba(20, 67, 120, 70%)) + border 1px solid #6fc4e2 +.el-dialog__headerbtn + font-size .32rem +.el-dialog__headerbtn .el-dialog__close + color #fff +.el-dialog__body + padding .3rem .4rem + .button-wrap + margin-top .6rem +.el-input-number__decrease, .el-input-number__increase + width .8rem + font-size: 0.3rem; + height: 0.8rem; + line-height: .8rem; + background: #0489c0; color: #fff; -} -.scroll-tab - _font(.14rem, .34rem, #fff,,center) - font-family YouSheBiaoTiHei; - background-color #1F438A -.scroll-container - height calc(100% - .34rem) - overflow hidden -.scroll-item - _font(.14rem, .34rem, #fff,,center) - background: rgba(31,46,73,0.9) - border 1px solid rgba(122,159,224,0.17) +.el-button + font-size .34rem +.el-button+.el-button + margin-left .4rem \ No newline at end of file