From 76e762e84e6e032cdf56b14a5fdcb7e1f68b23c1 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Thu, 30 Mar 2023 10:45:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=BC=82=E5=B8=B8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=BC=93=E5=AD=98=E7=BA=BF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/iconfont.css | 13 +++++++-- common/style/layout.css | 3 ++ pages/home/home.vue | 4 +-- pages/management/hcxcheck.vue | 47 +++++++++++++++++++------------ pages/management/inscanerror.vue | 8 +++--- pages/management/outscanerror.vue | 8 +++--- pages/management/searchMater.vue | 14 +++++---- utils/getData2.js | 12 +++----- utils/request.js | 6 ++-- vuex/modules/user.js | 2 +- 10 files changed, 68 insertions(+), 49 deletions(-) diff --git a/common/style/iconfont.css b/common/style/iconfont.css index 853a524..910814e 100644 --- a/common/style/iconfont.css +++ b/common/style/iconfont.css @@ -52,12 +52,19 @@ content: '\e607'; } .icon-check { - width: 30px; - height: 30px; - background-color: #fff; + width: 24px; + height: 24px; + font-size: 20px; + line-height: 24px; + color: #bbb; + background-color: #bbb; border-radius: 50%; margin: 0 auto; } .icon-checked { + color: #fff; background-color: #D7592F; +} +.icon-check::after { + content: '\e608' } \ No newline at end of file diff --git a/common/style/layout.css b/common/style/layout.css index 78c03fd..550be62 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -181,6 +181,9 @@ uni-button:after { .bg-red { background-color: #ff6a00; } +.bg-none { + display: none; +} .material-wrap { width: calc(100% - 30px); height: calc(100% - 152px);/** 42+15*5+35 */ diff --git a/pages/home/home.vue b/pages/home/home.vue index ec1510f..7ab0f0d 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -19,12 +19,12 @@ 缓存线盘点 - + 缓存线出箱异常 diff --git a/pages/management/hcxcheck.vue b/pages/management/hcxcheck.vue index 8655d31..7c4bc20 100644 --- a/pages/management/hcxcheck.vue +++ b/pages/management/hcxcheck.vue @@ -40,7 +40,7 @@ - + {{e.vehicle_code}} {{e.material_spec}} @@ -102,7 +102,7 @@ - + @@ -129,7 +129,7 @@ data() { return { options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}], - index1: '', + index1: 'A1', options2: [], index2: '', options3: [], @@ -151,21 +151,21 @@ }; }, created () { - for(let i = 1; i < 16; i++) { - this.dataList.push({vehicle_code: i + '', material_spec: 'a', status: '4'}) - } + // for(let i = 1; i < 16; i++) { + // this.dataList.push({vehicle_code: i + '', material_spec: 'a', status: '4'}) + // } this._getCacheLine('A1') this._workprocedureQuery() }, destroyed () { this.$store.dispatch('setPublicObj', '') }, - mounted () { + onShow () { if (this.$store.getters.publicObj !== '') { this.val2 = this.$store.getters.publicObj.material_code this.val3 = this.$store.getters.publicObj.material_name this.val4 = this.$store.getters.publicObj.material_spec - this.val5 = this.$store.getters.publicObj.material_uuid + this.val5 = this.$store.getters.publicObj.material_id } }, methods: { @@ -187,11 +187,11 @@ /** 缓存线 */ async _getCacheLine (id) { let res = await getCacheLine(id) - this.options2 = [...res.result] + this.options2 = [...res] }, async _getCacheLineMaterialInfo () { let res = await getCacheLineMaterialInfo(this.index1, this.index2) - this.dataList = [...res.result] + this.dataList = [...res] }, /** 选择器3 */ selectChange3(e) { @@ -200,9 +200,20 @@ /** 工序 */ async _workprocedureQuery () { let res = await workprocedureQuery() - this.options3 = [...res.result] + this.options3 = [...res] }, toSearch () { + this.val1 = '' + this.index3 = '' + this.val2 = '' + this.val3 = '' + this.val4 = '' + this.val5 = '' + this.val6 = '' + this.val7 = '' + this.obj = {} + this.active = false + this.$store.dispatch('setPublicObj', '') this._getCacheLineMaterialInfo() }, toInfo(e) { @@ -210,14 +221,14 @@ this.obj = e this.val1 = this.obj.vehicle_code this.options3.map(el => { - if (el.value === e.workprocedure_code) { + if (Number(el.workprocedure_code) === Number(e.workprocedure_code)) { this.index3 = el.value } }) this.val2 = this.obj.material_code this.val3 = this.obj.material_name this.val4 = this.obj.material_spec - this.val5 = this.obj.material_uuid + this.val5 = this.obj.material_id this.val6 = this.obj.quantity this.val7 = this.obj.weight }, @@ -229,7 +240,7 @@ closePop () { this.active = false }, - async __setfullBox () { + async _setfullBox () { this.disabled1 = true if (!this.val1 || !this.index3 || !this.val6 || !this.val7) { this.disabled1 = false @@ -241,7 +252,7 @@ this.$set(this.obj, 'material_code', this.val2) this.$set(this.obj, 'material_name', this.val3) this.$set(this.obj, 'material_spec', this.val4) - this.$set(this.obj, 'material_uuid', this.val5) + this.$set(this.obj, 'material_id', this.val5) this.$set(this.obj, 'quantity', this.val6) this.$set(this.obj, 'weight', this.val7) let res = await setfullBox(this.obj) @@ -263,8 +274,8 @@ } try { let obj = {} - this.$set(this.obj, 'vehicle_code', this.val1) - this.$set(this.obj, 'workprocedure_code', this.index3) + this.$set(obj, 'vehicle_code', this.val1) + this.$set(obj, 'workprocedure_code', this.index3) let res = await setEmptyBox(obj) this.disabled2 = false this.toSearch() @@ -284,7 +295,7 @@ } try { let obj = {} - this.$set(this.obj, 'vehicle_code', this.val1) + this.$set(obj, 'vehicle_code', this.val1) let res = await deleteBox(obj) this.disabled3 = false this.toSearch() diff --git a/pages/management/inscanerror.vue b/pages/management/inscanerror.vue index 60a28a9..0339197 100644 --- a/pages/management/inscanerror.vue +++ b/pages/management/inscanerror.vue @@ -25,7 +25,7 @@ - +