Merge remote-tracking branch 'origin/master'

zkqy-ui/src/views/bussiness/processMange.vue

@@ -242,7 +242,7 @@ import NodeShow from "./dialogCompments/Mec/NodeShow.vue";
 import RecordQuality from "./dialogCompments/Mec/RecordQuality.vue";
 import ProductionProcesses from "./dialogCompments/Mec/ProductionProcesses.vue";
 import PersonalDistribution from "./dialogCompments/Mec/PersonalDistribution.vue";
-import RecordSplitData from "./dialogCompments/Mec/RecordSplitData.vue";
+// import RecordSplitData from "./dialogCompments/Mec/RecordSplitData.vue";
 
 export default {
   name: "processMange",
@@ -267,7 +267,7 @@ export default {
     RecordQuality,
     ProductionProcesses,
     PersonalDistribution,
-    RecordSplitData,
+    // RecordSplitData,
   },
   dicts: ["bpm_type", "task_process_state"],
   data() {

zkqy-ui/src/views/system/bpmnPro/data/index.js

@@ -48,7 +48,7 @@ export const formList = [
     formName: "质控卡分卡处理",
   },
   // {
-  //   formKey: "EditQualityCard ",
+  //   formKey: "EditQualityCard",
   //   formName: "质控卡修改",
   // },
   {