From 4d87bcbd5b00101219806e1dab47fedf56f5b85c Mon Sep 17 00:00:00 2001 From: helloDy <1615073571@qq.com> Date: Fri, 29 Mar 2024 08:49:43 +0800 Subject: [PATCH] bug --- src/App.vue | 16 +------ src/assets/form1.png | Bin 0 -> 1866 bytes src/assets/form2.png | Bin 0 -> 914 bytes src/assets/form3.png | Bin 0 -> 673 bytes src/assets/form4.png | Bin 0 -> 793 bytes src/assets/form5.png | Bin 0 -> 692 bytes src/assets/form6.png | Bin 0 -> 918 bytes src/assets/form7.png | Bin 0 -> 595 bytes src/assets/sub-right.png | Bin 0 -> 1104 bytes src/main.js | 2 +- src/views/Login.vue | 4 +- src/views/Quality.vue | 26 ++++++++--- src/views/Scrap.vue | 90 +++++++++++++++++++++++++++++++++++---- src/views/ScrapList.vue | 11 +++-- 14 files changed, 113 insertions(+), 36 deletions(-) create mode 100644 src/assets/form1.png create mode 100644 src/assets/form2.png create mode 100644 src/assets/form3.png create mode 100644 src/assets/form4.png create mode 100644 src/assets/form5.png create mode 100644 src/assets/form6.png create mode 100644 src/assets/form7.png create mode 100644 src/assets/sub-right.png diff --git a/src/App.vue b/src/App.vue index 36abca1..af5eb5f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,7 +1,7 @@ @@ -31,18 +31,6 @@ export default { -moz-osx-font-smoothing: grayscale; text-align: center; color: #2c3e50; -} - -nav { - padding: 30px; - - a { - font-weight: bold; - color: #2c3e50; - - &.router-link-exact-active { - color: #42b983; - } - } + margin: 0; } diff --git a/src/assets/form1.png b/src/assets/form1.png new file mode 100644 index 0000000000000000000000000000000000000000..46d0149448f2fec576b15514ad5f0ff719ea8240 GIT binary patch literal 1866 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 Hu0mjfw!J(~ literal 0 HcmV?d00001 diff --git a/src/assets/form4.png b/src/assets/form4.png new file mode 100644 index 0000000000000000000000000000000000000000..087c965848160a0da00a3b0aaa9d9ed81ffbbe00 GIT binary patch literal 793 zcmV+!1LpjRP)Px%(@8`@R5(w?lzV8+VHn3h&-v|4Hf+pgVZt~&xnDAbVJ=zOMn*$S2-~o+A?1>5 znbc6zR&JY1C`959l9U?b56NZICc>m|85E8G}iArLbH+|{t_0@Qf9@;F=Kn*};kHOYi*flq29>C{?+i{FvA z{}Q1AZ6K^Oyex+{cG#H+Pv1b!4RrZ5(l^YKL%$q`uhOo5e&nLWBOFVJVtec`b_p!m zaSpNB&`q=P*bM?*9@uskhWCX<6CpJZ;v=bziDZxu=vb|@M9EVyMOcxaj@zu`xCp&W zg{6lfDH@^&<5DHadUNtNl)Q)C3t;ORaQ1|SQRIj-MPpUC3|t)9hs?A%GJsT7Y(Fb! zIhZg2630=2(8)UAcd4NO8)rl22^bpz31fL75vh6~;cY<%J3f5me3u~lH}0*g58!ek z#6?omFBJR3Qf#*#!}>Vr77Uy6A#Em%?2F3+R(9`9ZpKWOWu71;XC+w4|2<3-E*8S| zhfrrW+|M81;QG)tc=Zvo7K6V*nFTD2=+1!6b7)sp+Z6UYxW)^gtMGITB)|fnz5{ok z!Ma!&+S{ir5a(*0WGXkEJun7_f$=MI&94n_J?@Gxw0l$v-g;O%1;#jhS~XydugdAi zG`XytobpPrs@hW64QL;LcW^K4Q-?rsV1rtO{i7YS(FasjTVXLbfyu2}XMzVM;KyXt z0(&DJ>=dy^{YMlPslBcPX(-dbcSYNlzyfX+YE^mUClriwNNFpUL#w literal 0 HcmV?d00001 diff --git a/src/assets/form5.png b/src/assets/form5.png new file mode 100644 index 0000000000000000000000000000000000000000..8ee45cffd14a203a1db467a0fe17825bad3d74a8 GIT binary patch literal 692 zcmV;l0!#ggP)Px%Zb?KzR5(x7luJmIQ5462_ZuIhWfm>cB7?-4As->7`I$u-6cMPQL1+t&XwisJ z5M{ZkFsUR-rvf5@>dsy%D+H8ENj%W)TcU2%Exws?fxsc4 zLqJC$)DO2bf!pH}O*W@&6i^J@K{A7&6iD?gk!?bQfI{P{r%ALapl3$LeV=2K^8xPl zYv@i%p!>}*t%cbX73MN(K3e6bd47Qb?|pGz`N9JGy|Pk50}#>B25CtUp+VmWRIB^~ ztk(;z{mj*$CS!N9m<$09H}ax?ggIcXiZg+6G0-{yb*F-XuLj}$I9x8~_8yzK6x>5W z&66v%`{wy!hMB;<4!GD11zB(;)42UQ3pbxbNe=8w<)LmDX99umfEZ0m{sykMZCO76mk9vw~O37xwp(4s+(9b%#k&(B5p zI0*}jkdg>nHX44(3ZU(r%n}0K8bxGr4)uY+T>EkWJsw!{hkk|RL`Y5uQ?dlBMPq#D zHjbHLpQenGRd1el!H%r~(g3DsK~-_RG!!_*KZYU%3{Aj=g5V4X$KY8n)Ru(-Dq%ma zrX$>x{{~c&Y3ccIfk0<`EM4XKw3u2@Px&P)S5VR5(wqlx=KNbrgr6bGyzhFoxYGZY634ogK@Vd>}DmB))`swR5@&W2lqL%U0L+-ecO* zvTk*J@&D;2=Xai*^E>w(;eUQIAJ6U8A{Ex4I7NwJ@Y|IL$1c1lQ~#Bh6?pfvx>5~x z3Dg2PKm;)2-wI(74w^#q&mD4pHh2!u-Jm`dcB2f7jW#PvZ}1&1P=`@jO1Wk6n8Nc| zT_nlDA{3yx9$dJnWb4tL#_>Dc8d*s&iXQCbJP7$|?GVGN7)Gp)S4Qah) z(H)Q74EVz+w0#0EY^3?=hovP6^r~0j%|MsrU$5?zlJM-N!0}7qKLGxXgsKZ!k^s6J z^cfX80wv`2Z>H2HoKsEudu{?+x|9C-Jg|5{X4~igf|oylSL;oGzD#*+}5 zOtxFU25MJbbnS z!GJ@ROPOp~PvN4(%;&!G5Of`ei7UxrIExZ1vgh6kY07pS)~WDeo*l;nRZw#$6c;83 zaxnzo55w^w6c<3#h9pej7c<7{`>Nzp*7H^MoH}CDyqKHI)<_h`%oc)S?!iU#x7@TExykK*Vt(@Xtdi{TvPy#g6m2lEU?#%(j2cWl|S#rPKgEvH22yq s+^;6f4Fj8HFq*%BzM9)*a&{sA0#U;{EKu(CegFUf07*qoM6N<$f>y4wc>n+a literal 0 HcmV?d00001 diff --git a/src/assets/form7.png b/src/assets/form7.png new file mode 100644 index 0000000000000000000000000000000000000000..94a38c418a731166c589d7b34b3ee1768b592a51 GIT binary patch literal 595 zcmV-Z0<8UsP)Px%4M{{nR5(wq)L%$bVHn5p@3W1GL68u-=+CfdHY>a6FGN8XK`tVq3#qG&F2b{- zh@^`kB?!8yF4Pc$yh;j$aCIRKBEgC-f}-Z87X?B8b~4i~_6h6WT8BDBXlq|E_FouU1}@o(JZX=Fu+c8G5DF?n>^evP;1IzYU(e zB{LYK_u)lpo(GcSc;cqqem0_4MQJUzQV~9E56G$o!RHCR0~{#^oScD|@8H7gU!Al` z&iW|%Gt5_5EI2U@Hy*&pBxGh;8t;^`lEG9S8;8^T;ly6Ctdc+ri@>KOwCsaTwXmbE zL@+sJxA{2xXZX5DvixD{&=)V`&@vo`zE)SpNsMV1+?L{W*vMgQ7(DG;pZ4hMn8i z!sUBlqGmMeSAv6KhX=1Y&SjZ4lmD;ZFL*|m&1LON!yoMby0YKcKLO|-93%ul2#Wv!002ovPDHLkV1f)i5Fh{m literal 0 HcmV?d00001 diff --git a/src/assets/sub-right.png b/src/assets/sub-right.png new file mode 100644 index 0000000000000000000000000000000000000000..cdec287fb821ac1eaf6e94f02d18c1ba23e50fa7 GIT binary patch literal 1104 zcmV-W1h4yvP)Px(3Q0skR9HvNm`RLOMHt6_|K@eQ#u;K1#qpqt+fianz~y2jpiwaDLF01pq9z(N z?rQ>=h;jFT(L_9o%f%(?Nduf*KwR+PK@TRVDC+eT(c zs(=0JtFNlQDlx-~W*85-fo#u7M_J|?iv;s6&cU4A7?{{^^LqidQeb_U#ix??=Na^* zfky11sKN^14&bE8bRu!c=AF36DoNWX)n=kfw&S$QQ@}$ugA>*7@%^C0t07{wq@l@%9^%mI~XF)lyu$NoQWHAdmQWC3{bi1wbZzCnt=8eU`Ytt(y4bi^#_8RGxh>+ zmm=Mj^-$_fh6Tq8bR=H(C}K&FzVFmZDt^}H=}x;~a~!lV>!H*;fzyr!$grmdO9nz$ znALXUOzc*6m4Z(11gal;p-b(${ZHU*AnFAyv0H9T(+^!d^PJ6-eFmGBg5vCyRa~}d z7~59B)@sT%0|WZ2T=sdI#fLWYySRL}iYyM&kDcGjiJwP2-p}(ANnBJZ>!FHwU>a^4 z11fMs9O;wRf7^4@3SSy7`mYkZ3Q+^*r!FurARe1A48+b-QS&lDhf{wmXav?+sc~JY zq|e$-`|MLo6}~WBjM!B$i$mxN^CIHW31I-krrAN4bjHwIM`ES1^xDdn;UZTINeA1F z!^1vh_5kas@kAVJ>p0I;{1WDo$-p%0tStrIodHS`-(vCJI1#aNIAU2RRIkp;sb2;j z&H;nWt#PdPGeEWnn@2~tG<9QKWT~V>{W>bAex;u3=7JF;&7)%^162Q$R=uWHV|iCW zu_2CF)(fhf`c>e;JTUdTg#xdKNcXkcWlnqB^U^B6+04lURZjgH@IYP|!GTcZd`UaH z0@aO&6R)f%PCdnsdg>-gyKRT0LLFu-eaHh}3&ViixYmoUvaBZ$@P>Xs-T@+hT zGwLecKEJkyl2KMr`=1{hI)g6r93$qNqt7u%wu<^8dE%a9@-FMC)}QqI&{R9f+wNcL Wy{t5v7!Mu*0000 @@ -195,6 +195,8 @@ export default { this.$router.push({ path: 'home' }) + } else { + this.$message.error(res.data.msg) } }) } diff --git a/src/views/Quality.vue b/src/views/Quality.vue index b86f9ed..aa85d18 100644 --- a/src/views/Quality.vue +++ b/src/views/Quality.vue @@ -1,7 +1,7 @@ @@ -54,6 +54,10 @@ + + @@ -89,7 +93,13 @@ export default { checkTime: formattedTime }).then(res => { if (res.data.code === 0) { - this.$set(value, 'active', true) + this.typeList.forEach(element => { + element.forEach(el => { + el.active = false + }) + }) + value.active = true + // this.$set(value, 'active', true) value.count++ this.count++ } @@ -113,8 +123,7 @@ export default { }, getLine () { authList({ userId: getUserId() }).then(res => { - console.log('res', res.data.data) - if (res && res.data.data.datas.length > 0) { + if (res && res?.data?.data?.datas?.length > 0) { this.lineArray = res.data.data.datas.map(item => { item.text = item.name item.value = item.id @@ -172,7 +181,7 @@ export default { width: 226px; line-height: 72px; box-shadow: 5px 6px 8px 0px rgba(206,212,226,0.72), inset 6px 0px 6px 0px #FFFFFF; - background-color: #276BFF; + background-color: #456DFF; } .rightDiv { border-radius: 7px; @@ -205,9 +214,10 @@ export default { } .leftDiv { border-radius: 7px 36px 36px 7px; - background-color: #276BFF; + background-color: #456DFF; height: 72px; width: 77px; + color: white; line-height: 72px; /* margin: 5px 0 5px 0; */ } @@ -251,9 +261,11 @@ export default { } .quality { background-image: url('./../assets/quality-bg.png'); - min-height: 100vh; + background-size: cover; + height: 100vh; width: 100vw; padding: 20px 20px; + overflow: auto; box-sizing: border-box; } diff --git a/src/views/Scrap.vue b/src/views/Scrap.vue index 97d266b..ffa6c15 100644 --- a/src/views/Scrap.vue +++ b/src/views/Scrap.vue @@ -1,7 +1,7 @@ @@ -26,6 +26,10 @@
+
+ + 工单选择 +
@@ -35,7 +39,11 @@
- +
+ + 报废数量 +
+
@@ -48,6 +56,10 @@ @delete="onDelete" /> +
+ + 报废原因 +

@@ -59,6 +71,10 @@
+
+ + 产线 +
@@ -68,6 +84,10 @@
+
+ + 工段 +
@@ -79,14 +99,28 @@
- +
+ + 时间 +
+
+ + +
+ +
+
- +
+ + 备注 +
+
@@ -95,7 +129,8 @@ - 提交 + + 提交 @@ -182,6 +217,7 @@ export default { scrapList: [], sectionArray: [], disabled: true, + subIconUrl: require('@/assets/sub-right.png'), rules: { // workOrderId: [ // { required: true, message: '请选择工单', trigger: 'change' } @@ -257,6 +293,9 @@ export default { } }, methods: { + refresh () { + this.ruleForm.logTime = new Date().getTime() + }, getSection (value) { const temp = this.lineArray.filter(item => { return item.id === value @@ -274,6 +313,13 @@ export default { inputFun () { this.$emit('input') }, + showNumber () { + this.show = true + this.simpleShow = false + this.simpleShow1 = false + this.simpleShow2 = false + this.simpleShow3 = false + }, focusInput (e) { this.inputEle = e.srcElement // 关闭所有keyboard @@ -288,6 +334,7 @@ export default { this.simpleShow1 = false this.simpleShow2 = false this.simpleShow3 = false + this.show = false // this.$emit('focus') }, focusInput1 (e) { @@ -296,6 +343,7 @@ export default { this.simpleShow = false this.simpleShow2 = false this.simpleShow3 = false + this.show = false }, focusInput2 (e) { this.inputEle2 = e.srcElement @@ -303,6 +351,7 @@ export default { this.simpleShow1 = false this.simpleShow = false this.simpleShow3 = false + this.show = false }, focusInput3 (e) { this.inputEle3 = e.srcElement @@ -310,6 +359,7 @@ export default { this.simpleShow2 = false this.simpleShow1 = false this.simpleShow = false + this.show = false }, onChange1 (input) { this.inputValue1 = input @@ -349,7 +399,6 @@ export default { console.log('onKeyPress', button) }, onInput (value) { - // Toast(value); console.log('value', value, this.ruleForm.num) }, onDelete () { @@ -373,8 +422,8 @@ export default { // }) // }) await authList({ userId: getUserId() }).then(res => { - console.log('res', res.data.data) - if (res && res.data.data.datas.length > 0) { + // console.log('res', res.data.data) + if (res && res?.data?.data?.datas.length > 0) { this.lineArray = res.data.data.datas this.ruleForm.lineId = this.lineArray[0].id this.getSection(this.ruleForm.lineId) @@ -403,6 +452,8 @@ export default { this.$router.push({ path: 'list' }) + } else { + this.$message.error(res.data.msg) } }) } else { @@ -419,22 +470,42 @@ export default {