From afcda7778648dc4e6f348ef3ddf5648f5fd9c3e7 Mon Sep 17 00:00:00 2001 From: liushuai Date: Thu, 5 Sep 2019 10:33:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/ParseQuery.js | 34 + src/assets/img/img4.png | Bin 0 -> 7129 bytes .../Assembly/AssemblyExecution/index.vue | 4 + .../ManufacturingCenter/ParseQuery/index.vue | 4275 +++++++++++++++++ .../ProcessQuotaEstablishment/index.vue | 20 +- src/views/MarketingCenter/BidBond/index.vue | 27 +- src/views/MarketingCenter/CRM/index.vue | 26 +- .../ComprehensiveInquiryMS/index.vue | 6 +- .../ContractCapitalManagement/index.vue | 35 +- .../ContractInformationManagement/index.vue | 20 +- .../MarketingCenter/InvoiceRecord/index.vue | 23 +- .../MarketingCenter/PerformanceBond/index.vue | 6 +- .../MarketingCenter/SafetyMargin/index.vue | 51 +- .../OutsourcingDataMaintenance/index.vue | 2 +- .../MaterialManagement/index.vue | 13 +- .../PurchaseSituationSearch/index.vue | 1 + .../ImportChangeParts/index.vue | 4 +- .../ImportChangeParts/specificationData1.vue | 71 +- .../ImportParts/specificationData.vue | 21 +- 19 files changed, 4558 insertions(+), 81 deletions(-) create mode 100644 src/api/ManufacturingCenter/ParseQuery.js create mode 100644 src/assets/img/img4.png create mode 100644 src/views/ManufacturingCenter/ParseQuery/index.vue diff --git a/src/api/ManufacturingCenter/ParseQuery.js b/src/api/ManufacturingCenter/ParseQuery.js new file mode 100644 index 00000000..3d1c1f62 --- /dev/null +++ b/src/api/ManufacturingCenter/ParseQuery.js @@ -0,0 +1,34 @@ +import request from '@/utils/request' +export function SelectMachine() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '发货管理_发货申请_发货单_机床_查询', + param: '机床图号=' + arguments[0] + } + }) +} +export function ProcessOutsourcing() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '工序外协_综合查询', + param: '机床流水号=' + arguments[0] + } + }) +} +export function ProcessProportion() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '工序外协_工序占比_综合查询', + param: '机床流水号=' + arguments[0] + } + }) +} diff --git a/src/assets/img/img4.png b/src/assets/img/img4.png new file mode 100644 index 0000000000000000000000000000000000000000..730a5437f8fba7c9ef2c08dd791523fb67b62b63 GIT binary patch literal 7129 zcmeHLcUTkY)}PP`9TKsiAianyO+eI83=j|@Kmdb?^xm;yiJ(|Q2Px94G%3;rr7232 zCLmn|DZ&aOMOrd1|j)?)zz|73V!oh>&U}xtL;@ZQ>vtLBwz9$sbZV zhE`Qm$7ty3;|vUqPU0;rt*mWq?d&}~&z?Jf;iA{|8@@Mh-M&K%4Z9m25gBzaIyogZ z?S6VjW>!IAQE^FW*`xB>r_bu1zo>6$?0D7L)&07sx9{!9=)1A;iOKgUI`j@B`mF(8wanXHyuJb zBmd8IweS7NWmS;gb-nA}vhsZ^NL604xE;1qsf{6q>Dap}CDfmwcBvks%@uZI>U z9jsvbI?YDjJ};`C$fE^P$^_pi*(MW1d=WVL54rE|MT;wqsI*h5yDf)kiQS15elU%3 zHt&poKJMnqsB9T_MpwRumTON}%CT^71z!YK-3*P;f&EmFde{h0Bi@p;7@^3fp{BU& z4ia)RSMhcxJz71bXsaG0dsfpXndiwJwJ&Zj1zwmYw;s8L?@Z?pYaie!!=jOVaFGHr zX~&GQ?LL&SSZ;jUk^%^!JuKoB7NbP(R$1p)Zc7X%PcvO~=_ z5`2&1-pqr*UX!I?+V!{I=eDQ5QiO495GX~F;)}9n$<{7w9w5*=eT?-fkIx}D!=pD|WE5f1N=loq6C4}T za~+^jZ+Bd%V-ebQAkLJ6qSpzqCe}A%i*g~?C2gy zCJF-^k`+p*H}5Au83Tc~l zoOFbjAUX=u5Ix58HYzB>}iZ z{a`3d;~|3_y-E-WibIhrS;&4~WevY-sy~8gh_GJvBP*UqLGjh*YiHncyXqaS$AT$| z&LG@)nKPS2zXpZ3J_5oU*brnK!LigU?yhr-H#KhXl$KR}O&)J!|VEGJ!(#L0$dmH@w=LL@68lqj|DDqJmmemyy=(97lPcMt8 z`IgtjWbu1-U-sY7ENhaOq~#Nu&k=RJ9h$;_JJ%vR1Lm{J|aT)^==0xHVgDIovaj?Vl`#QttP88hEw8Sc%QRB z!9w~b#__{of3~y+X5CH8I0Je2=A0N(zSox0;^8mBOm_M@#x;&%n<0n5DpLPUu$^%h3EDPivX^2lW0@^nQF?}%1$A8QQRC>4U0M0{C||h>3F$+` zOj2Yzq3!5v@_ODfcFVQi=Sw%!v^hvAYuii<6E6pIoeA?_!M--9LLM(cD5kl{Z;3@rD}#l zTI5Nh>;a1w=O=BkT7l9;nLvJh^suNu>_mnzgaRNMR(`OQf`&SDNcm}5lUmR_f@p*> zgUCBcEgKiUQiBV3!g%m2|nzW<`E4%dYqZ(^7?MD+2GLudkixUn@l|GyDPq z9Oz}5Y3=&fRV5H;cQF(#!koh273|6xy@{bZzYnJgIHdx^ULQu{(xzOeBFLU1qOcm~ zvWcDr8Mkl~jeN$`Gd_}ZNs2glB0vM|&Uoxpl9W>iRWwy3Vm_^$HdtLrZiUYV6?$E_ zU6~@POI$WtO2fC`{vMAf)vDz+(J|}gAhM#N>6c`HlYS7*?!2_g%x@L!Z=9)rq)9{q z2ypMbMY;?EAEdL3^#(N0Y`oyN1oL;!Hq&oD!3nGHIm!O`wg;q3WF@G^n(#sp`r(l- z!=|XV_@u2#?Dx;G;a=IHM}FK70xHOqlP}1s`cR2J2qnZi+pg9mi780`YmrCjP(w9) z^?S|E4nMI*K3W9zRLiJU@u@MrUi!0J@uIQ04Fd0|&n|GUvgRCWp5tD>mRkuGe`RF4 z0hxLVy13c~wQ1BpCF0M>`ICDH=<&*lOkWhDlD3(^FI?gr@I8*1Yc*$}#FtO%+#LN;zirA>U(pskI{yi)oqarrzzm z=}Mi`SMnOU%?{AZdQ4ELqL@jdULxsd0~42cO5pe9E*JoP${Q{=z;;*5k()YONfi)6(+0$hqEcnM zg#(@+PHGOJdh$-J`MBnX8p2a(+vYm%KYs1|B)fUvFGo)i9^6h|oVkR1vbCJ4Q=PeH zKPEiysBxk{{8#6?4_Pe_HCbKWhM$A@i!(|lzMM_6g{$n zWYXPXr5?X4YDWu4%Z&^R|KUCNM)C~K6@tKi?!^`E#q5Ci8x=WPJB5=I{|tm%;iW{K zhMEjL5O}R#wP4=u`vdW_2^1^j8;cPA{%~DNUNYg~wCkzu)-lbc7nYP`qRj42?19Ff z4@n@P_)-%DV6Drq`nM*4?wr){cKRcZ=7Y=EjExV!=`DTgjOs=|^coFo5z}pXXVSl~ zR>XX8ojtdk+xNJtSG(>2zMVsEGNeZiaFGb=P86~#M1+u7A8azCu|cpbTe zvpntw%A&lKSM~CMTA`fkcCJqsbF$JhSWEF2&4D!~uC?cj=d#Y7%TMVPPPNuoo>9*7 z5A}j6AF3zLY3o|Q+`}I+&y_Q zc6{#D>L?Yg(X`mb3{ATwg{Vf0am!)1gqXF;u1vJasMDRojd)d3(h6BG>s=~zqI#=} zS%sfP!0rhaupcxtBUB4T(INMTWbV&&m=J%Q4+52PsG0bYJXSg$|Lc9kl2Io%k{0000f$Dk*=zd98?R>7O*Q|j7H>UMr|zG)%b+k+(qB7tKW09!|Gfq zctySnIlsy$s02@F?L>Y4sQ>BVAV>Spe!(`@PR0|je~3t!Ut}SzBYyjHpaJKx1$}Nu zC>1AU5N3x{zU#Q>mkT8)u34q8lT<)}K)ppL+_(J*lD1zQH8I7#wk-Uc4%dVIcP2BA z_Ckpcr2_(QYSg|fjhT6Bqm`DLv{zPdk;(9_I${jTUZO1DtiXQPkvB5=Pnl!@W5%D_h~vcSiaWmk&|R5x>7Fr-`Q zAkZpL_{ghG7ERk2#B#n4Vvq117y)aoFz0d0a;EFgCNo7NbYb(cqaO$L-bY(iM#6~w z7a85_`sI(7O`_nB&_d9-^gKE2i4RdYW4perLH>{`Uz|~f!p+xWt(|PsdRQ$5M_N>_ z-L?aE951=Fp8%qGLq{&}w%GHzK81(Xpj`y9yu{5}ud7k3#BnqO-SJ4bUL>kuVRq$XF+^H1GJ;_B{>}W`ul@fZ!b7v{Nqz$%rx(`bFg+etW8fD(Y?MdW2Gs6sdSpWS3(0}a(VJRz+H zwlzX?*$6$Y9G_>dHB99QAK?*Qj~hBEC|?X3acyJr`zGmEprHm&AYJArZCiBDv^Q?+ zYY92*$JigIW0jAK2sO`QFfJGU#Eju#bi*&YcZi@+ZQ&c+!vE;J zp=Z}5@U#`#^|GQNU_@}cxm*j~;gM`p+xb&{hxv5N73RqKnY-1JudjAT_{YDSD&N_O zyR^%?sMzTAi1E$cr&Yp0U}}A;PGuk!>LqyKza<0fsooiQctt$ZlVq{h*F2pP@3Vvg z?PhYF8Eu3M^83Dlj;C8X6+M@7qG2{0rOve@&O|CxdpT?Z0KaiQ?a| Mh4oLa$pZHN3l@~ literal 0 HcmV?d00001 diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue index fca6947f..ecf9f1ff 100644 --- a/src/views/Assembly/AssemblyExecution/index.vue +++ b/src/views/Assembly/AssemblyExecution/index.vue @@ -168,6 +168,10 @@ export default { }, methods: { submitTable2(row) { + row.备注 ? row.备注 : '' + row.实际工时 ? row.实际工时 : '' + row.修补工时 ? row.修补工时 : '' + console.log(row.备注, row.计划流水号, row.实际工时, row.修补工时) submitTable2(row.备注, row.计划流水号, row.实际工时, row.修补工时).then(res => { if (res.data[0].result === '1') { this.$message.success('编辑成功') diff --git a/src/views/ManufacturingCenter/ParseQuery/index.vue b/src/views/ManufacturingCenter/ParseQuery/index.vue new file mode 100644 index 00000000..24bc4673 --- /dev/null +++ b/src/views/ManufacturingCenter/ParseQuery/index.vue @@ -0,0 +1,4275 @@ + + + + + diff --git a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue index d0d17861..cab51562 100644 --- a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue +++ b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue @@ -406,7 +406,7 @@ - + + :value="item.value"> +
{{ item.label }}
+
{{ item.name1 }}
+ - + + + + + + @@ -681,6 +689,7 @@ export default { perNum2: '', tuhao: [], tuhaoValue: '', + guige: '', check1: 0, check2: 0, check3: 0, @@ -1297,10 +1306,12 @@ export default { this.CraftmanValue = this.CraftmanValue2 this.perNum = this.perNum2 this.remark1 = '' + this.guige = '' this.tuhaoValue = '' }, inputChange() { // 零件号改变 this.remark1 = '' + this.guige = '' this.tuhaoValue = '' }, // 典艺工艺查询 @@ -1368,6 +1379,7 @@ export default { this.tuhao.push({ label: response.data[i].零件图号, name: response.data[i].零件名称, + name1: response.data[i].规格, value: response.data[i].工艺计划流水号 }) } @@ -1387,11 +1399,13 @@ export default { // 当完成工艺号改变时，零件名称改变，并获取工艺要求 numChange1() { this.remark1 = '' + this.guige = '' this.tableData4 = null console.log(this.tuhaoValue) for (let i = 0; i < this.tuhao.length; i++) { if (this.tuhaoValue === this.tuhao[i].value) { this.remark1 = this.tuhao[i].name + this.guige = this.tuhao[i].name1 this.num = this.tuhao[i].value } } diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue index 55fa6d6c..73ed761b 100644 --- a/src/views/MarketingCenter/BidBond/index.vue +++ b/src/views/MarketingCenter/BidBond/index.vue @@ -32,8 +32,8 @@ size="small" type="date" placeholder="请选择结束日期"/> - 查询 - 增加 + 查询 + 新增 @@ -192,7 +192,7 @@ @node-click="handleNodeClick" /> - +