From 041c06dce2e5f7df846d6aec3c8c179f8870d934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Mon, 21 Oct 2024 14:19:45 +0800
Subject: [PATCH] no message

---
 pages/modules/point-clean.vue | 29 +++++++++++++++++++++--------
 utils/getData1.js             |  6 ------
 utils/getData2.js             |  6 ++++++
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/pages/modules/point-clean.vue b/pages/modules/point-clean.vue
index 5db881d..8075eed 100644
--- a/pages/modules/point-clean.vue
+++ b/pages/modules/point-clean.vue
@@ -5,7 +5,7 @@
 			<view class="zd_wrapper">
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">起始点位</span>
+						<span class="filter_label">当前点位</span>
 					</view>
 					<view class="filter_input_wraper">
 						<zxz-uni-data-select v-model="index1" filterable :localdata="options1" @inputChange="inputChange1" @change="selectChange1"></zxz-uni-data-select>
@@ -33,15 +33,14 @@
 		</view>
 		<view class="zd-row submit-bar_new">
 			<button class="zd-col-7 submit-button_c" @tap="toClear">清空</button>
-			<button class="zd-col-15 submit-button_new" :class="{'btn-disabled': index1 === ''}" :disabled="disabled" @tap="_pointclean">确认</button>
+			<button class="zd-col-15 submit-button_new" :class="{'btn-disabled': index1 === ''}" :disabled="disabled" @tap="toSure">确认</button>
 		</view>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
-	import {pointSearch1} from '@/utils/getData1.js'
-	import {pointclean}  from '@/utils/getData2.js'
+	import {queryCleanPoint, pointclean}  from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar
@@ -55,7 +54,7 @@
 			};
 		},
 		created () {
-			this._pointSearch()
+			this._queryCleanPoint()
 		},
 		methods: {
 			inputChange1 (e) {
@@ -73,8 +72,8 @@
 				}
 			},
 			/** 点位查询 下拉框显示 */
-			async _pointSearch () {
-				let res = await pointSearch1('CB')
+			async _queryCleanPoint () {
+				let res = await queryCleanPoint('CB')
 				this.options1 = [...res]
 				this.options1.map(el => {
 				this.$set(el, 'value', el.point_code)
@@ -85,12 +84,26 @@
 				this.index1 = ''
 				this.obj = {}
 			},
-			async _pointclean () {
+			toSure () {
 				this.disabled = true
 				if (this.index1 === '') {
 					this.disabled = false
 					return
 				}
+				uni.showModal({
+					title: '提示',
+					content: '确认清空点位信息',
+					confirmColor: '#ff6a00',
+					success: (res) => {
+						if (res.confirm) {
+							this._pointclean()
+						} else if (res.cancel) {
+							this.disabled = false
+						}
+					}
+				})
+			},
+			async _pointclean () {
 				try {
 					let res = await pointclean(this.index1)
 					if (res.code === '1') {
diff --git a/utils/getData1.js b/utils/getData1.js
index 30cd958..1980738 100644
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -18,12 +18,6 @@ export const pointSearch = (rcode, pcode, ne) => request({
 		need_emtpy: ne
     }
 })
-export const pointSearch1 = (rcode) => request({
-	url:'api/pda/point',
-	data: {
-        region_code: rcode
-    }
-})
 
 // 查询各点位物料状态
 export const dwztSearch = (rcode) => request({
diff --git a/utils/getData2.js b/utils/getData2.js
index 364c13a..0fac855 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -159,6 +159,12 @@ export const zpchange = (code, ncode) => request({
 /**
  * 点位清空
  */
+export const queryCleanPoint = (rcode) => request({
+	url:'api/pda/queryCleanPoint',
+	data: {
+        region_code: rcode
+    }
+})
 export const pointclean = (code) => request({
 	url:'api/pda/pointclean',
 	data: {