From 4dd23381458820161c7034a442878fa59072378d Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 21 Nov 2022 16:59:52 +0800
Subject: [PATCH] up

---
 components/jp-select/jp-select/jp-select.vue  | 10 ++--
 .../zhilin-cascader/zhilin-cascader.vue       | 11 +++--
 inspect/inspect.vue                           | 46 ++++++++++++++-----
 3 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/components/jp-select/jp-select/jp-select.vue b/components/jp-select/jp-select/jp-select.vue
index 365b92c..d728a1b 100644
--- a/components/jp-select/jp-select/jp-select.vue
+++ b/components/jp-select/jp-select/jp-select.vue
@@ -23,9 +23,9 @@
 				</view>
 			</view>
 			<view>
-				<scroll-view v-if="list" class="scroll-Y" scroll-y="true" :style="[style]" @scrolltolower="scrolltolower">
+				<scroll-view :scroll-into-view="viewId" v-if="list" class="scroll-Y" scroll-y="true" :style="[style]" @scrolltolower="scrolltolower">
 					<view v-for="(items,index) in list" :key="index" class="wallet_list" :class="xzindex===index?'wallet_listdj':''"  @click="toChecked(items,index)">
-						<view class="text" :style="[textStyle]">{{items[name]||items}}({{items['score']+'分'||''}})</view>
+						<view :id="'to'+items[id]" class="text" :style="[textStyle]">{{items[name]||items}}({{items['score']+'分'||''}})</view>
 						<!-- <marquee behavior="" direction="">{{items[name]||items}}</marquee> -->
 						<view v-if="select=='radio'" style="width: 50rpx;">
 							<radio style="transform: scale(0.7)" value="r2" :color="color" :checked="items[id]?items[id]==item1[id]:items==item1" />
@@ -106,7 +106,8 @@
 				item1: '' || {} || [],
 				style: {},
 				textStyle: {},
-				xzindex: -1
+				xzindex: -1,
+				viewId:""
 			}
 		},
 		mounted() {
@@ -140,7 +141,8 @@
 				}
 			},
 			toOpen() {
-				this.item1 = JSON.parse(JSON.stringify(this.item))
+				this.item1 = JSON.parse(JSON.stringify(this.item))
+				this.viewId = 'to'+this.item1.id
 				this.type = true
 				this.selectType = true
 			},
diff --git a/components/zhilin-cascader/zhilin-cascader.vue b/components/zhilin-cascader/zhilin-cascader.vue
index ef93e72..5994a36 100644
--- a/components/zhilin-cascader/zhilin-cascader.vue
+++ b/components/zhilin-cascader/zhilin-cascader.vue
@@ -67,7 +67,8 @@
 				values: [],
 				valuesCopy:[],
 				titles: this.title,
-				wrapperHeight: 0
+				wrapperHeight: 0,
+				clickItem:null
 			}
 		},
 		watch: {
@@ -118,8 +119,7 @@
 				this.valuesCopy[wrapIdx] = this.wrapContent[wrapIdx][i][this.labelKey]
 				
 				this.values[wrapIdx] = this.wrapContent[wrapIdx][i][this.valueKey]
-					
-				// this.titles = this.wrapContent[wrapIdx][i].name
+				this.clickItem = this.wrapContent[wrapIdx][i]
 				this.values = this.values.slice(0, wrapIdx + 1)
 				this.valuesCopy = this.valuesCopy.slice(0, wrapIdx + 1)
 				let children = this.wrapContent[wrapIdx][i][this.childrenKey]
@@ -145,7 +145,7 @@
 					if (this.values.length && this.values.length != this.wrapContent.length) return console.log('未选择完整')
 				}
 				this.$emit('input', false)
-				this.$emit('confirm', this.values,this.valuesCopy)
+				this.$emit('confirm', this.values,this.valuesCopy,this.clickItem)
 			},
 			reset() {
 				this.titles = "请选择"
@@ -153,7 +153,8 @@
 					this.values = []
 					this.valuesCopy = []
 					this.wrapContent = [this.wrapContent[0]]
-				}
+				}
+				this.$emit("reset")
 			},
 			popupChange(e) {
 				this.$emit('input', e.show)
diff --git a/inspect/inspect.vue b/inspect/inspect.vue
index abcd48b..e5d7c06 100644
--- a/inspect/inspect.vue
+++ b/inspect/inspect.vue
@@ -24,10 +24,10 @@
 				<!-- <u-select v-model="askShow1" mode="mutil-column-auto" value-name="id" label-name="name" :list="askList"
 					@confirm="confirmAsk"></u-select> -->
 				<zhilin-cascader v-model="askShow" :options="askList" :fieldNames="fieldNames" :isFullValue="true"
-					@confirm="confirmAsk">
+					@confirm="confirmAsk" @reset="resetAsk">
 				</zhilin-cascader>
 			</u-form-item>
-			<u-form-item label="扣分条款" prop="dec_score">
+			<u-form-item label="扣分条款" prop="dec_score" v-if="showScore">
 				<!-- <u-input placeholder="请选择扣分条款" label-position="top" v-model="decName" type="select" :border="false"
 					@click="decShow = true" /> -->
 				<u-input placeholder="请选择扣分条款" label-position="top" v-model="decName" type="select" :border="false"
@@ -35,7 +35,7 @@
 
 				<!-- <u-select v-model="decShow" mode="single-column" value-name="id" label-name="name" :list="decList"
 					@confirm="confirmDec"></u-select> -->
-				<jp-select ref="jpSelect" @checked="confirmDec" :list="decList" :item="''" :select="'radio'"></jp-select>
+				<jp-select ref="jpSelect" @checked="confirmDec" :list="decList" :item="decItem" :select="'radio'"></jp-select>
 				<!-- <u-input placeholder="请输入扣除分数" label-position="top" v-model="form.dec_score" /> -->
 			</u-form-item>
 			<u-form-item label="问题影像" prop="picFileList">
@@ -96,10 +96,12 @@
 				areaList: [],
 				riverShow: false,
 				riverName: "",
-				riverList: [],
+				riverList: [],
+				showScore:false,
 				decShow: false,
 				decName: "",
-				decList: [],
+				decList: [],
+				decItem:'',
 				askShow: false,
 				askName: "",
 				askList: [],
@@ -226,11 +228,28 @@
 					}
 				});
 			},
-			confirmAsk(val, copy) {
+			confirmAsk(val, copy,item) {
+				if(item.is_check==1){
+					this.showScore = true
+				}else{
+					this.showScore = false
+					this.decName = ''
+					this.form.dec_score = ''
+					this.form.deal_examine_id = ''
+				}
 				this.form.ask_type_id_top_pid = val[0]
 				this.form.ask_type_id = val[val.length - 1]
 				this.askName = copy.join("/")
 				console.log(this.form.ask_type_id, this.askName)
+			},
+			resetAsk(){
+				this.form.ask_type_id_top_pid = ""
+				this.form.ask_type_id = ""
+				this.askName = ""
+				this.showScore = false
+				this.decName = ''
+				this.form.dec_score = ''
+				this.form.deal_examine_id = ''
 			},
 			// 扣分条款
 			loadDec() {
@@ -256,14 +275,15 @@
 				});
 			},
 			confirmDec(val) {
-				console.log('dec', val)
 				this.decName = val.score
 				this.form.dec_score = val.score
-				this.form.deal_examine_id = val.id
-			},
-			checked(el) {
-				this.item = el
+				this.form.deal_examine_id = val.id
+				this.decItem = val
+				console.log(this.decItem)
 			},
+			// checked(el) {
+			// 	this.item = el
+			// },
 			toOpen() {
 				this.$refs.jpSelect.toOpen()
 			},
@@ -343,7 +363,9 @@
 						})
 					}
 				}
-				this.form.inspection_file_list = pic
+				this.form.inspection_file_list = pic
+				console.log(this.form.deal_examine_id)
+				return
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
 						that.util.request({