fix： 逾期上报+拒绝取消部门列表；修复逾期上报提醒操作失败问题

sdk/includeHead.js

@@ -57,13 +57,13 @@ if (window.env == 'dev') {
 
   const tempTk = 
       // 网格员
-  // 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLolpvmmZPpo54iLCJsb2dpbl91c2VyX2tleSI6IjZiNjM0MmVkLTk2NjQtNDlkNC1hMWE2LTFiNDViZGVlN2RmNCJ9.ky2MT5Niq5aEOMCbwRYzHHxoR_fqSnE-R9si7iCJSqvvtUxJgPaAK0-ECE2_83zBsBEB3wJfqbsvkgcNgU70oA'
+  'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLolpvmmZPpo54iLCJsb2dpbl91c2VyX2tleSI6Ijg0NmVlN2VlLTI3OTEtNDhiMS1hZjRiLWJkNzk0ZTNhZDFjZSJ9.mrO-KedsH4OnbthiloKZe0uhs5-qcL6aq2fGKMH7Z819iEDwXEkb2QpySR5T5xSCTFHtyVuPqVZxhi34wbNupg'
   // 消费者
   // 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLmtojotLnogIUiLCJsb2dpbl91c2VyX2tleSI6ImExNWIwMDNjLWRlYWItNGU2MC04ODg4LTJiODNjMzVkNDUzNSJ9.l6gHzFX-U5rKGJ7zoDA4jMBIxkhVgCjWr5ynFg1DR6xspM9Ls6raTxyEo2Kr61UbG2UD6P2kN63vF_U8nX8afg'
   // 商户
   // 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxNTcyMTAzMTg4NiIsImxvZ2luX3VzZXJfa2V5IjoiNGJjY2JjYzUtNmY0Yy00ZDhlLWJiYzEtZjYzMzVlZDBlZTgwIn0.j3jEfHzeu3kklm60kKCirwwyKaWD51ABicOzxEnuFOfGe63FFqYOQ122ojAhukbInnKj4try3DjrST6wNDVjVQ'
   // 管理员
-  'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiMzRiMjk4YWEtMjdlZi00YTA5LWJiMjEtNjk3YjIwOGU0NTMyIn0.-aJ24xSQzTyl04CczNubZ_Evb8PZse4maylMBdThdrUJsTI82OOv60oQ92D4TqSbt0sszmoMJ8_onRSCg13cGg'
+  // 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiMzRiMjk4YWEtMjdlZi00YTA5LWJiMjEtNjk3YjIwOGU0NTMyIn0.-aJ24xSQzTyl04CczNubZ_Evb8PZse4maylMBdThdrUJsTI82OOv60oQ92D4TqSbt0sszmoMJ8_onRSCg13cGg'
   // 街道
   // 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJqaWVkYW8iLCJsb2dpbl91c2VyX2tleSI6ImNjNjRkMmZhLWQzNmItNGRkZi05MjcxLTliYTA0ZDJkYzM4NiJ9.G2BAs3XnlqR6QgDRWDfXkOpdLYhFdqEaTxvE8GxLAgU8vcsHPEKdhQ4VvOwsiNAtIaUpMDXirOb-FrHVNvZo4g'
 

src/_check_info.html

@@ -239,8 +239,14 @@
 						style="resize: none;"></textarea>
 
 					<div class="shangbao-wrapper" v-if="jujue.pushFlag">
-						<h5 style="text-align: left;font-size: .3rem;">上报相关部门</h5>
-						<van-checkbox-group v-model="jujue.dept">
+						<!-- <h5 style="text-align: left;font-size: .3rem;">整改上报</h5> -->
+						<h5 style="font-family: PingFang SC;background: #EAF5FF;
+							font-weight: 500;
+							font-size: .26rem;
+							color: #0587FE;border-radius: .04rem;padding:.2rem;
+							border: 0.02rem solid #7DC3FF;">该隐患已整改{{jujue.rectificationCount}}次，上报上级部门</h5>
+							
+						<!-- <van-checkbox-group v-model="jujue.dept">
 							<div v-for="(item, index) in jujue.deptDict" style="overflow: hidden;">
 								<h5 style="text-align: left;font-size: .3rem;color: #1081E3;font-weight: 500;">
 									{{item.name}}</h5>
@@ -249,7 +255,7 @@
 									{{ subItem.deptName }}
 								</van-checkbox>
 							</div>
-						</van-checkbox-group>
+						</van-checkbox-group> -->
 					</div>
 
 					<div class="footer-bar">
@@ -276,7 +282,7 @@
 			</van-action-sheet>
 
 			<!-- 上报弹窗 -->
-			<van-action-sheet v-model="yuqi.show4shangbao" title="  ">
+		<!-- 	<van-action-sheet v-model="yuqi.show4shangbao" title="  ">
 				<div class="content" style="padding: 0rem 1rem 0.5rem; text-align: center;">
 					<h4 style="text-align: left;font-size: .32rem;">选择行业主管部门</h4>
 					<van-checkbox-group v-model="yuqi.dept">
@@ -290,13 +296,13 @@
 					<van-button type="info" size="small" @click="shangbao">上报行业主管部门</van-button>
 
 				</div>
-			</van-action-sheet>
+			</van-action-sheet> -->
 
 			<!-- 隐患详情底部栏 -->
 			<div class="bottom_bar" v-if="flag=='3' && userType == 'wgy'">
 				<div>
 
-					<van-button type="primary" size="small" @click="showShangbao">上报行业主管部门</van-button>
+					<van-button type="primary" size="small" @click="shangbao">逾期上报</van-button>
 					<van-button type="info" size="small" @click="yuqi.show4yanqi=true">限期3天整改</van-button>
 				</div>
 			</div>

src/_check_info.js

@@ -84,6 +84,7 @@ window.onload = function () {
 			jujue:{
 				show4modal :false,
 				pushFlag: false, // 是否推送(审核拒绝时，如果true，则显示推送弹窗)
+				rectificationCount: 0, // 整改次数
 				reason: '', // 拒绝原因
 				dept:[], // 拒绝部门 请求参数
 				deptDict:[] // 列表
@@ -136,69 +137,69 @@ window.onload = function () {
 			}
 		},
 		methods: {
-			showShangbao(){
-				this.yuqi.show4shangbao=true;
-				this.yuqi.dept=[];
-				this.getDept4yuqi();
-			},
-			getDept4yuqi(param) {
-				http2.post({
-					serviceId: API_KEY_MAP["no-page"]['id'],
-					interfacePublicKey: API_KEY_MAP["no-page"]["publicKey"],
-					interfacePrivateKey: API_KEY_MAP["no-page"]["privateKey"],
-					reqParams: {
-						sign: 28, // 逾期上报列表获取
-					}
-				}, (res) => {
-					if (!res) { // 中台返回为undefined 重新请求
-						vant.Toast.clear()
-						setTimeout(() => {
-							this.getDept4yuqi()
-						}, 0);
-						return
-					}
-					if (res) {
-						setTimeout(() => {
-							this.$nextTick(() => {
-								vant.Toast.clear()
-							})
-						}, 0);
-						var result = JSON.parse(res)
-						console.log('接口回调数据getDept4jujue', JSON.parse(res))
-						this.yuqi.deptDict = result.data
+			// showShangbao(){
+			// 	this.yuqi.show4shangbao=true;
+			// 	this.yuqi.dept=[];
+			// 	this.getDept4yuqi();
+			// },
+			// getDept4yuqi(param) {
+			// 	http2.post({
+			// 		serviceId: API_KEY_MAP["no-page"]['id'],
+			// 		interfacePublicKey: API_KEY_MAP["no-page"]["publicKey"],
+			// 		interfacePrivateKey: API_KEY_MAP["no-page"]["privateKey"],
+			// 		reqParams: {
+			// 			sign: 28, // 逾期上报列表获取
+			// 		}
+			// 	}, (res) => {
+			// 		if (!res) { // 中台返回为undefined 重新请求
+			// 			vant.Toast.clear()
+			// 			setTimeout(() => {
+			// 				this.getDept4yuqi()
+			// 			}, 0);
+			// 			return
+			// 		}
+			// 		if (res) {
+			// 			setTimeout(() => {
+			// 				this.$nextTick(() => {
+			// 					vant.Toast.clear()
+			// 				})
+			// 			}, 0);
+			// 			var result = JSON.parse(res)
+			// 			console.log('接口回调数据getDept4jujue', JSON.parse(res))
+			// 			this.yuqi.deptDict = result.data
 
-					}
-				})
-			},
-			getDept4jujue(param) {
-				http2.post({
-					serviceId: API_KEY_MAP["no-page"]['id'],
-					interfacePublicKey: API_KEY_MAP["no-page"]["publicKey"],
-					interfacePrivateKey: API_KEY_MAP["no-page"]["privateKey"],
-					reqParams: {
-						sign: 26, // 2次拒绝上报列表获取
-					}
-				}, (res) => {
-					if (!res) { // 中台返回为undefined 重新请求
-						vant.Toast.clear()
-						setTimeout(() => {
-							this.getDept4jujue()
-						}, 0);
-						return
-					}
-					if (res) {
-						setTimeout(() => {
-							this.$nextTick(() => {
-								vant.Toast.clear()
-							})
-						}, 0);
-						var result = JSON.parse(res)
-						console.log('接口回调数据getDept4jujue', JSON.parse(res))
-						this.jujue.deptDict = result.data
+			// 		}
+			// 	})
+			// },
+			// getDept4jujue(param) {
+			// 	http2.post({
+			// 		serviceId: API_KEY_MAP["no-page"]['id'],
+			// 		interfacePublicKey: API_KEY_MAP["no-page"]["publicKey"],
+			// 		interfacePrivateKey: API_KEY_MAP["no-page"]["privateKey"],
+			// 		reqParams: {
+			// 			sign: 26, // 2次拒绝上报列表获取
+			// 		}
+			// 	}, (res) => {
+			// 		if (!res) { // 中台返回为undefined 重新请求
+			// 			vant.Toast.clear()
+			// 			setTimeout(() => {
+			// 				this.getDept4jujue()
+			// 			}, 0);
+			// 			return
+			// 		}
+			// 		if (res) {
+			// 			setTimeout(() => {
+			// 				this.$nextTick(() => {
+			// 					vant.Toast.clear()
+			// 				})
+			// 			}, 0);
+			// 			var result = JSON.parse(res)
+			// 			console.log('接口回调数据getDept4jujue', JSON.parse(res))
+			// 			this.jujue.deptDict = result.data
 
-					}
-				})
-			},
+			// 		}
+			// 	})
+			// },
 			shangbao(type){
 				let reqParams = {
 					sign: 27, // 上报
@@ -208,14 +209,14 @@ window.onload = function () {
 				if(type===1){ // 为1，则是延期
 					reqParams.type = type
 				}else{ // 上报
-					if(!this.yuqi.dept.length){
-						vant.Dialog.alert({
-							title: '信息提示',
-							message: '请选择要上报的部门'
-						})
-						return
-					}
-					reqParams.reportedIds = this.yuqi.dept
+					// if(!this.yuqi.dept.length){
+					// 	vant.Dialog.alert({
+					// 		title: '信息提示',
+					// 		message: '请选择要上报的部门'
+					// 	})
+					// 	return
+					// }
+					// reqParams.reportedIds = this.yuqi.dept
 				}
 		
 				http2.post({
@@ -223,7 +224,9 @@ window.onload = function () {
 					interfacePublicKey: API_KEY_MAP["submit"]["publicKey"],
 					interfacePrivateKey: API_KEY_MAP["submit"]["privateKey"],
 					reqParams
-				}, (res) => {
+				}, (response) => {
+					console.log('预期上报', response, response.code===200)
+					const res = JSON.parse(response)
 					if (!res) { // 中台返回为undefined 重新请求
 						vant.Toast.clear()
 						setTimeout(() => {
@@ -393,6 +396,7 @@ window.onload = function () {
 
 						// 2025年6月18日 新增返回字段 隐患整改、逾期上报等
 						this.jujue.pushFlag =  result.pushFlag
+						this.jujue.rectificationCount =  result.rectificationCount
 						this.recordList = result.recordList
 						this.checkDeptName = result.checkDeptName // 检查单位
 
@@ -567,9 +571,9 @@ window.onload = function () {
 				 // 2025年6月18日 新增逻辑： 如果是拒绝，且需要上报，则额外添加上报参数
 				if(auditStatus==0){
 					reqParams.reason = this.jujue.reason
-					if(this.jujue.pushFlag){
-						reqParams.reportedIds = this.jujue.dept
-					}
+					// if(this.jujue.pushFlag){
+					// 	reqParams.reportedIds = this.jujue.dept
+					// }
 				}
 
 				http2.post({