举证说明 显示，确认退回功能和接口联调

pages.json

@@ -1,109 +1,153 @@
 {
-  "pages": [{
-    "path": "pages/login",
-    "style": {
-      "navigationBarTitleText": "登录"
-    }
-  }, {
-    "path": "pages/register",
-    "style": {
-      "navigationBarTitleText": "注册"
-    }
-  }, {
-    "path": "pages/index",
-    "style": {
-      "navigationBarTitleText": "任务"
-    }
-  }, {
-    "path": "pages/work/index",
-    "style": {
-      "navigationBarTitleText": "工作台"
-    }
-  }, {
-    "path": "pages/mine/index",
-    "style": {
-      "navigationBarTitleText": "我的"
-    }
-  }, {
-    "path": "pages/mine/avatar/index",
-    "style": {
-      "navigationBarTitleText": "修改头像"
-    }
-  }, {
-    "path": "pages/mine/info/index",
-    "style": {
-      "navigationBarTitleText": "个人信息"
-    }
-  }, {
-    "path": "pages/mine/info/edit",
-    "style": {
-      "navigationBarTitleText": "编辑资料"
-    }
-  }, {
-    "path": "pages/mine/pwd/index",
-    "style": {
-      "navigationBarTitleText": "修改密码"
-    }
-  }, {
-    "path": "pages/mine/setting/index",
-    "style": {
-      "navigationBarTitleText": "应用设置"
-    }
-  }, {
-    "path": "pages/mine/help/index",
-    "style": {
-      "navigationBarTitleText": "常见问题"
-    }
-  }, {
-    "path": "pages/mine/about/index",
-    "style": {
-      "navigationBarTitleText": "关于我们"
-    }
-  }, {
-    "path": "pages/common/webview/index",
-    "style": {
-      "navigationBarTitleText": "浏览网页"
-    }
-  }, {
-    "path": "pages/common/textview/index",
-    "style": {
-      "navigationBarTitleText": "浏览文本"
-    }
-  },
-  {
-    "path": "pages/check/index",
-    "style": {
-      "navigationBarTitleText": "核查"
-    }
-  }
-],
-  "tabBar": {
-    "color": "#000000",
-    "selectedColor": "#000000",
-    "borderStyle": "white",
-    "backgroundColor": "#ffffff",
-    "list": [
-      {
-        "pagePath": "pages/index",
-        "iconPath": "static/images/tabbar/home.png",
-        "selectedIconPath": "static/images/tabbar/home_.png",
-        "text": "任务"
-      }, {
-        "pagePath": "pages/check/index",
-        "iconPath": "static/images/tabbar/work.png",
-        "selectedIconPath": "static/images/tabbar/work_.png",
-        "text": "核查"
-      }, {
-        "pagePath": "pages/mine/index",
-        "iconPath": "static/images/tabbar/mine.png",
-        "selectedIconPath": "static/images/tabbar/mine_.png",
-        "text": "我的"
-      }
-    ]
-  },
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "RuoYi",
-    "navigationBarBackgroundColor": "#FFFFFF"
-  }
-}
+	"pages": [{
+			"path": "pages/login",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
+		}, {
+			"path": "pages/register",
+			"style": {
+				"navigationBarTitleText": "注册"
+			}
+		}, {
+			"path": "pages/index",
+			"style": {
+				"navigationBarTitleText": "任务"
+			}
+		}, {
+			"path": "pages/work/index",
+			"style": {
+				"navigationBarTitleText": "工作台"
+			}
+		}, {
+			"path": "pages/mine/index",
+			"style": {
+				"navigationBarTitleText": "我的"
+			}
+		}, {
+			"path": "pages/mine/avatar/index",
+			"style": {
+				"navigationBarTitleText": "修改头像"
+			}
+		}, {
+			"path": "pages/mine/info/index",
+			"style": {
+				"navigationBarTitleText": "个人信息"
+			}
+		}, {
+			"path": "pages/mine/info/edit",
+			"style": {
+				"navigationBarTitleText": "编辑资料"
+			}
+		}, {
+			"path": "pages/mine/pwd/index",
+			"style": {
+				"navigationBarTitleText": "修改密码"
+			}
+		}, {
+			"path": "pages/mine/setting/index",
+			"style": {
+				"navigationBarTitleText": "应用设置"
+			}
+		}, {
+			"path": "pages/mine/help/index",
+			"style": {
+				"navigationBarTitleText": "常见问题"
+			}
+		}, {
+			"path": "pages/mine/about/index",
+			"style": {
+				"navigationBarTitleText": "关于我们"
+			}
+		}, {
+			"path": "pages/common/webview/index",
+			"style": {
+				"navigationBarTitleText": "浏览网页"
+			}
+		}, {
+			"path": "pages/common/textview/index",
+			"style": {
+				"navigationBarTitleText": "浏览文本"
+			}
+		},
+		{
+			"path": "pages/check/index",
+			"style": {
+				"navigationBarTitleText": "核查"
+			}
+		},
+		{
+			"path": "pages/index/common/affirm",
+			"style": {
+				"navigationBarTitleText": "确认/退回图斑外业任务"
+			}
+		}
+	],
+	"tabBar": {
+		"color": "#000000",
+		"selectedColor": "#000000",
+		"borderStyle": "white",
+		"backgroundColor": "#ffffff",
+		"list": [{
+			"pagePath": "pages/index",
+			"iconPath": "static/images/tabbar/home.png",
+			"selectedIconPath": "static/images/tabbar/home_.png",
+			"text": "任务"
+		// }, {
+		// 	"pagePath": "pages/check/index",
+		// 	"iconPath": "static/images/tabbar/work.png",
+		// 	"selectedIconPath": "static/images/tabbar/work_.png",
+		// 	"text": "核查"
+		}, {
+			"pagePath": "pages/mine/index",
+			"iconPath": "static/images/tabbar/mine.png",
+			"selectedIconPath": "static/images/tabbar/mine_.png",
+			"text": "我的"
+		}]
+	},
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#FFFFFF",
+		"backgroundColor": "#F8F8F8"
+		// "usingComponents": {
+		// 	"van-dropdown-menu": "/wxcomponents/dist/dropdown-menu/index",
+		// 	"van-dropdown-item": "/wxcomponents/dist/dropdown-item/index",
+		// 	"van-action-sheet": "/wxcomponents/dist/action-sheet/index",
+		// 	"van-area": "/wxcomponents/dist/area/index",
+		// 	"van-button": "/wxcomponents/dist/button/index",
+		// 	"van-card": "/wxcomponents/dist/card/index",
+		// 	"van-cell": "/wxcomponents/dist/cell/index",
+		// 	"van-cell-group": "/wxcomponents/dist/cell-group/index",
+		// 	"van-checkbox": "/wxcomponents/dist/checkbox/index",
+		// 	"van-checkbox-group": "/wxcomponents/dist/checkbox-group/index",
+		// 	"van-col": "/wxcomponents/dist/col/index",
+		// 	"van-dialog": "/wxcomponents/dist/dialog/index",
+		// 	"van-field": "/wxcomponents/dist/field/index",
+		// 	"van-goods-action": "/wxcomponents/dist/goods-action/index",
+		// 	"van-goods-action-icon": "/wxcomponents/dist/goods-action-icon/index",
+		// 	"van-goods-action-button": "/wxcomponents/dist/goods-action-button/index",
+		// 	"van-icon": "/wxcomponents/dist/icon/index",
+		// 	"van-loading": "/wxcomponents/dist/loading/index",
+		// 	"van-nav-bar": "/wxcomponents/dist/nav-bar/index",
+		// 	"van-notice-bar": "/wxcomponents/dist/notice-bar/index",
+		// 	"van-notify": "/wxcomponents/dist/notify/index",
+		// 	"van-panel": "/wxcomponents/dist/panel/index",
+		// 	"van-popup": "/wxcomponents/dist/popup/index",
+		// 	"van-progress": "/wxcomponents/dist/progress/index",
+		// 	"van-radio": "/wxcomponents/dist/radio/index",
+		// 	"van-radio-group": "/wxcomponents/dist/radio-group/index",
+		// 	"van-row": "/wxcomponents/dist/row/index",
+		// 	"van-search": "/wxcomponents/dist/search/index",
+		// 	"van-slider": "/wxcomponents/dist/slider/index",
+		// 	"van-stepper": "/wxcomponents/dist/stepper/index",
+		// 	"van-sticky": "/wxcomponents/dist/sticky/index",
+		// 	"van-steps": "/wxcomponents/dist/steps/index",
+		// 	"van-submit-bar": "/wxcomponents/dist/submit-bar/index",
+		// 	"van-swipe-cell": "/wxcomponents/dist/swipe-cell/index",
+		// 	"van-switch": "/wxcomponents/dist/switch/index",
+		// 	"van-tab": "/wxcomponents/dist/tab/index",
+		// 	"van-tabs": "/wxcomponents/dist/tabs/index"
+		// }
+	}
+}

pages/index/common/affirm.vue

@@ -0,0 +1,114 @@
+<template>
+	<view class="container">
+		<view class="example">
+			<uni-forms ref="form" :model="firm" labelWidth="80px">
+				<uni-forms-item label="监测图斑" name="dkbh">
+					{{obj.dkbh}}
+				</uni-forms-item>
+				<uni-forms-item label="监测面积" name="dkmj">
+					{{obj.dkmj}}
+				</uni-forms-item>
+				<uni-forms-item v-if="firm.confirmState == '1' " label="退回原因" name="confirmType">
+					<uni-data-select v-model="firm.confirmType" :localdata="options"></uni-data-select>
+				</uni-forms-item>
+				<uni-easyinput v-if="firm.confirmState == '1' " v-model=" firm.confirmNotse" type="textarea"
+					placeholder="请输入其他原因" />
+			</uni-forms>
+			<button type="primary" @click="submit">提交</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		confirm,
+	} from "@/api/dkjbxx.js";
+
+
+	export default {
+		data() {
+			return {
+				tytitle: '',
+				obj: {},
+				firm: {
+					"id": "",
+					"confirmState": "",
+					"confirmType": "",
+					"confirmNotse": "",
+					"auditflowStep": "WYQR"
+				},
+				options: [{
+					text: '图斑位置无法到达',
+					value: "0"
+				}, {
+					text: '任务期间处于离岗',
+					value: "1"
+				}, {
+					text: '其它',
+					value: "2"
+				}],
+
+			}
+		},
+
+		onLoad(option) {
+			this.tytitle = option.confirmState == '1' ? '退回' : '确认'
+			uni.setNavigationBarTitle({
+				title: `${this.tytitle}图斑外业任务` // 这里的标题可以是变量或者计算结果
+			});
+
+			this.obj = uni.$globalData || {}
+			this.firm.id = this.obj.id
+			this.firm.confirmState = option.confirmState
+			console.log(this.obj)
+		},
+		onReady() {
+			// this.$refs.form.setRules(this.rules)
+		},
+		methods: {
+
+			submit(ref) {
+				this.$refs.form.validate().then(res => {
+					confirm(this.firm).then(response => {
+						this.$modal.msgSuccess("修改成功")
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #ffffff;
+	}
+
+	.example {
+		padding: 15px;
+		background-color: #fff;
+	}
+
+	.segmented-control {
+		margin-bottom: 15px;
+	}
+
+	.button-group {
+		margin-top: 15px;
+		display: flex;
+		justify-content: space-around;
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+		flex: 1;
+	}
+
+	.button {
+		display: flex;
+		align-items: center;
+		height: 35px;
+		line-height: 35px;
+		margin-left: 10px;
+	}
+</style>

pages/index/common/hcDetails.vue

@@ -60,12 +60,15 @@
 			</van-tabs>
 		</van-sticky>
 		<div class="btns">
-			<button type="primary" @click="">举证说明</button>
-			<button type="primary" @click="">退回</button>
+			<button type="primary" @click="toggle">举证说明</button>
+			<button type="primary" @click="affirm(0)">确认</button>
+			<button type="primary" @click="affirm(1)">退回</button>
 			<button type="primary" @click="save">保存</button>
 			<button type="primary" @click="tj">提交</button>
 		</div>
-
+		<uni-popup ref="popup" background-color="#fff">
+			<uni-popup-dialog :type="msgType" title="举证说明" :content="nowobj.notes"></uni-popup-dialog>
+		</uni-popup>
 	</view>
 
 
@@ -74,7 +77,8 @@
 	import {
 		getDkjbxx,
 		getDkjbywy,
-		confirm,
+		getStep,
+	
 		hcWork,
 		getHcInfo,
 		tjWork,
@@ -89,12 +93,13 @@
 		name: "list",
 		data() {
 			return {
+				nowobj: {},
 				active: 0,
 				tabOptions: ['基本信息', '业务研判', '实地拍照', '核查信息'],
 				loading: false,
+				steps: [],
 				jbxxs: jbxxs,
 				tdxzTable: tdxzTable,
-
 				activeName: "jbxx",
 				infoObj: {},
 				activities: [],
@@ -123,6 +128,7 @@
 		mounted() {},
 		methods: {
 			handleClick(val) {
+				this.nowobj = val
 				let id = val.dkjdxxId
 				getDkjbxx(id).then((res) => {
 					this.infoObj = res.data;
@@ -134,6 +140,11 @@
 					}
 					console.log(this.sheets);
 				});
+				getStep({
+					dkjdxxId: id
+				}).then((res) => {
+					this.steps = res.data;
+				});
 				getHcInfo({
 					dkid: id,
 					auditflowStep: 'WYDC',
@@ -165,7 +176,15 @@
 				//     element.status = null;
 				//   }, 2000);
 				// });
-			}
+			},
+			toggle() {
+				this.$refs.popup.open('center')
+			},
+			affirm(confirmState) {
+				uni.$globalData = this.nowobj
+				this.$tab.navigateTo('/pages/index/common/edit?confirmState=' + confirmState)
+			},
+			
 
 
 		},