优化

src/view/inventory/ruku.vue

@@ -52,11 +52,16 @@
 		<el-button type="primary" @click="res_bomcloseDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
 		<el-button type="primary" @click="res_bomenterDialog"  style="width: 100px;height: 50px;">一键入库</el-button>
 	</div>
-	 <el-divider><span class="print-title" style="font-size: 18px;">面料入库页</span></el-divider>
-	 <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px;">
-	   <p style="font-size: 18px;margin-right: 20px;">领用单号: <el-input v-model="danhao" style="width: 200px;" disabled/></p>
-		<p style="font-size: 18px;margin-right: 20px;">领用日期:<el-input v-model="riqi" style="width: 200px;" disabled/></p>
-	 </div>
+	 <el-divider><span class="print-title" style="font-size: 18px;">面料入库信息</span></el-divider>
+	 <!-- <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px;">
+	   <p style="font-size: 18px;margin-right: 20px;">入库单号: <el-input v-model="danhao" style="width: 200px;" disabled/></p>
+		<p style="font-size: 18px;margin-right: 20px;">入库日期:<el-input v-model="riqi" style="width: 200px;" disabled/></p>
+	 </div> -->
+
+	 <el-descriptions class="margin-top" :column="2"  :size="size" border>
+		<el-descriptions-item label="入库单号">{{danhao}}</el-descriptions-item>
+		<el-descriptions-item label="入库日期">{{riqi}}</el-descriptions-item>
+	</el-descriptions>
 	
 	<el-descriptions class="margin-top" :column="4"  :size="size" border>
 		<el-descriptions-item label="订单编号" class="ddh">{{ ddhformData['ddh'] }}</el-descriptions-item>
@@ -101,12 +106,13 @@
   		    </el-table-column>
   		  </template>
   		</el-table>
-		
-          <div style="display: flex;  align-items: center;">
-            <p style="font-size: 18px;">入库人员:
-                 <el-input v-model="chukuren" style="width: 200px;;" disabled/>
-             </p>
-          </div>
+		<br>
+		<br>
+		<div style="display: flex;  align-items: center;">
+			<p style="font-size: 18px;">入库人员:
+				<el-input v-model="chukuren" style="width: 200px;;" disabled/>
+			</p>
+		</div>
 		
   	</div>
   </el-dialog>
@@ -454,8 +460,8 @@ const scfjfpxsCellClass = ({row, column, rowIndex, columnIndex}) =>{
 // 确定
 const res_bomenterDialog = async () => {
     console.log(resbomtableData);
-	if(resbomtableData.value[0]['领用'] === ''|| resbomtableData.value[0]['领用'] === undefined){
-		ElMessage({type: 'warning',message: '领用不能为空'})
+	if(resbomtableData.value[0]['入库数量'] === ''|| resbomtableData.value[0]['入库数量'] === undefined){
+		ElMessage({type: 'warning',message: '入库数量不能为空'})
 		return
 	}
     // 直接构造一个对象，不用 JSON 格式的索引
@@ -464,7 +470,7 @@ const res_bomenterDialog = async () => {
         款号: ddhformData.sckh,
         物料编码: resbomtableData.value[0]['物料编号'],
         物料名称: resbomtableData.value[0]['物料名称'],
-        number: resbomtableData.value[0]['领用'],
+        number: resbomtableData.value[0]['入库数量'],
         name: "入库",
         sys_id: userStore.userInfo.nickName,
         receipt_number: danhao.value,

src/view/performance/caiqiebaogong.vue

@@ -842,10 +842,14 @@ const selectionChange = (selection, type) => {
 }
 const del_delclick = async () => {
     // 检查机台号是否匹配
-    if (select_jtbh.value != add_formData['机台号']) {
+    const selectedJtbhArray = select_jtbh.value.split(','); // 将逗号分隔的字符串转换为数组
+    const isAllMatch = selectedJtbhArray.every(jtbh => jtbh === add_formData['机台号']); // 检查所有值是否匹配
+
+    if (!isAllMatch) {
         ElMessage({ type: 'warning', message: '请选择与机台号相同的记录' });
         return false;
     }
+
     try {
         // 显示确认弹窗
         const confirmResult = await ElMessageBox.confirm('确定要删除这条记录吗？', '提示', {
@@ -853,6 +857,7 @@ const del_delclick = async () => {
             cancelButtonText: '取消',
             type: 'warning',
         });
+
         // 如果用户点击了确定
         if (confirmResult === 'confirm') {
             console.log(Selection.value);

src/view/performance/chafengbaogong.vue

@@ -435,7 +435,7 @@ import {ref,reactive,nextTick,watch,setBlockTracking} from 'vue'
 import {getSpotList,search,SubWorkOrderStatusList,getTab,OrderAttachments,getTabByGdbh,processAdd,spotcheckdel,Mabaolist} from '@/api/mes/job'
 import {getMachineMac} from '@/api/jixiaoguanli/jitairibaobiao'
 import {getMac} from '@/api/jixiaoguanli/baogong'
-import {ElMessage} from "element-plus";
+import {ElMessage,ElMessageBox} from "element-plus";
 import {get} from 'scriptjs';
 import PrintPage from '../yunyin/shengchanguanli/components/print.vue'
 import luckyexcelPage from '../yunyin/shengchanguanli/components/luckyexcel.vue';
@@ -764,8 +764,23 @@ function updateTotal() {
 
 	const currentSlValue = ref('')
 	
-	//车缝报工
-	const add_Dialog = async () => {
+
+// 标志变量，用于控制按钮的可点击状态
+let isClickable = true;
+//车缝报工
+const add_Dialog = async () => {
+    // 如果按钮不可点击，直接返回
+    if (!isClickable) {
+        return;
+    }
+    // 禁用按钮
+    isClickable = false;
+
+    // 设置定时器，2 秒后重新启用按钮
+    setTimeout(() => {
+        isClickable = true;
+    }, 2000);
+
 		if(add_formData['机台号'] === '测试机台'){
 			ElMessage({ type: 'warning', message: '测试机台禁止报工' });
 			return;
@@ -1121,23 +1136,51 @@ const add_printxp = async () => {
 //报工删除
 const delall = ref(true)
 const Selection = ref('')
+const select_jtbh = ref('')
 const selectionChange = (selection, type) => {
+	console.log(selection)
 	const ids = selection.map(item => {
 		return item.UniqId
 	})
+	const zbs = selection.map(item => {
+		return item.组别	
+	})
 	Selection.value = ids.join(',')
+	select_jtbh.value = zbs.join(',')
 	console.log(Selection.value)
 }
 const del_delclick = async () => {
-	console.log(Selection.value)
-	console.log(add_formData['组别'])
-	const res1 = await spotcheckdel({UniqId:Selection.value,sys_id:add_formData['组别']})
-	if(res1.code === 0){
-		ElMessage.success('删除成功')
-		Selection.value = ''
-		add_onSubmit()
-	}
-}
+    // 检查机台号是否匹配
+    const selectedJtbhArray = select_jtbh.value.split(','); // 将逗号分隔的字符串转换为数组
+    const isAllMatch = selectedJtbhArray.every(组别 => 组别 === add_formData['组别']); // 检查所有值是否匹配
+
+    if (!isAllMatch) {
+        ElMessage({ type: 'warning', message: '请选择与机台号相同的记录' });
+        return false;
+    }
+    try {
+        // 显示确认弹窗
+        const confirmResult = await ElMessageBox.confirm('确定要删除这条记录吗？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+        });
+        // 如果用户点击了确定
+        if (confirmResult === 'confirm') {
+            console.log(Selection.value);
+            console.log(add_formData['组别']);
+            const res1 = await spotcheckdel({ UniqId: Selection.value, sys_id: add_formData['组别'] });
+            if (res1.code === 0) {
+                ElMessage.success('删除成功');
+                Selection.value = '';
+                add_onSubmit();
+            }
+        }
+    } catch (error) {
+        // 用户点击了取消或关闭了弹窗
+        ElMessage.info('删除操作已取消');
+    }
+};
 
 
 // =========== 分页 ===========

src/view/performance/chukubaogong.vue

@@ -53,12 +53,17 @@
 		  <el-button type="primary" @click="res_bomcloseDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
 		  <el-button type="primary" @click="res_bomenterDialog"  style="width: 100px;height: 50px;">一键出库</el-button>
 	  </div>
-	   <el-divider><span class="print-title" style="font-size: 18px;">面料出库页</span></el-divider>
-	   <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px;">
-		 <p style="font-size: 18px;margin-right: 20px;">领用单号: <el-input v-model="danhao" style="width: 200px;" disabled/></p>
-		  <p style="font-size: 18px;margin-right: 20px;">领用日期:<el-input v-model="riqi" style="width: 200px;" disabled/></p>
-	   </div>
+	   <el-divider><span class="print-title" style="font-size: 18px;">面料出库信息</span></el-divider>
+	   <!-- <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px;">
+		 <p style="font-size: 18px;margin-right: 20px;">出库单号: <el-input v-model="danhao" style="width: 200px;" disabled/></p>
+		  <p style="font-size: 18px;margin-right: 20px;">出库日期:<el-input v-model="riqi" style="width: 200px;" disabled/></p>
+	   </div> -->
 	  
+	   <el-descriptions class="margin-top" :column="2"  :size="size" border>
+		<el-descriptions-item label="出库单号">{{danhao}}</el-descriptions-item>
+		<el-descriptions-item label="出库日期">{{riqi}}</el-descriptions-item>
+	</el-descriptions>
+
 	  <el-descriptions class="margin-top" :column="4"  :size="size" border>
 		  <el-descriptions-item label="订单编号" class="ddh">{{ ddhformData['ddh'] }}</el-descriptions-item>
 		  <el-descriptions-item label="客户">{{ ddhformData['kh'] }}</el-descriptions-item>
@@ -102,13 +107,13 @@
 				</el-table-column>
 			  </template>
 			</el-table>
-			
+			<br>
 			<br>
 			<div style="display: flex; justify-content: space-around; align-items: center; margin-bottom: 10px;">
-				<p style="font-size: 18px;">出库人: 
+				<p style="font-size: 18px;">出库人员: 
 					<el-input v-model="chukuren" style="width: 200px;" disabled/>
 				</p>
-				<p style="font-size: 18px;">领用人: 
+				<p style="font-size: 18px;">领用人员: 
 					<el-input v-model="linguser" style="width: 200px;" />
 				</p>
 		  </div>
@@ -462,7 +467,7 @@
   const res_bomenterDialog = async () => {
 	  console.log(resbomtableData);
   	if(linguser.value === '' || linguser.value === null){
-	  ElMessage({type: 'warning',message: '请输入领用人'})
+	  ElMessage({type: 'warning',message: '请输入领用人员'})
 	  return
 	}
 

src/view/performance/houdaoshougong.vue

@@ -284,7 +284,7 @@ import {getMac} from '@/api/jixiaoguanli/baogong'
 import PrintPage from '../yunyin/shengchanguanli/components/print.vue';
 import luckyexcelPage from '../yunyin/shengchanguanli/components/luckyexcel.vue';
 import SubOrderPage from '../yunyin/shengchanguanli/components/SubOrder.vue';
-import {ElMessage} from "element-plus";
+import {ElMessage,ElMessageBox} from "element-plus";
 import { get } from 'scriptjs';
 import { useUserStore } from '@/pinia/modules/user';
 defineOptions({name: 'Company'})
@@ -562,8 +562,23 @@ function baogongslpd() {
 }
 const currentSlValue=ref('')
 
+
+// 标志变量，用于控制按钮的可点击状态
+let isClickable = true;
 //报工
-const add_Dialog = async ()=>{
+const add_Dialog = async () => {
+    // 如果按钮不可点击，直接返回
+    if (!isClickable) {
+        return;
+    }
+    // 禁用按钮
+    isClickable = false;
+
+    // 设置定时器，2 秒后重新启用按钮
+    setTimeout(() => {
+        isClickable = true;
+    }, 2000);
+
 	if(add_formData['机台号'] === '测试机台'){
 		ElMessage({ type: 'warning', message: '测试机台禁止报工' });
 		return;
@@ -574,7 +589,7 @@ const add_Dialog = async ()=>{
   }
   
   if(_order.value === ''){
-    ElMessage({type: 'warning',message: '请重新扫描小票二维码'})
+    ElMessage({type: 'warning',message: '请重新扫描小票二维码'})	
 	return;
   }else{
 		let params ={}
@@ -621,15 +636,16 @@ const SubWorkOrderClose = () => {
 
 //单击
 const add_tableRowClick = async (row) => {
+	console.log(row)
 	// 使用 split 方法手动分割字符串
 	const serialParts = row['serial'].split('('); // 按 '(' 分割
 	const serial = serialParts[1] ? serialParts[1].split(')')[0] : ''; // 提取括号内的内容，如果没有则返回空字符串
 
 	// 根据尾包判断是否为 1 或 0
-	const tailPackage = row['尾包'] ? 1 : 0;
+	const tailPackage = row['尾包'] === "是" ? 1 : 0;
 	
 	// 拼接 searchInfo 字符串
-	const searchInfo = `${row['子订单编号']},${row['组别']},3,${row['尺码']},${row['数量']},${tailPackage},${serial}`;
+	// const searchInfo = `${row['子订单编号']},${row['组别']},3,${row['尺码']},${row['数量']},${tailPackage},${row['serial']}`;
 	add_searchInfo.value = searchInfo;
 	
 	add_formData['尺码'] =  row.尺码
@@ -698,20 +714,53 @@ const table_SelectionChange = (val) => {
 //报工删除
 const delall = ref(true)
 const Selection = ref('')
+const select_jtbh = ref('')
 const selectionChange = (selection, type) => {
+	console.log(selection)
 	const ids = selection.map(item => {
 		return item.UniqId
 	})
+	const zbs = selection.map(item => {
+		return item.机台号	
+	})
 	Selection.value = ids.join(',')
+	select_jtbh.value = zbs.join(',')
 	console.log(Selection.value)
 }
 const del_delclick = async () => {
-	console.log(Selection.value)
-	console.log(add_formData['组别'])
-	const res1 = await spotcheckdel({UniqId:Selection.value,sys_id:add_formData['组别']})
-	res1.code === 0 && ElMessage.success('删除成功')
-	add_onSubmit()
-}
+    // 检查机台号是否匹配
+    const selectedJtbhArray = select_jtbh.value.split(','); // 将逗号分隔的字符串转换为数组
+    const isAllMatch = selectedJtbhArray.every(机台号 => 机台号 === add_formData['机台号']); // 检查所有值是否匹配
+
+    if (!isAllMatch) {
+        ElMessage({ type: 'warning', message: '请选择与机台号相同的记录' });
+        return false;
+    }
+
+    try {
+        // 显示确认弹窗
+        const confirmResult = await ElMessageBox.confirm('确定要删除这条记录吗？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+        });
+
+        // 如果用户点击了确定
+        if (confirmResult === 'confirm') {
+            console.log(Selection.value);
+            console.log(add_formData['组别']);
+            const res1 = await spotcheckdel({ UniqId: Selection.value, sys_id: add_formData['组别'] });
+            if (res1.code === 0) {
+                ElMessage.success('删除成功');
+                Selection.value = '';
+                add_onSubmit();
+            }
+        }
+    } catch (error) {
+        // 用户点击了取消或关闭了弹窗
+        ElMessage.info('删除操作已取消');
+    }
+};
   
  
 // =========== 分页 ===========

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -14,9 +14,9 @@
               <el-button type="primary" icon="edit"   @click="addgdyj_onclick"   class="bt" title="新增颜色资料">新增颜色资料</el-button>
               <el-button type="primary" icon="edit"   @click="addgdgy_onclick"   class="bt" title="新增工序资料" >新增工序资料</el-button>
 			  <el-button type="primary" icon="edit"   @click="BOMclick"   class="bt"   title="BOM面料">批量修改BOM资料</el-button>
-              <el-button type="primary" icon="edit"   @click="del_ddzlClick" 	v-if="table_del=== true" :disabled="table_Selection === ''"  class="bt" title="删除订单资料"  >删除订单资料</el-button>
-              <el-button type="primary" icon="edit"   @click="delgd_delclick" 	v-if="delall=== true" :disabled="ysSelection === '' && gySelection === ''"  class="bt"   >删除颜色工艺资料</el-button>
-			  <el-button type="primary" icon="edit"   @click="delbom_delclick" 	v-if="del_bom=== true" :disabled="bom_Selection === '' "  class="bt"   >删除bom资料</el-button>
+              <el-button type="primary" icon="edit"   @click="del_ddzlClick" 	v-if="table_del=== true" :disabled="table_Selection === ''"  class="bt" title="选中复选框进行删除订单数据">删除订单资料</el-button>
+              <el-button type="primary" icon="edit"   @click="delgd_delclick" 	v-if="delall=== true" :disabled="ysSelection === '' && gySelection === ''"  class="bt" title="选中复选框进行删除颜色数据">删除颜色资料</el-button>
+			  <el-button type="primary" icon="edit"   @click="delbom_delclick" 	v-if="del_bom=== true" :disabled="bom_Selection === '' "  class="bt" title="选中复选框进行删除bom数据">删除bom资料</el-button>
 			  
               <!-- <el-button type="primary" icon="edit"   @click="CSclick"   class="bt"   title="库存测试">库存测试</el-button> -->
 			</el-form-item>
@@ -46,15 +46,15 @@
                         :cell-class-name="tableDataCellClass"
 						@row-click="tableRowClick" @row-dblclick="updateCompanyFunc"
                         @selection-change="ddzlSelectionChange" :show-overflow-tooltip="true">
-                <el-table-column align="center" type="selection" width="30"/>
+                <el-table-column align="center" type="selection" width="40"/>
 				<el-table-column align="center"  label="附件状态"     	prop="status" 	width="100" />
-                <el-table-column align="left" sortable label="订单编号"     	prop="订单编号" 	width="105" />
+                <el-table-column align="left" sortable label="订单编号"     	prop="订单编号" 	width="110" />
 				<el-table-column align="left" sortable label="客户"      	prop="客户编号" 		width="80" />
                 <el-table-column align="left" sortable label="生产款号"   	prop="生产款号"  width="110" />
                 <el-table-column align="left" sortable label="款式"       	prop="款式"   	width="100"/>
-				<el-table-column align="left" sortable label="订单数量"    	prop="订单数量" 	width="105" />
+				<el-table-column align="left" sortable label="订单数量"    	prop="订单数量" 	width="110" />
 				<el-table-column align="left" sortable label="落货日期"   	prop="落货日期" 	width="120" />
-				<el-table-column align="left" sortable label="船样合计"    	prop="船样合计" 	width="105" />
+				<el-table-column align="left" sortable label="船样合计"    	prop="船样合计" 	width="110" />
 				<el-table-column align="left" sortable label="船样描述"    	prop="船样描述" 	width="140" />
 				<el-table-column align="left" sortable label="单位"    		prop="单位" 		width="80" />
                 <el-table-column align="left" sortable label="面料"       	prop="面料" 		width="130" />
@@ -95,8 +95,8 @@
                   <el-table-column type="selection" width="30" />
                   <el-table-column align="left" sortable label="子订单编号" prop="子订单编号"  width="140"/>
 				  <el-table-column align="left" sortable label="PO号	" prop="款号"  width="180"/>
-				  <el-table-column align="left" sortable label="颜色备注" prop="颜色备注"  width="105"/>
-                  <el-table-column align="left" sortable label="色系名称" prop="颜色"  width="105"/>
+				  <el-table-column align="left" sortable label="颜色备注" prop="颜色备注"  width="110"/>
+                  <el-table-column align="left" sortable label="色系名称" prop="颜色"  width="110"/>
                   <el-table-column align="left" sortable label="船样" prop="船样"  width="80"/>
 				  <!-- 尺码列表 -->
                   <template v-for="item in sizeDatas">
@@ -193,13 +193,13 @@
 						  @selection-change="bomSelectionChange"
                           style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="bomtableData" row-key="ID">
                  <el-table-column type="selection" width="30" />
-                  <el-table-column align="left" label="订单编号" prop="订单编号"  width="105"/>
+                  <el-table-column align="left" label="订单编号" prop="订单编号"  width="110"/>
                   <el-table-column align="left" label="物料名称" prop="物料名称"  width="170"/>
-                  <el-table-column align="left" label="计划用料" prop="计划用料"  width="100" />
-                  <el-table-column align="left" label="计划门幅" prop="计划门幅"  width="100"/>
+                  <el-table-column align="left" label="计划用料" prop="计划用料"  width="110" />
+                  <el-table-column align="left" label="计划门幅" prop="计划门幅"  width="110"/>
                   <el-table-column align="left" label="定额用料" prop="定额用料"  width="90"/>
-                  <el-table-column align="left" label="定额门幅" prop="定额门幅"  width="100"/>
-                  <el-table-column align="left" label="实际门幅" prop="实际门幅"  width="100"/>
+                  <el-table-column align="left" label="定额门幅" prop="定额门幅"  width="110"/>
+                  <el-table-column align="left" label="实际门幅" prop="实际门幅"  width="110"/>
 				  <el-table-column align="left" label="单位" prop="投料单位"  width="60"/>
 				  <el-table-column align="left" label="备注" prop="备注"  width="180"/>
 				  <el-table-column align="left" label="更新用户" prop="ID"  width="160"/>
@@ -221,20 +221,20 @@
                           style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="mltableData" row-key="ID" @selection-change="handleSelectionChange">
 <!--                  <el-table-column type="selection" width="30" />-->
 				  <el-table-column type="selection" width="30" />
-                  <el-table-column align="left" label="物料编号" prop="物料编号"  width="105"/>
-				  <el-table-column align="left" label="材料分类" prop="材料分类"  width="100"/>
+                  <el-table-column align="left" label="物料编号" prop="物料编号"  width="110"/>
+				  <el-table-column align="left" label="材料分类" prop="材料分类"  width="110"/>
                   <el-table-column align="left" label="物料名称" prop="物料名称"  width="170"/>
 				  <el-table-column align="left" label="颜色" prop="颜色"  width="100"/>
-                  <el-table-column align="left" label="计划用料" prop="计划用料"  width="100" />
-				  <el-table-column align="left" label="计划门幅" prop="计划门幅"  width="100"/>
+                  <el-table-column align="left" label="计划用料" prop="计划用料"  width="110" />
+				  <el-table-column align="left" label="计划门幅" prop="计划门幅"  width="110"/>
                   <el-table-column align="left" label="定额用料" prop="定额用料"  width="90"/>
-				  <el-table-column align="left" label="定额门幅" prop="定额门幅"  width="100"/>
-				  <el-table-column align="left" label="实际门幅" prop="实际门幅"  width="100"/>
+				  <el-table-column align="left" label="定额门幅" prop="定额门幅"  width="110"/>
+				  <el-table-column align="left" label="实际门幅" prop="实际门幅"  width="110"/>
                   <el-table-column align="left" label="裁床实际用料" prop="裁床实际用料"  width="120"/>
                   <el-table-column align="left" label="裁床领用面料" prop="裁床领用面料"  width="120"/>
 				  <el-table-column align="left" label="裁床退回仓库面料" prop="裁床退回仓库面料"  width="140"/>
-				  <el-table-column align="left" label="入库总量" prop="入库总量"  width="90"/>
-				  <el-table-column align="left" label="面料结余" prop="面料结余"  width="90"/>
+				  <el-table-column align="left" label="入库总量" prop="入库总量"  width="110"/>
+				  <el-table-column align="left" label="面料结余" prop="面料结余"  width="110"/>
 				  <el-table-column align="left" label="单位" prop="投料单位"  width="60"/>
 				  <el-table-column align="left" label="备注" prop="备注"  width="180"/>
 				  <el-table-column align="left" label="更新用户" prop="ID"  width="160"/>
@@ -535,17 +535,21 @@
                   <el-table-column align="left" label="物料名称" prop="物料名称"  width="170"/>
                   <el-table-column align="left" label="计划门幅" prop="计划门幅"  width="90"/>
 				  <el-table-column align="left" label="定额门幅" prop="定额门幅"  width="90"/>
-                  <el-table-column align="left" label="款式" prop="款式"  width="110"/>
-				  <el-table-column align="left" label="入库总量" prop="入库总量"  width="90"/>
-				  <el-table-column align="left" label="面料结余" prop="面料结余"  width="90"/>
-				  <el-table-column align="left" label="单位" prop="投料单位"  width="60"/>
-				  <el-table-column align="left" label="裁床实际用料" prop="裁床实际用料"  width="110"/>
-				  <el-table-column align="left" label="裁床领用面料" prop="裁床领用面料"  width="110"/>
-				  <el-table-column align="left" label="裁床退回仓库面料" prop="裁床退回仓库面料"  width="140"/>
-				  <el-table-column align="left" label="备注" prop="备注"  width="180"/>
-				  <!-- <el-table-column align="left" label="客户编号" prop="客户编号"  width="100" /> -->
-				  <!-- <el-table-column align="left" label="id" prop="ID"  width="100"/> -->
-				  <!-- <el-table-column align="left" label="UNIQID" prop="UNIQID"  width="80"/> -->
+                  <el-table-column align="left" label="款式" prop="款式"  width="110" />
+				  <el-table-column
+      fixed="right"
+      label="操作"
+      width="120">
+      <template slot-scope="scope">
+        <el-button
+          @click.native.prevent="deleteRow(scope.$index, zsglddtableData)"
+          type="text"
+          size="small">
+          移除
+        </el-button>
+      </template>
+    </el-table-column>
+
                 </el-table>
 		  <!-- 底部操作按钮 -->
 		  <template #footer>
@@ -1174,7 +1178,9 @@ export default {
     };
   },
   methods: {
-    
+	deleteRow(index, rows) {
+        rows.splice(index, 1);
+      }
   }
 };
 </script>
@@ -1692,9 +1698,21 @@ const add_gdscgdformData = reactive({
   合并: false,
 });
 
+let isClickable = true;
 const add_gddialogFormVisible = ref(false)
 //点击新增订单资料按钮
 const addgd_onclick = async () => {
+	if (!isClickable) {
+        return;
+    }
+    // 禁用按钮
+    isClickable = false;
+
+    // 设置定时器，2 秒后重新启用按钮
+    setTimeout(() => {
+        isClickable = true;
+    }, 2000);
+
   console.log("用户信息", _username.value);
   // 判断客户代号是否为空
   if (!_Gd_khdh.value) {
@@ -2722,20 +2740,39 @@ const ddzlSelectionChange = (selection, type) => {
   table_Selection.value = ids.join(',')
 }
 
-//删除按钮
+// 删除按钮
 const del_ddzlClick = async () => {
-  let params = {};  
-  params.Uniqid = table_Selection._value; 
-  console.log(params)
-  const res1 = await orderDataDel(params)
-  res1.code === 0 && ElMessage.success('删除成功')
-    const WorkListdata = await WorkOrderList({search:_Gd_khdh.value,page:"1",limit:"10"});
-   tableData.value= WorkListdata.data.data
-   ystableData.splice(0, ystableData.length);//颜色资料清空
-   gytableData.splice(0, gytableData.length);//工艺资料情空
-   ddtableData.splice(0, ddtableData.length);//订单资料附件清空
-   jstableData.splice(0, jstableData.length);//技术附件清空
-}
+  try {
+    // 显示确认弹窗
+    await ElMessageBox.confirm('确定要删除这条记录吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    // 如果用户点击了确定
+    let params = {};
+    params.Uniqid = table_Selection._value;
+    console.log(params);
+    const res1 = await orderDataDel(params);
+    if (res1.code === 0) {
+      ElMessage.success('删除成功');
+
+      // 重新加载工单列表
+      const WorkListdata = await WorkOrderList({ search: _Gd_khdh.value, page: "1", limit: "10" });
+      tableData.value = WorkListdata.data.data;
+
+      // 清空相关数据
+      ystableData.splice(0, ystableData.length); // 颜色资料清空
+      gytableData.splice(0, gytableData.length); // 工艺资料清空
+      ddtableData.splice(0, ddtableData.length); // 订单资料附件清空
+      jstableData.splice(0, jstableData.length); // 技术附件清空
+    }
+  } catch (error) {
+    // 用户点击了取消或关闭了弹窗
+    ElMessage.info('删除操作已取消');
+  }
+};
 
 
 const delall = ref(true)