From a566bf1ca5003c351a87a07a9038bc1f815679a0 Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123 <819527061@qq.com>
Date: 星期四, 14 七月 2022 16:57:54 +0800
Subject: [PATCH] '发运日计划'
---
utils/jihua.js | 5 +
pages/jihua/jihua.vue | 291 +++++++++++++++++++++++++++++++++++++++------------------
2 files changed, 204 insertions(+), 92 deletions(-)
diff --git a/pages/jihua/jihua.vue b/pages/jihua/jihua.vue
index a69473b..d3532e3 100644
--- a/pages/jihua/jihua.vue
+++ b/pages/jihua/jihua.vue
@@ -1,7 +1,7 @@
<template>
<view class="jihua-wrap">
<view class="qiehuan-box">
- <u-tabs :list="tabList" @click="tabClick"></u-tabs>
+ <u-tabs :list="tabList" @click="tabClick"></u-tabs>
</view>
<view class="jihua-main">
<view class="shaixuan-box">
@@ -12,75 +12,137 @@
</u-radio-group>
</view>
<div class="main-inside">
- <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.coalName}}</view>
- <view>鍓╀綑閲忥細{{item.executiveSurplus}}</view>
+ <view v-if="isTomJihua == '鍏ㄩ儴'">
+ <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>
- <view class="jihua-main-line">
- <view class="main-flex">
- <view class="carNum-box">
- <view>璁″垝杞︽暟锛�</view>
- <u--input
- focus
- placeholder="璇疯緭鍏ュ彂杩愯溅鏁�"
- border="surround"
- v-model="item.numPlan"
- @change="change"
- ></u--input>
+ <view class="jihua-main-line">
+ <view class="main-flex">
+ <view>鐓ょ锛歿{ item.coalName}}</view>
+ <view>鍓╀綑閲忥細{{ item.executiveSurplus}}</view>
</view>
- <view>瀹為檯鍙戣溅鏁帮細{{item.numReal}}</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="item.numPlan"
+ @change="inputChange"
+ ></u--input>
+ </view>
+ <view>瀹為檯鍙戣溅鏁帮細{{item.numReal}}</view>
+ </view>
</view>
</view>
+ <u-button class="xiugai-btn" type="primary" text="鎻愪氦" @click="dataFormSubmit"></u-button>
</view>
+ <view v-else>
+ <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 ? item.order.coalName : item.coalName}}</view>
+ <view>鍓╀綑閲忥細{{ item.order ? item.order.executiveSurplus : item.executiveSurplus}}</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="item.numPlan"
+ @change="inputTotalChange(item)"></u--input>
+ </view>
+ <view>瀹為檯鍙戣溅鏁帮細{{item.order ? item.order.numReal : item.numReal}}</view>
+ </view>
+ </view>
+ </view>
+ <u-button class="xiugai-btn" type="primary" text="淇敼" @click="getOrderCarNum"></u-button>
+ </view>
+
</div>
</view>
- <u-button class="xiugai-btn" type="primary" text="鎻愪氦" @click="dataFormSubmit"></u-button>
+ <!-- 鑿滃崟鏍� -->
+ <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
</view>
</template>
<script>
-
+ import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
export default {
+ components: {
+ popupMenu
+ },
data() {
return {
radioValue: '鍏ㄩ儴',
tabList: [{
name: '浠婃棩鍙戣繍璁″垝'
- },{
+ }, {
name: '鏄庢棩鍙戣繍璁″垝'
}],
- carValue:0,
+ carValue: 0,
fyData: [],
+ fyData2: [],
info: {
shippingDate: this.todayDate()
},
- isTomJihua:'',
+ isTomJihua: '',
+ editRow:'', //淇敼琛岀殑琛�
+ menuShow:false,
}
},
onShow() {
+ if(this.menuShow == true){
+ this.$refs.menuRef.menuClick()
+ }
this.init()
+ },
+ // 鐐瑰嚮瀵艰埅鏍忚彍鍗曞悗
+ onNavigationBarButtonTap(e) {
+ // console.log(e);
+ this.$refs.menuRef.menuClick()
},
methods: {
init() {
this.fyList()
},
+ menushow(e){
+ this.menuShow = e;
+ },
dataFormSubmit() { //鎻愪氦璁㈠崟
- this.$reqPost('addObj',JSON.stringify(this.fyData)).then(res => {
-
+ this.fyData.forEach(e => {
+ e.shippingDate = this.info.shippingDate
+ if (e.planId && !e.numPlan) {
+ e.numPlan = -1; //鍒犻櫎璁剧疆涓虹┖鐨勮鍒�
+ }
+ let orderId = e.id;
+ e.id = e.planId;
+ e.orderId = orderId;
+ })
+ this.$reqPost('addObj', this.fyData).then(res => {
+ this.$u.toast('娣诲姞鎴愬姛')
+ this.fyList()
+ })
+ },
+ getOrderCarNum() { //淇敼
+ this.$reqPost('setCarNums',this.editRow).then(res => {
+ this.$u.toast('淇敼鎴愬姛')
+ this.xscarshippingdayplan()
})
},
groupChange(n) {
- console.log(n,'n================')
+ console.log(n, 'n================')
this.isTomJihua = n
- if(n == '宸茶缃殑璁″垝') {
+ if (n == '宸茶缃殑璁″垝') {
this.xscarshippingdayplan()
- }else {
+ } else {
this.fyList()
}
},
@@ -89,26 +151,30 @@
let date = new Date(yes)
let y = date.getFullYear()
let m = date.getMonth() + 1
- m = m < 10 ? ('0'+ m) : m
+ 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)
+ 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
- },
- fyList() {
+ 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
+ },
+
+ fyList() { //鍒楄〃鏌ヨ
+ uni.showLoading({
+ title: '姝ｅ湪鍔犺浇...'
+ });
let compId = uni.getStorageSync('userInfo').compId
let params = {
current: 1,
@@ -117,71 +183,100 @@
trainType: 1,
compId: compId
}
- this.$reqGet('fyList',params).then(res => {
- if(res.code == 0) {
- this.fyData = res.data
+ this.$reqGet('fyList', params).then(res => {
+ if (res.code == 0) {
+ this.xscarshippingdayplan(res.data);
+
}
})
},
- xscarshippingdayplan() {
+ xscarshippingdayplan(allList) { //宸茬粡璁剧疆鐨�
+ console.log(allList,'allList==========')
let params = {
current: 1,
size: 50,
shippingDate: this.info.shippingDate
}
this.$reqGet('xscarshippingdayplan', params).then(res => {
- if(res.code == 0) {
- this.fyData = res.data.records
+ if (res.code == 0) {
+ if(!allList) {
+ this.fyData = res.data.records
+ }else {
+ let l = res.data.records
+ allList.forEach(e => {
+ l.forEach(ee => {
+ if (e.id == ee.orderId) {
+ e.numPlan = ee.numPlan;
+ e.numReal = ee.numReal;
+ e.planId = ee.id;
+ if (ee.carNums != null) {
+ e.carNums = ee.carNums;
+ }
+ }
+ })
+ })
+ this.fyData = allList;
+ }
+ uni.hideLoading();
}
})
},
- tabClick(item) { //鍒囨崲浠婃棩鍜屾槑鏃�
- console.log(item.name,'item==========')
- if(item.index == 1) {
+ tabClick(item) { //鍒囨崲浠婃棩鍜屾槑鏃�
+ console.log(item.name, 'item==========')
+ if (item.index == 1) {
this.info.shippingDate = this.tomorrowDate()
- if(this.isTomJihua == '宸茶缃殑璁″垝') {
+ if (this.isTomJihua == '宸茶缃殑璁″垝') {
this.xscarshippingdayplan()
- }else {
+ } else {
this.fyList()
}
-
- }else {
+
+ } else {
this.info.shippingDate = this.todayDate()
- if(this.isTomJihua == '宸茶缃殑璁″垝') {
+ if (this.isTomJihua == '宸茶缃殑璁″垝') {
this.xscarshippingdayplan()
- }else {
+ } else {
this.fyList()
}
}
-
+
},
- change() {
-
+ inputChange(val) {
+ console.log(val)
+ },
+ inputTotalChange(val) {
+ console.log(val,'val2=======val2')
+ this.editRow = val
}
}
}
</script>
<style lang="scss" scoped>
- ::v-deep{
- .u-tabs__wrapper__nav{
+ ::v-deep {
+ .u-tabs__wrapper__nav {
padding-left: vww(75.5)
}
- .u-radio__text{
- span{
+
+ .u-radio__text {
+ span {
font-size: vww(14);
}
}
- .u-radio-group--row{
+
+ .u-radio-group--row {
height: 100%;
}
- .u-radio__icon-wrap{
- width: vww(14)!important;
- height: vww(14)!important;;
+
+ .u-radio__icon-wrap {
+ width: vww(14) !important;
+ height: vww(14) !important;
+ ;
}
-
+
}
- .qiehuan-box{
+
+ .qiehuan-box {
position: sticky;
top: 0;
left: 0;
@@ -190,13 +285,15 @@
z-index: 1;
background-color: #fff;
}
- .jihua-wrap{
+
+ .jihua-wrap {
width: 100%;
height: 100%;
overflow-y: auto;
display: flex;
flex-direction: column;
- .xiugai-btn{
+
+ .xiugai-btn {
position: absolute;
left: 50%;
bottom: vww(20);
@@ -204,17 +301,20 @@
transform: translateX(-50%);
}
}
- .jihua-main{
+
+ .jihua-main {
display: flex;
flex-direction: column;
width: 100%;
- padding:vww(0) vww(10);
+ padding: vww(0) vww(10) vww(60) vww(10);
box-sizing: border-box;
- .main-inside{
+
+ .main-inside {
width: 100%;
height: calc(100% - vww(44));
}
- .shaixuan-box{
+
+ .shaixuan-box {
height: vww(40);
position: sticky;
top: vww(44);
@@ -224,37 +324,44 @@
z-index: 1;
background-color: #fff;
}
- .main-block-box{
- box-shadow: 0 0 8px rgba(0,0,0,0.1);
+
+ .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);
- .jihua-main-line{
+
+ .jihua-main-line {
width: 100%;
display: flex;
- view{
+
+ view {
font-size: vww(14);
line-height: 2;
}
- .name{
- font-weight: 600!important;
+
+ .name {
+ font-weight: 600 !important;
}
- .main-flex{
+
+ .main-flex {
width: 100%;
display: flex;
justify-content: space-between;
- .carNum-box{
+
+ .carNum-box {
display: flex;
- .u-input{
+
+ .u-input {
height: vww(20);
width: vww(100);
}
}
}
}
-
+
}
}
</style>
diff --git a/utils/jihua.js b/utils/jihua.js
index 586b409..741ad21 100644
--- a/utils/jihua.js
+++ b/utils/jihua.js
@@ -18,4 +18,9 @@
url: '/yunxiao/xscarshippingdayplan',
method: 'POST'
},
+ // /yunxiao/xscarshippingdayplan/setCarNums
+ setCarNums: {
+ url: '/yunxiao/xscarshippingdayplan/setCarNums',
+ method: 'POST'
+ },
}
\ No newline at end of file
--
Gitblit v1.9.1