From 2b8231f5da82c56c3315d1cf5b126688ea3d501e Mon Sep 17 00:00:00 2001 From: loulijun2021 <1694218219@qq.com> Date: 星期日, 09 十月 2022 17:01:32 +0800 Subject: [PATCH] 1.设备维修申请、设备维修开发完成 --- pages/xtsy/index.html | 7 unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxsq.html | 129 ++- unpackage/cache/wgt/H5EDA0853/pages/xtsy/index.html | 7 pages/sbgl/rcdj.html | 20 unpackage/cache/wgt/H5EDA0853/pages/sbgl/dqby.html | 19 unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxyz.html | 366 ++++++-- pages/sbgl/sbwx.html | 511 ++++++++----- unpackage/cache/wgt/H5EDA0853/css/global.css | 48 css/global.css | 48 /dev/null | 0 pages/sbgl/wxyz.html | 464 ++++++----- pages/sbgl/dqby.html | 19 static/images/box1.png | 0 pages/sbgl/wxsq.html | 129 ++- unpackage/cache/wgt/H5EDA0853/static/images/box1.png | 0 unpackage/cache/wgt/H5EDA0853/pages/sbgl/rcdj.html | 20 unpackage/cache/wgt/H5EDA0853/pages/sbgl/sbwx.html | 510 ++++++++----- 17 files changed, 1,449 insertions(+), 848 deletions(-) diff --git a/css/global.css b/css/global.css index ecb7741..0f42896 100644 --- a/css/global.css +++ b/css/global.css @@ -20,6 +20,11 @@ letter-spacing: 2px; } +.van-nav-bar__right { + padding: 0; + margin-right: 16px; +} + .vanFieldInput { height: 36px; @@ -33,14 +38,13 @@ } .vanFieldInputArea { - height: 72px; - line-height: 24px; - align-items: center; border: 1px solid #ddd !important; border-radius: 5px; - padding: 0; - padding-left: 10px; - margin: 5px 0; + min-height: 73px; +} + +.van-field__control { + padding: 0 10px; } .vanButtonInfo { @@ -163,22 +167,42 @@ box-shadow: #436df5 0px 0px 28px; } +.box { + width: 128px; + height: 128px; + margin: 200px auto 20px; + background-color: #436df5; + border-radius: 50%; + box-shadow: #436df5 0px 0px 28px; + display: flex; + align-items: center; + justify-content: center; +} + +.boxImg { + width: 100px; + height: 100px; + border-radius: 50%; + background: #436df5 url(".././static/images/box1.png") no-repeat; +} + .scanText { margin: auto; color: #000ccc; } -.van-cell{ +.van-cell { padding: 0; font-size: 16px; - line-height:21px; - position:unset; + line-height: 21px; + position: unset; } -.van-cell__title{ + +.van-cell__title { margin-left: 20px; } -.cellDiv{ +.cellDiv { margin-left: 20px; -} \ No newline at end of file +} diff --git a/pages/sbgl/dqby.html b/pages/sbgl/dqby.html index c6ad4e0..41cf45e 100644 --- a/pages/sbgl/dqby.html +++ b/pages/sbgl/dqby.html @@ -73,7 +73,7 @@ let bwcode = '' //鐐瑰嚮閮ㄤ綅鐨勬壂鎻忔 鐐规椤圭洰code - let number = [] //淇濆吇椤圭洰鍐呭 鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 + let falseArray = [] //淇濆吇椤圭洰鍐呭 鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 // 鎵弿淇濆吇宸ヤ綅杩斿洖鏃舵墽琛屾柟娉� function scaned(r) { @@ -130,7 +130,7 @@ } - number.push({ + falseArray.push({ id: '1' }) } @@ -323,7 +323,8 @@ <div style="position:fixed;bottom: 0;width: 96%;display: flex;justify-content: center;flex-direction: column;align-items: center"> - <van-button class="vanButtonInfo" :disabled="resultValue===''" @click="submit" type="info"> + <van-button :load='submitIsDisabled' load-text="姝e湪鎻愪氦,璇风◢绛�..." class="vanButtonInfo" + :disabled="resultValue===''" @click="submit" type="info"> 纭鎻愪氦</van-button> </div> @@ -345,6 +346,7 @@ el: '#app', data: function() { return { + submitIsDisabled: false, overlayShow: false, showPopover: false, actions: [{ @@ -366,7 +368,7 @@ }], topContent2: topContent, centerContent2: centerContent, - number2: number, + falseArray2: falseArray, sheetFlag: false, } @@ -401,14 +403,14 @@ // deep: true, // immediate: true, // }, - 'number2.length': { + 'falseArray2.length': { handler(newValue, oldValue) { this.$forceUpdate() }, deep: true, immediate: true, }, - // 'number.length': { + // 'falseArray.length': { // handler(newValue, oldValue) { // this.$forceUpdate() // }, @@ -452,7 +454,7 @@ username: localStorage.getItem('username'), maintcyc: dropdownValue } - + this.submitIsDisabled = true post('AppDeviceManage/AppDeviceRepairSave' + formatParams(params), data) .then(res => { if (res.code === '200') { @@ -472,7 +474,10 @@ centerContent = [] } resultValue = '' + this.submitIsDisabled = false this.$forceUpdate() + } else { + this.submitIsDisabled = false } }) diff --git a/pages/sbgl/rcdj.html b/pages/sbgl/rcdj.html index d703cf5..9e4c59f 100644 --- a/pages/sbgl/rcdj.html +++ b/pages/sbgl/rcdj.html @@ -63,7 +63,7 @@ let bwcode = '' //鐐瑰嚮閮ㄤ綅鐨勬壂鎻忔 鐐规椤圭洰code - let number = [] //鐐规椤圭洰鍐呭 鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 + let falseArray = [] //鐐规椤圭洰鍐呭 鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 // 鎵弿鐐规宸ヤ綅杩斿洖鏃舵墽琛屾柟娉� function scaned(r) { @@ -120,7 +120,7 @@ } - number.push({ + falseArray.push({ id: '1' }) } @@ -172,7 +172,7 @@ <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' /> + <van-icon name="bars" size='20' color='#fff'/> </template> </van-popover> </template> @@ -300,7 +300,8 @@ <div style="position:fixed;bottom: 0;width: 96%;display: flex;justify-content: center;flex-direction: column;align-items: center"> - <van-button class="vanButtonInfo" :disabled="resultValue===''" @click="submit" type="info"> + <van-button :load='submitIsDisabled' load-text="姝e湪鎻愪氦,璇风◢绛�..." class="vanButtonInfo" + :disabled="resultValue===''" @click="submit" type="info"> 纭鎻愪氦</van-button> </div> @@ -320,6 +321,7 @@ el: '#app', data: function() { return { + submitIsDisabled: false, //鎻愪氦鎸夐挳鏄惁鍙彁浜� overlayShow: false, showPopover: false, actions: [{ @@ -334,7 +336,7 @@ }], topContent2: topContent, centerContent2: centerContent, - number2: number + falseArray2: falseArray } }, watch: { @@ -367,14 +369,14 @@ // deep: true, // immediate: true, // }, - 'number2.length': { + 'falseArray2.length': { handler(newValue, oldValue) { this.$forceUpdate() }, deep: true, immediate: true, }, - // 'number.length': { + // 'falseArray.length': { // handler(newValue, oldValue) { // this.$forceUpdate() // }, @@ -403,6 +405,7 @@ result: resultValue, children: children } + this.submitIsDisabled = true post('AppDeviceManage/AppDeviceCheckSave?username=' + localStorage.getItem('username'), data) .then(res => { if (res.code === '200') { @@ -422,7 +425,10 @@ centerContent = [] } resultValue = '' + this.submitIsDisabled = false this.$forceUpdate() + } else { + this.submitIsDisabled = false } }) diff --git a/pages/sbgl/sbwx.html b/pages/sbgl/sbwx.html index 0435d85..308a3b5 100644 --- a/pages/sbgl/sbwx.html +++ b/pages/sbgl/sbwx.html @@ -24,53 +24,55 @@ <!-- <link rel="stylesheet" href="../../css/global.css" type="text/css" charset="utf-8" /> --> <script type="text/javascript"> - var topContent = [{ - wxsqd: 'SB00990001', - code: 'SB001', - name: '榻胯疆绠辩粍', - wksp_code: "CJ002", - wksp_name: '瑁呴厤杞﹂棿', - eqpchkmain_code: "djbz002", - sqry: '浣╃綏瑗�', - sqsj: '2022-09-20 15:20:30', - gzly: '璁惧鐐规', - gzms: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓嶄笉绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓�', - }, - { - wxsqd: 'SB00990002', - code: 'SB002', - name: '榻胯疆绠辩粍', - wksp_code: "CJ002", - wksp_name: '瑁呴厤杞﹂棿', - eqpchkmain_code: "djbz002", - sqry: '浣╃綏瑗�', - sqsj: '2022-09-20 15:20:30', - gzly: '璁惧鐐规', - gzms: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓�', - }, { - wxsqd: 'SB00990003', - code: 'SB003', - name: '榻胯疆绠辩粍', - wksp_code: "CJ002", - wksp_name: '瑁呴厤杞﹂棿', - eqpchkmain_code: "djbz002", - sqry: '浣╃綏瑗�', - sqsj: '2022-09-20 15:20:30', - gzly: '璁惧鐐规', - gzms: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓�', - }, - { - wxsqd: 'SB00990004', - code: 'SB004', - name: '榻胯疆绠辩粍', - wksp_code: "CJ002", - wksp_name: '瑁呴厤杞﹂棿', - eqpchkmain_code: "djbz002", - sqry: '浣╃綏瑗�', - sqsj: '2022-09-20 15:20:30', - gzly: '璁惧鐐规', - gzms: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓�', - }, + var topContent = [ + // { + // docu_code: 'SB00990001', + // eqpcode: 'SB001', + // eqpname: '榻胯疆绠辩粍', + // wksp_code: "CJ002", + // wksp_name: '瑁呴厤杞﹂棿', + // 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: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓�', + // }, ]; @@ -78,7 +80,7 @@ let radioValue = '' //鍗曢�夋閫変腑鐨勯」 - let number = [] //鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 + let falseArray = [] //鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 // 鎵弿缁翠慨宸ヤ綅杩斿洖鏃舵墽琛屾柟娉� function scaned(r) { @@ -88,7 +90,7 @@ let temp = {} let flag = false topContent.forEach((item, index) => { - if (item.code === radioValue) { + if (item.docu_code === radioValue) { temp = item topContent.splice(index, 1) flag = true @@ -102,13 +104,13 @@ message: '鎵�鎵簩缁寸爜鍥村湪鍒楄〃涓紒' }) if (topContent.length > 0) { - radioValue = topContent[0].code + radioValue = topContent[0].docu_code } } - number.push({ + falseArray.push({ id: '1' }) } @@ -133,145 +135,162 @@ </van-nav-bar> </van-sticky> - <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 v-if="topContent.length===0"> + <div class="sacnBody"> + <div class="box"> + <div class="boxImg"></div> </div> - + <div class="scanText">鏆傛棤璁惧鍙淮淇�</div> </div> - - <van-radio-group v-model="radioValue"> - <van-cell-group> - <div style="margin: 10px 0;" v-for="(item,index) in topContent" :key="item.code" - @click="topContentClcik(item.code)"> - <div class="cellDiv">缁翠慨鐢宠鍗曪細{{item.wxsqd}}</div> - <div class="cellDiv">宸ヤ綅缂栫爜锛歿{item.code}}</div> - <div class="cellDiv">宸ヤ綅鍚嶇О锛歿{item.name}}</div> - <div class="cellDiv">鐢熶骇杞﹂棿锛歿{item.wksp_name}}</div> - <van-cell :title="'鐢宠浜哄憳锛�'+item.sqry"> - <template #right-icon> - <van-radio style="margin-right: 10px;" checked-color='red' :name="item.code" /> - </template> - </van-cell> - <div class="cellDiv">鐢宠鏃堕棿锛歿{item.sqsj}}</div> - <div class="cellDiv">鏁呴殰鏉ユ簮锛歿{item.gzly}}</div> - <div class="cellDiv">鏁呴殰鎻忚堪锛歿{item.gzms}}</div> - - </div> - </van-cell-group> - </van-radio-group> - </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> - - - - <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;"> + <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;"> - <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> + <van-icon name="scan" color='red' size='24' @click='topScanClick()' /> </div> + </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="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 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> + + + + <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 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="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: 10px;"> - <div class="head_block" style="margin-bottom:10px;"> - <div class="head_left"> - <div class="head_bar"></div> - <div class="head_title"> - 鏇存崲澶囦欢 + <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 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="2" autosize - type="textarea" placeholder="璇疯緭鍏�" /> + + <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 style="width: 96%;margin: auto;margin-top: 10px;"> - <van-uploader :before-read="beforeRead" v-model="fileList2" :after-read="afterRead2" - multiple :max-count="3" /> + + <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 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" type="info"> - 纭鎻愪氦1</van-button> - - <van-button v-show="isStop==='N'" - :disabled="messageDescr.trim().toString().length===0||messageContent.trim().toString().length===0" - class="vanButtonInfo" @click="submit" type="info"> - 纭鎻愪氦2</van-button> - - </div> - </div> </div> @@ -287,6 +306,7 @@ el: '#app', data: function() { return { + submitIsDisabled: false, overlayShow: false, showPopover: false, actions: [{ @@ -301,7 +321,7 @@ }], topContent2: topContent, messageDescr: '', //鏁呴殰鎻忚堪 蹇呭~ - fileList: [ + fileList: [ //鏁呴殰鎻忚堪鍥剧墖 // { // url: 'https://img01.yzcdn.cn/vant/leaf.jpg' // }, @@ -312,11 +332,10 @@ // }, ], isStop: 'Y', - messageContent: '', //缁翠慨鍐呭 褰撶淮淇仠鏈洪�変簡鍚� 姝ゅ瓧娈靛繀濉� - messageDescr2: '', //鏇存崲澶囦欢 - fileList2: [], - photoList: [], - number2: number + messageDescr2: '', //缁翠慨鍐呭 褰撶淮淇仠鏈洪�変簡鍚� 姝ゅ瓧娈靛繀濉� + messageDescr3: '', //鏇存崲澶囦欢 + fileList2: [], //鏇存崲澶囦欢鍥剧墖 + falseArray2: falseArray, } }, watch: { @@ -325,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) } } @@ -335,7 +354,7 @@ deep: true, immediate: true, }, - 'number2.length': { + 'falseArray2.length': { handler(newValue, oldValue) { this.$forceUpdate() }, @@ -345,22 +364,91 @@ }, created() {}, mounted() { - console.log(this.$refs.item0) - // console.log(this.$refs.item0.$el.offsetHeight) + 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("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 - console.log(this.messageContent.trim().toString().length === 0 && this.messageDescr.trim() - .toString().length === 0) + 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) { @@ -372,28 +460,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', { @@ -416,8 +531,8 @@ vanFieldBlur() { this.$forceUpdate() }, - topContentClcik(code) { - radioValue = code + topContentClcik(docu_code) { + radioValue = docu_code this.$forceUpdate() }, onClickleft() { @@ -441,5 +556,9 @@ </script> <style type="text/css"> @import url('../../css/global.css'); + + .van-hairline--top-bottom { + position: static; + } </style> </html> diff --git a/pages/sbgl/wxsq.html b/pages/sbgl/wxsq.html index d77b61b..821acdc 100644 --- a/pages/sbgl/wxsq.html +++ b/pages/sbgl/wxsq.html @@ -25,21 +25,22 @@ <script type="text/javascript"> var topContent = [ - // { - // code: 'SB001', - // name: '鐢垫睜缁勪竴绾�', - // wksp_code: "CJ002", - // wksp_name: '鐢垫睜杞﹂棿', - // eapmai_code: "bybz004", - // eapmai_name: "鏍囧噯4", - // main_cycle: "M", - // }, - ]; - - let number = []; // 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 + { + code: 'SB001', + name: '鐢垫睜缁勪竴绾�', + wksp_code: "CJ002", + wksp_name: '鐢垫睜杞﹂棿', + eapmai_code: "bybz004", + eapmai_name: "鏍囧噯4", + main_cycle: "M", + }, + ] - let dropdownValue = 'V1'; //涓嬫媺榛樿閫変腑鐨勫�� + let falseArray = []; // 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 + + + let dropdownValue = 'A'; //涓嬫媺榛樿閫変腑鐨勫�� // 鎵弿缁翠慨宸ヤ綅杩斿洖鏃舵墽琛屾柟娉� function scaned(r) { @@ -47,7 +48,7 @@ eqpcode: r }).then(res => { topContent = res.data - number.push({ + falseArray.push({ id: '1' }) }) @@ -59,7 +60,7 @@ <div id="app"> <div class="body"> - + <van-sticky> <van-nav-bar title="璁惧缁翠慨鐢宠" @click-right="onClickRight" left-arrow @click-left="onClickleft"> <template #right> @@ -72,7 +73,7 @@ </template> </van-nav-bar> </van-sticky> - + <div v-if="topContent.length===0"> <div class="sacnBody"> <div class="scanImg" @click="topScanClick()"></div> @@ -131,7 +132,7 @@ </div> <div style="margin-right: 10px;"> <van-button @click="sheetFlag=true" type="info" style="width:100px;height: 30px;"> - {{dropdownValue==='V1'?'璁惧鐐规':'璁惧鐐规2'}} + {{actionsSheet.find(item=>item.code===dropdownValue).name}} </van-button> <van-action-sheet v-model="sheetFlag" :actions="actionsSheet" @select="onSelectSheet" /> </div> @@ -152,12 +153,12 @@ <div style="display:flex;flex-direction: column;width: 96%;margin: auto;"> - <van-field class="vanFieldInputArea" v-model="messageDescr" rows="2" autosize + <van-field class="vanFieldInputArea" v-model="messageDescr" autosize rows="3" 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" /> + <van-uploader :before-read="beforeRead" v-model="fileList" :after-read="afterRead" + :before-delete="beforeDelete" multiple :max-count="3" /> </div> </div> @@ -166,7 +167,7 @@ <div style="position:fixed;bottom: 0;width: 96%;display: flex;justify-content: center;flex-direction: column;align-items: center"> <van-button class="vanButtonInfo" :disabled="messageDescr.trim().toString().length===0" - @click="submit" type="info"> + @click="submit" type="info" :loading="submitIsDisabled" loading-text='姝e湪鎻愪氦,璇风◢绛�...'> 纭鎻愪氦</van-button> </div> </div> @@ -187,6 +188,7 @@ el: '#app', data: function() { return { + submitIsDisabled: false, //鎻愪氦鎸夐挳鏄惁鍙彁浜� overlayShow: false, showPopover: false, actions: [{ @@ -200,26 +202,28 @@ text: '閫�鍑虹櫥褰�' }], actionsSheet: [{ - code: 'V1', + code: 'A', name: '璁惧鐐规' }, { - code: 'V2', - name: '璁惧鐐规2' - }], - number2: number, + code: 'B', + name: '璁惧淇濆吇' + }, { + code: 'C', + name: '瀹夌伅鍛煎彨' + }, { + code: 'D', + name: '鎵嬪伐' + }, ], + falseArray2: falseArray, messageDescr: '', fileList: [], sheetFlag: false, - } }, watch: { - 'number2.length': { + 'falseArray2.length': { handler(newValue, oldValue) { - - console.log(111) this.$forceUpdate() - }, deep: true, immediate: true, @@ -228,13 +232,50 @@ created() {}, mounted() {}, methods: { - onOversize(file) { - this.$toast("鏂囦欢澶у皬涓嶈兘瓒呰繃5MB"); + //鎻愪氦 + submit() { + const formData = new FormData() + formData.append("username", localStorage.getItem('username')) + formData.append("eqpcode", topContent[0].code) + formData.append("wkshpcode", topContent[0].wksp_code) + formData.append("faultsourcecode", dropdownValue) + formData.append("faultdescr", this.messageDescr) + + this.fileList.forEach((item, index) => { + formData.append('files1', item.file) + }) + + // for (let [a, b] of formData.entries()) { + // console.log(a, b, 1) + // } + this.submitIsDisabled = true + post('AppDeviceManage/MaintainScanDeviceApplySave', formData).then(res => { + if (res.code === '200') { + topContent = [] + this.messageDescr = '' + this.fileList = [] + this.submitIsDisabled = false + this.$forceUpdate() + } else { + this.submitIsDisabled = false + } + + + }) + + }, + // 鍥剧墖鍒犻櫎鍓� + beforeDelete(file) { + this.fileList.forEach((item, index) => { + if (file.file.lastModified === item.file.lastModified) { + this.fileList.splice(index, 1) + } + }) }, afterRead(file) { }, - //鏍¢獙鍥剧墖鐨勬牸寮� + //鍥剧墖涓婁紶鍓嶆牎楠� beforeRead(file) { if (!/(jpg|jpeg|png|JPG|PNG)/i.test(file.type)) { this.$toast("璇蜂笂浼犳纭牸寮忕殑鍥剧墖"); @@ -244,17 +285,27 @@ 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; }, onSelectSheet(val) { dropdownValue = val.code this.sheetFlag = false this.$forceUpdate() - - }, - //鎻愪氦 - submit() { - }, // 杈撳叆妗嗗け鐒﹁Е鍙戜簨浠� vanFieldBlur() { diff --git a/pages/sbgl/wxyz.html b/pages/sbgl/wxyz.html index 8d23b58..af5d98d 100644 --- a/pages/sbgl/wxyz.html +++ b/pages/sbgl/wxyz.html @@ -51,38 +51,37 @@ arrowType: true, //绠ご绫诲埆 messageDescr: '123', fileList: [], - }, - { - wxsqd: 'SB00990003', - code: 'SB003', - name: '榻胯疆绠辩粍', - wksp_code: "CJ002", - wksp_name: '瑁呴厤杞﹂棿', - eqpchkmain_code: "djbz002", - sqry: '浣╃綏瑗�', - sqsj: '2022-09-20 15:20:30', - gzly: '璁惧鐐规', - gzms: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓嶄簡', - arrowType: true, //绠ご绫诲埆 - messageDescr: '123', - fileList: [], - }, - { - wxsqd: 'SB00990004', - code: 'SB004', - name: '榻胯疆绠辩粍', - wksp_code: "CJ002", - wksp_name: '瑁呴厤杞﹂棿', - eqpchkmain_code: "djbz002", - sqry: '浣╃綏瑗�', - sqsj: '2022-09-20 15:20:30', - gzly: '璁惧鐐规', - gzms: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓嶄簡', - arrowType: true, //绠ご绫诲埆 - messageDescr: '123', - fileList: [], - }, + // { + // wxsqd: 'SB00990003', + // code: 'SB003', + // name: '榻胯疆绠辩粍', + // wksp_code: "CJ002", + // wksp_name: '瑁呴厤杞﹂棿', + // eqpchkmain_code: "djbz002", + // sqry: '浣╃綏瑗�', + // sqsj: '2022-09-20 15:20:30', + // gzly: '璁惧鐐规', + // gzms: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓嶄簡', + // arrowType: true, //绠ご绫诲埆 + // messageDescr: '123', + // fileList: [], + // }, + // { + // wxsqd: 'SB00990004', + // code: 'SB004', + // name: '榻胯疆绠辩粍', + // wksp_code: "CJ002", + // wksp_name: '瑁呴厤杞﹂棿', + // eqpchkmain_code: "djbz002", + // sqry: '浣╃綏瑗�', + // sqsj: '2022-09-20 15:20:30', + // gzly: '璁惧鐐规', + // gzms: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓嶄簡', + // arrowType: true, //绠ご绫诲埆 + // messageDescr: '123', + // fileList: [], + // }, ]; @@ -90,7 +89,7 @@ let radioValue = '' //鍗曢�夋閫変腑鐨勯」 - let number = [] //鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 + let falseArray = [] //鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 // 鎵弿缁翠慨宸ヤ綅杩斿洖鏃舵墽琛屾柟娉� function scaned(r) { @@ -120,7 +119,7 @@ - number.push({ + falseArray.push({ id: '1' }) } @@ -145,200 +144,211 @@ </van-nav-bar> </van-sticky> - <van-sticky :offset-top="44"> - <div style="display: flex; - background-color: #eff0f1; - height: 40px;align-items:center; - justify-content: space-between;width: 98%;margin: auto;"> - - <div class="head_left"> - <div class="head_bar"></div> - <div class="head_title"> - 鎵弿缁翠慨宸ヤ綅 - </div> + <div v-if="topContent.length===0"> + <div class="sacnBody"> + <div class="box"> + <div class="boxImg"></div> </div> - - <div style="margin-right: 10px;"> - <van-icon name="scan" color='red' size='24' @click='topScanClick()' /> - </div> - + <div class="scanText">鏆傛棤缁翠慨鍙獙璇�</div> </div> - </van-sticky> + </div> + <div v-else> - <van-radio-group v-model="radioValue"> - <van-cell-group> - <div class="head" style="width: 96%;float: left;margin-right: 0;" - v-for="(item,index) in topContent" :key="item.code" @click="topContentClcik(item.code)"> - <div class="cellDiv">缁翠慨鐢宠鍗曪細{{item.wxsqd}}</div> - <div class="cellDiv">宸ヤ綅缂栫爜锛歿{item.code}}</div> - <div class="cellDiv">宸ヤ綅鍚嶇О锛歿{item.name}}</div> - <div class="cellDiv">鐢熶骇杞﹂棿锛歿{item.wksp_name}}</div> - <van-cell :title="'鐢宠浜哄憳锛�'+item.sqry"> - <template #right-icon> - <van-radio style="margin-right: 10px;" checked-color='red' :name="item.code" /> - </template> - </van-cell> - <div class="cellDiv">鐢宠鏃堕棿锛歿{item.sqsj}}</div> - <div class="cellDiv">鏁呴殰鏉ユ簮锛歿{item.gzly}}</div> - <div class="cellDiv">鏁呴殰鎻忚堪锛歿{item.gzms}}</div> + <van-sticky :offset-top="44"> + <div style="display: flex; + background-color: #eff0f1; + height: 40px;align-items:center; + justify-content: space-between;width: 98%;margin: auto;"> - <div v-show="item.arrowType" style="height: 30px;margin: auto;margin-top: 10px;" - :style="{marginBottom:(topContent.length-1===index)?'70px':'0px'}"> - <div style="border-radius: 5px;width: 60px;height: 30px;background-color: aliceblue;" - @click="arrowTypeChangeDown(item.code)" class="flex_center_center"> - <van-icon :name="item.arrowType?'arrow-down':'arrow-up'" /> + <div class="head_left"> + <div class="head_bar"></div> + <div class="head_title"> + 鎵弿缁翠慨宸ヤ綅 </div> </div> - <!-- <div v-if="topContent.length-1===index" style="z-index: 100;height: 10px;background-color: red;margin-top: -10px;"></div> --> + <div style="margin-right: 10px;"> + <van-icon name="scan" color='red' size='24' @click='topScanClick()' /> + </div> - <div v-show="!item.arrowType" class="flex_column"> - <div class="flex_center_center" - style="margin-top: 10px;background-color: #eff0f1;height: 40px;font-size: 20px;"> - 缁翠慨璇︽儏</div> + </div> + </van-sticky> + <van-radio-group v-model="radioValue"> + <van-cell-group> + <div class="head" style="width: 96%;float: left;margin-right: 0;" + v-for="(item,index) in topContent" :key="item.code" @click="topContentClcik(item.code)"> + <div class="cellDiv">缁翠慨鐢宠鍗曪細{{item.wxsqd}}</div> + <div class="cellDiv">宸ヤ綅缂栫爜锛歿{item.code}}</div> + <div class="cellDiv">宸ヤ綅鍚嶇О锛歿{item.name}}</div> + <div class="cellDiv">鐢熶骇杞﹂棿锛歿{item.wksp_name}}</div> + <van-cell :title="'鐢宠浜哄憳锛�'+item.sqry"> + <template #right-icon> + <van-radio style="margin-right: 10px;" checked-color='red' :name="item.code" /> + </template> + </van-cell> + <div class="cellDiv">鐢宠鏃堕棿锛歿{item.sqsj}}</div> + <div class="cellDiv">鏁呴殰鏉ユ簮锛歿{item.gzly}}</div> + <div class="cellDiv">鏁呴殰鎻忚堪锛歿{item.gzms}}</div> - <div class="head" style="padding-bottom: 0;"> - <div class="head_block"> - <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;padding: 10px 10px 0 10px;"> - <!-- <van-field class="vanFieldInputArea" readonly v-model="item.messageDescr" - rows="2" autosize type="textarea" placeholder="璇疯緭鍏�" /> --> - {{item.messageDescr}} - </div> - <div style="width: 96%;margin: auto;"> - <van-uploader multiple v-model="item.fileList" multiple :max-count="3" /> - </div> - - </div> - - - <div style="background-color: #eff0f1;height: 10px;"></div> - - <div class="head" style="padding-bottom: 5px;margin-top: 0;"> - <div class="head_block" style=""> - <div class="head_left"> - <div class="head_bar"></div> - <div class="head_title"> - 鍋滄満缁翠慨 - </div> - </div> - - <van-button class="buttonSmall" plain size="small" type="primary"> - 鍚�</van-button> - - </div> - - </div> - - <div style="background-color: #eff0f1;height: 10px;"></div> - - <div class="head" style="padding-bottom: 0;"> - <div class="head_block"> - <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;padding: 10px 10px 0 10px;"> - <!-- <van-field class="vanFieldInputArea" readonly v-model="item.messageDescr" - rows="2" autosize type="textarea" placeholder="璇疯緭鍏�" /> - --> - {{item.messageDescr}} - </div> - - </div> - - <div style="background-color: #eff0f1;height: 10px;"></div> - - - <div class="head" style="padding-bottom: 0;"> - <div class="head_block"> - <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;padding: 10px 10px 0 10px;"> - <!-- <van-field class="vanFieldInputArea" readonly v-model="item.messageDescr" - rows="2" autosize type="textarea" placeholder="璇疯緭鍏�" /> --> - {{item.messageDescr}} - </div> - <div style="width: 96%;margin: auto;"> - <van-uploader multiple v-model="item.fileList" multiple :max-count="3" /> - </div> - - </div> - - <div style="background-color: #eff0f1;height: 10px;"></div> - - <div class="head" style="padding-bottom: 5px;margin-top: 0;"> - <div class="head_block" style=""> - <div class="head_left"> - <div class="head_bar"></div> - <div class="head_title"> - 楠岃瘉缁撴灉 - </div> - </div> - - <div class="flex_center" - style="width: 30%;display: flex;justify-content: space-around;"> - <van-button class="buttonSmall" size="small" plain type="primary"> - 姝e父</van-button> - <van-button class="buttonSmall" size="small" plain type="danger">寮傚父 - </van-button> - </div> - - </div> - - </div> - - - <div v-show="!item.arrowType" style="height: 30px;margin: auto;margin-top: 10px;" + <div v-show="item.arrowType" style="height: 30px;margin: auto;margin-top: 10px;" :style="{marginBottom:(topContent.length-1===index)?'70px':'0px'}"> <div style="border-radius: 5px;width: 60px;height: 30px;background-color: aliceblue;" - @click="arrowTypeChangeUp(item.code)" class="flex_center_center"> + @click="arrowTypeChangeDown(item.code)" class="flex_center_center"> <van-icon :name="item.arrowType?'arrow-down':'arrow-up'" /> </div> </div> + <!-- <div v-if="topContent.length-1===index" style="z-index: 100;height: 10px;background-color: red;margin-top: -10px;"></div> --> + + <div v-show="!item.arrowType" class="flex_column"> + <div class="flex_center_center" + style="margin-top: 10px;background-color: #eff0f1;height: 40px;font-size: 20px;"> + 缁翠慨璇︽儏</div> + + + <div class="head" style="padding-bottom: 0;"> + <div class="head_block"> + <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;padding: 10px 10px 0 10px;"> + <!-- <van-field class="vanFieldInputArea" readonly v-model="item.messageDescr" + rows="2" autosize type="textarea" placeholder="璇疯緭鍏�" /> --> + {{item.messageDescr}} + </div> + <div style="width: 96%;margin: auto;"> + <van-uploader multiple v-model="item.fileList" multiple :max-count="3" /> + </div> + + </div> + + + <div style="background-color: #eff0f1;height: 10px;"></div> + + <div class="head" style="padding-bottom: 5px;margin-top: 0;"> + <div class="head_block" style=""> + <div class="head_left"> + <div class="head_bar"></div> + <div class="head_title"> + 鍋滄満缁翠慨 + </div> + </div> + + <van-button class="buttonSmall" plain size="small" type="primary"> + 鍚�</van-button> + + </div> + + </div> + + <div style="background-color: #eff0f1;height: 10px;"></div> + + <div class="head" style="padding-bottom: 0;"> + <div class="head_block"> + <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;padding: 10px 10px 0 10px;"> + <!-- <van-field class="vanFieldInputArea" readonly v-model="item.messageDescr" + rows="2" autosize type="textarea" placeholder="璇疯緭鍏�" /> + --> + {{item.messageDescr}} + </div> + + </div> + + <div style="background-color: #eff0f1;height: 10px;"></div> + + + <div class="head" style="padding-bottom: 0;"> + <div class="head_block"> + <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;padding: 10px 10px 0 10px;"> + <!-- <van-field class="vanFieldInputArea" readonly v-model="item.messageDescr" + rows="2" autosize type="textarea" placeholder="璇疯緭鍏�" /> --> + {{item.messageDescr}} + </div> + <div style="width: 96%;margin: auto;"> + <van-uploader multiple v-model="item.fileList" multiple :max-count="3" /> + </div> + + </div> + + <div style="background-color: #eff0f1;height: 10px;"></div> + + <div class="head" style="padding-bottom: 5px;margin-top: 0;"> + <div class="head_block" style=""> + <div class="head_left"> + <div class="head_bar"></div> + <div class="head_title"> + 楠岃瘉缁撴灉 + </div> + </div> + + <div class="flex_center" + style="width: 30%;display: flex;justify-content: space-around;"> + <van-button class="buttonSmall" size="small" plain type="primary"> + 姝e父</van-button> + <van-button class="buttonSmall" size="small" plain type="danger">寮傚父 + </van-button> + </div> + + </div> + + </div> + + + <div v-show="!item.arrowType" style="height: 30px;margin: auto;margin-top: 10px;" + :style="{marginBottom:(topContent.length-1===index)?'70px':'0px'}"> + <div style="border-radius: 5px;width: 60px;height: 30px;background-color: aliceblue;" + @click="arrowTypeChangeUp(item.code)" class="flex_center_center"> + <van-icon :name="item.arrowType?'arrow-down':'arrow-up'" /> + </div> + </div> + + + </div> </div> + </van-cell-group> + </van-radio-group> + + <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 :loading="submitIsDisabled" loading-text='姝e湪鎻愪氦,璇风◢绛�...' class="vanButtonInfo" + @click="submit" type="info"> + 纭鎻愪氦</van-button> </div> - </van-cell-group> - </van-radio-group> - - <!-- <div style="height: 1200px;width: 100%;background-color: black;margin-bottom: 100px;"></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> @@ -353,6 +363,7 @@ el: '#app', data: function() { return { + submitIsDisabled: false, overlayShow: false, showPopover: false, actions: [{ @@ -379,9 +390,8 @@ // }, ], isStop: 'Y', - messageContent: '', //缁翠慨鍐呭 褰撶淮淇仠鏈洪�変簡鍚� 姝ゅ瓧娈靛繀濉� - photoList: [], - number2: number + messageContent: '', //缁翠慨鍐呭 褰撶淮淇仠鏈洪�変簡鍚� 姝ゅ瓧娈靛繀濉� + falseArray2: falseArray } }, watch: { @@ -400,7 +410,7 @@ deep: true, immediate: true, }, - 'number2.length': { + 'falseArray2.length': { handler(newValue, oldValue) { this.$forceUpdate() }, @@ -409,8 +419,15 @@ }, }, created() {}, - mounted() {}, + mounted() { + // this.getList() + }, methods: { + getList() { + get('AppDeviceManage/RepairVerificationScanDeviceData').then(res => { + + }) + }, arrowTypeChangeUp(code) { topContent.forEach(item => { item.arrowType = true @@ -428,15 +445,30 @@ this.$forceUpdate() }, submit() { - // 寮�鍙戞椂瀵笷ormData瀵硅薄append鏁版嵁鍚庢墦鍗板嚭鏉ヤ负绌哄璞★紝寮�濮嬩互涓烘槸娌℃湁append杩涘幓锛屽疄闄呬笂鏄疐ormData瀵硅薄涓嶈兘鐩存帴鐢╟onsole.log(formData)杩涜鎵撳嵃銆� - // 濡傛灉瑕佹墦鍗帮紝鍙互鐢ㄤ笅闈㈢殑鏂瑰紡锛� - // for (var key of this.photoList.entries()) { - // console.log(key[0] + ', ' + key[1] ); - // } + const result = topContent.find(item => item.code === radioValue) - for (let [a, b] of this.photoList.entries()) { + const formData = new FormData() + formData.append("username", localStorage.getItem('username')) + formData.append("eqpcode", result.code) + 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) + // }) + + for (let [a, b] of formData.entries()) { console.log(a, ', ', b); } + + // post('AppDeviceManage/RepairVerificationScanDeviceSave', formData).then(res => { + // if (res.code === '200') { + + // } + // }) }, topScanClick() { createWithoutTitle('../../components/barcode_scan.html', { diff --git a/pages/xtsy/index.html b/pages/xtsy/index.html index 001b767..305a9be 100644 --- a/pages/xtsy/index.html +++ b/pages/xtsy/index.html @@ -19,8 +19,6 @@ <script type="text/javascript" src="../../js/axios.min.js"></script> <script type="text/javascript" src="../../js/http.js"></script> - - <link rel="stylesheet" href="../css/global.css" type="text/css" charset="utf-8" /> <script type="text/javascript" src="../../js/global.js"></script> </head> @@ -188,5 +186,10 @@ color: #fff; letter-spacing: 2px; } + + .van-nav-bar__right { + padding: 0; + margin-right: 16px; + } </style> </html> diff --git a/static/images/box1.png b/static/images/box1.png new file mode 100644 index 0000000..ce96cea --- /dev/null +++ b/static/images/box1.png Binary files differ diff --git a/unpackage/cache/wgt/H5EDA0853/css/global.css b/unpackage/cache/wgt/H5EDA0853/css/global.css index ecb7741..0f42896 100644 --- a/unpackage/cache/wgt/H5EDA0853/css/global.css +++ b/unpackage/cache/wgt/H5EDA0853/css/global.css @@ -20,6 +20,11 @@ letter-spacing: 2px; } +.van-nav-bar__right { + padding: 0; + margin-right: 16px; +} + .vanFieldInput { height: 36px; @@ -33,14 +38,13 @@ } .vanFieldInputArea { - height: 72px; - line-height: 24px; - align-items: center; border: 1px solid #ddd !important; border-radius: 5px; - padding: 0; - padding-left: 10px; - margin: 5px 0; + min-height: 73px; +} + +.van-field__control { + padding: 0 10px; } .vanButtonInfo { @@ -163,22 +167,42 @@ box-shadow: #436df5 0px 0px 28px; } +.box { + width: 128px; + height: 128px; + margin: 200px auto 20px; + background-color: #436df5; + border-radius: 50%; + box-shadow: #436df5 0px 0px 28px; + display: flex; + align-items: center; + justify-content: center; +} + +.boxImg { + width: 100px; + height: 100px; + border-radius: 50%; + background: #436df5 url(".././static/images/box1.png") no-repeat; +} + .scanText { margin: auto; color: #000ccc; } -.van-cell{ +.van-cell { padding: 0; font-size: 16px; - line-height:21px; - position:unset; + line-height: 21px; + position: unset; } -.van-cell__title{ + +.van-cell__title { margin-left: 20px; } -.cellDiv{ +.cellDiv { margin-left: 20px; -} \ No newline at end of file +} diff --git a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/dqby.html b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/dqby.html index c6ad4e0..41cf45e 100644 --- a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/dqby.html +++ b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/dqby.html @@ -73,7 +73,7 @@ let bwcode = '' //鐐瑰嚮閮ㄤ綅鐨勬壂鎻忔 鐐规椤圭洰code - let number = [] //淇濆吇椤圭洰鍐呭 鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 + let falseArray = [] //淇濆吇椤圭洰鍐呭 鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 // 鎵弿淇濆吇宸ヤ綅杩斿洖鏃舵墽琛屾柟娉� function scaned(r) { @@ -130,7 +130,7 @@ } - number.push({ + falseArray.push({ id: '1' }) } @@ -323,7 +323,8 @@ <div style="position:fixed;bottom: 0;width: 96%;display: flex;justify-content: center;flex-direction: column;align-items: center"> - <van-button class="vanButtonInfo" :disabled="resultValue===''" @click="submit" type="info"> + <van-button :load='submitIsDisabled' load-text="姝e湪鎻愪氦,璇风◢绛�..." class="vanButtonInfo" + :disabled="resultValue===''" @click="submit" type="info"> 纭鎻愪氦</van-button> </div> @@ -345,6 +346,7 @@ el: '#app', data: function() { return { + submitIsDisabled: false, overlayShow: false, showPopover: false, actions: [{ @@ -366,7 +368,7 @@ }], topContent2: topContent, centerContent2: centerContent, - number2: number, + falseArray2: falseArray, sheetFlag: false, } @@ -401,14 +403,14 @@ // deep: true, // immediate: true, // }, - 'number2.length': { + 'falseArray2.length': { handler(newValue, oldValue) { this.$forceUpdate() }, deep: true, immediate: true, }, - // 'number.length': { + // 'falseArray.length': { // handler(newValue, oldValue) { // this.$forceUpdate() // }, @@ -452,7 +454,7 @@ username: localStorage.getItem('username'), maintcyc: dropdownValue } - + this.submitIsDisabled = true post('AppDeviceManage/AppDeviceRepairSave' + formatParams(params), data) .then(res => { if (res.code === '200') { @@ -472,7 +474,10 @@ centerContent = [] } resultValue = '' + this.submitIsDisabled = false this.$forceUpdate() + } else { + this.submitIsDisabled = false } }) diff --git a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/rcdj.html b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/rcdj.html index d703cf5..9e4c59f 100644 --- a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/rcdj.html +++ b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/rcdj.html @@ -63,7 +63,7 @@ let bwcode = '' //鐐瑰嚮閮ㄤ綅鐨勬壂鎻忔 鐐规椤圭洰code - let number = [] //鐐规椤圭洰鍐呭 鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 + let falseArray = [] //鐐规椤圭洰鍐呭 鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 // 鎵弿鐐规宸ヤ綅杩斿洖鏃舵墽琛屾柟娉� function scaned(r) { @@ -120,7 +120,7 @@ } - number.push({ + falseArray.push({ id: '1' }) } @@ -172,7 +172,7 @@ <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' /> + <van-icon name="bars" size='20' color='#fff'/> </template> </van-popover> </template> @@ -300,7 +300,8 @@ <div style="position:fixed;bottom: 0;width: 96%;display: flex;justify-content: center;flex-direction: column;align-items: center"> - <van-button class="vanButtonInfo" :disabled="resultValue===''" @click="submit" type="info"> + <van-button :load='submitIsDisabled' load-text="姝e湪鎻愪氦,璇风◢绛�..." class="vanButtonInfo" + :disabled="resultValue===''" @click="submit" type="info"> 纭鎻愪氦</van-button> </div> @@ -320,6 +321,7 @@ el: '#app', data: function() { return { + submitIsDisabled: false, //鎻愪氦鎸夐挳鏄惁鍙彁浜� overlayShow: false, showPopover: false, actions: [{ @@ -334,7 +336,7 @@ }], topContent2: topContent, centerContent2: centerContent, - number2: number + falseArray2: falseArray } }, watch: { @@ -367,14 +369,14 @@ // deep: true, // immediate: true, // }, - 'number2.length': { + 'falseArray2.length': { handler(newValue, oldValue) { this.$forceUpdate() }, deep: true, immediate: true, }, - // 'number.length': { + // 'falseArray.length': { // handler(newValue, oldValue) { // this.$forceUpdate() // }, @@ -403,6 +405,7 @@ result: resultValue, children: children } + this.submitIsDisabled = true post('AppDeviceManage/AppDeviceCheckSave?username=' + localStorage.getItem('username'), data) .then(res => { if (res.code === '200') { @@ -422,7 +425,10 @@ centerContent = [] } resultValue = '' + this.submitIsDisabled = false this.$forceUpdate() + } else { + this.submitIsDisabled = false } }) diff --git a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/sbwx.html b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/sbwx.html index 21f0527..308a3b5 100644 --- a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/sbwx.html +++ b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/sbwx.html @@ -24,53 +24,55 @@ <!-- <link rel="stylesheet" href="../../css/global.css" type="text/css" charset="utf-8" /> --> <script type="text/javascript"> - var topContent = [{ - wxsqd: 'SB00990001', - code: 'SB001', - name: '榻胯疆绠辩粍', - wksp_code: "CJ002", - wksp_name: '瑁呴厤杞﹂棿', - eqpchkmain_code: "djbz002", - sqry: '浣╃綏瑗�', - sqsj: '2022-09-20 15:20:30', - gzly: '璁惧鐐规', - gzms: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓嶇簿宸ヨ溅闂存敞濉戞満涓�鍙峰紑涓�', - }, - { - wxsqd: 'SB00990002', - code: 'SB002', - name: '榻胯疆绠辩粍', - wksp_code: "CJ002", - wksp_name: '瑁呴厤杞﹂棿', - eqpchkmain_code: "djbz002", - sqry: '浣╃綏瑗�', - sqsj: '2022-09-20 15:20:30', - gzly: '璁惧鐐规', - gzms: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓�', - }, { - wxsqd: 'SB00990003', - code: 'SB003', - name: '榻胯疆绠辩粍', - wksp_code: "CJ002", - wksp_name: '瑁呴厤杞﹂棿', - eqpchkmain_code: "djbz002", - sqry: '浣╃綏瑗�', - sqsj: '2022-09-20 15:20:30', - gzly: '璁惧鐐规', - gzms: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓�', - }, - { - wxsqd: 'SB00990004', - code: 'SB004', - name: '榻胯疆绠辩粍', - wksp_code: "CJ002", - wksp_name: '瑁呴厤杞﹂棿', - eqpchkmain_code: "djbz002", - sqry: '浣╃綏瑗�', - sqsj: '2022-09-20 15:20:30', - gzly: '璁惧鐐规', - gzms: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓�', - }, + var topContent = [ + // { + // docu_code: 'SB00990001', + // eqpcode: 'SB001', + // eqpname: '榻胯疆绠辩粍', + // wksp_code: "CJ002", + // wksp_name: '瑁呴厤杞﹂棿', + // 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: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓�', + // }, ]; @@ -78,7 +80,7 @@ let radioValue = '' //鍗曢�夋閫変腑鐨勯」 - let number = [] //鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 + let falseArray = [] //鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 // 鎵弿缁翠慨宸ヤ綅杩斿洖鏃舵墽琛屾柟娉� function scaned(r) { @@ -88,7 +90,7 @@ let temp = {} let flag = false topContent.forEach((item, index) => { - if (item.code === radioValue) { + if (item.docu_code === radioValue) { temp = item topContent.splice(index, 1) flag = true @@ -102,13 +104,13 @@ message: '鎵�鎵簩缁寸爜鍥村湪鍒楄〃涓紒' }) if (topContent.length > 0) { - radioValue = topContent[0].code + radioValue = topContent[0].docu_code } } - number.push({ + falseArray.push({ id: '1' }) } @@ -133,144 +135,162 @@ </van-nav-bar> </van-sticky> - <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 v-if="topContent.length===0"> + <div class="sacnBody"> + <div class="box"> + <div class="boxImg"></div> </div> - + <div class="scanText">鏆傛棤璁惧鍙淮淇�</div> </div> - - <van-radio-group v-model="radioValue"> - <van-cell-group> - <div style="margin: 10px 0;" v-for="(item,index) in topContent" :key="item.code" @click="topContentClcik(item.code)"> - <div class="cellDiv">缁翠慨鐢宠鍗曪細{{item.wxsqd}}</div> - <div class="cellDiv">宸ヤ綅缂栫爜锛歿{item.code}}</div> - <div class="cellDiv">宸ヤ綅鍚嶇О锛歿{item.name}}</div> - <div class="cellDiv">鐢熶骇杞﹂棿锛歿{item.wksp_name}}</div> - <van-cell :title="'鐢宠浜哄憳锛�'+item.sqry" > - <template #right-icon> - <van-radio style="margin-right: 10px;" checked-color='red' :name="item.code" /> - </template> - </van-cell> - <div class="cellDiv">鐢宠鏃堕棿锛歿{item.sqsj}}</div> - <div class="cellDiv">鏁呴殰鏉ユ簮锛歿{item.gzly}}</div> - <div class="cellDiv">鏁呴殰鎻忚堪锛歿{item.gzms}}</div> - - </div> - </van-cell-group> - </van-radio-group> - </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> - - - - <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;"> + <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;"> - <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> + <van-icon name="scan" color='red' size='24' @click='topScanClick()' /> </div> + </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="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 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> + + + + <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 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="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: 10px;"> - <div class="head_block" style="margin-bottom:10px;"> - <div class="head_left"> - <div class="head_bar"></div> - <div class="head_title"> - 鏇存崲澶囦欢 + <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 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="2" autosize - type="textarea" placeholder="璇疯緭鍏�" /> + + <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 style="width: 96%;margin: auto;margin-top: 10px;"> - <van-uploader :before-read="beforeRead" v-model="fileList2" :after-read="afterRead2" - multiple :max-count="3" /> + + <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 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" type="info"> - 纭鎻愪氦1</van-button> - - <van-button v-show="isStop==='N'" - :disabled="messageDescr.trim().toString().length===0||messageContent.trim().toString().length===0" - class="vanButtonInfo" @click="submit" type="info"> - 纭鎻愪氦2</van-button> - - </div> - </div> </div> @@ -286,6 +306,7 @@ el: '#app', data: function() { return { + submitIsDisabled: false, overlayShow: false, showPopover: false, actions: [{ @@ -300,7 +321,7 @@ }], topContent2: topContent, messageDescr: '', //鏁呴殰鎻忚堪 蹇呭~ - fileList: [ + fileList: [ //鏁呴殰鎻忚堪鍥剧墖 // { // url: 'https://img01.yzcdn.cn/vant/leaf.jpg' // }, @@ -311,11 +332,10 @@ // }, ], isStop: 'Y', - messageContent: '', //缁翠慨鍐呭 褰撶淮淇仠鏈洪�変簡鍚� 姝ゅ瓧娈靛繀濉� - messageDescr2: '', //鏇存崲澶囦欢 - fileList2: [], - photoList: [], - number2: number + messageDescr2: '', //缁翠慨鍐呭 褰撶淮淇仠鏈洪�変簡鍚� 姝ゅ瓧娈靛繀濉� + messageDescr3: '', //鏇存崲澶囦欢 + fileList2: [], //鏇存崲澶囦欢鍥剧墖 + falseArray2: falseArray, } }, watch: { @@ -324,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) } } @@ -334,7 +354,7 @@ deep: true, immediate: true, }, - 'number2.length': { + 'falseArray2.length': { handler(newValue, oldValue) { this.$forceUpdate() }, @@ -344,22 +364,91 @@ }, created() {}, mounted() { - console.log(this.$refs.item0) - // console.log(this.$refs.item0.$el.offsetHeight) + 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("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 - console.log(this.messageContent.trim().toString().length === 0 && this.messageDescr.trim() - .toString().length === 0) + 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) { @@ -371,28 +460,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', { @@ -415,8 +531,8 @@ vanFieldBlur() { this.$forceUpdate() }, - topContentClcik(code) { - radioValue = code + topContentClcik(docu_code) { + radioValue = docu_code this.$forceUpdate() }, onClickleft() { @@ -440,5 +556,9 @@ </script> <style type="text/css"> @import url('../../css/global.css'); + + .van-hairline--top-bottom { + position: static; + } </style> </html> diff --git a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxsq.html b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxsq.html index d77b61b..821acdc 100644 --- a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxsq.html +++ b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxsq.html @@ -25,21 +25,22 @@ <script type="text/javascript"> var topContent = [ - // { - // code: 'SB001', - // name: '鐢垫睜缁勪竴绾�', - // wksp_code: "CJ002", - // wksp_name: '鐢垫睜杞﹂棿', - // eapmai_code: "bybz004", - // eapmai_name: "鏍囧噯4", - // main_cycle: "M", - // }, - ]; - - let number = []; // 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 + { + code: 'SB001', + name: '鐢垫睜缁勪竴绾�', + wksp_code: "CJ002", + wksp_name: '鐢垫睜杞﹂棿', + eapmai_code: "bybz004", + eapmai_name: "鏍囧噯4", + main_cycle: "M", + }, + ] - let dropdownValue = 'V1'; //涓嬫媺榛樿閫変腑鐨勫�� + let falseArray = []; // 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 + + + let dropdownValue = 'A'; //涓嬫媺榛樿閫変腑鐨勫�� // 鎵弿缁翠慨宸ヤ綅杩斿洖鏃舵墽琛屾柟娉� function scaned(r) { @@ -47,7 +48,7 @@ eqpcode: r }).then(res => { topContent = res.data - number.push({ + falseArray.push({ id: '1' }) }) @@ -59,7 +60,7 @@ <div id="app"> <div class="body"> - + <van-sticky> <van-nav-bar title="璁惧缁翠慨鐢宠" @click-right="onClickRight" left-arrow @click-left="onClickleft"> <template #right> @@ -72,7 +73,7 @@ </template> </van-nav-bar> </van-sticky> - + <div v-if="topContent.length===0"> <div class="sacnBody"> <div class="scanImg" @click="topScanClick()"></div> @@ -131,7 +132,7 @@ </div> <div style="margin-right: 10px;"> <van-button @click="sheetFlag=true" type="info" style="width:100px;height: 30px;"> - {{dropdownValue==='V1'?'璁惧鐐规':'璁惧鐐规2'}} + {{actionsSheet.find(item=>item.code===dropdownValue).name}} </van-button> <van-action-sheet v-model="sheetFlag" :actions="actionsSheet" @select="onSelectSheet" /> </div> @@ -152,12 +153,12 @@ <div style="display:flex;flex-direction: column;width: 96%;margin: auto;"> - <van-field class="vanFieldInputArea" v-model="messageDescr" rows="2" autosize + <van-field class="vanFieldInputArea" v-model="messageDescr" autosize rows="3" 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" /> + <van-uploader :before-read="beforeRead" v-model="fileList" :after-read="afterRead" + :before-delete="beforeDelete" multiple :max-count="3" /> </div> </div> @@ -166,7 +167,7 @@ <div style="position:fixed;bottom: 0;width: 96%;display: flex;justify-content: center;flex-direction: column;align-items: center"> <van-button class="vanButtonInfo" :disabled="messageDescr.trim().toString().length===0" - @click="submit" type="info"> + @click="submit" type="info" :loading="submitIsDisabled" loading-text='姝e湪鎻愪氦,璇风◢绛�...'> 纭鎻愪氦</van-button> </div> </div> @@ -187,6 +188,7 @@ el: '#app', data: function() { return { + submitIsDisabled: false, //鎻愪氦鎸夐挳鏄惁鍙彁浜� overlayShow: false, showPopover: false, actions: [{ @@ -200,26 +202,28 @@ text: '閫�鍑虹櫥褰�' }], actionsSheet: [{ - code: 'V1', + code: 'A', name: '璁惧鐐规' }, { - code: 'V2', - name: '璁惧鐐规2' - }], - number2: number, + code: 'B', + name: '璁惧淇濆吇' + }, { + code: 'C', + name: '瀹夌伅鍛煎彨' + }, { + code: 'D', + name: '鎵嬪伐' + }, ], + falseArray2: falseArray, messageDescr: '', fileList: [], sheetFlag: false, - } }, watch: { - 'number2.length': { + 'falseArray2.length': { handler(newValue, oldValue) { - - console.log(111) this.$forceUpdate() - }, deep: true, immediate: true, @@ -228,13 +232,50 @@ created() {}, mounted() {}, methods: { - onOversize(file) { - this.$toast("鏂囦欢澶у皬涓嶈兘瓒呰繃5MB"); + //鎻愪氦 + submit() { + const formData = new FormData() + formData.append("username", localStorage.getItem('username')) + formData.append("eqpcode", topContent[0].code) + formData.append("wkshpcode", topContent[0].wksp_code) + formData.append("faultsourcecode", dropdownValue) + formData.append("faultdescr", this.messageDescr) + + this.fileList.forEach((item, index) => { + formData.append('files1', item.file) + }) + + // for (let [a, b] of formData.entries()) { + // console.log(a, b, 1) + // } + this.submitIsDisabled = true + post('AppDeviceManage/MaintainScanDeviceApplySave', formData).then(res => { + if (res.code === '200') { + topContent = [] + this.messageDescr = '' + this.fileList = [] + this.submitIsDisabled = false + this.$forceUpdate() + } else { + this.submitIsDisabled = false + } + + + }) + + }, + // 鍥剧墖鍒犻櫎鍓� + beforeDelete(file) { + this.fileList.forEach((item, index) => { + if (file.file.lastModified === item.file.lastModified) { + this.fileList.splice(index, 1) + } + }) }, afterRead(file) { }, - //鏍¢獙鍥剧墖鐨勬牸寮� + //鍥剧墖涓婁紶鍓嶆牎楠� beforeRead(file) { if (!/(jpg|jpeg|png|JPG|PNG)/i.test(file.type)) { this.$toast("璇蜂笂浼犳纭牸寮忕殑鍥剧墖"); @@ -244,17 +285,27 @@ 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; }, onSelectSheet(val) { dropdownValue = val.code this.sheetFlag = false this.$forceUpdate() - - }, - //鎻愪氦 - submit() { - }, // 杈撳叆妗嗗け鐒﹁Е鍙戜簨浠� vanFieldBlur() { diff --git a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxyz.html b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxyz.html index 436be3a..af5d98d 100644 --- a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxyz.html +++ b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxyz.html @@ -32,7 +32,10 @@ sqry: '浣╃綏瑗�', sqsj: '2022-09-20 15:20:30', gzly: '璁惧鐐规', - gzms: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓�', + gzms: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓嶇簿宸ヨ溅闂存敞濉戞満涓�鍙峰紑涓�', + arrowType: true, //绠ご绫诲埆 + messageDescr: '123', + fileList: [], }, { wxsqd: 'SB00990002', @@ -45,6 +48,9 @@ sqsj: '2022-09-20 15:20:30', gzly: '璁惧鐐规', gzms: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓�', + arrowType: true, //绠ご绫诲埆 + messageDescr: '123', + fileList: [], }, // { // wxsqd: 'SB00990003', @@ -57,6 +63,9 @@ // sqsj: '2022-09-20 15:20:30', // gzly: '璁惧鐐规', // gzms: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓嶄簡', + // arrowType: true, //绠ご绫诲埆 + // messageDescr: '123', + // fileList: [], // }, // { // wxsqd: 'SB00990004', @@ -69,6 +78,9 @@ // sqsj: '2022-09-20 15:20:30', // gzly: '璁惧鐐规', // gzms: '绮惧伐杞﹂棿娉ㄥ鏈轰竴鍙峰紑涓嶄簡', + // arrowType: true, //绠ご绫诲埆 + // messageDescr: '123', + // fileList: [], // }, ]; @@ -77,7 +89,7 @@ let radioValue = '' //鍗曢�夋閫変腑鐨勯」 - let number = [] //鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 + let falseArray = [] //鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤 // 鎵弿缁翠慨宸ヤ綅杩斿洖鏃舵墽琛屾柟娉� function scaned(r) { @@ -107,7 +119,7 @@ - number.push({ + falseArray.push({ id: '1' }) } @@ -132,103 +144,212 @@ </van-nav-bar> </van-sticky> - <van-sticky :offset-top="44"> - <div style="display: flex; - background-color: #eff0f1; - height: 40px;align-items:center; - justify-content: space-between;width: 98%;margin: auto;"> - - <div class="head_left"> - <div class="head_bar"></div> - <div class="head_title"> - 鎵弿缁翠慨宸ヤ綅 - </div> + <div v-if="topContent.length===0"> + <div class="sacnBody"> + <div class="box"> + <div class="boxImg"></div> </div> - - <div style="margin-right: 10px;"> - <van-icon name="scan" color='red' size='24' @click='topScanClick()' /> - </div> - + <div class="scanText">鏆傛棤缁翠慨鍙獙璇�</div> </div> - </van-sticky> - - - <div class="head" style="width: 88%;float: left;margin-right: 0;border-radius: 5px 0 0 5px;" - v-for="item in topContent" :key="item.code"> - - <div class="flex_between"> - <div style="width: 100%;margin-top: 10px;"> - <div style="margin-bottom: 10px;line-height:20px;margin-left: 20px;" - @click="topContentClcik(item.code)"> - <div style="display: flex;align-items: center;"> - <div style="text-align: right;"> - <div>缁翠慨鐢宠鍗曪細</div> - <div>宸ヤ綅缂栫爜锛�</div> - <div>宸ヤ綅鍚嶇О锛�</div> - <div>鐢熶骇杞﹂棿锛�</div> - <div>鐢宠浜哄憳锛�</div> - <div>鐢宠鏃堕棿锛�</div> - <div>鏁呴殰鏉ユ簮锛�</div> - <!-- <div>鏁呴殰鎻忚堪锛�</div> --> - </div> - <div> - <div>{{item.wxsqd}}</div> - <div>{{item.code}}</div> - <div>{{item.name}}</div> - <div>{{item.wksp_name}}</div> - <div>{{item.sqry}}</div> - <div>{{item.sqsj}}</div> - <div>{{item.gzly}}</div> - <!-- <div style="width: 200px;" class="textEllipsis">{{item.gzms}}</div> --> - </div> - </div> - <div style="display: flex;"> - <div style="margin-left: 16px;">鏁呴殰鎻忚堪锛�</div> - <div style="width: 180px;">{{item.gzms}}</div> - </div> - - </div> - </div> - <!-- <div> - <van-radio-group v-model="radioValue" style="padding-right: 12px;"> - <van-radio checked-color='red' icon-size="18px" @click="topContentClcik(item.code)" - style="height: 160px;margin-bottom: 10px;" v-for="item in topContent" - :key="item.code" :name="item.code"></van-radio> - </van-radio-group> - </div> --> - </div> - - - <!-- 绠ご鍥炬爣閮ㄥ垎 --> - <div style="height: 30px;margin: auto;margin-top: 10px;"> - <div style="border-radius: 5px;width: 60px;height: 30px;background-color: aliceblue;" - @click="arrowTypeChange" class="flex_center_center"> - <van-icon :name="arrowType?'arrow-down':'arrow-up'" /> - </div> - </div> - </div> - <div style="display: flex;"> - <van-radio-group v-model="radioValue" style=""> - <van-radio checked-color='red' icon-size="18px" @click="topContentClcik(item.code)" - style="padding-right: 30%;background-color: #fff;height: 220px;margin-bottom: 10px;background-color: #fff;margin: 5px 0;padding: 10px 0;" - v-for="item in topContent" :key="item.code" :name="item.code"></van-radio> + <div v-else> + + <van-sticky :offset-top="44"> + <div style="display: flex; + background-color: #eff0f1; + height: 40px;align-items:center; + justify-content: space-between;width: 98%;margin: auto;"> + + <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> + </van-sticky> + + <van-radio-group v-model="radioValue"> + <van-cell-group> + <div class="head" style="width: 96%;float: left;margin-right: 0;" + v-for="(item,index) in topContent" :key="item.code" @click="topContentClcik(item.code)"> + <div class="cellDiv">缁翠慨鐢宠鍗曪細{{item.wxsqd}}</div> + <div class="cellDiv">宸ヤ綅缂栫爜锛歿{item.code}}</div> + <div class="cellDiv">宸ヤ綅鍚嶇О锛歿{item.name}}</div> + <div class="cellDiv">鐢熶骇杞﹂棿锛歿{item.wksp_name}}</div> + <van-cell :title="'鐢宠浜哄憳锛�'+item.sqry"> + <template #right-icon> + <van-radio style="margin-right: 10px;" checked-color='red' :name="item.code" /> + </template> + </van-cell> + <div class="cellDiv">鐢宠鏃堕棿锛歿{item.sqsj}}</div> + <div class="cellDiv">鏁呴殰鏉ユ簮锛歿{item.gzly}}</div> + <div class="cellDiv">鏁呴殰鎻忚堪锛歿{item.gzms}}</div> + + <div v-show="item.arrowType" style="height: 30px;margin: auto;margin-top: 10px;" + :style="{marginBottom:(topContent.length-1===index)?'70px':'0px'}"> + <div style="border-radius: 5px;width: 60px;height: 30px;background-color: aliceblue;" + @click="arrowTypeChangeDown(item.code)" class="flex_center_center"> + <van-icon :name="item.arrowType?'arrow-down':'arrow-up'" /> + </div> + </div> + + <!-- <div v-if="topContent.length-1===index" style="z-index: 100;height: 10px;background-color: red;margin-top: -10px;"></div> --> + + <div v-show="!item.arrowType" class="flex_column"> + <div class="flex_center_center" + style="margin-top: 10px;background-color: #eff0f1;height: 40px;font-size: 20px;"> + 缁翠慨璇︽儏</div> + + + <div class="head" style="padding-bottom: 0;"> + <div class="head_block"> + <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;padding: 10px 10px 0 10px;"> + <!-- <van-field class="vanFieldInputArea" readonly v-model="item.messageDescr" + rows="2" autosize type="textarea" placeholder="璇疯緭鍏�" /> --> + {{item.messageDescr}} + </div> + <div style="width: 96%;margin: auto;"> + <van-uploader multiple v-model="item.fileList" multiple :max-count="3" /> + </div> + + </div> + + + <div style="background-color: #eff0f1;height: 10px;"></div> + + <div class="head" style="padding-bottom: 5px;margin-top: 0;"> + <div class="head_block" style=""> + <div class="head_left"> + <div class="head_bar"></div> + <div class="head_title"> + 鍋滄満缁翠慨 + </div> + </div> + + <van-button class="buttonSmall" plain size="small" type="primary"> + 鍚�</van-button> + + </div> + + </div> + + <div style="background-color: #eff0f1;height: 10px;"></div> + + <div class="head" style="padding-bottom: 0;"> + <div class="head_block"> + <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;padding: 10px 10px 0 10px;"> + <!-- <van-field class="vanFieldInputArea" readonly v-model="item.messageDescr" + rows="2" autosize type="textarea" placeholder="璇疯緭鍏�" /> + --> + {{item.messageDescr}} + </div> + + </div> + + <div style="background-color: #eff0f1;height: 10px;"></div> + + + <div class="head" style="padding-bottom: 0;"> + <div class="head_block"> + <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;padding: 10px 10px 0 10px;"> + <!-- <van-field class="vanFieldInputArea" readonly v-model="item.messageDescr" + rows="2" autosize type="textarea" placeholder="璇疯緭鍏�" /> --> + {{item.messageDescr}} + </div> + <div style="width: 96%;margin: auto;"> + <van-uploader multiple v-model="item.fileList" multiple :max-count="3" /> + </div> + + </div> + + <div style="background-color: #eff0f1;height: 10px;"></div> + + <div class="head" style="padding-bottom: 5px;margin-top: 0;"> + <div class="head_block" style=""> + <div class="head_left"> + <div class="head_bar"></div> + <div class="head_title"> + 楠岃瘉缁撴灉 + </div> + </div> + + <div class="flex_center" + style="width: 30%;display: flex;justify-content: space-around;"> + <van-button class="buttonSmall" size="small" plain type="primary"> + 姝e父</van-button> + <van-button class="buttonSmall" size="small" plain type="danger">寮傚父 + </van-button> + </div> + + </div> + + </div> + + + <div v-show="!item.arrowType" style="height: 30px;margin: auto;margin-top: 10px;" + :style="{marginBottom:(topContent.length-1===index)?'70px':'0px'}"> + <div style="border-radius: 5px;width: 60px;height: 30px;background-color: aliceblue;" + @click="arrowTypeChangeUp(item.code)" class="flex_center_center"> + <van-icon :name="item.arrowType?'arrow-down':'arrow-up'" /> + </div> + </div> + + + </div> + + </div> + </van-cell-group> </van-radio-group> - </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 :loading="submitIsDisabled" loading-text='姝e湪鎻愪氦,璇风◢绛�...' class="vanButtonInfo" + @click="submit" type="info"> + 纭鎻愪氦</van-button> - - <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> - - </div> @@ -238,11 +359,11 @@ </div> </body> <script> - var app = new Vue({ el: '#app', data: function() { return { + submitIsDisabled: false, overlayShow: false, showPopover: false, actions: [{ @@ -255,8 +376,6 @@ icon: 'revoke', text: '閫�鍑虹櫥褰�' }], - arrowType: true, //绠ご绫诲埆 - topContent2: topContent, messageDescr: '', //鏁呴殰鎻忚堪 蹇呭~ @@ -271,9 +390,8 @@ // }, ], isStop: 'Y', - messageContent: '', //缁翠慨鍐呭 褰撶淮淇仠鏈洪�変簡鍚� 姝ゅ瓧娈靛繀濉� - photoList: [], - number2: number + messageContent: '', //缁翠慨鍐呭 褰撶淮淇仠鏈洪�変簡鍚� 姝ゅ瓧娈靛繀濉� + falseArray2: falseArray } }, watch: { @@ -292,7 +410,7 @@ deep: true, immediate: true, }, - 'number2.length': { + 'falseArray2.length': { handler(newValue, oldValue) { this.$forceUpdate() }, @@ -301,22 +419,56 @@ }, }, created() {}, - mounted() {}, + mounted() { + // this.getList() + }, methods: { - arrowTypeChange() { - this.arrowType = !this.arrowType + getList() { + get('AppDeviceManage/RepairVerificationScanDeviceData').then(res => { + + }) + }, + arrowTypeChangeUp(code) { + topContent.forEach(item => { + item.arrowType = true + }) + this.$forceUpdate() + }, + + arrowTypeChangeDown(code) { + topContent.forEach(item => { + item.arrowType = true + if (item.code === code) { + item.arrowType = false + } + }) this.$forceUpdate() }, submit() { - // 寮�鍙戞椂瀵笷ormData瀵硅薄append鏁版嵁鍚庢墦鍗板嚭鏉ヤ负绌哄璞★紝寮�濮嬩互涓烘槸娌℃湁append杩涘幓锛屽疄闄呬笂鏄疐ormData瀵硅薄涓嶈兘鐩存帴鐢╟onsole.log(formData)杩涜鎵撳嵃銆� - // 濡傛灉瑕佹墦鍗帮紝鍙互鐢ㄤ笅闈㈢殑鏂瑰紡锛� - // for (var key of this.photoList.entries()) { - // console.log(key[0] + ', ' + key[1] ); - // } + const result = topContent.find(item => item.code === radioValue) - for (let [a, b] of this.photoList.entries()) { + const formData = new FormData() + formData.append("username", localStorage.getItem('username')) + formData.append("eqpcode", result.code) + 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) + // }) + + for (let [a, b] of formData.entries()) { console.log(a, ', ', b); } + + // post('AppDeviceManage/RepairVerificationScanDeviceSave', formData).then(res => { + // if (res.code === '200') { + + // } + // }) }, topScanClick() { createWithoutTitle('../../components/barcode_scan.html', { diff --git a/unpackage/cache/wgt/H5EDA0853/pages/xtsy/index.html b/unpackage/cache/wgt/H5EDA0853/pages/xtsy/index.html index 001b767..305a9be 100644 --- a/unpackage/cache/wgt/H5EDA0853/pages/xtsy/index.html +++ b/unpackage/cache/wgt/H5EDA0853/pages/xtsy/index.html @@ -19,8 +19,6 @@ <script type="text/javascript" src="../../js/axios.min.js"></script> <script type="text/javascript" src="../../js/http.js"></script> - - <link rel="stylesheet" href="../css/global.css" type="text/css" charset="utf-8" /> <script type="text/javascript" src="../../js/global.js"></script> </head> @@ -188,5 +186,10 @@ color: #fff; letter-spacing: 2px; } + + .van-nav-bar__right { + padding: 0; + margin-right: 16px; + } </style> </html> diff --git a/unpackage/cache/wgt/H5EDA0853/static/images/box1.png b/unpackage/cache/wgt/H5EDA0853/static/images/box1.png new file mode 100644 index 0000000..ce96cea --- /dev/null +++ b/unpackage/cache/wgt/H5EDA0853/static/images/box1.png Binary files differ diff --git a/unpackage/release/apk/H5EDA0853__20220930082047.apk b/unpackage/release/apk/H5EDA0853__20220930082047.apk deleted file mode 100644 index d1cba76..0000000 --- a/unpackage/release/apk/H5EDA0853__20220930082047.apk +++ /dev/null Binary files differ diff --git a/unpackage/release/apk/H5EDA0853__20220930082604.apk b/unpackage/release/apk/H5EDA0853__20220930082604.apk deleted file mode 100644 index 4d7f4d2..0000000 --- a/unpackage/release/apk/H5EDA0853__20220930082604.apk +++ /dev/null Binary files differ diff --git a/unpackage/release/apk/H5EDA0853__20220930082730.apk b/unpackage/release/apk/H5EDA0853__20220930082730.apk deleted file mode 100644 index b416e3e..0000000 --- a/unpackage/release/apk/H5EDA0853__20220930082730.apk +++ /dev/null Binary files differ diff --git a/unpackage/release/apk/H5EDA0853__20220930141808.apk b/unpackage/release/apk/H5EDA0853__20220930141808.apk deleted file mode 100644 index 51f77ef..0000000 --- a/unpackage/release/apk/H5EDA0853__20220930141808.apk +++ /dev/null Binary files differ -- Gitblit v1.9.3