Merge remote-tracking branch 'origin/rubberPaint-dev' into dev

applications/dee-mes/src/privateComponents/components/AddAoInGeberalExperRecord/index.vue

+<template>
+  <div class="addAoInGeberalExperRecord-dialog">
+    <dee-as-com :basicData="basicData" ref="tablelists" class="list-table" table-height="50vh" :lay-config="{
+      typeName: 'ExtProcessPlan',
+      layKey: 'addAoInGeberalExperRecord',
+    }" @selectionChange="selectionChange" />
+    <div slot="footer" class="foot-btn-box">
+      <el-button type="primary" @click="submitEvent">确认</el-button>
+      <el-button @click="cancelEvent">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { post } from '@/utils/http'
+export default {
+  name: 'AddAoInGeberalExperRecordDialog',
+  components: {},
+  props: {
+    basicData: {
+      type: Object,
+      default: () => { }
+    },
+  },
+  data() {
+    return {
+      selection: []
+    }
+  },
+
+  computed: {},
+  mounted() { },
+  methods: {
+    selectionChange(val) {
+      this.selection = val
+    },
+    submitEvent() {
+      if (!this.selection||!this.selection.length )  return  this.$utils.showMessageWarning('请选择数据！')
+        const params = this.selection.map((item) => {
+          return {
+            sourceId: this.basicData.id,
+            sourceIdType: this.basicData.subTypeName,
+            targetId: item.id,
+            targetIdType: item.subTypeName,
+            operator: 'ADD'
+          }
+        })
+        post('/ExperimentPlanLink/recursions', params).then(res => {
+          this.cancelEvent()
+          this.$utils.showMessageSuccess('保存成功')
+          this.$bus.$emit('refreshExperimentPlanLink')
+        })
+    },
+    cancelEvent() {
+      this.$emit('cancel')
+    }
+  }
+}
+</script>
+<style lang="scss">
+</style>

applications/dee-task-center/src/views/workflow/task-center/task/handleTasks.vue

@@ -5,7 +5,7 @@
     width="60%"
     @handleClose="handleClose"
   >
-    <route-dealing :basic-data="basicData" :routes="routes" :show-title="false" :participant-data="participantData" @finishTask="finishTask" />
+    <route-dealing :basic-data="basicData" :routes="routes" :show-title="false" :participant-data="participantData" :is-save-before-submit="true" @finishTask="finishTask" />
   </dee-dialog>
 </template>
 <script>