lilei 1 year ago
parent
commit
b2e7297f9e
2 changed files with 30 additions and 20 deletions
  1. 4 4
      pages/sales/edit.vue
  2. 26 16
      pages/sales/index.vue

+ 4 - 4
pages/sales/edit.vue

@@ -75,9 +75,9 @@
 								<view class="sales-item-price" v-if="detailData&&detailData.discountAmount">折后:¥{{toThousands(item.discountedAmount||0, 2)}}</view>
 							</view>
 						</view>
-						<!-- <view class="btn-box" style="padding-right: 0;">
+						<view class="btn-box" style="padding-right: 0;">
 							<u-button v-if="pageData.type=='edit'" @click="handleDel(item)" size="mini" :hair-line="false" shape="circle" plain type="error" hover-class="none">删除</u-button>
-						</view> -->
+						</view>
 					</view>
 					<view v-if="listData && listData.length == 0">
 						<u-empty :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="150" :text="noDataText" mode="list" :margin-top="50"></u-empty>
@@ -89,13 +89,13 @@
 			</view>
 		</view>
 		<!-- 操作按钮 -->
-		<!-- <view class="sales-btn-box" v-if="detailData&&detailData.billStatus!='FINISH'">
+		<view class="sales-btn-box" v-if="detailData&&detailData.billStatus!='FINISH'">
 			<view v-if="pageData.type=='edit'" class="flex align_center justify_between">
 				<u-button class="handle-btn" shape="circle" size="medium" hover-class="none" @click="handleDel()">整单删除</u-button>
 				<u-button class="handle-btn search-btn" shape="circle" @click="handleSubmit" size="medium" hover-class="none" :custom-style="customBtnStyle">提交</u-button>
 			</view>
 			<u-button v-if="pageData.type=='detail' && (detailData&&detailData.billStatus !== 'CANCEL' && detailData.billStatus !== 'FINISH' && detailData.billStatus != 'WAIT_OUT_WAREHOUSE')" class="edit-btn" shape="circle" @click="goPage" size="medium" hover-class="none" :custom-style="customBtnStyle">编辑</u-button>
-		</view> -->
+		</view>
 		<!-- 基础信息 -->
 		<orderInfoModal :openModal="infoModal" :infoData="detailData" @close="infoModal=false" />
 		<!-- 折扣 -->

+ 26 - 16
pages/sales/index.vue

@@ -27,22 +27,24 @@
 					<u-image class="nav-pic" style="margin-top: 5upx;" :src="`../../static/${theme}/navIcon/price_icon.png`" width="60" height="60"></u-image>
 					<text class="nav-txt" style="margin-top: 5upx;">产品报价</text>
 				</view>
-				<!-- <view class="nav-item" @click="toPage('/pages/sales/chooseCustomer?backPage=addSales')">
-					<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/sale_icon.png`" width="70" height="70"></u-image>
-					<text class="nav-txt">新增销售单</text>
-				</view> -->
 				<view class="nav-item" @click="toPage('/pages/webviews/openview?title=产品查询&url=https://jgqp.51cjml.com/h5/#!/')" v-if="$hasPermissions('M_queryProduct_mobile')">
-					<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/pfind.png`" width="64" height="64"></u-image>
+					<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/pfind.png`" width="60" height="60"></u-image>
 					<text class="nav-txt">产品查询</text>
 				</view>	
 				<view class="nav-item" @click="toPage('/pages/sales/productUniversal')" v-if="$hasPermissions('M_productUniversalList_mobile')">
-					<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/parts.png`" width="64" height="64"></u-image>
+					<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/parts.png`" width="60" height="60"></u-image>
 					<text class="nav-txt">通用产品</text>
 				</view>	
-				<view class="nav-item" @click="toPage('/pages/sales/chooseCustomerBill')" v-if="$hasPermissions('M_ARStatement_mobile')">
-					<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/billImg.png`" width="64" height="64"></u-image>
+			</view>
+			<view class="nav-cont flex align_center">
+				<view class="nav-item1" @click="toPage('/pages/sales/chooseCustomerBill')" v-if="$hasPermissions('M_ARStatement_mobile')">
+					<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/billImg.png`" width="60" height="60"></u-image>
 					<text class="nav-txt">应收对账单</text>
 				</view>
+				<view class="nav-item1" @click="toPage('/pages/sales/chooseCustomer?backPage=addSales')">
+					<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/sale_icon.png`" width="70" height="70"></u-image>
+					<text class="nav-txt">新增销售单</text>
+				</view>
 			</view>
 			<!-- 销售单 -->
 			<view class="sales-list">
@@ -84,7 +86,7 @@
 		onReady() {
 			const query = uni.createSelectorQuery().in(this);
 			query.select('#tjCons').boundingClientRect(data => {
-			  this.listHeight = Math.floor(data.height) + 2
+			  this.listHeight = Math.floor(data.height/3)
 			}).exec();
 		},
 		onLoad(opts) {
@@ -268,26 +270,34 @@
 			}
 		}
 		.nav-cont{
-			.nav-item{
+			.nav-item,.nav-item1{
 				flex:1;
 				margin-right: 2%;
-				border-radius: 25upx;
+				border-radius: 20upx;
 				background-color: #ffffff;
-				padding: 14upx 0;
+				padding: 15upx 0;
 				box-shadow: 3upx 2upx 6upx #eee;
 				margin-bottom: 20upx;
 				text-align: center;
-				.nav-pic{
-					margin: 0 auto;
-				}
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
 				.nav-txt{
 					font-size: 28upx;
 					color: #666666;
 				}
 			}
-			.nav-item:last-child{
+			.nav-item:last-child,.nav-item1:last-child{
 				margin-right: 0 !important;
 			}
+			.nav-item1{
+				padding: 20upx 0;
+				flex-direction: row;
+				.nav-txt{
+					margin-left: 6px;
+				}
+			}
 		}
 		.sales-list{
 			.title{