55

src/views/InTheSystem/components/search.vue

@@ -18,7 +18,7 @@
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
               <el-form-item label="类型:">
                   <el-select v-model="where.feedStatus" clearable style="width: 100%">
-                    <el-option label="报告中" :value="1" />
+                    <el-option label="报工中" :value="1" />
                     <el-option label="投料中" :value="0" />
                   </el-select>
               </el-form-item>

src/views/InTheSystem/components/tg-details-search.vue

@@ -39,7 +39,7 @@
           >
 
   
-            <el-option label="报告中" :value="1" />
+            <el-option label="报工中" :value="1" />
             <el-option label="投料中" :value="0" />
           </el-select>
         </el-form-item>

src/views/InTheSystem/components/tgDetails.vue

@@ -13,7 +13,7 @@
         <template v-slot:feedStatus="{ row }">
           {{
             row.feedStatus === 1
-              ? '报告中'
+              ? '报工中'
               : row.feedStatus === 0
               ? '投料中'
               : ''

src/views/InTheSystem/index.vue

@@ -13,7 +13,7 @@
         <template v-slot:feedStatus="{ row }">
           {{
             row.feedStatus === 1
-              ? '报告中'
+              ? '报工中'
               : row.feedStatus === 0
               ? '投料中'
               : ''

src/views/produce/components/picking/detailed.vue

@@ -173,6 +173,54 @@
 </script>
 
 <style lang="scss" scoped>
+
+
+.tableZ_box {
+    border: 1px solid #e3e5e5;
+    margin: 6px 0;
+
+    &:last-child {
+      border-bottom: none;
+    }
+
+    .row {
+      width: 100%;
+      display: flex;
+    }
+
+    .col {
+      width: calc(100% / 5);
+      display: flex;
+      align-items: center;
+      min-width: 200px;
+      min-height: 32px;
+      border-bottom: 1px solid #e3e5e5;
+      border-right: 1px solid #e3e5e5;
+
+      &:last-child {
+        border-right: none;
+      }
+
+      .name {
+        display: flex;
+        align-items: center;
+        padding: 4px;
+        width: 80px;
+        height: 100%;
+        background-color: #d0e4d5;
+        color: #000;
+      }
+
+      .content {
+        padding: 4px 6px;
+        color: #000;
+      }
+    }
+
+    .pd6 {
+      padding: 0 6px;
+    }
+  }
   .tableZ_box {
     .col {
       width: calc(100% / 3);

src/views/produce/components/picking/index.vue

@@ -379,6 +379,54 @@
   .table_content {
     margin-bottom: 10px;
   }
+
+
+  .tableZ_box {
+    border: 1px solid #e3e5e5;
+    margin: 6px 0;
+
+    &:last-child {
+      border-bottom: none;
+    }
+
+    .row {
+      width: 100%;
+      display: flex;
+    }
+
+    .col {
+      width: calc(100% / 5);
+      display: flex;
+      align-items: center;
+      min-width: 200px;
+      min-height: 32px;
+      border-bottom: 1px solid #e3e5e5;
+      border-right: 1px solid #e3e5e5;
+
+      &:last-child {
+        border-right: none;
+      }
+
+      .name {
+        display: flex;
+        align-items: center;
+        padding: 4px;
+        width: 80px;
+        height: 100%;
+        background-color: #d0e4d5;
+        color: #000;
+      }
+
+      .content {
+        padding: 4px 6px;
+        color: #000;
+      }
+    }
+
+    .pd6 {
+      padding: 0 6px;
+    }
+  }
 </style>
 
 <style>