Browse Source

修改主页样式,新增报销页面的376等于0判断

LongYuFei 2 years ago
parent
commit
283cbf181f
3 changed files with 66 additions and 16 deletions
  1. 61 11
      pages/index.vue
  2. 3 3
      pages/particulars/claimExpense/index.vue
  3. 2 2
      pages/particulars/index.vue

+ 61 - 11
pages/index.vue

@@ -35,13 +35,18 @@
 					<!-- <view class="date">
 						<text>{{ item.billDate }}</text>
 					</view> -->
+					<!-- {{item.status317}}
+					{{item.status376}} -->
 					<view class="date">
 						<text class="true" v-if="item.status317 == 2">{{ item.billStatusName }}</text>
-						<text class="yellow" v-if="item.status376 == 2 && item.status317 == 6 || item.status376 == 0">{{ item.billStatusName }}</text>
+						<!-- item.status376 == 0 -->
+						<!-- item.status376 == 2  -->
+						<text class="yellow"
+							v-if="item.status317 == 6">{{ item.billStatusName }}</text>
 						<text class="false" v-if="item.status376 == 6">{{ item.billStatusName }}</text>
 					</view>
 				</view>
-				<view class="details">
+				<!-- <view class="details">
 					<view class="left vertical-layout">
 						<text class="data-left vertical-layout colorBlue">装车地</text>
 						<text class="data-right">{{ item.loadAddr == null ? '' : item.loadAddr }}</text>
@@ -72,6 +77,28 @@
 						<text class="data-left vertical-layout colorBlue">派单日期</text>
 						<text>{{ item.billDate == null ? '' : item.billDate}}</text>
 					</view>
+				</view> -->
+
+				<view class="details">
+					<view class="data">
+						<text class="key">装卸地点</text>
+						<text
+							class="value">{{ item.loadAddr == null ? '' : item.loadAddr }}--{{ item.unLoadAddr == null ? '' : item.unLoadAddr }}</text>
+					</view>
+					<view class="data">
+						<text class="key">装货品名</text>
+						<text class="value">{{ item.goodsCName == null ? '' : item.goodsCName }} {{ item.rightqty == null ? '' : item.rightqty + "吨" }}</text>
+					</view>
+					<view class="data vertical-layout">
+						<view class="a">
+							<text class="key">派单日期</text>
+							<text class="value">{{ item.billDate == null ? '' : item.billDate}}</text>
+						</view>
+						<view class="b">
+							<text class="key">业务员</text>
+							<text class="value">{{ item.transact == null ? '' : item.transact }}</text>
+						</view>
+					</view>
 				</view>
 			</view>
 
@@ -96,7 +123,7 @@
 				// 数据
 				orderBillsPlansList: [],
 				show: false,
-				
+
 			}
 		},
 		computed: {
@@ -150,17 +177,18 @@
 				date.setDate(1);
 				var beginDate = date.toISOString().slice(0, 10);
 				var endDate = this.getFullDate(new Date().setDate(endOfMonth));
-				
-				
+
+
 				var date1 = new Date();
 				var date2 = new Date(date1);
-				
+
 				//-30为30天前,+30可以获得30天后的日期
 				date2.setDate(date1.getDate() - 30);
-				
+
 				//30天前(月份判断是否小于10,小于10的前面+0)
-				var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
-				
+				var agoDay =
+					`${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+
 				this.condition.range.push(agoDay, endDate);
 
 			},
@@ -329,7 +357,7 @@
 					.true {
 						color: red;
 					}
-					
+
 					.yellow {
 						color: #3c9cff;
 					}
@@ -353,7 +381,7 @@
 				padding-bottom: 4rpx;
 
 
-					margin-left: 20rpx;
+				margin-left: 20rpx;
 				// border-top: 4rpx solid #f0f0f0ff;
 
 				// border-bottom: 2rpx dotted #000;
@@ -387,6 +415,28 @@
 				.data-right {
 					// width: 50%;
 				}
+
+				.data {
+					
+					margin-bottom: 10rpx;
+
+					.key {
+						color: #3c9cff;
+					}
+
+					.value {
+						padding-left: 20rpx;
+					}
+
+					.a {
+						width: 50%;
+					}
+
+					.b {
+						width: 50%;
+					}
+
+				}
 			}
 
 			.primary {

+ 3 - 3
pages/particulars/claimExpense/index.vue

@@ -165,7 +165,7 @@
 
 		</view>
 
-		<view class="bottom vertical-layout" v-if="status376 == 2">
+		<view class="bottom vertical-layout" v-if="status376 == 2 || status376 == 0">
 			<button class="submit" iconColor="#3c9cff" type="primary" @click="submit">提交费用</button>
 		</view>
 
@@ -273,7 +273,7 @@
 						message: "不允许保存!",
 						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
 					})
-				} else if (this.status376 == 2) {
+				} else if (this.status376 == 2 || this.status376 == 0) {
 
 
 
@@ -339,7 +339,7 @@
 						message: "不允许修改!",
 						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
 					})
-				} else if (this.status376 == 2) {
+				} else if (this.status376 == 2 || this.status376 == 0) {
 				this.event = event;
 				this.deleteShow = true;
 				}

+ 2 - 2
pages/particulars/index.vue

@@ -167,8 +167,8 @@
 				<text v-if="status317 == 6 || status317 == 0">里程信息</text>
 			</view>
 			<view class="claim-expense" @click="skipClaimExpense()">
-				<text v-if="status376 == 2">报销费用</text>
-				<text v-if="status376 == 6 || status376 == 0">查看报销</text>
+				<text v-if="status376 == 2 || status376 == 0">报销费用</text>
+				<text v-if="status376 == 6">查看报销</text>
 			</view>
 
 		</view>