优化

src/pinia/modules/user.js

@@ -116,27 +116,44 @@ const fetchMACAddress = async () => {
 
 // 获取机器MAC列表，并设置Machine.value
 const getMachineMaclist = async (macAddress) => {
-  try {
-    console.log("Fetching MAC details for:", macAddress);
+  // try {
+	console.log("macAddress：",macAddress)
     const response = await getMachineMac({ sys_sbID: macAddress });
-	console.log(response)
+
+	if (response.code === 7) {console.log("未登录或非法访问");return;}
 	
-	// 直接返回，避免处理未登录或非法访问的提示
-    if (response.code === 7) {
-      console.warn("未登录或非法访问，已忽略该提示");
-      return; // 如果是 code7, 直接返回，不执行后续逻辑
-    }
 	
+	if (response.data.机台号 === macAddress) {
+        Machine.value = response.data.机台号;
+        console.log("获取到的机台号:", Machine.value);
+    }else{
+		if (response.data === null) {
+		    console.log("未能获取响应数据，请检查请求或网络连接。");
+		    return;
+		}
+		
+		if (response.code === 7) {
+		  console.log("未登录或非法访问，已忽略该提示");
+		  return;
+		}
+		
+		if (response.data.机台号 === undefined) {
+		  console.log("该电脑未绑定 MAC 地址");
+		  return;
+		}
+	}
 	
-    if (response?.data?.机台号) {
-      Machine.value = response.data.机台号;
-      console.log("获取到的机台号:", Machine.value);
-    } else {
-      console.warn("未获取到有效的机台号，可能是初次登录");
+	if (response.data === null) {
+        console.log("未能获取响应数据，请检查请求或网络连接。");
+        return;
     }
-  } catch (error) {
-    handleGlobalError("获取机器MAC列表时出错", error);
-  }
+	
+    
+	if (response.data.机台号 === undefined) {
+	  console.log("该电脑未绑定 MAC 地址");
+	  return;
+	}
+
 };
 
 

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -49,20 +49,19 @@
                         @selection-change="handleSelectionChange"
                         :show-overflow-tooltip="true">
                 <el-table-column align="center" type="selection" width="30"/>
-                <!-- <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="80" />
                 <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="80"/>
-                <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="110" />
-                <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="100"/>
+				<el-table-column align="left" sortable label="订单数量"    	prop="订单数量" 	width="105" />
+				<el-table-column align="left" sortable label="单位"    		prop="单位" 		width="80" />
+				<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="140" />
+                <el-table-column align="left" sortable label="面料"       	prop="面料" 		width="130" />
+                <el-table-column align="left" sortable label="要求"       	prop="要求" 		width="130" />
                 <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="80" />
+				<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>
@@ -700,16 +699,16 @@
 					  </el-form-item>
 					</el-col>
 				</el-row>
-        <el-row :gutter="24">  
-  <el-col :span="24">  
-    <el-form-item label="附件备注:" prop="address" class="mab">  
-      <el-select v-model="jsfjformdata.附件备注" placeholder="请选择附件类型" id="附件备注">  
-        <el-option label="订单资料附件" value="订单资料附件"></el-option>
-        <el-option label="技术附件" value="技术附件"></el-option>
-      </el-select>  
-    </el-form-item>  
-  </el-col>  
-</el-row> 
+				<el-row :gutter="24">  
+				  <el-col :span="24">  
+					<el-form-item label="附件备注:" prop="address" class="mab">  
+					  <el-select v-model="jsfjformdata.附件备注" placeholder="请选择附件类型" id="附件备注">  
+						<el-option label="订单资料附件" value="订单资料附件"></el-option>
+						<el-option label="技术附件" value="技术附件"></el-option>
+					  </el-select>  
+					</el-form-item>  
+				  </el-col>  
+				</el-row> 
 				<el-row :gutter="24">
 					<el-col :span="6"></el-col>
 					<el-col :span="12">
@@ -1093,7 +1092,7 @@ const add_gddialogFormVisible = ref(false)
 const addgd_onclick = async ()=>{
   console.log(_Gd_khdh.value)
   if(_Gd_khdh.value === '' ||  _Gd_khdh.value === null){
-	  ElMessage({type: 'warning',message: '请选择左侧客户编号' })
+	  ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能' })
 	  return false;
   }else{
     add_gddialogFormVisible.value = true
@@ -1599,10 +1598,14 @@ const tableRowClick = async (row) => {
     _ddhval.value = row.订单编号
     sizeDatas.length = 0
     try {
+		//数据列表显示
         const PrintListDatas = await PrintListData({order:_Gd_gdbh.value})
         const jsOrderAttachments = await OrderAttachments({order:_Gd_gdbh.value,desc:'技术附件'})
         const ddOrderAttachments = await OrderAttachments({order:_Gd_gdbh.value,desc:'订单资料附件'})
-        console.log(jsOrderAttachments.data.length)
+		
+		
+		
+		//颜色资料
         if(PrintListDatas.data.列表.length === 0 ){
           ystableData.length = 0
         }else{
@@ -1616,7 +1619,14 @@ const tableRowClick = async (row) => {
           // 将新数组赋值给 ystableData，这会触发视图更新，清空旧数据（可选，如果不需要保留旧数据的话）  
           ystableData.length = 0;  
           ystableData.push(...newData);
-        } 
+        }
+		
+		//技术附件
+		if(jsOrderAttachments.data === ''){
+		  const WorkListdata = [];
+		  jstableData.splice(0,jstableData.length,...WorkListdata);
+		}
+		
         if(jsOrderAttachments.code === 0 && ddOrderAttachments.code === 0){
           jstableData.splice(0,jsOrderAttachments.data.length,...jsOrderAttachments.data);
           ddtableData.splice(0,ddOrderAttachments.data.length,...ddOrderAttachments.data);
@@ -1625,6 +1635,7 @@ const tableRowClick = async (row) => {
         console.error(error);
     }
 }
+
 //pdf
 const showPdfModal = ref(false);
 const pdfContainer = ref(null);
@@ -1701,9 +1712,9 @@ const previewPdf = (blob) => {
 //   link.click();
 // };
 
-const table_del = ref(true)
 //表格复选框
-const table_Selection = ref('')
+const table_del = ref(true)//删除订单资料
+const table_Selection = ref('')//存储选中Uniqid
 const handleSelectionChange = (selection, type) => {
   const ids = selection.map(item => {
     return item.Uniqid
@@ -1715,19 +1726,11 @@ const handleSelectionChange = (selection, type) => {
 //删除按钮
 const del_ddzlClick = async () => {
   console.log(table_Selection._value)
-
   let params = {};  
   params.Uniqid = table_Selection._value; 
   console.log(params)
-  
-  // if (table_Selection.value !== '') {
-    // try {
-      const res1 = await orderDataDel(params)
-      res1.code === 0 && ElMessage.success('删除成功')
-    // } catch(err) {
-      // ElMessage.error(err)
-    // }
-  // } 
+  const res1 = await orderDataDel(params)
+  res1.code === 0 && ElMessage.success('删除成功')
 }
 
 
@@ -1736,7 +1739,6 @@ const delall = ref(true)
 const ysSelection = ref('')
 //工艺复选框
 const gySelection = ref('')
-
 // 颜色资料多选、工艺资料多选
 const selectionChange = (selection, type) => {
   console.log(selection)
@@ -1748,7 +1750,6 @@ const selectionChange = (selection, type) => {
 	  return type === '工艺资料' ? item.Uniqid: item.Uniqid
 	  } 
   })
-
   
   if (type === '颜色资料') {
     ysSelection.value = ids.join(',')
@@ -1756,9 +1757,8 @@ const selectionChange = (selection, type) => {
   if (type === '工艺资料') {
     gySelection.value = ids.join(',')
   }
-  // console.log(ysSelection.value)
-
 }
+
 // ===========删除颜色资料、工艺资料 ===========
 const delgd_delclick = async () => {
   console.log(ysSelection.value)
@@ -1781,10 +1781,8 @@ const delgd_delclick = async () => {
         sizeDatas.splice(0,PrintListDatas.data.型号.length,...PrintListDatas.data.型号);//型号数据
         ystableData.splice(0,PrintListDatas.data.列表.length,...PrintListDatas.data.列表);//表格数据
       }else{
-        
+        console.log('?')
       }
-      
-     
     } catch(err) {
       ElMessage.error(err)
     }
@@ -1833,15 +1831,13 @@ const searchInfo = ref('')
 //查询按钮
 const onSubmit = async () => {
   if(searchInfo.value === ''){
-    ElMessage({type: 'warning',message: '请输入搜索的信息'})
+    ElMessage({type: 'warning',message: '请输入搜索的订单编号'})
     return false;
   }else{
     const WorkListdata = await WorkOrderList({search:searchInfo.value,page:1,limit:15});
     tableData.value=WorkListdata.data.data
     console.log(searchInfo.value)
-    console.log("点击了搜索按钮");
   }
-  // _cha_WorkList();
 };
 //回车查询
 const handleSearch = async (event) => {
@@ -2002,6 +1998,11 @@ const jsfj_del = (row) =>{
 
 //技术附件弹窗确定
 const jsfjenterDialog = () => {
+	
+	// console.log(jsfjformdata.value.附件类型)
+	
+	
+	// return;
 	if(jsfjformdata.value.附件备注==''){
 		ElMessage({
 			type: 'error',
@@ -2023,6 +2024,10 @@ const jsfjenterDialog = () => {
 		});
 		return;
 	}
+	//判断验证上传文件类型是否为 xlsx
+	// if(){//不是此类型提示
+		
+	// }
 
 	let fr = new FileReader();
 	fr.readAsDataURL(jsfjformdata.value.附件内容);