Merge remote-tracking branch 'origin/develop' into develop

src/components/drawers/ AssessmentList.vue

@@ -47,7 +47,11 @@
               expandRowByClick="true"
               @expand="expandTable"
               :pagination="false"
-              :row-selection="rowSelection"
+              :row-selection="{
+              selectedRowKeys: selectedRowKeys,
+              onChange: onSelectChange,
+              type: 'radio',
+            }"
               filterMultiple:false
             />
 
@@ -101,9 +105,10 @@ export default {
       tableDataTotal: 0,
       tableData: [],
       selectedRowKeys: [],
-      assessmentId:null,
+      assessmentId:null
     });
     const closeDrawer = () => {
+      state.selectedRowKeys = [];
       ctx.emit("update:assessmentVisible", false);
       ctx.emit("update:titleTag", true);
      
@@ -165,6 +170,19 @@ export default {
     //   state.selectedRowKeys = selectedRowKeys;
     // };
 
+    const onSelectChange = (selectedRowKeys, selectRow) => {
+      console.log("selectedRowKeys changed: ", selectedRowKeys, selectRow);
+      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRows = selectRow;
+      console.log(selectRow)
+      state.assessment =selectRow[0];
+      state.assessmentId = selectRow[0].assessmentId;
+      ctx.emit("checkedAss", state.assessment);
+      ctx.emit("update:assessmentId", state.assessmentId);
+      state.selectedRowKeys = [];
+      closeDrawer();
+    };
+
     const handelChangePage = (page, pageSize) => {
       state.currentPage = page;
       state.pageSize = pageSize;
@@ -222,6 +240,7 @@ export default {
       getAllInvistText,
       resetInvist,
       handelChangePage,
+      onSelectChange
     };
   },
 };

src/components/drawers/AddInvist.vue

@@ -54,7 +54,7 @@
                     >
                     <span class="title"
                       >名称：
-                      <span class="data">{{ assessment1.createName }}</span>
+                      <span class="data">{{ assessment1.assessmentName }}</span>
                     </span>
                     <span class="title"
                       >题数：
@@ -184,6 +184,8 @@ export default {
     const closeDrawer = () => {
       ctx.emit("update:addinvistVisible", false);
       ctx.emit("update:edit", false);
+      state.assessment = null;
+      state.assessment1 = null;
       state.inputV1 = "";
       // ctx.emit("changeData", false);
       localStorage.setItem("stageId", props.chooseStageId);
@@ -205,6 +207,7 @@ export default {
         api
           .queryAppraiseDetailById({ assessmentId: props.EditInvistId })
           .then((res) => {
+            console.log(res)
             //更新讨论信息
             state.assessment1 = res.data.data;
           })

src/components/drawers/ProjCheckPower.vue

@@ -181,8 +181,34 @@
                   </div>
                   <div class="boeTree">
                     <div class="boeTreeTitle">BOE组织树</div>
+                    <a-tree
+                      v-if="!isSearchOrg"
+                      class="treeMain treeMain2"
+                      :style="{ height: screenHeight - 430 + 'px' }"
+                      dropdownClassName="changetreedropdownboe"
+                      :dropdown-style="{
+                        maxHeight: '600px',
+                      }"
+                      placeholder="BOE组织树"
+                      allow-clear
+                      tree-default-expand-all
+                      :tree-data="isSearchOrg ? treeData2 : treeData"
+                      @select="departmentSelect1"
+                      multiple
+                      v-model:selectedKeys="selectedKeys1"
+                      :fieldNames="{
+                        children: 'treeChildList',
+                        key: 'id',
+                        title: 'name',
+                        value: 'name',
+                      }"
+                      v-model:expandedKeys="expandedKeys"
+                    >
+                      <template #suffixIcon></template>
+                    </a-tree>
 
                     <a-tree
+                      v-else-if="isSearchOrg"
                       class="treeMain treeMain2"
                       :style="{ height: screenHeight - 430 + 'px' }"
                       dropdownClassName="changetreedropdownboe"
@@ -953,13 +979,14 @@ export default {
         .getOrgInfo(obj)
         .then((res) => {
           if (res.data.code === 200) {
+            console.log("搜索组织", res);
             state.isSearchOrg = true;
             // res.data.data.rows.forEach((element) => {
             //   // console.log("element", element);
             //   element.treeChildList = [];
             // });
             // console.log("组织树搜索成功", res.data.data.rows);
-            state.treeData2 = res.data.data.rows;
+            state.treeData2 = res.data.data;
           }
         })
         .catch((err) => {

src/components/drawers/ProjPowerList.vue

@@ -177,6 +177,9 @@ export default {
     const closeDrawer = () => {
       ctx.emit("update:ProjPvisible", false);
       state.currentPage = 1;
+      state.tableData = [];
+      state.tableDataTotal = -1;
+      state.name = null;
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool, props);

src/components/drawers/ProjectOwn.vue

@@ -200,6 +200,7 @@ import elementResizeDetectorMaker from "element-resize-detector";
 // import { message } from "ant-design-vue";
 import * as api from "../../api/index1";
 import { useStore } from "vuex";
+import { message } from "ant-design-vue";
 export default {
   name: "ProjOwnerShip",
   props: {
@@ -407,6 +408,16 @@ export default {
         .optionAuthPerm(obj)
         .then((res) => {
           console.log("获取授权成功", res);
+          if (res.data.code === 200 && res.data.data.records.length > 0) {
+            state.selectedRowKeys = res.data.data.records[0].memberId;
+
+            let obj = {
+              id: res.data.data.records[0].memberId,
+              name: res.data.data.records[0].memberName,
+            };
+            state.choosepeople = [obj];
+            state.selectPeopleArr = [obj];
+          }
         })
         .catch((err) => {
           console.log("获取授权失败", err);
@@ -440,6 +451,7 @@ export default {
         .optionAuthPerm(obj)
         .then((res) => {
           console.log("修改授权成功", res);
+          message.success("修改归属权成功");
           closeDrawer();
         })
         .catch((err) => {