From 542593742c26593b049b83b00e1a17209af13343 Mon Sep 17 00:00:00 2001 From: loulijun2021 <1694218219@qq.com> Date: 星期一, 10 十月 2022 13:49:15 +0800 Subject: [PATCH] 1.维修验证页面开发完成 --- pages/sbgl/sbwx.html | 569 ++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 366 insertions(+), 203 deletions(-) diff --git a/pages/sbgl/sbwx.html b/pages/sbgl/sbwx.html index 3758ff8..e5b0fae 100644 --- a/pages/sbgl/sbwx.html +++ b/pages/sbgl/sbwx.html @@ -25,19 +25,53 @@ <script type="text/javascript"> var topContent = [ - { - code: 'SB003', - name: '榻胯疆绠辩粍', - wksp_code: "CJ002", - wksp_name: '瑁呴厤杞﹂棿', - eqpchkmain_code: "djbz002" - }, // { - // code: 'SB001', - // name: '榻胯疆绠辩粍', + // docu_code: 'SB00990001', + // eqpcode: 'SB001', + // eqpname: '榻胯疆绠辩粍', // wksp_code: "CJ002", // wksp_name: '瑁呴厤杞﹂棿', - // eqpchkmain_code: "djbz002" + // eqpchkmain_code: "djbz002", + // request_person: '浣╃綏瑗�', + // request_date: '2022-09-20 15:20:30', + // source: '璁惧鐐规', + // failure_descript: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓嶄笉绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓�', + // }, + // { + // docu_code: 'SB00990002', + // eqpcode: 'SB002', + // eqpname: '榻胯疆绠辩粍', + // wksp_code: "CJ002", + // wksp_name: '瑁呴厤杞﹂棿', + // eqpchkmain_code: "djbz002", + // request_person: '浣╃綏瑗�', + // request_date: '2022-09-20 15:20:30', + // source: '璁惧鐐规', + // failure_descript: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓�', + // }, + // { + // docu_code: 'SB00990003', + // eqpcode: 'SB003', + // eqpname: '榻胯疆绠辩粍', + // wksp_code: "CJ002", + // wksp_name: '瑁呴厤杞﹂棿', + // eqpchkmain_code: "djbz002", + // request_person: '浣╃綏瑗�', + // request_date: '2022-09-20 15:20:30', + // source: '璁惧鐐规', + // failure_descript: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓�', + // }, + // { + // docu_code: 'SB00990004', + // eqpcode: 'SB004', + // eqpname: '榻胯疆绠辩粍', + // wksp_code: "CJ002", + // wksp_name: '瑁呴厤杞﹂棿', + // eqpchkmain_code: "djbz002", + // request_person: '浣╃綏瑗�', + // request_date: '2022-09-20 15:20:30', + // source: '璁惧鐐规', + // failure_descript: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓�', // }, ]; @@ -46,41 +80,39 @@ let radioValue = '' //鍗曢�夋閫変腑鐨勯」 + let falseArray = [] //鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 - // 鎵弿鐐规宸ヤ綅杩斿洖鏃舵墽琛屾柟娉� + // 鎵弿缁翠慨宸ヤ綅杩斿洖鏃舵墽琛屾柟娉� function scaned(r) { - // let flag = false - // topContent.forEach((item, index) => { - // if (item.code === r) { - // flag = true - // } - // }) - // if (flag) { - // vant.Notify({ - // type: 'danger', - // message: '姝ゆ潯鐮佸凡鎵弿锛屽凡鍦ㄥ垪琛ㄤ腑锛�' - // }); - // } else { - // get('AppDeviceManage/CheckScanDeviceQrCodeData', { - // eqpcode: r - // }).then(res => { - // if (res.code === '200' && res.data[0].eqpchkmain_code !== null) { - // topContent.unshift(res.data[0]) - // topContentClcik(topContent[0].code) - // } + radioValue = r - // if (res.code === '200' && res.data[0].eqpchkmain_code === null) { - // vant.Notify({ - // type: 'danger', - // message: '褰撳墠璁惧鏈缃偣妫�鏍囧噯缁戝畾鐐规椤圭洰锛�' - // }); - // } - // }) - // } - } - function topContentClcik(code) { + let temp = {} + let flag = false + topContent.forEach((item, index) => { + if (item.docu_code === radioValue) { + temp = item + topContent.splice(index, 1) + flag = true + } + }) + if (flag) { + topContent.unshift(temp) + } else { + vant.Notify({ + type: 'danger', + message: '鎵�鎵簩缁寸爜鍥村湪鍒楄〃涓紒' + }) + if (topContent.length > 0) { + radioValue = topContent[0].docu_code + } + } + + + falseArray.push({ + id: '1' + }) } </script> </head> @@ -90,161 +122,177 @@ <div class="body"> - <van-nav-bar title="璁惧缁翠慨" @click-right="onClickRight" left-arrow @click-left="onClickleft"> - <template #right> - <van-popover style="" placement="bottom-end" :offset="[13,8]" v-model="showPopover" - trigger="click" :actions="actions" @select="onSelect"> - <template #reference> - <van-icon name="bars" size='20' color='#fff' /> - </template> - </van-popover> - </template> - </van-nav-bar> + <van-sticky> + <van-nav-bar title="璁惧缁翠慨" @click-right="onClickRight" left-arrow @click-left="onClickleft"> + <template #right> + <van-popover style="" placement="bottom-end" :offset="[13,8]" v-model="showPopover" + trigger="click" :actions="actions" @select="onSelect"> + <template #reference> + <van-icon name="bars" size='20' color='#fff' /> + </template> + </van-popover> + </template> + </van-nav-bar> + </van-sticky> - <div class="head"> - <div class="head_block"> - <div class="head_left"> - <div class="head_bar"></div> - <div class="head_title"> - 鎵弿缁翠慨宸ヤ綅 + <div v-if="topContent.length===0"> + <div class="sacnBody"> + <div class="box"> + <div class="boxImg"></div> + </div> + <div class="scanText">鏆傛棤璁惧鍙淮淇�</div> + </div> + </div> + + <div v-else> + <div class="head" style="height: 240px; overflow: scroll;"> + <div class="head_block"> + <div class="head_left"> + <div class="head_bar"></div> + <div class="head_title"> + 鎵弿缁翠慨宸ヤ綅 + </div> </div> + + <div style="margin-right: 10px;"> + <van-icon name="scan" color='red' size='24' @click='topScanClick()' /> + </div> + </div> - <div style="margin-right: 10px;"> - <van-icon name="scan" color='red' size='24' @click='topScanClick()' /> - </div> + <van-radio-group v-model="radioValue"> + <van-cell-group> + <div style="margin: 10px 0;" v-for="(item,index) in topContent" :key="item.eqpcode" + @click="topContentClcik(item.docu_code)"> + <div class="cellDiv">缁翠慨鐢宠鍗曪細{{item.docu_code}}</div> + <div class="cellDiv">宸ヤ綅缂栫爜锛歿{item.eqpcode}}</div> + <div class="cellDiv">宸ヤ綅鍚嶇О锛歿{item.eqpname}}</div> + <div class="cellDiv">鐢熶骇杞﹂棿锛歿{item.wksp_name}}</div> + <van-cell :title="'鐢宠浜哄憳锛�'+item.request_person"> + <template #right-icon> + <van-radio style="margin-right: 10px;" checked-color='red' + :name="item.docu_code" /> + </template> + </van-cell> + <div class="cellDiv">鐢宠鏃堕棿锛歿{item.request_date}}</div> + <div class="cellDiv">鏁呴殰鏉ユ簮锛歿{item.source}}</div> + <div class="cellDiv">鏁呴殰鎻忚堪锛歿{item.failure_descript}}</div> + + </div> + </van-cell-group> + </van-radio-group> </div> - <div class="flex_between" style=""> - <div id="contentLeft" style="width: 100%;margin-top: 10px;"> - <div id="topContentID" v-for="item in topContent" :key="item.code" - style="margin-bottom: 10px;margin-left: 20px;" @click="topContentClcik(item.code)"> - <div style="display: flex;align-items: center;"> - <div> - <div>宸ヤ綅缂栫爜锛�</div> - <div>宸ヤ綅鍚嶇О锛�</div> - <div>鐢熶骇杞﹂棿锛�</div> + <div style="height: 340px;overflow: scroll;"> + + <div class="head" style="margin-bottom: 10px;padding-bottom: 10px;"> + <div class="head_block" style="margin-bottom:10px;"> + <div class="head_left"> + <div class="head_bar"></div> + <div class="head_title"> + 鏁呴殰鎻忚堪 </div> - <div> - <div>{{item.code}}</div> - <div>{{item.name}}</div> - <div>{{item.wksp_name}}</div> + </div> + </div> + + + + <div style="display:flex;flex-direction: column;width: 96%;margin: auto;"> + <van-field class="vanFieldInputArea" v-model="messageDescr" rows="3" autosize + type="textarea" placeholder="璇疯緭鍏�" /> + </div> + <div style="width: 96%;margin: auto;margin-top: 10px;"> + <van-uploader :before-read="beforeRead" :before-delete="beforeDelete" v-model="fileList" + :after-read="afterRead" multiple :max-count="3" /> + </div> + + </div> + + <div class="head" style="margin-bottom: 10px;padding-bottom: 10px;"> + <div class="head_block"> + <div class="head_left"> + <div class="head_bar"></div> + <div class="head_title"> + 鍋滄満缁翠慨 </div> </div> - </div> - </div> - <div id="contentRight"> - <van-radio-group v-model="radioValue" style="padding-right: 12px;"> - <van-radio checked-color='red' icon-size="18px" - style="height: 63px;margin-bottom: 10px;" v-for="item in topContent" - :key="item.code" :name="item.code"></van-radio> - </van-radio-group> - </div> - </div> - </div> - - <div class="head" - :style="{marginTop:topContent.length===0?'100px':'0',minHeight:topContent.length===0?'0':'220px'}" - style="margin-bottom: 10px;padding-bottom: 10px;overflow-y: ;" - :style="{marginTop:topContent.length===0?'78px':'0'}"> - <div class="head_block" style="margin-bottom:10px;"> - <div class="head_left"> - <div class="head_bar"></div> - <div class="head_title"> - 鏁呴殰鎻忚堪 - </div> - </div> - </div> - - - - <div style="display:flex;flex-direction: column;width: 96%;margin: auto;"> - <van-field class="vanFieldInputArea" v-model="messageDescr" rows="2" autosize type="textarea" placeholder="璇疯緭鍏�" /> - </div> - <div style="width: 96%;margin: auto;margin-top: 10px;"> - <van-uploader @oversize="onOversize" :before-read="beforeRead" v-model="fileList" - :after-read="afterRead" multiple :max-count="3" /> - </div> - - </div> - - - <div class="head" style="margin-bottom: 10px;padding-bottom: 10px;overflow-y: ;"> - <div class="head_block"> - <div class="head_left"> - <div class="head_bar"></div> - <div class="head_title"> - 鍋滄満缁翠慨 + <div style="margin-right: 10px;"> + <div class="flex_center" + style="width: 100%;display: flex;justify-content: space-around;"> + <van-button class="buttonSmall" size="small" :plain="isStop!=='Y'" + style="margin-right: 10px;" @click="isStopClick('Y')" type="primary"> + 鏄�</van-button> + <van-button class="buttonSmall" size="small" :plain="isStop!=='N'" + @click="isStopClick('N')" type="danger">鍚�</van-button> + </div> + </div> </div> </div> - <div style="margin-right: 10px;"> - <div class="flex_center" style="width: 100%;display: flex;justify-content: space-around;"> - <van-button class="buttonSmall" size="small" :plain="isStop!=='Y'" - style="margin-right: 10px;" @click="isStopClick('Y')" type="primary"> - 鏄�</van-button> - <van-button class="buttonSmall" size="small" :plain="isStop!=='N'" - @click="isStopClick('N')" type="danger">鍚�</van-button> + <div class="head" v-if="isStop==='N'" style="margin-bottom: 10px;padding-bottom: 10px;"> + <div class="head_block" style="margin-bottom:10px;"> + <div class="head_left"> + <div class="head_bar"></div> + <div class="head_title"> + 缁翠慨鍐呭 + </div> + </div> + </div> + + <div style="display:flex;flex-direction: column;width: 96%;margin: auto;"> + <van-field class="vanFieldInputArea" v-model="messageDescr2" rows="3" autosize + type="textarea" :before-delete="beforeDelete2" placeholder="璇疯緭鍏�" /> </div> </div> - </div> - </div> + + <div class="head" v-if="isStop==='N'" style="margin-bottom: 10px;padding-bottom: 10px;"> + <div class="head_block" style="margin-bottom:10px;"> + <div class="head_left"> + <div class="head_bar"></div> + <div class="head_title"> + 鏇存崲澶囦欢 + </div> + </div> + </div> - <div class="head" v-if="isStop==='N'" style="margin-bottom: 10px;padding-bottom: 10px;overflow-y: ;"> - <div class="head_block" style="margin-bottom:10px;"> - <div class="head_left"> - <div class="head_bar"></div> - <div class="head_title"> - 缁翠慨鍐呭 + <div style="display:flex;flex-direction: column;width: 96%;margin: auto;"> + <van-field class="vanFieldInputArea" v-model="messageDescr3" rows="3" autosize + type="textarea" placeholder="璇疯緭鍏�" /> + </div> + <div style="width: 96%;margin: auto;margin-top: 10px;"> + <van-uploader :before-read="beforeRead2" v-model="fileList2" :after-read="afterRead2" + multiple :max-count="3" /> + </div> + + </div> + + <div class="footer" style="min-height:50px;"> + <div + style="position:fixed;bottom: 0;width: 96%;display: flex;justify-content: center;flex-direction: column;align-items: center"> + + <van-button v-show="isStop==='Y'" :disabled="messageDescr.trim().toString().length===0" + class="vanButtonInfo" @click="submit" :loading="submitIsDisabled" + loading-text='姝e湪鎻愪氦,璇风◢绛�...' type="info"> + 纭鎻愪氦</van-button> + + <van-button v-show="isStop==='N'" + :disabled="messageDescr.trim().toString().length===0||messageDescr2.trim().toString().length===0" + class="vanButtonInfo" @click="submit" type="info" :loading="submitIsDisabled" + loading-text='姝e湪鎻愪氦,璇风◢绛�...'> + 纭鎻愪氦</van-button> + </div> </div> + </div> - <div style="display:flex;flex-direction: column;width: 96%;margin: auto;"> - <van-field class="vanFieldInputArea" v-model="messageContent" rows="2" autosize type="textarea" placeholder="璇疯緭鍏�" /> - </div> - </div> - - - <div class="head" v-if="isStop==='N'" style="margin-bottom: 10px;padding-bottom: 70px;overflow-y: ;"> - <div class="head_block" style="margin-bottom:10px;"> - <div class="head_left"> - <div class="head_bar"></div> - <div class="head_title"> - 鏇存崲澶囦欢 - </div> - </div> - </div> - - - - <div style="display:flex;flex-direction: column;width: 96%;margin: auto;"> - <van-field class="vanFieldInputArea" v-model="messageDescr2" rows="2" autosize type="textarea" placeholder="璇疯緭鍏�" /> - </div> - <div style="width: 96%;margin: auto;margin-top: 10px;"> - <van-uploader :before-read="beforeRead" v-model="fileList2" :after-read="afterRead2" multiple - :max-count="3" /> - </div> </div> - - - - - <div class="footer" style="min-height:50px;"> - <div - style="position:fixed;bottom: 0;width: 96%;display: flex;justify-content: center;flex-direction: column;align-items: center"> - <van-button class="vanButtonInfo" @click="submit" type="info"> - 纭鎻愪氦</van-button> - </div> - </div> - - </div> @@ -258,6 +306,7 @@ el: '#app', data: function() { return { + submitIsDisabled: false, overlayShow: false, showPopover: false, actions: [{ @@ -271,8 +320,8 @@ text: '閫�鍑虹櫥褰�' }], topContent2: topContent, - messageDescr: '', - fileList: [ + messageDescr: '', //鏁呴殰鎻忚堪 蹇呭~ + fileList: [ //鏁呴殰鎻忚堪鍥剧墖 // { // url: 'https://img01.yzcdn.cn/vant/leaf.jpg' // }, @@ -283,10 +332,10 @@ // }, ], isStop: 'Y', - messageContent: '', - messageDescr2: '', - fileList2: [], - photoList: [], + messageDescr2: '', //缁翠慨鍐呭 褰撶淮淇仠鏈洪�変簡鍚� 姝ゅ瓧娈靛繀濉� + messageDescr3: '', //鏇存崲澶囦欢 + fileList2: [], //鏇存崲澶囦欢鍥剧墖 + falseArray2: falseArray, } }, watch: { @@ -295,9 +344,9 @@ if (newValue !== oldValue) { // this.topContent2 = topContent // this.$forceUpdate() - if (topContent[0] && topContent[0].code) { + if (topContent[0] && topContent[0].eqpcode) { this.$forceUpdate() - this.topContentClcik(topContent[0].code) + this.topContentClcik(topContent[0].eqpcode) } } @@ -305,20 +354,102 @@ deep: true, immediate: true, }, + 'falseArray2.length': { + handler(newValue, oldValue) { + this.$forceUpdate() + }, + deep: true, + immediate: true, + }, }, created() {}, - mounted() {}, + mounted() { + this.getList() + }, methods: { - afterRead2(file) { + getList() { + get('AppDeviceManage/RepairScanDeviceQrCodeDataList').then(res => { + if (res.code === '200') { + topContent = res.data + if (topContent.length > 0) { + radioValue = topContent[0].docu_code + } + this.$forceUpdate() + } + }) + }, + submit() { + const result = topContent.find(item => item.docu_code === radioValue) + + const formData = new FormData() + formData.append("username", localStorage.getItem('username')) + formData.append("docu_code", result.docu_code) + formData.append("eqpcode", result.eqpcode) + formData.append("wkshpcode", result.wksp_code) + formData.append("faultdescr", this.messageDescr) + formData.append("is_stoprepair", this.isStop) + formData.append("repaircontent", this.messageDescr2) + formData.append("replaceparts", this.messageDescr3) + + this.fileList.forEach(item => { + formData.append('files1', item.file) + }) + this.fileList2.forEach(item => { + formData.append('files2', item.file) + }) + + for (let [a, b] of formData.entries()) { + console.log(a, ':', b); + } + + this.submitIsDisabled = true + post('AppDeviceManage/RepairScanDeviceSave', formData).then(res => { + if (res.code === '200') { + topContent.forEach((item, index) => { + if (item.docu_code === radioValue) { + topContent.splice(index, 1) + } + }) + this.messageDescr = '' //鏁呴殰鎻忚堪 + this.messageDescr2 = '' //缁翠慨鍐呭 + this.messageDescr3 = '' //璺熸崲澶囦欢 + this.isStop = 'Y' + this.fileList = [] + this.submitIsDisabled = false + if (topContent.length > 0) { + radioValue = topContent[0].docu_code + } + this.$forceUpdate() + } else { + this.submitIsDisabled = false + } + }) + }, + isStopClick(val) { this.isStop = val + if (val === 'Y') { + this.messageDescr2 = '' + this.messageDescr3 = '' + this.fileList2 = [] + } this.$forceUpdate() }, - onOversize(file) { - console.log(file, 1); - this.$toast("鏂囦欢澶у皬涓嶈兘瓒呰繃5MB"); + beforeDelete() { + this.fileList.forEach((item, index) => { + if (file.file.lastModified === item.file.lastModified) { + this.fileList.splice(index, 1) + } + }) + }, + beforeDelete2() { + this.fileList2.forEach((item, index) => { + if (file.file.lastModified === item.file.lastModified) { + this.fileList2.splice(index, 1) + } + }) }, //鏍¢獙鍥剧墖鐨勬牸寮� beforeRead(file) { @@ -330,28 +461,55 @@ this.$toast('鍥剧墖澶у皬涓嶈兘瓒呰繃 100MB'); return false; } + + let flag = true + this.fileList.forEach(item => { + if (file.lastModified === item.file.lastModified) { + vant.Notify({ + type: 'danger', + message: '涓婁紶澶辫触锛屾鍥剧墖宸蹭笂浼狅紒' + }); + flag = false + } + }) + if (!flag) { + return false + } + return true; }, - afterRead(file) { - // 姝ゆ椂鍙互鑷灏嗘枃浠朵笂浼犺嚦鏈嶅姟鍣� - - //鍒涘缓FormData瀵硅薄銆備笂浼犲浘鐗囬渶瑕佽浆鎹簩杩涘埗锛岃繖閲岃鐢ㄥ埌FormData - let forms = new FormData(); - //"file"琛ㄧず缁欏悗鍙颁紶鐨勫睘鎬у悕瀛� - forms.append("file", file.file); //鑾峰彇涓婁紶鍥剧墖淇℃伅 - - this.photoList = forms - }, - submit() { - // 寮�鍙戞椂瀵笷ormData瀵硅薄append鏁版嵁鍚庢墦鍗板嚭鏉ヤ负绌哄璞★紝寮�濮嬩互涓烘槸娌℃湁append杩涘幓锛屽疄闄呬笂鏄疐ormData瀵硅薄涓嶈兘鐩存帴鐢╟onsole.log(formData)杩涜鎵撳嵃銆� - // 濡傛灉瑕佹墦鍗帮紝鍙互鐢ㄤ笅闈㈢殑鏂瑰紡锛� - // for (var key of this.photoList.entries()) { - // console.log(key[0] + ', ' + key[1] ); - // } - - for (let [a, b] of this.photoList.entries()) { - console.log(a, ', ', b); + beforeRead2(file) { + if (!/(jpg|jpeg|png|JPG|PNG)/i.test(file.type)) { + this.$toast("璇蜂笂浼犳纭牸寮忕殑鍥剧墖"); + return false; } + if (file.size > 100 * 1024 * 1024) { + this.$toast('鍥剧墖澶у皬涓嶈兘瓒呰繃 100MB'); + return false; + } + + let flag = true + this.fileList2.forEach(item => { + if (file.lastModified === item.file.lastModified) { + vant.Notify({ + type: 'danger', + message: '涓婁紶澶辫触锛屾鍥剧墖宸蹭笂浼狅紒' + }); + flag = false + } + }) + if (!flag) { + return false + } + + return true; + }, + + afterRead(file) { + + }, + afterRead2(file) { + }, topScanClick() { createWithoutTitle('../../components/barcode_scan.html', { @@ -374,8 +532,9 @@ vanFieldBlur() { this.$forceUpdate() }, - topContentClcik(code) { - + topContentClcik(docu_code) { + radioValue = docu_code + this.$forceUpdate() }, onClickleft() { history.back() @@ -398,5 +557,9 @@ </script> <style type="text/css"> @import url('../../css/global.css'); + + .van-hairline--top-bottom { + position: static; + } </style> </html> -- Gitblit v1.9.3