0314

src/views/business/drawing/drawingDetail.vue

@@ -76,7 +76,12 @@
                 prop="pattern"
                 align="center"
                 width="80"
-              />
+              >
+              <template #default="scope">
+                <span v-if="scope.row.abandoned == 0">{{ scope.row.pattern }}</span>
+                <template v-else>作废产品</template>
+                </template>
+            </el-table-column>
               <el-table-column
                 label="状态"
                 width="80px"

src/views/business/drawingAuditing/index.vue

@@ -76,7 +76,7 @@
             </el-table-column>
             <el-table-column label="类型" prop="pattern" align="center">
               <template #default="scope">
-                <span :class="getClassByPattern(scope.row.pattern)">{{ scope.row.pattern }}</span>
+                <span :class="getClassByPattern(scope.row.abandoned,scope.row.pattern)">{{ scope.row.pattern }}</span>
               </template>
             </el-table-column>
             <el-table-column label="状态" width="80px" prop="status" align="center">
@@ -283,17 +283,20 @@ function handleNGBacth() {
   }
 }
 
-function getClassByPattern(pattern) {
+function getClassByPattern(abandoned,pattern) {
+  if(abandoned==1){
+      return "font-danger";
+  }else{
   switch (pattern) {
     case "替换产品":
       return "font-warning";
     case "新产品":
-      return "font-success";
-    case "作废产品":
-      return "font-danger";
+      return "font-success";  
     default:
       return "";
   }
+  }
+
 }
 function getRowKey(row) {
   return row.id;

src/views/business/drawingRatify/index.vue

@@ -75,7 +75,7 @@
             <el-table-column label="图纸" prop="drawingName" align="center" />
             <el-table-column label="类型" prop="pattern" align="center" width="60">
               <template #default="scope">
-                <span :class="getClassByPattern(scope.row.pattern)">{{ scope.row.pattern }}</span>
+                <span :class="getClassByPattern(scope.row.abandoned,scope.row.pattern)">{{ scope.row.pattern }}</span>
               </template>
             </el-table-column>
             <el-table-column label="状态" width="80px" prop="status" align="center">
@@ -290,17 +290,20 @@ function getRowKey(row) {
   return row.id;
 }
 
-function getClassByPattern(pattern) {
+function getClassByPattern(abandoned,pattern) {
+  if(abandoned==1){
+      return "font-danger";
+  }else{
   switch (pattern) {
     case "替换产品":
       return "font-warning";
     case "新产品":
-      return "font-success";
-    case "作废产品":
-      return "font-danger";
+      return "font-success";  
     default:
       return "";
   }
+  }
+
 }
 </script>
 <style scoped>