first commit

src/view/inventory/fabricsummary.vue

@@ -26,7 +26,7 @@
 					            :cell-class-name="tableDataCellClass" id="Fabricinventory"
                       highlight-current-row="true"  @row-dblclick="updateCompanyFunc"
                       @row-click="tableRowClick" :show-overflow-tooltip="true"
-                      @selection-change="handleSelectionChange">
+                      @selection-change="handleSelectionChange1">
 			        <!-- <el-table-column type="selection" width="80" /> -->
 				<el-table-column  align="left" label="批次号" prop="批次号" width="90" />
 				<el-table-column  align="left" label="关联号" prop="关联号" width="90" />
@@ -50,7 +50,7 @@
 				<el-table-column  align="left" label="操作日期" prop="入仓日期" width="160"/>
 				<el-table-column fixed="right" label="操作" width="130">
 				<template #default="{ row, $index }">
-				  <el-button @click="record_deleteRow(row,$index)" type="success" size="small" 
+				  <el-button @click="record_listRow(row,$index)" type="success" size="small" 
 				  style="font-size: 16px;padding: 0px;width: 90px;">
 					查看明细
 				  </el-button>
@@ -79,6 +79,8 @@
 
 		<el-dialog v-model="FabricVisible" :before-close="FabricVisiblecloseDialog" title="入库、出库、退还详情数据" 
 				style="width: 100%;height: 100%;margin: 0px;" top="0%" destroy-on-close>
+				<el-button type="danger"  @click="FabricVisiblecloseDialog" style="height: 40px;font-size: 20px;margin-left: 20px;">关闭</el-button>
+				
 			<el-tabs v-model="activeName" @tab-click="handleClick">
 				<el-tab-pane label="入库记录"   name="first">
 					<el-table ref="multipleTable" style="width: 100%;height: 80vh" tooltip-effect="dark"
@@ -111,6 +113,14 @@
 					<el-table-column  align="left" label="操作时间" prop="操作时间" width="160" />
 					<el-table-column  align="left" label="来料选择" prop="来料部门" width="90" />
 					<el-table-column  align="left" label="备注" prop="备注" width="115" />
+					<el-table-column fixed="right" label="操作" width="80">
+					  <template #default="{ row, $index }">
+						<el-button @click="record_deleteRow(row,$index)" type="danger" size="small" 
+								   style="font-size: 16px;padding: 0px;width: 60px;background-color: red;">
+						  删除
+						</el-button>
+					  </template>
+					</el-table-column>
 					</el-table>
 				</el-tab-pane>
 				
@@ -146,6 +156,14 @@
 					<el-table-column  align="left" label="操作时间" prop="操作时间" width="160" />
 					<el-table-column  align="left" label="部门选择" prop="来料部门" width="90" />
 					<el-table-column  align="left" label="备注" prop="备注" width="115" />
+					<el-table-column fixed="right" label="操作" width="80">
+					  <template #default="{ row, $index }">
+						<el-button @click="record_deleteRow(row,$index)" type="danger" size="small" 
+								   style="font-size: 16px;padding: 0px;width: 60px;background-color: red;">
+						  删除
+						</el-button>
+					  </template>
+					</el-table-column>
 					</el-table>
 				</el-tab-pane>
 				
@@ -181,6 +199,14 @@
 					<el-table-column  align="left" label="操作时间" prop="操作时间" width="160" />
 					<el-table-column  align="left" label="部门选择" prop="来料部门" width="90" />
 					<el-table-column  align="left" label="备注" prop="备注" width="160" />
+					<el-table-column fixed="right" label="操作" width="80">
+					  <template #default="{ row, $index }">
+						<el-button @click="record_deleteRow(row,$index)" type="danger" size="small" 
+								   style="font-size: 16px;padding: 0px;width: 60px;background-color: red;">
+						  删除
+						</el-button>
+					  </template>
+					</el-table-column>
 					</el-table>
 				</el-tab-pane>
 			</el-tabs>
@@ -207,8 +233,8 @@ export default {
 // 全量引入格式化工具 请按需保留
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import {ref, reactive} from 'vue'
-import {FabricLotList,fabricListmonth,FabricDetaillist} from '@/api/mes/job'
-import {ElMessage} from "element-plus";
+import {FabricLotList,fabricListmonth,FabricDetaillist,FabricDetaildel} from '@/api/mes/job'
+import { ElMessage, ElMessageBox,ElUpload, ElButton,ElLoading } from 'element-plus'
 import * as XLSX from 'xlsx';
 import FileSaver from 'file-saver';
 // import { get } from 'scriptjs';
@@ -351,12 +377,18 @@ const DetaillistrestableData = reactive([])
 const chukutableData = reactive([])
 const tuihuantableData = reactive([])
 
+const FabricVisiblecloseDialog = async (row)=>{
+	FabricVisible.value = false
+}
+
 //双击
 const updateCompanyFunc = async (row)=>{
 	
 }
 
-const record_deleteRow = async (row)=>{
+
+//查看明细
+const record_listRow = async (row)=>{
 	console.log(row)
 	_pch.value = row['批次号']
 	FabricVisible.value = true
@@ -371,6 +403,56 @@ const record_deleteRow = async (row)=>{
 	tuihuantableData.splice(0,FabricDetaillistdata.length,...FabricDetaillistdata.data['退还记录']);
 }
 
+//删除
+const record_deleteRow = async (row, index) => {
+	  console.log(row.id);
+	  
+	  // 使用 ElMessageBox 提示确认删除
+	  ElMessageBox.confirm('确定删除此行数据吗？', '提示', {
+		  confirmButtonText: '确定',
+		  cancelButtonText: '取消',
+		  type: 'warning'
+	  }).then(async () => {
+		  // 确认删除，检查UNIQID是否为空
+		  if (row.id === '' || row.id === null || row.id === undefined) {
+			  // 删除当前行数据
+			  resbomtableData.value.splice(index, 1);
+			  ElMessage({
+				  type: 'success',
+				  message: '删除成功'
+			  });
+		  } else {
+			  // 调用接口删除
+			  const list = await FabricDetaildel({ id: row.id,Mod_id: userStore.userInfo.nickName});
+			  console.log(list)
+			  if (list.code === 0) {
+			    ElMessage({
+			      type: 'success',
+			      message: '删除成功'
+			    });
+			  } else {
+			    
+			  }
+			  _pch.value = row['批次号']
+			  FabricVisible.value = true
+			  DetaillistrestableData.splice(0,DetaillistrestableData.length);
+			  chukutableData.splice(0,chukutableData.length);
+			  tuihuantableData.splice(0,tuihuantableData.length);
+			  
+			  const FabricDetaillistdata = await FabricDetaillist({lotNumber:_pch.value});
+			  console.log(FabricDetaillistdata)
+			  DetaillistrestableData.splice(0,FabricDetaillistdata.length,...FabricDetaillistdata.data['入库记录']);
+			  chukutableData.splice(0,FabricDetaillistdata.length,...FabricDetaillistdata.data['出库记录']);
+			  tuihuantableData.splice(0,FabricDetaillistdata.length,...FabricDetaillistdata.data['退还记录']);
+		  }
+	  }).catch(() => {
+		  // 取消删除
+		  // ElMessage({
+			 //  type: 'info',
+			 //  message: '已取消删除'
+		  // });
+	  });
+  }
 
 // =========== 分页 ===========
 // 分页相关的响应式变量

src/view/performance/chafengbaogong.vue

@@ -609,7 +609,7 @@ const showPdf = async (row) => {
 		const values = relevantKeys.map(key => parseInt(slformdata[key], 10) ||0);
 		slformdata.sctotal = values.reduce((sum, value) => sum + value, 0);
 
-		const relevantKeyss = ['scsl1', 'scsl2', 'scsl3', 'scsl4', 'scsl5', 'scsl6', 'scsl7', 'scsl8', 'scsl9', 'scsl0', 'scsl1', 'scsl2', 'scsl3', 'scsl4'];
+		const relevantKeyss = ['scsl1', 'scsl2', 'scsl3', 'scsl4', 'scsl5', 'scsl6', 'scsl7', 'scsl8', 'scsl9', 'scsl10', 'scsl11', 'scsl12', 'scsl13', 'scsl14'];
 		const valuess = relevantKeyss.map(key => parseInt(scslformdata[key], 10) ||0);
 		scslformdata.sctotal = valuess.reduce((sum, value) => sum + value, 0);
 	}

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -2106,42 +2106,48 @@
 	}
   }
   
-  const gldd_Selection = ref('')//存储选中Uniqid
-  const gldd_Selection_ddbh = ref('')//存储选中订单编号
-  const glddSelectionChange = (selection) => {
-	console.log("当前选中的数据：", selection);
-	// 更新 glddtableData 中每一行的 checked 状态
-	glddtableData.value = glddtableData.value.map(item => {
-	  return {
-		...item,
-		checked: selection.some(selectedItem => selectedItem.UNIQID === item.UNIQID), // 判断是否被勾选
-	  };
-	});
-  };
+  const gldd_Selection = ref('') // 存储选中Uniqid
+  const gldd_Selection_ddbh = ref('') // 存储选中订单编号
+  const zsglddtableData = ref([]) // 存储最终选择的订单数据
+  const currentSelectedRows = ref([]) // 新增：存储当前选中的行数据
   
-  //关联订单取消
+  const glddSelectionChange = (selection) => {
+    console.log("当前选中的数据：", selection)
+    currentSelectedRows.value = selection // 存储当前选中的行数据
+    // 更新 glddtableData 中每一行的 checked 状态
+    glddtableData.value = glddtableData.value.map(item => {
+      return {
+        ...item,
+        checked: selection.some(selectedItem => selectedItem.UNIQID === item.UNIQID)
+      }
+    })
+  }
+  
+  // 关联订单取消
   const Related_fabricscloseDialog = () => {
-	  gldd_Selection.value = ''
-	  Related_fabricsVisible.value = false
+    gldd_Selection.value = ''
+    Related_fabricsVisible.value = false
   }
   
-  //关联订单确定
-  const zsglddtableData = ref([])
+  // 关联订单确定
   const Related_fabricsenterDialog = () => {
-	  // 过滤出勾选的数据
-	  const filteredData = glddtableData.value.filter(item => item.checked);
-	  
-	  console.log(filteredData)
-	  if(filteredData.length === 0){
-		  return
-	  }
-	  
-	  // 将过滤后的数据添加到 zsglddtableData
-	  zsglddtableData.value.push(...filteredData);
-  
-	  // 关闭弹窗
-	  Related_fabricsVisible.value = false;
-  };
+    if (currentSelectedRows.value.length === 0) {
+      ElMessage.warning('请至少选择一条数据')
+      return
+    }
+    
+    console.log("确定选择的数据：", currentSelectedRows.value)
+    
+    // 将选中的数据添加到 zsglddtableData
+    zsglddtableData.value = [...zsglddtableData.value, ...currentSelectedRows.value]
+    
+    // 提取UNIQID和订单编号
+    gldd_Selection.value = currentSelectedRows.value.map(item => item.UNIQID).join(',')
+    gldd_Selection_ddbh.value = currentSelectedRows.value.map(item => item.订单编号).join(',')
+    
+    // 关闭弹窗
+    Related_fabricsVisible.value = false
+  }
   
   
   // =========== 新增颜色资料 ===========
@@ -2781,17 +2787,38 @@ function Input_handle() {
 			  });
 		  } else {
 			  // 调用接口删除
-			  const Bomdel_del = await Bomdel({ UNIQID:row.UNIQID});
+			  const Bomdel_del = await Bomdel({ UNIQID: row.UNIQID });
+			  console.log(Bomdel_del)
 			  if (Bomdel_del.code === 0) {
-				  ElMessage({
-					  type: 'success',
-					  message: '删除成功'
-				  });
+			    ElMessage({
+			      type: 'success',
+			      message: '删除成功'
+			    });
 			  } else {
-				  ElMessage({
-					  type: 'error',
-					  message: '删除失败'
-				  });
+			    const msg = Bomdel_del.msg || '';
+			    console.log('msg:', msg);
+			    
+			    // 初始化标题和内容
+			    let title = '提示';
+			    let content = msg;
+			    
+			    // 截取中文句号（。）分割
+			    const splitIndex = msg.indexOf('。');
+			    if (splitIndex !== -1) {
+			      title = msg.substring(0, splitIndex + 1); // 截取第一个句号前的作为标题（含句号）
+			      content = msg.substring(splitIndex + 1);  // 后面的作为内容
+			    }
+			    
+			    // 弹窗提示（注意参数顺序）
+			    ElMessageBox.confirm(
+			      `<p style="font-size:14px;">${content}</p>`, // 内容
+			      title, // 标题
+			      {
+			        type: 'warning',
+			        dangerouslyUseHTMLString: true
+			      }
+			    );
+
 			  }
 			  // 重新获取BOM列表数据
 			  const orderBomListdata = await orderBomList({ order: _Gd_gdbh.value });
@@ -2802,10 +2829,10 @@ function Input_handle() {
 		  }
 	  }).catch(() => {
 		  // 取消删除
-		  ElMessage({
-			  type: 'info',
-			  message: '已取消删除'
-		  });
+		  // ElMessage({
+			 //  type: 'info',
+			 //  message: '已取消删除'
+		  // });
 	  });
   }
   
@@ -3593,7 +3620,26 @@ function Input_handle() {
 	text-overflow: ellipsis !important;
   }
   
+  .big-error-message {
+    padding: 20px 30px !important;     /* 整体弹窗变大 */
+    font-size: 20px !important;        /* 文字更大 */
+    animation: scaleFadeIn 0.3s ease-out; /* 放大淡入动画 */
+  }
+  
+  .big-error-message .el-message__icon {
+    font-size: 26px !important; /* 图标变大 */
+  }
   
+  @keyframes scaleFadeIn {
+    0% {
+      transform: scale(0.8);
+      opacity: 0;
+    }
+    100% {
+      transform: scale(1);
+      opacity: 1;
+    }
+  }