From 8c2bdac410ae06761c997d534883bd845237c33f Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123 <819527061@qq.com>
Date: 星期四, 14 七月 2022 08:30:04 +0800
Subject: [PATCH] '日发运'
---
pages/home/home.vue | 9 +
utils/jihua.js | 21 ++++
utils/request.js | 6 +
pages/login/login.vue | 1
utils/index.js | 5
pages/jihua/jihua.vue | 212 ++++++++++++++++++++++++++++++------------
6 files changed, 190 insertions(+), 64 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 2c1f02f..cbd0679 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -257,6 +257,7 @@
import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
import combinedTitle from '@/components/common/combined-title/combined-title.vue';
import combinationCard from '@/components/common/combination-card/combination-card.vue';
+import {setAccessToken} from '@/utils/status.js'
export default {
name: 'home',
data() {
@@ -328,7 +329,15 @@
popupMenu
},
methods: {
+ getUserInfo() {
+ this.$reqGet('getUserInfo').then(res => {
+ if(res.code == 0) {
+ uni.setStorageSync('userInfo',res.data.sysUser)
+ }
+ })
+ },
init() {
+ this.getUserInfo()
this.getProcessDataList(); // 鐢宠鍒楄〃
this.todoList(); // 鎴戠殑寰呭姙
this.doneList(); // 鎴戠殑宸插姙
diff --git a/pages/jihua/jihua.vue b/pages/jihua/jihua.vue
index 60c1056..a69473b 100644
--- a/pages/jihua/jihua.vue
+++ b/pages/jihua/jihua.vue
@@ -5,70 +5,47 @@
</view>
<view class="jihua-main">
<view class="shaixuan-box">
- <u-radio-group v-model="radioValue">
+ <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 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>
+ <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>
- <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 class="jihua-main-line">
+ <view class="main-flex">
+ <view>鐓ょ锛歿{item.coalName}}</view>
+ <view>鍓╀綑閲忥細{{item.executiveSurplus}}</view>
</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 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>
+ <view>瀹為檯鍙戣溅鏁帮細{{item.numReal}}</view>
</view>
- <view>瀹為檯鍙戣溅鏁帮細4000</view>
</view>
</view>
- <!-- <u-button class="xiugai-btn" type="primary" text="淇敼" size="mini"></u-button> -->
- </view>
+ </div>
</view>
+ <u-button class="xiugai-btn" type="primary" text="鎻愪氦" @click="dataFormSubmit"></u-button>
</view>
</template>
<script>
+
export default {
data() {
return {
@@ -79,10 +56,103 @@
name: '鏄庢棩鍙戣繍璁″垝'
}],
carValue:0,
+ fyData: [],
+ info: {
+ shippingDate: this.todayDate()
+ },
+ isTomJihua:'',
}
},
+ onShow() {
+ this.init()
+ },
methods: {
- tabClick(item) {
+ init() {
+ this.fyList()
+ },
+ dataFormSubmit() { //鎻愪氦璁㈠崟
+ this.$reqPost('addObj',JSON.stringify(this.fyData)).then(res => {
+
+ })
+ },
+ groupChange(n) {
+ console.log(n,'n================')
+ this.isTomJihua = n
+ if(n == '宸茶缃殑璁″垝') {
+ this.xscarshippingdayplan()
+ }else {
+ this.fyList()
+ }
+ },
+ 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
+ },
+ fyList() {
+ 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) {
+ this.fyData = res.data
+ }
+ })
+ },
+ xscarshippingdayplan() {
+ 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
+ }
+ })
+ },
+ tabClick(item) { //鍒囨崲浠婃棩鍜屾槑鏃�
+ console.log(item.name,'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()
+ }
+ }
},
change() {
@@ -109,23 +179,50 @@
width: vww(14)!important;
height: vww(14)!important;;
}
- .u-button__text{
- font-size: vww(12)!important;
- }
+
+ }
+ .qiehuan-box{
+ position: sticky;
+ top: 0;
+ left: 0;
+ right: 0;
+ width: 100%;
+ z-index: 1;
+ 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%);
+ }
}
.jihua-main{
display: flex;
flex-direction: column;
width: 100%;
- padding:vww(10) vww(10);
+ padding:vww(0) 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: 1;
+ background-color: #fff;
}
.main-block-box{
box-shadow: 0 0 8px rgba(0,0,0,0.1);
@@ -134,13 +231,6 @@
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;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 4fa24d9..bc1020f 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -54,6 +54,7 @@
}
}
}
+
}
};
</script>
diff --git a/utils/index.js b/utils/index.js
index 8b190fc..f87a629 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -7,8 +7,9 @@
"Content-type": 'application/x-www-from-urlencoded'
},
headerPOST: {
- // "Content-type":'application/json'
- 'Content-Type': 'application/x-www-form-urlencoded'
+ "Content-type":'application/json'
+ // 'Content-Type': 'application/x-www-form-urlencoded',
+
},
}
diff --git a/utils/jihua.js b/utils/jihua.js
new file mode 100644
index 0000000..586b409
--- /dev/null
+++ b/utils/jihua.js
@@ -0,0 +1,21 @@
+export const jihua = {
+ //鑾峰彇鐢ㄦ埛淇℃伅
+ getUserInfo: {
+ url: '/admin/user/info',
+ method: 'GET'
+ },
+ // 鍙戣繍鍒楄〃
+ fyList: {
+ url: '/yunxiao/contractorder/fyList',
+ method: 'GET'
+ },
+ xscarshippingdayplan: {
+ url: '/yunxiao/xscarshippingdayplan/page',
+ method: 'GET'
+ },
+ // /yunxiao/xscarshippingdayplan
+ addObj: {
+ url: '/yunxiao/xscarshippingdayplan',
+ method: 'POST'
+ },
+}
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
index b1f0de2..43fa9c7 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -2,6 +2,10 @@
api
} from './api.js';
+import {
+ jihua
+} from './jihua.js';
+
// 鎴愬姛
const responseOK = (response) => {
const {
@@ -86,7 +90,7 @@
// 璇锋眰鎷︽埅
const fetch = (url, opt) => {
- let urls = (api[opt.url]?.url || api[url]?.url);
+ let urls = (api[opt.url]?.url || api[url]?.url || jihua[opt.url]?.url || jihua[url]?.url);
let params = opt.params ? ('?' + Object.keys(opt.params).map(key => key + '=' + opt.params[key]).join('&')) :
'';
opt.url = urls + params
--
Gitblit v1.9.1