Merge branch 'develop' of http://94.191.100.41/inet-two/web into develop

applications/dee-plan/src/privateComponents/components/ExtPurchasePlanDocLinkAdd/index.vue

@@ -17,7 +17,7 @@
       }"
       :dis-business="true"
       :result-data="tableData"
-      @selectionChange="selectionChange"
+      @radio-current-change="selectionChange"
     />
     <div class="btns">
       <el-button type="primary" class="submitBTN" :disabled="!isDisable" @click="tosubmit">确定</el-button>
@@ -89,7 +89,7 @@ export default {
   },
   methods: {
     selectionChange(data) {
-      this.selections = data
+      this.selections = [data.row]
     },
     getData() {
       const params = this.queryParams

applications/dee-task-center/src/business-components/tabCom/task-detail.vue

@@ -60,20 +60,19 @@
           v-if="basicData&& basicData.businessObject &&basicData.businessObject.subTypeName&& basicData.businessObject.subTypeName==='ExtPlanFeedback'"
         >
           <!-- <div class="sub-title" style="padding-bottom:12px">计划反馈</div> -->
-          <dee-as-com
+          <!--          <dee-as-com
             v-if=" isCheckTaskState && basicData.basicInfo.state==='BE_RESOLVED'"
             :lay-config="{
               typeName: 'ExtPlanReply',
-              layKey: 'task-ExtPlanReply'
+              layKey: 'ExtPlanReply-View'
             }"
             :form="ExtPlanReplyLinkform"
             @on-submit="toSubmitExtPlanReply"
-          />
+          />-->
           <dee-as-com
-            v-else
             :lay-config="{
               typeName: 'ExtPlanReply',
-              layKey: 'ExtPlanReply-View'
+              layKey: 'task-ExtPlanReply'
             }"
             :form="ExtPlanReplyLinkform"
           />