tijiao

hb_client/src/views/em/monitoring.vue

@@ -393,8 +393,8 @@
         ],
         state_: {
           10: "合格",
-
-          40: "禁用",
+           40: "禁用",
+          50: "报废",
         },
         options: [
           {
@@ -404,6 +404,11 @@
           {
             value: 40,
             label: "禁用",
+          }
+          ,
+          {
+            value: 50,
+            label: "报废",
           },
         ],
         listQuery: {

hb_client/src/views/sam/salesdetail.vue

@@ -76,7 +76,7 @@
         <el-table-column label="装箱单号" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.packnum }}</template>
         </el-table-column>
-        <el-table-column label="未装箱说明" show-overflow-tooltip>
+        <el-table-column label="备注" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.remark }}</template>
         </el-table-column>
         <el-table-column align="center" label="操作" width="220px">