检查页面flag标记值修改

src/_check_info.html

@@ -87,22 +87,29 @@
 								</van-cell>
 							</van-cell-group>
 							
-							<van-cell-group>
-								<van-cell  v-if="flag==='JC_XQ' || flag==='YH_XQ' ||  flag==='ZG_XQ' ">
+							<van-cell-group v-if="flag!='ADD'">
+								<van-cell>
 									<span class="">隐患图片:</span>
 									<div>
 										<img v-for="(imgItem, subIndex) in item.hiddenImageUrlList" :src="imgItem" alt="" style="width:1.2rem;height:1.2rem;margin-right:.2rem;" />
 									</div>
 								</van-cell>
-								
-								<van-cell  v-if="flag==='JC_XQ' || flag==='YH_XQ'"><span class="">整改情况:</span>
+							</van-cell-group>
+							<van-cell-group  v-if="flag==='JC_XQ' || flag==='YZG' || flag==='ZGYQ_XQ'">
+								<van-cell><span class="">整改情况:</span>
 									<div>
 										<img v-for="(imgItem, subIndex) in item.rectificationImageUrlList" :src="imgItem" alt="" style="width:1.2rem;height:1.2rem;margin-right:.2rem;" />
 									</div>
 								</van-cell>
+								<van-cell><span class="">整改日期:</span>
+									<div>
+										<span>{{item.rectificationDate}}</span>
+									</div>
+								</van-cell>
 							</van-cell-group>
 
-							<van-cell-group v-if="flag=='ZG_XQ'">
+							
+							<van-cell-group v-if="flag=='DZG_XQ'">
 								<van-cell><span class="title_require">请上传整改图片:</span><span
 										style="color: red;">(格式png/jpg/jpeg,最多4张)</span>
 									<!-- <div>
@@ -126,14 +133,7 @@
 											<option value="5">5</option>
 											<option value="7">7</option>
 										</select>
-										<span> 截止整改日期: <b style="color:#148ef7">{{item.deadlineDate}}</b></span>
-									</div>
-								</van-cell>
-							</van-cell-group>
-							<van-cell-group v-if="flag!=='ADD'">
-								<van-cell>
-									<div class="limit_date_wrapper">
-										<span>整改期限:  {{item.rectificationDate}}</span>
+										<span> 整改截止日期: <b style="color:#148ef7">{{item.deadlineDate}}</b></span>
 									</div>
 								</van-cell>
 							</van-cell-group>
@@ -147,36 +147,39 @@
 					<van-cell>
 						<van-field label="检查日期" v-model="checkDate" />
 					</van-cell>
-					<van-cell v-if="flag==='YH_XQ'||flag==='ZG_XQ'">
+					<van-cell v-if="flag!='ADD'">
 						<van-field label="整改截止日期" v-model="rectificationDeadline" />
 					</van-cell>
-					<van-cell v-if="flag==='YH_XQ'">
+					<div v-if="flag=='DZG_XQ' || flag=='YZG_XQ' || flag=='ZGYQ_XQ'">
+						<van-cell>
 							<van-field label="审核日期" v-model="reviewDate" />
 						</van-cell>
-					<van-cell v-if="flag==='YH_XQ'">
+						<van-cell>
 							<van-field label="审核记录" v-model="reviewRecord" />
 						</van-cell>
+					</div>
+					
 				</van-form>
 
 
 				<!-- 隐患详情底部栏 -->
-				<!-- 	<div class="bottom_bar">
+				<!-- 	<div class="bottom_bar" v-if="flag=='ZGYQ_XQ'">
 					<div>
 						<van-button type="primary" size="small" @click="navTo1" >上报行业主管部门</van-button>
 						<van-button type="info" size="small" @click="navTo1" >限期3天整改</van-button>
 					</div>
 				</div> -->
 				
-				<div class="bottom_bar" v-if="flag=='ZG_XQ'">
+				<div class="bottom_bar" v-if="flag=='DZG_XQ'">
 					<div style="display: flex;justify-content: center;gap: 1rem;">
-						<van-button type="info" size="small" @click="add4ZG_XQ" style="width:2rem" >提交整改</van-button>
+						<van-button type="info" size="small" @click="add4DZG_XQ" style="width:2rem" >提交整改</van-button>
 					</div>
 				</div>
 				
-				<div class="bottom_bar" v-if="flag=='YH_XQ'">
+				<div class="bottom_bar" v-if="flag=='DSH_XQ'">
 					<div style="display: flex;justify-content: center;gap: 1rem;">
-						<van-button type="danger" size="small" @click="add4YH_XQ(0)" style="width:2rem" >拒绝</van-button>
-						<van-button type="info" size="small" @click="add4YH_XQ(1)" style="width:2rem" >通过</van-button>
+						<van-button type="danger" size="small" @click="add4DSH_XQ(0)" style="width:2rem" >拒绝</van-button>
+						<van-button type="info" size="small" @click="add4DSH_XQ(1)" style="width:2rem" >通过</van-button>
 					</div>
 				</div>
 

src/_check_info.js

@@ -9,6 +9,14 @@
 	10：查询用户检查过的商户信息
 	11: 查询商户详情信息
 	
+	跳转逻辑：
+	新增检查单，flag=ADD，
+	检查单详情，flag=JC_XQ，id=记录id
+	待审核隐患，flag=DSH_XQ，id=隐患id
+	待整改隐患，flag=DZG_XQ，id=隐患id
+	已整改隐患，flag=YZG_XQ，id=隐患id
+	整改逾期隐患，flag=ZGYQ_XQ，id=隐患id
+	
  */
 
 var VUE = null
@@ -76,9 +84,8 @@ window.onload = function() {
 			
 			// this.flag = 'JC_XQ'
 			// this.flag = 'ADD'
-			if (this.flag === 'YH_XQ') { // 隐患详情
-				this.getDetail4YH_XQ()
-			} else if (this.flag === 'ZG_XQ') { // 整改详情
+			if (this.flag === 'DSH_XQ' || this.flag === 'DZG_XQ' 
+			|| this.flag === 'YZG_XQ' || this.flag === 'ZGYQ_XQ') { // 隐患详情
 				this.getDetail4YH_XQ()
 			} else if (this.flag === 'JC_XQ') { // 检查详情
 				this.getDetail4JC_XQ()
@@ -278,7 +285,7 @@ window.onload = function() {
 						  		vant.Toast.clear()
 						  	})
 						  }, 0);
-				        console.log('接口回调数据检查详情', res)
+				        console.log('接口回调数据检查详情', JSON.parse(res))
 				        // setTimeout(() => {
 				        // 	this.$nextTick(() => {
 				        // 		vant.Toast.clear()
@@ -302,7 +309,7 @@ window.onload = function() {
 				  )
 				}, 0)
 			},
-			add4ZG_XQ() {
+			add4DZG_XQ() {
 				if (!this.checkData.photos.length) {
 					vant.Dialog.alert({
 						message: '请上传整改图片',
@@ -327,7 +334,7 @@ window.onload = function() {
 					if (!res && !type) { // 如果是中台接口返回为undefined，则重新发起请求
 						vant.Toast.clear()
 						setTimeout(() => {
-							this.add4ZG_XQ()
+							this.add4DZG_XQ()
 						}, 0);
 						return
 					}
@@ -341,7 +348,7 @@ window.onload = function() {
 					}
 				})
 			},
-			add4YH_XQ(auditStatus) { // 隐患详情 审核通过或拒绝
+			add4DSH_XQ(auditStatus) { // 隐患详情 审核通过或拒绝
 				vant.Toast.loading({
 					message: '正在处理...',
 					forbidClick: true,
@@ -360,7 +367,7 @@ window.onload = function() {
 					if (!res && !type) { // 如果是中台接口返回为undefined，则重新发起请求
 						vant.Toast.clear()
 						setTimeout(() => {
-							this.add4YH_XQ()
+							this.add4DSH_XQ()
 						}, 0);
 						return
 					}