From 2c11814ecf148a5fe5a80d03e29481476e47f34d Mon Sep 17 00:00:00 2001 From: 付延余 <f-yanyu@outlook.com> Date: 星期一, 19 十二月 2022 16:13:34 +0800 Subject: [PATCH] test push two --- pages/jihua/jihua.vue | 757 +++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 587 insertions(+), 170 deletions(-) diff --git a/pages/jihua/jihua.vue b/pages/jihua/jihua.vue index 60c1056..04c277a 100644 --- a/pages/jihua/jihua.vue +++ b/pages/jihua/jihua.vue @@ -1,170 +1,587 @@ -<template> - <view class="jihua-wrap"> - <view class="qiehuan-box"> - <u-tabs :list="tabList" @click="tabClick"></u-tabs> - </view> - <view class="jihua-main"> - <view class="shaixuan-box"> - <u-radio-group v-model="radioValue"> - <u-radio style="margin-right: 30rpx;" shape="square" label="鍏ㄩ儴" name="鍏ㄩ儴"></u-radio> - <u-radio style="margin-right: 30rpx;" shape="square" label="宸茶缃殑璁″垝" name="宸茶缃殑璁″垝"></u-radio> - <u-radio shape="square" label="鏈缃殑璁″垝" name="鏈缃殑璁″垝"></u-radio> - </u-radio-group> - </view> - <view class="main-block-box"> - <view class="jihua-main-line"> - <view class="name">瀹㈡埛鍚嶇О锛氭瀹�****</view> - </view> - <view class="jihua-main-line"> - <view class="main-flex"> - <view>鐓ょ锛氫富鐒�</view> - <view>鍓╀綑閲忥細277.65</view> - </view> - </view> - <view class="jihua-main-line"> - <view class="main-flex"> - <view class="carNum-box"> - <view>鍙戣繍杞︽暟锛�</view> - <u--input - focus - placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" - border="surround" - v-model="carValue" - @change="change" - ></u--input> - </view> - <view>瀹為檯鍙戣溅鏁帮細4000</view> - </view> - </view> - </view> - <view class="main-block-box"> - <view class="jihua-main-line"> - <view class="name">瀹㈡埛鍚嶇О锛氭瀹�****</view> - </view> - <view class="jihua-main-line"> - <view class="main-flex"> - <view>鐓ょ锛氫富鐒�</view> - <view>鍓╀綑閲忥細277.65</view> - </view> - </view> - <view class="jihua-main-line"> - <view class="main-flex"> - <view class="carNum-box"> - <view>鍙戣繍杞︽暟锛�</view> - <u--input - focus - placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" - border="surround" - v-model="carValue" - @change="change" - ></u--input> - </view> - <view>瀹為檯鍙戣溅鏁帮細4000</view> - </view> - </view> - <!-- <u-button class="xiugai-btn" type="primary" text="淇敼" size="mini"></u-button> --> - </view> - </view> - </view> -</template> - -<script> - export default { - data() { - return { - radioValue: '鍏ㄩ儴', - tabList: [{ - name: '浠婃棩鍙戣繍璁″垝' - },{ - name: '鏄庢棩鍙戣繍璁″垝' - }], - carValue:0, - } - }, - methods: { - tabClick(item) { - - }, - change() { - - } - } - } -</script> - -<style lang="scss" scoped> - ::v-deep{ - .u-tabs__wrapper__nav{ - padding-left: vww(75.5) - } - .u-radio__text{ - span{ - font-size: vww(14); - } - } - .u-radio-group--row{ - height: 100%; - } - .u-radio__icon-wrap{ - width: vww(14)!important; - height: vww(14)!important;; - } - .u-button__text{ - font-size: vww(12)!important; - } - } - .jihua-wrap{ - width: 100%; - display: flex; - flex-direction: column; - } - .jihua-main{ - display: flex; - flex-direction: column; - width: 100%; - padding:vww(10) vww(10); - box-sizing: border-box; - .shaixuan-box{ - height: vww(40); - } - .main-block-box{ - box-shadow: 0 0 8px rgba(0,0,0,0.1); - height: vww(120); - padding: vww(10); - box-sizing: border-box; - margin-top: vww(15); - border-radius: vww(5); - position: relative; - .xiugai-btn{ - position: absolute; - right: vww(10); - bottom: vww(10); - width: vww(20); - } - .jihua-main-line{ - width: 100%; - display: flex; - view{ - font-size: vww(14); - line-height: 2; - } - .name{ - font-weight: 600!important; - } - .main-flex{ - width: 100%; - display: flex; - justify-content: space-between; - .carNum-box{ - display: flex; - .u-input{ - height: vww(20); - width: vww(100); - } - } - } - } - - } - } -</style> +<template> + <view class="jihua-wrap"> + <u-overlay :show="overlayShow" @click="overlayShow = false"></u-overlay> + <view class="qiehuan-box"><u-tabs :list="tabList" @click="tabClick"></u-tabs></view> + <view class="jihua-main"> + <view class="shaixuan-box"> + <u-radio-group v-model="radioValue" @change="groupChange"> + <u-radio style="margin-right: 30rpx;" shape="square" label="鍏ㄩ儴" name="鍏ㄩ儴"></u-radio> + <u-radio style="margin-right: 30rpx;" shape="square" label="宸茶缃殑璁″垝" name="宸茶缃殑璁″垝"></u-radio> + <!-- <u-radio shape="square" label="鏈缃殑璁″垝" name="鏈缃殑璁″垝"></u-radio> --> + </u-radio-group> + </view> + <view class="main-inside"> + <view v-if="isTomJihua == '鍏ㄩ儴'"> + <u-empty v-if="fyData.length == 0" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" class="empty-container"></u-empty> + <view id="u-dropdown" class="main-block-box" v-for="(item, index) in fyData" :key="item.id" ref="planViewRef"> + <view class="jihua-main-line"> + <!-- <view class="name">瀹㈡埛鍚嶇О锛歿{item.customerName || ''}}</view> --> + <view class="name">鏀惰揣鍗曚綅锛歿{ item.customerAddressName || '' }}</view> + </view> + <view class="jihua-main-line"> + <view class="main-flex"> + <view>鐓ょ锛歿{ item.coalName || '' }}</view> + <view>鍓╀綑閲忥細{{ item.executiveSurplus || '' }}</view> + </view> + </view> + <view class="jihua-main-line"> + <view class="main-flex"> + <view class="carNum-box"> + <view>璁″垝杞︽暟锛�</view> + <!-- <u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" v-model="item.numPlan" @change="inputChange" @focus="faYunPlanCarsFocus(item)"></u--input> --> + <view class="planCars" :style="{color:item.numPlan ? '#111':'#ccc'}" @click="faYunPlanCarsFocus(item)"> + <text v-model="item.numPlan">{{ item.numPlan || '鐐瑰嚮杈撳叆鏁伴噺' }}</text> + <view class="cursor" v-if="isCursor && fayunPlanFocusId == item.id"><image src="@/static/cursor.gif" mode=""><image></view> + </view> + </view> + <view>瀹為檯鍙戣溅鏁帮細{{ item.numReal || '鏆傛棤' }}</view> + </view> + </view> + <u-keyboard + @change="valChange" + @backspace="backspace" + @confirm="keyBoardConfirm" + @cancel="keyBoardCancel" + @close="keyBoardClose" + :show="keyBoardShow" + ref="uKeyboard" + mode="number" + :overlay="false" + :closeOnClickOverlay="false" + :dotDisabled="true" + zIndex="100000" + ></u-keyboard> + </view> + + <u-button class="xiugai-btn" type="primary" text="鎻愪氦" @click="submit"></u-button> + </view> + <view v-if="isTomJihua == '宸茶缃殑璁″垝'"> + <u-empty v-if="fyData.length == 0" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" class="empty-container"></u-empty> + <view class="main-block-box" v-for="(item, index) in fyData" :key="item.id"> + <view class="jihua-main-line"> + <view class="name">瀹㈡埛鍚嶇О锛歿{ item.customerName || '' }}</view> + </view> + <view class="jihua-main-line"> + <view class="main-flex"> + <view>鐓ょ锛歿{ item.order.coalName || '' }}</view> + <view>鍓╀綑閲忥細{{ item.order.executiveSurplus || '' }}</view> + </view> + </view> + <view class="jihua-main-line"> + <view class="main-flex"> + <view class="carNum-box"> + <view>璁″垝杞︽暟锛�</view> + <!-- <u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" v-model="item.numPlan" @change="inputTotalChange(item)" @focus="faYunPlanCarsFocus(item)"></u--input> --> + <view class="planCars" :style="{color:item.numPlan ? '#111':'#ccc'}" @click="faYunPlanCarsFocus(item)"> + <text v-model="item.numPlan">{{ item.numPlan || '鐐瑰嚮杈撳叆鏁伴噺' }}</text> + <view class="cursor" v-if="isCursor && fayunPlanFocusId == item.id"> + <image src="@/static/cursor.gif" mode="" /> + </view> + </view> + </view> + <view>瀹為檯鍙戣溅鏁帮細{{ item.order.numReal == null ? '鏆傛棤' : item.order.numReal }}</view> + </view> + </view> + <u-keyboard + @change="valChange" + @backspace="backspace" + @confirm="keyBoardConfirm" + @cancel="keyBoardCancel" + @close="keyBoardClose" + :show="keyBoardShow" + ref="uKeyboard" + mode="number" + :overlay="false" + :closeOnClickOverlay="false" + :dotDisabled="true" + zIndex="100000" + ></u-keyboard> + </view> + <u-button class="xiugai-btn" type="primary" text="淇敼" @click="editPlan"></u-button> + </view> + </view> + </view> + + <view class="back-top-container"><u-back-top :scroll-top="scrollTop" icon="arrow-up" mode="square"></u-back-top></view> + <!-- 鑿滃崟鏍� --> + <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu> + </view> +</template> + +<script> +import popupMenu from '@/components/common/popup-menu/popup-menu.vue'; +import tool from '@/utils/tool.js'; +export default { + components: { + popupMenu + }, + data() { + return { + radioValue: '鍏ㄩ儴', + tabList: [ + { + name: '浠婃棩鍙戣繍璁″垝' + }, + { + name: '鏄庢棩鍙戣繍璁″垝' + } + ], + carValue: 0, + fyData: [], + fyData2: [], + info: { + shippingDate: this.todayDate() + }, + isTomJihua: '鍏ㄩ儴', + editRow: '', //淇敼琛岀殑琛� + menuShow: false, + scrollTop: 0, // 杩斿洖椤堕儴鎸夐挳缁戝畾, + // 閿洏 + keyBoardShow: false, + keyBoardValue: '', + fayunPlanFocusId: null, + isCursor: false ,// 鏃ヨ鍒掕溅杈嗚緭鍏ユ鐒︾偣鍔ㄧ敾 + overlayShow:false // 閬僵灞� + }; + }, + onShow() { + if (this.menuShow == true) { + this.$refs.menuRef.menuClick(); + } + this.init(); + }, + onPageScroll(e) { + // 浼犲叆scrollTop鍊煎苟瑙﹀彂鎵�鏈塭asy-loadimage缁勪欢涓嬬殑婊氬姩鐩戝惉浜嬩欢 + this.scrollTop = e.scrollTop; + }, + // 鐐瑰嚮瀵艰埅鏍忚彍鍗曞悗 + onNavigationBarButtonTap(e) { + // console.log(e); + this.$refs.menuRef.menuClick(); + }, + mounted() { + // setInterval(() => { + // uni.hideKeyboard(); + // }, 1); + }, + watch: { + isTomJihua: { + handler: function(newV, oldV) { + if (newV != oldV) { + this.keyBoardShow = false; + } + }, + deep: true, + immediate: true + }, + keyBoardValue: { + handler: function(newV, oldV) { + console.log('閿洏杈撳叆鍊�', newV, oldV); + this.fyData.map(item => { + if (item.id == this.fayunPlanFocusId) { + if (item.numPlan && item.numPlan != newV) { + item.numPlan = this.keyBoardValue; + if (this.isTomJihua == '宸茶缃殑璁″垝') { + this.editRow = item; + } + } + } + }); + }, + deep: true, + immediate: true + }, + scrollTop: { + handler: function(newV, oldV) { + // console.log('椤甸潰婊戝姩', newV); + if (newV != oldV) { + this.keyBoardClose(); + // this.keyBoardShow = false; + } + } + }, + deep: true, + immediate: true + }, + methods: { + init() { + this.fyList(); + }, + menushow(e) { + this.menuShow = e; + }, + //鎻愪氦 + dataFormSubmit() { + console.log('鏃ュ彂杩愯鍒掓洿鏂版暟鎹彁浜�',this.fyData); + this.overlayShow = true; + this.fyData.forEach(e => { + e.shippingDate = this.info.shippingDate; + if (e.planId && !e.numPlan) { + e.numPlan = -1; // 鍒犻櫎璁剧疆涓虹┖鐨勮鍒� + } + let orderId = e.id; // 璁㈠崟id + e.orderId = orderId; + // e.id = e.planId; + }); + this.$reqPost('addObj', this.fyData).then(res => { + console.log('addObj鎺ュ彛杩斿洖',res); + this.$u.toast('娣诲姞鎴愬姛'); + this.fyList(); + }); + }, + // 鍏ㄩ儴鏃ヨ鍒掓彁浜ゆ寜閽槻鎶� + submit:tool.throttle(function(){ + this.dataFormSubmit(); + }), + // 淇敼鏃ヨ鍒掓寜閽� + getOrderCarNum() { + //淇敼 + this.$reqPost('setCarNums', this.editRow).then(res => { + this.$u.toast('淇敼鎴愬姛'); + this.xscarshippingdayplan(); + }); + }, + // 淇敼鏃ヨ鍒掗槻鎶栨寜閽� + editPlan:tool.throttle(function(){ + this.getOrderCarNum(); + }), + // 鍒囨崲鍏ㄩ儴鍜屽凡璁剧疆 + groupChange(n) { + console.log(n, 'n================'); + this.isTomJihua = n; + if (n == '宸茶缃殑璁″垝') { + this.xscarshippingdayplan(); + } else { + this.fyList(); + } + }, + fyList() { + this.overlayShow = true; + //鍒楄〃鏌ヨ + uni.showLoading({ + title: '姝e湪鍔犺浇...' + }); + let compId = uni.getStorageSync('userInfo').compId; + let params = { + current: 1, + size: 100, + status: 2, + trainType: 1, + compId: compId + }; + this.$reqGet('fyList', params).then(res => { + if (res.code == 0) { + console.log('fylist--------',res.data); + this.xscarshippingdayplan(res.data); + } + }); + }, + xscarshippingdayplan(allList) { + uni.showLoading({ + title: '姝e湪鍔犺浇...' + }); + this.overlayShow = true; + //宸茬粡璁剧疆鐨� + let params = { + current: 1, + size: 50, + shippingDate: this.info.shippingDate + }; + this.$reqGet('xscarshippingdayplan', params) + .then(res => { + console.log('涓嶇煡閬撴槸浠�涔�---------------',res); + if (res.code == 0) { + if (allList) { + let selectFyData = res.data.records; + allList.forEach(e => { + selectFyData.forEach(ee => { + if (e.id == ee.orderId) { + e.numPlan = ee.numPlan; + e.numReal = ee.numReal; + // e.planId = ee.id; + console.log('淇敼planid鎿嶄綔',`planId:${ee.id}`); + if (ee.carNums != null) { + e.carNums = ee.carNums; + } + } + }); + }); + this.fyData = allList; + } else { + this.fyData = res.data.records; + } + uni.hideLoading(); + this.overlayShow = false; + } + }) + .catch(e => { + uni.hideLoading(); + this.overlayShow = false; + }); + }, + //鍒囨崲浠婃棩鍜屾槑鏃� + tabClick(item) { + console.log(item, 'item=========='); + if (item.index == 1) { + this.info.shippingDate = this.tomorrowDate(); + if (this.isTomJihua == '宸茶缃殑璁″垝') { + this.xscarshippingdayplan(); + } else { + this.fyList(); + } + } else { + this.info.shippingDate = this.todayDate(); + if (this.isTomJihua == '宸茶缃殑璁″垝') { + this.xscarshippingdayplan(); + } else { + this.fyList(); + } + } + }, + inputChange(val) { + console.log('鍏ㄩ儴璁″垝', val); + }, + inputTotalChange(val) { + console.log(val, 'val2=======val2,宸茶缃鍒�'); + this.editRow = val; + }, + // input鑾峰彇鐒︾偣 + faYunPlanCarsFocus(item) { + // 鑾峰彇璇ョ劍鐐瑰湪椤甸潰鐨勪綅缃� + // let boxBottom = document.getElementById('#u-dropdown'); + // console.log('鍏冪礌',boxBottom); + // let bottom = this.$refs.planViewRef.offsetHeight + + this.fayunPlanFocusId = item.id; + this.keyBoardShow = true; + this.isCursor = true; + this.keyBoardValue = item.numPlan + ''; + }, + // 閿洏 + valChange(val) { + // this.keyBoardValue += val; + // 灏嗘瘡娆℃寜閿殑鍊兼嫾鎺ュ埌value鍙橀噺涓紝娉ㄦ剰+=鍐欐硶 + this.fyData.map(item => { + if (item.id == this.fayunPlanFocusId) { + if (item.numPlan) { + item.numPlan = this.keyBoardValue += val + ''; + this.keyBoardValue = item.numPlan; + } else { + item.numPlan = val; + this.keyBoardValue = item.numPlan; + } + } + }); + }, + backspace() { + this.keyBoardValue = this.keyBoardValue.substr(0, this.keyBoardValue.length - 1); + }, + keyBoardConfirm(val) { + console.log('閿洏鐐瑰嚮纭畾鐨勫��', val); + this.keyBoardClose(); + }, + keyBoardCancel() { + this.keyBoardClose(); + }, + keyBoardClose() { + console.log('閿洏鍏抽棴浜�'); + this.fayunPlanFocusId = null; + this.keyBoardShow = false; + this.isCursor = false; + }, + todayDate() { + let yes = new Date().getTime(); + let date = new Date(yes); + let y = date.getFullYear(); + let m = date.getMonth() + 1; + m = m < 10 ? '0' + m : m; + let d = date.getDate(); + d = d < 10 ? '0' + d : d; + const time = y + '-' + m + '-' + d; + console.log('todayDate---------', time); + return time; + }, + tomorrowDate() { + let yes = new Date().getTime() + 60 * 24 * 60 * 1000; + let date = new Date(yes); + let y = date.getFullYear(); + let m = date.getMonth() + 1; + m = m < 10 ? '0' + m : m; + let d = date.getDate(); + d = d < 10 ? '0' + d : d; + const time = y + '-' + m + '-' + d; + console.log('tomorrowDate---------222', time); + return time; + } + } +}; +</script> + +<style lang="scss" scoped> +::v-deep { + .u-tabs__wrapper__nav { + padding-left: vww(75.5); + } + + .u-radio__text { + span { + font-size: vww(14); + } + } + .u-radio { + margin-right: vww(10); + } + .u-radio__text { + font-size: vww(14) !important; + } + .u-input { + height: vww(16); + width: vww(100); + z-index: 1; + } + .u-button { + position: fixed !important; + left: 50%; + bottom: vww(20); + width: vww(200) !important; + transform: translateX(-50%); + border-radius: vww(20); + z-index: 9999; + } + .u-radio-group--row { + height: 100%; + width: 100%; + display: flex; + justify-content: right; + } + + .u-radio__icon-wrap { + width: vww(18) !important; + height: vww(18) !important; + } + .u-icon__icon { + font-size: vww(12) !important; + line-height: vww(12) !important; + } + .u-empty { + width: 100%; + height: vww(300); + } +} + +.qiehuan-box { + position: fixed; + top: 0; + left: 0; + right: 0; + width: 100%; + height: vww(44); + z-index: 10; + background-color: #fff; +} + +.jihua-wrap { + width: 100%; + height: 100%; + // overflow-y: auto; // 浼氬紩璧烽敭鐩樺脊鍑洪〉闈㈠竷灞� + display: flex; + flex-direction: column; + + // .xiugai-btn { + // position: absolute; + // left: 50%; + // bottom: vww(20); + // width: vww(200); + // transform: translateX(-50%); + // border-radius: vww(20); + // } +} + +.jihua-main { + display: flex; + flex-direction: column; + width: 100%; + padding: vww(44) vww(10) vww(70) vww(10); + box-sizing: border-box; + .main-inside { + width: 100%; + height: calc(100% - vww(44)); + } + + .shaixuan-box { + height: vww(40); + position: sticky; + top: vww(44); + left: 0; + right: 0; + width: 100%; + z-index: 10; + background-color: #fff; + } + + .main-block-box { + box-shadow: 0px 0px 8px 0px rgba(216, 218, 238, 0.8); + height: vww(120); + padding: vww(10); + box-sizing: border-box; + margin-top: vww(12); + border-radius: vww(8); + &:first-child { + margin-top: vww(5); + } + .jihua-main-line { + width: 100%; + display: flex; + + view { + font-size: vww(14); + } + + .name { + font-weight: 600 !important; + } + + .main-flex { + width: 100%; + display: flex; + justify-content: space-between; + view { + font-size: vww(14); + line-height: vww(32); + } + .carNum-box { + display: flex; + .planCars { + display: flex; + box-sizing: border-box; + overflow: auto; + width: vww(120); + border: 1px solid #dddddd; + border-radius: vww(4); + padding: vww(1) vww(10); + + + // 杈撳叆鐒︾偣鍥剧墖 + .cursor { + // float: left; + width: vww(1); + height: vww(15); + vertical-align: middle; + align-self: center; + image { + width: vww(1); + display: block; + height: vww(15); + } + } + } + view { + font-size: vww(14); + line-height: vww(32); + } + } + } + } + } +} +</style> \ No newline at end of file -- Gitblit v1.9.1