chenrui 2 anni fa
parent
commit
23a10198e6
2 ha cambiato i file con 42 aggiunte e 28 eliminazioni
  1. 29 23
      pages/vinAnalyse/search.vue
  2. 13 5
      pages/vinAnalyse/shelfAnalyse.vue

+ 29 - 23
pages/vinAnalyse/search.vue

@@ -6,34 +6,34 @@
 					<u-input clearable v-model="form.date" disabled placeholder="请选择扫描时间区间" class="form-item-inp" @click="showDate=true" />
 					<u-input clearable v-model="form.date" disabled placeholder="请选择扫描时间区间" class="form-item-inp" @click="showDate=true" />
 					<u-icon v-show="form.date.length != 0" name="close-circle-fill" color="#c8c0cc" size="32" class="close-circle" @click="clearTime"></u-icon>
 					<u-icon v-show="form.date.length != 0" name="close-circle-fill" color="#c8c0cc" size="32" class="close-circle" @click="clearTime"></u-icon>
 				</u-form-item>
 				</u-form-item>
-				<u-form-item label="VIN"><u-input v-model.trim="form.code" placeholder="请输入VIN"/></u-form-item>
-				<u-form-item label="车辆品牌"><u-input v-model.trim="form.origCode" placeholder="请输入车辆品牌"/></u-form-item>
-				<u-form-item label="车型"><u-input v-model.trim="form.name" placeholder="请输入车型"/></u-form-item>
+				<u-form-item label="VIN"><u-input v-model.trim="form.vinCode" placeholder="请输入VIN"/></u-form-item>
+				<u-form-item label="车辆品牌"><u-input v-model.trim="form.brandName" placeholder="请输入车辆品牌"/></u-form-item>
+				<u-form-item label="车型"><u-input v-model.trim="form.modelName" placeholder="请输入车型"/></u-form-item>
 				<u-form-item label="空调滤清器" label-position="top">
 				<u-form-item label="空调滤清器" label-position="top">
-					<u-radio-group v-model="value" :size="28">
+					<u-radio-group v-model="form.airConditionerFilterFlag" :size="28">
 						<u-radio 
 						<u-radio 
 							v-for="(item, index) in list" :key="index" 
 							v-for="(item, index) in list" :key="index" 
-							:name="item.val"
+							:name="item.val" :disabled="item.disabled"
 						>
 						>
 							{{item.name}}
 							{{item.name}}
 						</u-radio>
 						</u-radio>
 					</u-radio-group>
 					</u-radio-group>
 				</u-form-item>
 				</u-form-item>
 				<u-form-item label="空气滤清器" label-position="top">
 				<u-form-item label="空气滤清器" label-position="top">
-					<u-radio-group v-model="value" :size="28">
+					<u-radio-group v-model="form.airFilterFlag" :size="28">
 						<u-radio 
 						<u-radio 
 							v-for="(item, index) in list" :key="index" 
 							v-for="(item, index) in list" :key="index" 
-							:name="item.val"
+							:name="item.val" :disabled="item.disabled"
 						>
 						>
 							{{item.name}}
 							{{item.name}}
 						</u-radio>
 						</u-radio>
 					</u-radio-group>
 					</u-radio-group>
 				</u-form-item>
 				</u-form-item>
 				<u-form-item label="机油滤清器" label-position="top">
 				<u-form-item label="机油滤清器" label-position="top">
-					<u-radio-group v-model="value" :size="28">
+					<u-radio-group v-model="form.engineOilFilterFlag" :size="28">
 						<u-radio 
 						<u-radio 
 							v-for="(item, index) in list" :key="index" 
 							v-for="(item, index) in list" :key="index" 
-							:name="item.val"
+							:name="item.val" :disabled="item.disabled"
 						>
 						>
 							{{item.name}}
 							{{item.name}}
 						</u-radio>
 						</u-radio>
@@ -65,13 +65,12 @@
 					date: '',
 					date: '',
 					beginDate: '',
 					beginDate: '',
 					endDate: '',
 					endDate: '',
-					code: '', //  产品编码
-					name: '', //  产品名称
-					origCode: '', //  原厂编码
-					productBrandSn: undefined, //  产品品牌
-					productTypeSn1: undefined, //  产品分类1
-					productTypeSn2: undefined, //  产品分类2
-					productTypeSn3: undefined, //  产品分类3
+					airConditionerFilterFlag:undefined,
+					airFilterFlag:undefined,
+					engineOilFilterFlag:undefined,
+					vinCode: undefined, 
+					brandName: undefined,//车辆品牌
+					modelName: undefined//车型
 				},
 				},
 				customBtnStyle: {  //  自定义按钮样式
 				customBtnStyle: {  //  自定义按钮样式
 					borderColor: this.$config('primaryColor'),
 					borderColor: this.$config('primaryColor'),
@@ -81,17 +80,17 @@
 				list: [
 				list: [
 					{
 					{
 						name: '有适配',
 						name: '有适配',
-						val:'1',
+						val:1,
 						disabled: false
 						disabled: false
 					},
 					},
 					{
 					{
 						name: '无适配',
 						name: '无适配',
-						val:'0',
+						val:2,
 						disabled: false
 						disabled: false
 					},
 					},
 					{
 					{
 						name: '空(--)',
 						name: '空(--)',
-						val:'',
+						val:0,
 						disabled: false
 						disabled: false
 					}
 					}
 				],
 				],
@@ -116,16 +115,23 @@
 			},
 			},
 			// 表单清空
 			// 表单清空
 			handleClean(){
 			handleClean(){
-				this.form.code = ''
-				this.form.name = ''
-				this.form.origCode = ''
+				this.form={
+					date: '',
+					beginDate: '',
+					endDate: '',
+					airConditionerFilterFlag:undefined,
+					airFilterFlag:undefined,
+					engineOilFilterFlag:undefined,
+					vinCode: undefined, 
+					brandName: undefined,//车辆品牌
+					modelName: undefined//车型
+				}
 				setTimeout(()=>{
 				setTimeout(()=>{
 					this.handleSearch()
 					this.handleSearch()
 				},300)
 				},300)
 			},
 			},
 			handleSearch(){
 			handleSearch(){
 				let data = JSON.parse(JSON.stringify(this.form))
 				let data = JSON.parse(JSON.stringify(this.form))
-				console.log(data)
 				this.$emit('refresh', data)
 				this.$emit('refresh', data)
 				this.isShow=false
 				this.isShow=false
 			},
 			},

+ 13 - 5
pages/vinAnalyse/shelfAnalyse.vue

@@ -5,7 +5,7 @@
 				<u-checkbox v-model="item.checked" activeColor="rgb(4, 133, 246)" v-for="(item,index) in tabList" :key="index" :name="item.val">{{item.name}}</u-checkbox>
 				<u-checkbox v-model="item.checked" activeColor="rgb(4, 133, 246)" v-for="(item,index) in tabList" :key="index" :name="item.val">{{item.name}}</u-checkbox>
 			</u-checkbox-group>
 			</u-checkbox-group>
 			<view class="search" @click="showModal=true">
 			<view class="search" @click="showModal=true">
-				筛选 <u-icon name="arrow-down"></u-icon>
+				<text>筛选</text> <u-icon name="arrow-down"></u-icon>
 			</view>
 			</view>
 		</view>
 		</view>
 		<scroll-view class="product-list" scroll-y @scrolltolower="onreachBottom">
 		<scroll-view class="product-list" scroll-y @scrolltolower="onreachBottom">
@@ -139,7 +139,7 @@
 				detail: null,
 				detail: null,
 				tempData: null,
 				tempData: null,
 				productList: [],
 				productList: [],
-				shelfSn:''
+				shelfSn:''//货架名称
 			}
 			}
 		},
 		},
 		onNavigationBarButtonTap(e){
 		onNavigationBarButtonTap(e){
@@ -166,7 +166,7 @@
 		onLoad(option) {
 		onLoad(option) {
 			this.shelfSn = option.shelfSn
 			this.shelfSn = option.shelfSn
 			let ajaxData={
 			let ajaxData={
-				id:option.shelfSn,
+				shelf_sn:option.shelfSn,
 				pageNo: this.pageNo, 
 				pageNo: this.pageNo, 
 				pageSize: this.pageSize 
 				pageSize: this.pageSize 
 			}
 			}
@@ -185,10 +185,17 @@
 			},
 			},
 			// 刷新列表
 			// 刷新列表
 			refreshList(val){
 			refreshList(val){
+				debugger
 				this.params =val ? val : {},
 				this.params =val ? val : {},
 				this.listData = []
 				this.listData = []
 				this.totalNum = 0
 				this.totalNum = 0
-				this.getList(1)
+				let ajaxData={
+					shelf_sn:this.shelfSn,
+					pageNo:1, 
+					pageSize: this.pageSize 
+				}
+				
+				this.getList(ajaxData);
 			},
 			},
 			// 列表
 			// 列表
 			getList(params){
 			getList(params){
@@ -223,7 +230,7 @@
 			if(this.listData.length < this.totalNum){
 			if(this.listData.length < this.totalNum){
 				this.pageNo += 1
 				this.pageNo += 1
 				let ajaxData={
 				let ajaxData={
-					id:this.shelfSn,
+					shelf_sn:this.shelfSn,
 					pageNo: this.pageNo, 
 					pageNo: this.pageNo, 
 					pageSize: this.pageSize 
 					pageSize: this.pageSize 
 				}
 				}
@@ -248,6 +255,7 @@
 			color: #191919;
 			color: #191919;
 			.search{
 			.search{
 				color:#00aaff;
 				color:#00aaff;
+				width: 90rpx;;
 			}
 			}
 		}
 		}
 		.product-list{
 		.product-list{