first commit

src/view/performance/Machinestatus.vue

@@ -1,14 +1,13 @@
 <template>
     <div>
       <layout>
-        <layout-header>
-          <div class="gva-table-box" style="margin-left: 20px;">
-            <!--按钮部分-->
+        <!-- <layout-header>
+          <div class="gva-table-box" style="margin-left: 20px;width: 97%;">
             <el-form-item>
-              <el-button type="primary" icon="plus"  @click="addonclick" >新增</el-button>
+              <el-button type="primary" icon="plus"  @click="addonclick" >新增设备</el-button>
             </el-form-item>
           </div>
-        </layout-header>
+        </layout-header> -->
   
         <layout>
   
@@ -17,20 +16,20 @@
           <el-main>
             <div class="gva-table-box">
               <!-- 表格数据 -->
-              <el-table ref="multipleTable" style="width: 100%;height: 65vh" tooltip-effect="dark"
-                        :row-style="{ height: '25px' }"  :header-cell-style="{ padding: '0px' }"
+              <el-table ref="multipleTable" style="width: 100%;height: 76vh" tooltip-effect="dark"
+                        :row-style="{ height: '30px' }"  :header-cell-style="{ padding: '0px' }"
                         :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                         :data="tableData"  border row-key="ID"
                         size="small"
                         highlight-current-row="true" @row-dblclick="updateCompanyFunc"
                         @row-click="tableRowClick" :show-overflow-tooltip="true"
                         @selection-change="handleSelectionChange">
-               <el-table-column  sortable align="center" label="MAC地址" prop="sys_sbID"  width="160" />
-               <el-table-column  sortable align="center" label="设备编号" prop="设备编号"  width="120" />
-               <el-table-column  sortable align="center" label="生产工序" prop="生产工序"  width="120" />
-               <el-table-column  sortable align="center" label="设备编组" prop="设备编组"  width="120" />
-               <el-table-column  sortable align="center" label="组长" prop="组长"  width="100" />
-               <el-table-column prop="status" label="状态" align="center" width="120" sortable>
+               <el-table-column  sortable align="center" label="MAC地址" prop="sys_sbID"  width="220" />
+               <el-table-column  sortable align="center" label="设备编号" prop="设备编号"  width="130" />
+               <el-table-column  sortable align="center" label="生产工序" prop="生产工序"  width="130" />
+               <el-table-column  sortable align="center" label="设备编组" prop="设备编组"  width="130" />
+               <el-table-column  sortable align="center" label="组长" prop="组长"  width="130" />
+               <el-table-column prop="status" label="状态" align="center" width="130" sortable>
                     <template #default="{ row }">
                         <el-tag :type="row.status === '1' ? 'success' : 'danger'">
                             {{ row.status === '1' ? '正常' : '异常' }}
@@ -40,9 +39,9 @@
                 <el-table-column fixed="right" label="操作" width="130">
               <template #default="{ row, $index }">
               <el-button @click="Status_change(row,$index)" type="primary" size="small" 
-              style="font-size: 16px;padding: 0px;width: 90px;">
-              更改状态
-              </el-button>
+				  style="font-size: 16px;padding: 0px;width: 90px;height: 25px;">
+				  更改状态
+			  </el-button>
               </template>
               </el-table-column>
               </el-table>
@@ -51,25 +50,22 @@
               <div class="gva-pagination">
                 <el-pagination layout="total" :current-page="page" :page-size="pageSize"
                  :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
-  <!--              <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page" :page-size="pageSize" :page-sizes="[10, 30, 50, 100]"-->
-  <!--                             :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />-->
               </div>
             </div>
-            <el-dialog
-            v-model="add_MachinedialogFormVisible"
-            :before-close="add_gdyjcloseDialog"
-            style="width: 66%; max-height: 80%; overflow-y: auto; margin-top: 4%;"
-            :title="'新增机台信息'"
-            destroy-on-close>
+			
+            <el-dialog v-model="add_MachinedialogFormVisible" :before-close="add_gdyjcloseDialog"
+            style="width: 40%; max-height: 80%; overflow-y: auto; margin-top: 4%;"
+            :title="'新增机台信息'" destroy-on-close>
+			
             <el-form label-width="100px" :model="add_Machineformdata">
               <el-row :gutter="24" class="form-row">
-                <el-col :span="10">
+                <el-col :span="20">
                   <el-form-item label="MAC地址" class="mab" prop="keyOrder" id ='MAC地址' label-width='110'>
-                    <el-input v-model="add_Machineformdata.sys_sbID"  style="width: 250px;" />
+                    <el-input v-model="add_Machineformdata.sys_sbID"/>
                   </el-form-item>
                 </el-col>
               </el-row>
-
+			  
               <el-row :gutter="24" class="form-row">
                 <el-col :span="10">
                   <el-form-item label="设备编号" class="mab" prop="keyOrder" id ='设备编号' label-width='110'>
@@ -95,7 +91,7 @@
 
               <el-row :gutter="24" class="form-row">
                 <el-col :span="10">
-                  <el-form-item label="设备编组" class="mab" prop="keyOrder" id ='设备编组' label-width='110'>
+                  <el-form-item label="设备编组" class="mab" prop="keyOrder"  id ='设备编组' label-width='110'>
                     <el-input v-model="add_Machineformdata.设备编组"  style="width: 250px;" />
                   </el-form-item>
                 </el-col>

src/view/performance/Suborderdetailspage.vue

@@ -1,12 +1,19 @@
 <!-- 子订单状态页面 -->
 <template>
-	   <br><br>
-	   <div class="order-info" style="margin-left: 10px;">
+	<p style="height: 40px;font-size: 18px;margin: 0px 0px 0px 10px;">
+		<span style="color: red;">进行模糊搜索 </span>
+		<span>订单编号或生产款号</span>
+		<span>选择相关</span>
+		<span style="color: red;"> “子订单编号” </span>
+		<span>“查看工序信息”</span>
+	</p>
+	   <div class="order-info" style="margin: 10px 0px 0px 10px;">
 		   <el-text style="font-size: 24px;">订单编号:&nbsp;</el-text>
             <el-select style="width: 10%; height: 40px;"
                 v-model="orderform.订单编号"
                 placeholder="请输入或选择订单编号"
                 filterable
+				id="searchInput"
                 clearable
                 remote
                 :remote-method="searchOrder"
@@ -47,7 +54,7 @@
 		</div>
 		<br>
 		  <el-table  ref="multipleTable" 
-			style="width: 100%; height: 35vh; font-size: 16px;margin-left: 10px;" 
+			style="width: 100%; height: 37vh; font-size: 16px;margin-left: 10px;" 
 			:row-style="{ height: '40px' }" :header-cell-style="{ padding: '0px'}"
 			:cell-style="{ padding: '0px', fontSize: '16px' }" 
 			 @row-click="orderlistclick" :cell-class-name="satusCellClass"
@@ -94,6 +101,14 @@ defineOptions({name: 'Company'})
 const SubWorkOrderStatusListlog = ref(false)
 // let baoshulist = []; // 确保在使用前已经声明
 
+//自动获取光标
+setTimeout(() => {
+	const inputElement = document.getElementById('searchInput');
+	if (inputElement) {
+		inputElement.focus();		
+	}
+}, 100); // 延迟100毫秒
+  
 const gx = ref('')
 const orderid = ref('')
 const orderdata = reactive([])
@@ -336,7 +351,10 @@ defineExpose({open})
   font-weight: bold;
   transition: background-color 0.3s;
 }
-
+/* 选中某行时的背景色 */
+:deep(.el-table__body tr.current-row) > td {
+  background: #ff80ff !important;
+}
 :deep(.number-box.green) {
 	 /* 完成包数（绿色） */
   background-color: palegreen !important;

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -60,7 +60,7 @@
 				<el-table-column align="left"  label="订单数量"    	prop="订单数量" 	width="100" />
 				<el-table-column align="left" label="工单状态" prop="gd_statu" width="100" >
 					<template #default="{ row }">
-						<el-tag :type="row.gd_statu === '1-计划中' ? 'success' : (row.gd_statu === '2-生产中' ? 'info' : 'danger')">
+						<el-tag :type="row.gd_statu === '1-计划中' ? 'warning' : (row.gd_statu === '2-生产中' ? 'success' : 'info')">
 							{{ row.gd_statu === '1-计划中' ? '计划中' : (row.gd_statu === '2-生产中' ? '生产中' : '已完工') }}
 						</el-tag>
 					</template>
@@ -711,7 +711,7 @@
 				    <el-table-column #default="{ row, column, $index }" align="left" :label="item.label" :width="item.width">
 				      
 				      <!-- 如果是物料名称且UNIQID没有值，则显示输入框，否则显示内容 -->
-				      <div v-if="item.prop === '物料名称'">
+				      <div v-if="item.prop === '物料名称' || item.prop === 'BOM_desc'">
 				        <el-input
 				          v-if="!row.UNIQID" 
 				          v-model="row[item.prop]"
@@ -2456,6 +2456,7 @@ const ddhformData = reactive({
 });
 const resbom_tableColumns = ref(
     [
+	  { label: '物料分类', prop: 'BOM_desc', width: '130' },
       { label: '物料名称', prop: '物料名称', width: '300' },
       { label: '计划用料', prop: '计划用料', width: '130' },
 	  { label: '计划门幅', prop: '计划门幅', width: '130' },
@@ -2520,6 +2521,7 @@ const _TestCoefficient = async ()=>{
 	console.log(orderBomListdata)
 	resbomtableData.value = orderBomListdata.data;
     const formattedData = orderBomListdata.data.map(item=>{
+	  item.BOM_desc = item.BOM_desc;
       item.物料名称 = item.物料名称;
       item.计划用料 = item.计划用料;
 	  item.定额用料 = item.定额用料;
@@ -2568,6 +2570,7 @@ const resbom_handleKeyDown = (event, x, y, prop) => {
 }
 const scfjfpxsCellClass = ({row, column, rowIndex, columnIndex}) =>{
   if (
+		column.label === '物料分类' ||
 		column.label === '计划门幅' ||
 		column.label === '定额门幅' ||
 		column.label === '计划用料' || 
@@ -2583,6 +2586,7 @@ const scfjfpxsCellClass = ({row, column, rowIndex, columnIndex}) =>{
 const add_bomenterDialog = async() => {
 	// 创建一行空数据，字段值可以根据需求初始化
 	  const newRow = {
+		'BOM_desc': '',
 	    '物料名称': '',
 	    '计划用料': '',
 	    '定额用料': '',

src/view/yunyin/shengchanguanli/yangyipihe.vue

@@ -44,12 +44,12 @@
 						<el-table-column   align="left" label="订单编号" prop="订单编号"  width="115" />
 						<el-table-column   align="left" label="生产款号" prop="生产款号"  width="150" />
 						<el-table-column   align="left" label="款式" prop="款式"  width="110" />
-		               <el-table-column align="left" label="工单状态" prop="gd_statu" width="120" sortable>
-						  <template #default="{ row }">
-							<el-tag :type="row.gd_statu === '1-计划中' ? 'success' : (row.gd_statu === '2-生产中' ? 'info' : 'danger')">
-							  {{ row.gd_statu === '1-计划中' ? '计划中' : (row.gd_statu === '2-生产中' ? '生产中' : '已完工') }}
+				        <el-table-column align="left" label="工单状态" prop="gd_statu" width="100" >
+							<template #default="{ row }">
+							<el-tag :type="row.gd_statu === '1-计划中' ? 'warning' : (row.gd_statu === '2-生产中' ? 'success' : 'info')">
+							{{ row.gd_statu === '1-计划中' ? '计划中' : (row.gd_statu === '2-生产中' ? '生产中' : '已完工') }}
 							</el-tag>
-						  </template>
+							</template>
 						</el-table-column>
 						<el-table-column   align="left" label="订单数量" prop="订单数量"  width="90" />
 						<el-table-column   align="left" label="包装完工数量" prop="工单完工数量"  width="110" />