From 5596cc695d444d9ef13661148d6e227f8ed3171e Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123 <819527061@qq.com>
Date: 星期四, 28 七月 2022 20:25:37 +0800
Subject: [PATCH] '冲突解决'
---
pages/jihua/jihua.vue | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/pages/jihua/jihua.vue b/pages/jihua/jihua.vue
index d3532e3..6f8f2b1 100644
--- a/pages/jihua/jihua.vue
+++ b/pages/jihua/jihua.vue
@@ -28,7 +28,6 @@
<view class="carNum-box">
<view>璁″垝杞︽暟锛�</view>
<u--input
- focus
placeholder="璇疯緭鍏ュ彂杩愯溅鏁�"
border="surround"
v-model="item.numPlan"
@@ -41,7 +40,7 @@
</view>
<u-button class="xiugai-btn" type="primary" text="鎻愪氦" @click="dataFormSubmit"></u-button>
</view>
- <view v-else>
+ <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>
@@ -56,7 +55,7 @@
<view class="main-flex">
<view class="carNum-box">
<view>璁″垝杞︽暟锛�</view>
- <u--input focus placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" v-model="item.numPlan"
+ <u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" v-model="item.numPlan"
@change="inputTotalChange(item)"></u--input>
</view>
<view>瀹為檯鍙戣溅鏁帮細{{item.order ? item.order.numReal : item.numReal}}</view>
@@ -65,7 +64,12 @@
</view>
<u-button class="xiugai-btn" type="primary" text="淇敼" @click="getOrderCarNum"></u-button>
</view>
-
+ <!-- <u-empty
+ v-if="fyData.length == 0"
+ mode="data"
+ icon=""
+ >
+ </u-empty> -->
</div>
</view>
<!-- 鑿滃崟鏍� -->
@@ -93,7 +97,7 @@
info: {
shippingDate: this.todayDate()
},
- isTomJihua: '',
+ isTomJihua: '鍏ㄩ儴',
editRow:'', //淇敼琛岀殑琛�
menuShow:false,
}
@@ -176,6 +180,7 @@
title: '姝ｅ湪鍔犺浇...'
});
let compId = uni.getStorageSync('userInfo').compId
+
let params = {
current: 1,
size: 100,
@@ -201,6 +206,7 @@
if (res.code == 0) {
if(!allList) {
this.fyData = res.data.records
+ console.log(this.fyData,'this.fyData=========11111111')
}else {
let l = res.data.records
allList.forEach(e => {
@@ -216,13 +222,17 @@
})
})
this.fyData = allList;
+ console.log(this.fyData,'this.fyData=========22222222')
}
+ console.log(this.fyData,'this.fyData=========333333333')
uni.hideLoading();
}
+ }).catch(e => {
+ uni.hideLoading();
})
},
tabClick(item) { //鍒囨崲浠婃棩鍜屾槑鏃�
- console.log(item.name, 'item==========')
+ console.log(item, 'item==========')
if (item.index == 1) {
this.info.shippingDate = this.tomorrowDate()
if (this.isTomJihua == '宸茶缃殑璁″垝') {
@@ -266,6 +276,9 @@
.u-radio-group--row {
height: 100%;
+ width: 100%;
+ display: flex;
+ justify-content: right;
}
.u-radio__icon-wrap {
@@ -299,6 +312,7 @@
bottom: vww(20);
width: vww(200);
transform: translateX(-50%);
+ border-radius: vww(20);
}
}
@@ -306,7 +320,7 @@
display: flex;
flex-direction: column;
width: 100%;
- padding: vww(0) vww(10) vww(60) vww(10);
+ padding: vww(0) vww(10) vww(70) vww(10);
box-sizing: border-box;
.main-inside {
@@ -326,13 +340,15 @@
}
.main-block-box {
- box-shadow: 0 0 8px rgba(0, 0, 0, 0.1);
+ box-shadow: 0px 0px 8px 0px rgba(216,218,238,0.80);
height: vww(120);
padding: vww(10);
box-sizing: border-box;
- margin-top: vww(15);
- border-radius: vww(5);
-
+ margin-top: vww(12);
+ border-radius: vww(8);
+ &:first-child{
+ margin-top: vww(5);
+ }
.jihua-main-line {
width: 100%;
display: flex;
@@ -350,10 +366,16 @@
width: 100%;
display: flex;
justify-content: space-between;
-
+ view{
+ font-size: vww(14);
+ line-height: vww(34);
+ }
.carNum-box {
display: flex;
-
+ view {
+ font-size: vww(14);
+ line-height: vww(34);
+ }
.u-input {
height: vww(20);
width: vww(100);
--
Gitblit v1.9.1