From aa4fe4dacddbb4885e27671fcc8b544d79b37043 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Tue, 16 Dec 2025 08:48:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/procurement/addtory.vue                | 21 ++++++++++++++++----
 pages/procurement/api/lunpan.js              |  7 +++++++
 unpackage/dist/dev/.nvue/pages/camera.js     |  2 +-
 unpackage/dist/dev/.nvue/pages/fullcamera.js |  2 +-
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/pages/procurement/addtory.vue b/pages/procurement/addtory.vue
index 095ef08..64c2a45 100644
--- a/pages/procurement/addtory.vue
+++ b/pages/procurement/addtory.vue
@@ -30,18 +30,19 @@
 		 	<toryitem :pddlist="pddlist" @scrolltolower="scrolltolower" :pddType="pddobj?.pddType" :status="status" @tabitem="tabitem" @right="right"></toryitem>
 		 </view>
 		 <view class="submit" v-if="pddobj.pddType=='1'">
-		 	<view>取消盘点</view>
+		 	<view @click="pddzfshow = true">取消盘点</view>
 		 	<view @click="subitshowing">提交盘点单</view>
 		 </view>
 		 <errorshow :show="openerror" :font="errmsg" @close="openerror=false"  />
 		 <pddsub :show="subitshow" :pddobj="pddobj" @close="subitshow=false"></pddsub>
+		 <tanchuang :show="pddzfshow" font="确定要作废盘点单吗" @back="pddzfshow=false;" @right="pddzf"> </tanchuang>
 	</view>
 </template>
 
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue';
 	import { onShow, onLoad, onHide, onPageScroll} from "@dcloudio/uni-app"
-	import { queryPddInfoList,editPddInfo } from './api/lunpan.js'
+	import { queryPddInfoList,editPddInfo,voidedPddMain } from './api/lunpan.js'
 	import toryitem from './common/toryitem.vue'
 	import pddsub from './common/pddsub.vue'
 	const leftscrolltop = ref(0)
@@ -49,7 +50,7 @@
 	const openerror = ref(false)
 	const errmsg = ref('');
 	const subitshow = ref(false)
-	// "pddType": "1" 可以操作
+	const pddzfshow = ref(false)
 	const selectType = ref(0)
 	const changetype = (index : number) => {
 		if ((selectType.value == index) && index) {
@@ -80,7 +81,6 @@
 			pageSize:10
 		}
 		queryPddInfoList(obj).then(res=>{
-			console.log(res)
 			pddlist.value.push(...res.result.records);
 			status.value = (res.result.total == pddlist.value.length ? 'nomore' : 'loadmore');
 			let s = Math.ceil(res.result.total / 3);
@@ -154,6 +154,19 @@
 			}
 		})
 	}
+	const pddzf = ()=>{
+		voidedPddMain({id:pddobj.value.id}).then(res=>{
+			if(res.success){
+				pddzfshow.value = true;
+				setTimeout(()=>{
+					uni.navigateBack()
+				},800)
+			}else{
+				errmsg.value = res.message;
+				openerror.value = true;
+			}
+		})
+	}
 </script>
 
 <style scoped lang="less">
diff --git a/pages/procurement/api/lunpan.js b/pages/procurement/api/lunpan.js
index d1e4d20..13b81e4 100644
--- a/pages/procurement/api/lunpan.js
+++ b/pages/procurement/api/lunpan.js
@@ -400,3 +400,10 @@ export const submitPddMain = (params) => {
 		data: params,
 	})
 }
+export const voidedPddMain = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/pdd/voidedPddMain`,
+		method: 'post',
+		data: params,
+	})
+}
diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js
index 12310ff..04100f2 100644
--- a/unpackage/dist/dev/.nvue/pages/camera.js
+++ b/unpackage/dist/dev/.nvue/pages/camera.js
@@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
+const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
 export {
   camera as default
 };
diff --git a/unpackage/dist/dev/.nvue/pages/fullcamera.js b/unpackage/dist/dev/.nvue/pages/fullcamera.js
index dd59bdc..c959abe 100644
--- a/unpackage/dist/dev/.nvue/pages/fullcamera.js
+++ b/unpackage/dist/dev/.nvue/pages/fullcamera.js
@@ -577,7 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
+const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
 export {
   fullcamera as default
 };