From 607c18b1c60b5b4395ed65e42f3265f2fa528560 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Mon, 24 Nov 2025 09:28:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/Warehouse/components/equiment.vue | 184 ------------------------
 pages/Warehouse/picking.vue             |  20 ---
 pages/procurement/materialcar.vue       |   7 +-
 3 files changed, 3 insertions(+), 208 deletions(-)
 delete mode 100644 pages/Warehouse/components/equiment.vue

diff --git a/pages/Warehouse/components/equiment.vue b/pages/Warehouse/components/equiment.vue
deleted file mode 100644
index f5b0573..0000000
--- a/pages/Warehouse/components/equiment.vue
+++ /dev/null
@@ -1,184 +0,0 @@
-<template>
-	<view>
-		<view class="zhezhao" v-show="open" @click="emit('back')">
-			<view class="neuro-box" @click.stop v-if="open">
-				<view class="button-father">
-					<view :class="buttonposition?`buttontarget button`:`button-white` " @click="emit('back')">
-						取消</view>
-					<view :class="!buttonposition?`buttontarget button`:`button-white` " @click="config()">确定</view>
-				</view>
-		
-				<view class="card-font">
-					{{content}}
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script lang="ts" setup>
-	import { ref, onMounted, onBeforeUnmount, computed, nextTick, defineProps, watch, onUnmounted ,defineEmits } from 'vue';
-	const emit = defineEmits(["back", "del"])
-	const props = defineProps({
-		open: {
-			type: Boolean,
-			required: true,
-		},
-		content: {
-			type: String
-		},
-	});	
-	 const buttonposition = ref(false)
-	 const config = ()=>{
-		 emit('del')
-	 }
-</script>
-
-<style scoped lang="less">
-	.card-font {
-		margin-top: 70rpx;
-		width: 600rpx;
-		justify-content: center;
-		display: flex;
-	}
-	.button-white {
-		width: 40%;
-		border: 2rpx solid #c3cacd;
-		background: linear-gradient(to bottom, #f3f3f5, #dee4e9);
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 25rpx;
-		border-radius: 30rpx;
-	}
-	.button {
-		width: 40%;
-		background-color: #ddf0ff;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		color: #007CFF;
-		border: 1rpx solid #007CFF;
-		font-size: 25rpx;
-		border-radius: 30rpx;
-	}
-	.button-father {
-		position: absolute;
-		bottom: 60rpx;
-		left: 50%;
-		transform: translateX(-50%);
-		width: 100%;
-		height: 60rpx;
-		display: flex;
-		justify-content: space-around;
-		padding: 0 50rpx;
-	}
-	.neuro-box {
-		position: absolute;
-		left: 0;
-		top: 0;
-		bottom: 0;
-		right: 0;
-		margin: auto;
-		width: 400rpx;
-		height: 270rpx;
-		border-radius: 30rpx;
-		background-color: #fff;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		z-index: 21;
-		padding: 0 10%;
-		z-index: 999;
-		border: 1px solid #999;
-	}
-.zhezhao {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100vw;
-	height: 100vh;
-	z-index: 1125;
-}
-.zerotarget {
-		--color: #99C9FD;
-		--thick: 2px;
-		--radius: 50rpx;
-		--outline-offset: 0rpx;
-		/* 外扩多少 */
-		/* 内层虚线（你现在用的） */
-		border-radius: var(--radius);
-		background-color: white;
-		/* 内部背景 */
-		animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
-		/* 外层虚线：放在 outline（不会影响元素尺寸） */
-		outline: var(--thick) dashed var(--color);
-		outline-offset: var(--outline-offset);
-
-		/* 保证文本 / 子元素在最上层 */
-		position: relative;
-		z-index: 0;
-	}
-
-	.firsttarget {
-		--color: #99C9FD;
-		--thick: 2px;
-		--radius: 50%;
-		--outline-offset: 0rpx;
-		/* 外扩多少 */
-
-		/* 内层虚线（你现在用的） */
-		border-radius: var(--radius);
-		background-color: white;
-		/* 内部背景 */
-		animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
-		/* 外层虚线：放在 outline（不会影响元素尺寸） */
-		outline: var(--thick) dashed var(--color);
-		outline-offset: var(--outline-offset);
-
-		/* 保证文本 / 子元素在最上层 */
-		position: relative;
-		z-index: 0;
-	}
-
-	.buttontarget {
-		--color: #99C9FD;
-		--thick: 2px;
-		--radius: 30rpx;
-		--outline-offset: 0rpx;
-		/* 外扩多少 */
-
-		/* 内层虚线（你现在用的） */
-		border-radius: var(--radius);
-		background-color: white;
-		/* 内部背景 */
-		animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
-		/* 外层虚线：放在 outline（不会影响元素尺寸） */
-		outline: var(--thick) dashed var(--color);
-		outline-offset: var(--outline-offset);
-
-		/* 保证文本 / 子元素在最上层 */
-		position: relative;
-		z-index: 0;
-	}
-
-	@keyframes scalePulse {
-		0% {
-			transform: scale(1);
-		}
-
-		25% {
-			/* 先收缩一点点 */
-			transform: scale(0.94);
-		}
-
-		65% {
-			/* 再放大到略超出的感觉 */
-			transform: scale(1.08);
-		}
-
-		100% {
-			transform: scale(1);
-		}
-	}
-</style>
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index 8a9d064..42bf38c 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -1065,25 +1065,6 @@
 			</view>
 
 		</view>
-		<!-- <view :class="['neuro-wrapper', donghuacs ? 'is-active' : '']" v-show="badshow">
-			<view class="neuro-mask" @click="badshow=false;"></view>
-			<view class="neuro-box" @click.stop>
-
-				<view class="button-father">
-					<view class="button-white" @click="badshow=false;">取消</view>
-					<view class="button" @click="zuofei">确定</view>
-				</view>
-
-				<view class="title">作废</view>
-				<view class="card-font">
-					确定要作废这个采购单吗
-				</view>
-			</view>
-		</view> -->
-
-		<!-- <view class="mengban" v-if="open==1"> </view>
-		<equiment :open="open==1" @del="del()" @back="open = 0" :content="'是否删除此图片？'"></equiment>
-		<equiment :open="open==2" @del="sctp(1)" @back="open = 0" :content="'是否销账此物料？'"></equiment> -->
 		<tanchuang :show="badshow" font="确定要作废这个采购单吗" @back="badshow=false;" @right="zuofei"> </tanchuang>
 		<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del()"> </tanchuang>
 		<tanchuang :show="open==2" font="是否销账此物料？" @back="open = 0" @right="sctp(1)"> </tanchuang>
@@ -1096,7 +1077,6 @@
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
 	import calendar from '@/component/public/calendar.vue'
 	import superpicker from '@/component/public/superpicker.vue'
-	import equiment from './components/equiment.vue';
 	import nomessageimge from '@/pages/procurement/components/nomessage.vue';
 	import tanchuang from '@/pages/procurement/components/tanchuang.vue';
 
diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue
index 1ac713f..654a225 100644
--- a/pages/procurement/materialcar.vue
+++ b/pages/procurement/materialcar.vue
@@ -38,8 +38,8 @@
 		</view>
 		<carlist :InvoicingList="InvoicingList" :status="status" @delindex="opendelindex" @addcartory="addcartory"></carlist>
 		
-		<equiment :open="open==1"  @del="del()" @back="open = 0" :content="'是否清空购物车？'"></equiment>
-		<equiment :open="open==2"  @del="delindex()" @back="open = 0" :content="'是否删除此物料？'"></equiment>
+		<tanchuang :show="open==1" font="是否清空购物车？" @back="open = 0" @right="del()"> </tanchuang>
+		<tanchuang :show="open==2" font="是否删除此物料？" @back="open = 0" @right="delindex()"> </tanchuang>
 		
 		<!-- 筛选 -->
 		<view class="mengban" v-if="ification" @click="ification = false"></view>
@@ -58,7 +58,7 @@
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
 	import {eddShoppingCartList, queryShoppingCartList, getGwcMaterialTreeData, queryNuInfoByNuId, updateKfstatus,deleteQgInfoById,emptiedQgInfo ,queryWlInfoByWlId,generatedPurchaseOrder,generatedPurchaseViewOrder } from './api/lunpan.js'
 	import carlist from './components/carlist.vue';
-	import equiment from './components/equiment.vue';
+	import tanchuang from './components/tanchuang.vue';
 	import classification from './components/classification.vue'
 	import defaultr from './components/default.vue'
 	import calculator from './components/calculator.vue'
@@ -103,7 +103,6 @@
 				item.zk = false;
 				item.scrollleft = 0;
 	 		})
-	 		console.log(res.result.records)
 	 		InvoicingList.value.push(...res.result.records);
 	 		status.value = res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore';
 			setout.value = (res.result.total == InvoicingList.value.length ? false : true)