Merge remote-tracking branch 'origin/master'

src/views/base/accessories/index.vue

@@ -148,8 +148,9 @@ option.value = Object.assign(option.value, {
       label: "物料名称",
       prop: "materialName",
       addDisplay: false,
+      editDisplay: false,
     },
-    { label: "物料规格", prop: "spec", addDisplay: false },
+    { label: "物料规格", prop: "spec", addDisplay: false, editDisplay: falses },
   ],
 });
 </script>

src/views/base/defectCheck/index.vue

@@ -145,6 +145,9 @@ option.value = Object.assign(option.value, {
       prop: "unit",
       span: 12,
       search: false,
+      type: "select",
+      dicData: dicts.danwei_type,
+      props: { label: "dictLabel", value: "dictValue" },
     },
   ],
 });