Merge branch 'cf_dev' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP into cf_dev

src/views/base/craftManagement/route/components/configs.ts

@@ -339,18 +339,18 @@ export const comTypes: comType[] = [
     compentName: "点检",
     compentType: "dianjian",
   },
-  {
-    compentName: "设备记录",
-    compentType: "shebeijilu",
-  },
-  {
-    compentName: "紧固",
-    compentType: "jingu",
-  },
-  {
-    compentName: "调试配对",
-    compentType: "tiaoshipipei",
-  },
+  // {
+  //   compentName: "设备记录",
+  //   compentType: "shebeijilu",
+  // },
+  // {
+  //   compentName: "紧固",
+  //   compentType: "jingu",
+  // },
+  // {
+  //   compentName: "调试配对",
+  //   compentType: "tiaoshipipei",
+  // },
   /*{
 		compentName: "铭牌绑定",
 		compentType: "mingpai",

src/views/pro/traceability/components/updateExcel.vue

@@ -338,6 +338,19 @@ watch(
   },
   { immediate: true, deep: true }
 );
+watch(
+  () => rowData.value.lookStatus,
+  (val) => {
+    if (val == true) {
+      options.value.opreaState = false;
+      excelKey1.value = !excelKey1.value;
+    } else {
+      options.value.opreaState = true;
+      excelKey1.value = !excelKey1.value;
+    }
+  },
+  { immediate: true, deep: true }
+);
 </script>
 <style lang="scss" scoped>
 .dialogBody {