lilei 3 anni fa
parent
commit
b3f9de6017

+ 0 - 1
pages/sales/addSales.vue

@@ -3,7 +3,6 @@
 		<view class="content-customerName">
 			<view class="flex justify_between align_center customerName">
 			<text>{{customerData?customerData.customerName:''}}</text>
-			
 				<u-button size="mini" :hair-line="false" plain type="primary" hover-class="none" @click="goBack" :custom-style="customBtnStyle">重新选择</u-button>
 			</view>
 		</view>

+ 2 - 1
pages/sales/chooseCustomer.vue

@@ -12,6 +12,7 @@
 			<u-search
 				placeholder="请输入客户名称搜索" 
 				v-model="queryWord" 
+				height="90"
 				@input="searchBrand"
 				@blur="searchBrand"
 				@search="searchBrand"
@@ -138,7 +139,7 @@
 				.picker-main-item{
 					padding: 0 20upx;
 					.item-name{
-						padding: 14upx 0;
+						padding: 30upx 0;
 						border-bottom: 1rpx solid #e5e6eb;
 					}
 					.item-name:not(:last-child){

+ 23 - 3
pages/sales/list.vue

@@ -58,13 +58,33 @@
 			// 获取查询参数 刷新列表
 			refresh(params){
 				const _this = this
-				// this.searchParams = Object.assign(this.searchForm,params)
+				const data = {}
 				if(this.searchForm.billStatus){
-					params.billStatus = this.searchForm.billStatus
+					data.billStatus = this.searchForm.billStatus
 				}
 				if(this.searchForm.financialStatus){
-					params.financialStatus = this.searchForm.financialStatus
+					data.financialStatus = this.searchForm.financialStatus
 				}
+				if(params.beginDate){
+					data.beginDate = params.beginDate
+				}
+				if(params.endDate){
+					data.endDate = params.endDate
+				}
+				if(params.buyerName){
+					data.buyerName = params.buyerName
+				}
+				if(params.salesBillNo){
+					data.salesBillNo = params.salesBillNo
+				}
+				if(params.purchaseBillNo){
+					data.purchaseBillNo = params.purchaseBillNo
+				}
+				if(params.settleStyleSn){
+					data.settleStyleSn = params.settleStyleSn
+				}
+				this.searchParams = data
+				console.log(this.searchParams,'this.searchParams')
 				this.$nextTick(function(){
 					_this.$refs.salesList.getList(1)
 				})

+ 1 - 1
pages/sales/listComponent.vue

@@ -4,7 +4,7 @@
 			<view class="sales-list-main">
 				<view class="sales-list-item" v-for="(item, index) in listData" :key="item.id" @click="getDetail(item)">
 					<view class="list-item-tit">
-						<u-section :title="item.buyerName":right="false" :line-color="$config('primaryColor')"></u-section>
+						<u-section :title="item.buyerName" :sub-title="item.billStatusDictValue" :line-color="$config('primaryColor')"></u-section>
 					</view>
 					<view class="list-item-con">
 						<view class="list-item-line flex align_center justify_between">

+ 2 - 2
pages/sales/salesSearch.vue

@@ -21,8 +21,8 @@
 				</u-form-item>
 			</u-form>
 			<view class="uni-list-btns">
-				<u-button class="handle-btn" size="medium" hover-class="none" @click="resetForm">重置</u-button>
-				<u-button class="handle-btn search-btn" size="medium" hover-class="none" :custom-style="customBtnStyle" @click="handleSearch">查询</u-button>
+				<u-button class="handle-btn" size="medium" shape="circle" hover-class="none" @click="resetForm">重置</u-button>
+				<u-button class="handle-btn search-btn" shape="circle" size="medium" hover-class="none" :custom-style="customBtnStyle" @click="handleSearch">查询</u-button>
 			</view>
 		</u-popup>
 		<!-- 选择日期范围 -->

+ 2 - 2
pages/sales/search.vue

@@ -9,8 +9,8 @@
 				<u-form-item label="产品分类"><u-input v-model="productTypeNameArr" @click="showTypeModal=true" disabled placeholder="请选择产品分类" input-align="right" /></u-form-item>
 			</u-form>
 			<view class="form-footer-btn">
-				<u-button class="handle-btn" size="medium" hover-class="none" @click="handleClean">清空</u-button>
-				<u-button class="handle-btn" size="medium" hover-class="none" :custom-style="customBtnStyle" @click="handleSearch">查询</u-button>
+				<u-button class="handle-btn" shape="circle" size="medium" hover-class="none" @click="handleClean">重置</u-button>
+				<u-button class="handle-btn" shape="circle" size="medium" hover-class="none" :custom-style="customBtnStyle" @click="handleSearch">查询</u-button>
 			</view>
 		</u-popup>
 		<!-- 产品品牌 -->