Merge branch 'dev' into test

src/views/technology/production/components/user-setting-matter-add.vue

@@ -228,7 +228,7 @@
         if (this.formData.itemType == '2') {
           // 过程控制 只能选择按事项执行
           return list.map((item) => {
-            if (item.label == '任务驱动') {
+            if (item.label == '任务驱动' || (item.label == '事件驱动' && this.formData.reportWorkType === '2')) {
               item.disabled = true;
             } else {
               item.disabled = false;