liuhairui 1 year ago
parent
commit
2eb2b038ef

+ 4 - 4
src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -4837,10 +4837,10 @@ const xzhscsConfirm = async () => {
     const firstChar = item["损耗代号"] ? item["损耗代号"].charAt(0) : '';
     return firstChar === '0' || firstChar === '';
   });
-  if(firstCharValid.includes(false)){
-    ElMessage({type: 'warning',message: '损耗代号开头必须是 0' })
-    return false;
-  }
+  // if(firstCharValid.includes(false)){
+  //   ElMessage({type: 'warning',message: '损耗代号开头必须是 0' })
+  //   return false;
+  // }
   if (sxzhscstableData.value) {
     const formattedData = sxzhscstableData.value.map(item => {
       return {

+ 167 - 17
src/view/yunyin/shengchanguanli/shengchanjincheng.vue

@@ -89,6 +89,7 @@
                       :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                       :data="tableData"  border row-key="ID"
                       size="small"
+					  :cell-class-name="gxbgCellClass"
                       highlight-current-row="true" @row-dblclick="updateCompanyFunc"
                       @row-click="tableRowClick" :show-overflow-tooltip="true"
                       @selection-change="handleSelectionChange">
@@ -98,23 +99,23 @@
 			 <el-table-column  sortable align="center" label="联数" prop="联数"  width="100" />
 			 <el-table-column  sortable align="center" label="投料大箱" prop="投料大箱"  width="100" />
 			 <el-table-column  sortable align="center" label="计划投料" prop="计划投料"  width="100" />
-			 <el-table-column  sortable align="center" label="工序1" prop="工序1"  width="100" />
-			 <el-table-column  sortable align="center" label="工序2" prop="工序2"  width="100" />
-			 <el-table-column  sortable align="center" label="工序3" prop="工序3"  width="100" />
-			 <el-table-column  sortable align="center" label="工序4" prop="工序4"  width="100" />
-			 <el-table-column  sortable align="center" label="工序5" prop="工序5"  width="100" />
-			 <el-table-column  sortable align="center" label="工序6" prop="工序6"  width="100" />
-			 <el-table-column  sortable align="center" label="工序7" prop="工序7"  width="100" />
-			 <el-table-column  sortable align="center" label="工序8" prop="工序8"  width="100" />
-			 <el-table-column  sortable align="center" label="工序9" prop="工序9"  width="100" />
-			 <el-table-column  sortable align="center" label="工序10" prop="工序10"  width="100" />
-			 <el-table-column  sortable align="center" label="工序11" prop="工序11"  width="100" />
-			 <el-table-column  sortable align="center" label="工序12" prop="工序12"  width="100" />
-			 <el-table-column  sortable align="center" label="工序13" prop="工序13"  width="100" />
-			 <el-table-column  sortable align="center" label="工序14" prop="工序14"  width="100" />
-			 <el-table-column  sortable align="center" label="工序15" prop="工序15"  width="100" />
-			 <el-table-column  sortable align="center" label="工序16" prop="工序16"  width="100" />
-			 <el-table-column  sortable align="center" label="工序17" prop="工序17"  width="100" />
+			 <el-table-column  sortable align="center" label="工序1" prop="工序1"  width="200" />
+			 <el-table-column  sortable align="center" label="工序2" prop="工序2"  width="200" />
+			 <el-table-column  sortable align="center" label="工序3" prop="工序3"  width="200" />
+			 <el-table-column  sortable align="center" label="工序4" prop="工序4"  width="200" />
+			 <el-table-column  sortable align="center" label="工序5" prop="工序5"  width="200" />
+			 <el-table-column  sortable align="center" label="工序6" prop="工序6"  width="200" />
+			 <el-table-column  sortable align="center" label="工序7" prop="工序7"  width="200" />
+			 <el-table-column  sortable align="center" label="工序8" prop="工序8"  width="200" />
+			 <el-table-column  sortable align="center" label="工序9" prop="工序9"  width="200" />
+			 <el-table-column  sortable align="center" label="工序10" prop="工序10"  width="200" />
+			 <el-table-column  sortable align="center" label="工序11" prop="工序11"  width="200" />
+			 <el-table-column  sortable align="center" label="工序12" prop="工序12"  width="200" />
+			 <el-table-column  sortable align="center" label="工序13" prop="工序13"  width="200" />
+			 <el-table-column  sortable align="center" label="工序14" prop="工序14"  width="200" />
+			 <el-table-column  sortable align="center" label="工序15" prop="工序15"  width="200" />
+			 <el-table-column  sortable align="center" label="工序16" prop="工序16"  width="200" />
+			 <el-table-column  sortable align="center" label="工序17" prop="工序17"  width="200" />
             </el-table>
 
             <!-- 分页 -->
@@ -322,6 +323,17 @@ const gxclhcCellClass = ({row, column, rowIndex, columnIndex}) =>{
     }
   }
 }
+// 表格数据
+const gxbgCellClass = ({row, column, rowIndex, columnIndex}) =>{
+	// console.log(row)
+ for (let i = 1; i <= 17; i++) {
+    const key = `工序${i}`;
+    if (row[key] && row[key].includes('完工') && columnIndex === i + 5) {
+      return 'hui-plan-usage-lows';
+    }
+  }
+  return 'lan-plan-usage-lows';  
+}
 
 
 // 搜索默认为空
@@ -399,6 +411,144 @@ const formDataTest = ref({})
   width: 150px; /* 调整左侧输入框的宽度 */
 }
 
+:deep(.hui-plan-usage-lows  div) {
+  color: #8c939d !important;
+}
+:deep(.lan-plan-usage-lows  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+
+
+
+/* :deep(.hui-plan-usage-lows.column-0  div) {
+  color: #8c939d !important;
+}
+:deep(.hui-plan-usage-lows.column-1  div) {
+  color: #8c939d !important;
+}
+:deep(.hui-plan-usage-lows.column-2  div) {
+  color: #8c939d !important;
+}
+:deep(.hui-plan-usage-lows.column-3  div) {
+  color: #8c939d !important;
+}
+:deep(.hui-plan-usage-lows.column-4  div) {
+  color: #8c939d !important;
+}
+:deep(.hui-plan-usage-lows.column-5  div) {
+  color: #8c939d !important;
+}
+:deep(.hui-plan-usage-lows.column-6  div) {
+  color: #8c939d !important;
+}
+:deep(.hui-plan-usage-lows.column-7  div) {
+  color: #8c939d !important;
+}
+:deep(.hui-plan-usage-lows.column-8  div) {
+  color: #8c939d !important;
+}
+:deep(.hui-plan-usage-lows.column-9  div) {
+  color: #8c939d !important;
+}
+:deep(.hui-plan-usage-lows.column-10  div) {
+  color: #8c939d !important;
+}
+:deep(.hui-plan-usage-lows.column-11  div) {
+  color: #8c939d !important;
+}
+:deep(.hui-plan-usage-lows.column-12 div) {
+  color: #8c939d !important;
+}
+:deep(.hui-plan-usage-lows.column-13 div) {
+  color: #8c939d !important;
+}
+:deep(.hui-plan-usage-lows.column-14 div) {
+  color: #8c939d !important;
+}
+:deep(.hui-plan-usage-lows.column-15 div) {
+  color: #8c939d !important;
+}
+:deep(.hui-plan-usage-lows.column-16 div) {
+  color: #8c939d !important;
+}
+:deep(.hui-plan-usage-lows.column-17 div) {
+  color: #8c939d !important;
+}
+
+:deep(.lan-plan-usage-lows.column-0  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lows.column-1  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lows.column-2  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lows.column-3  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lows.column-4  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lows.column-5  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lows.column-6  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lows.column-7  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lows.column-8  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lows.column-9  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lows.column-10  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lows.column-11  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lows.column-12  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lows.column-13  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lows.column-14  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lows.column-15  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lows.column-16  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lows.column-17  div) {
+  color: blue !important;
+  font-weight: bold;
+} */
+
 /* 媒体查询,根据需要调整断点 */
 @media screen and (max-width: 768px) {
   .form-column {