Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop

src/components/project/OrgClassCheck.vue

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2023-02-23 14:57:21
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2023-02-24 22:54:03
+ * @LastEditTime: 2023-03-07 17:30:12
  * @FilePath: /fe-manage/src/components/project/OrgClassCheck.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->

src/views/courselibrary/components/seeModal.vue

@@ -86,14 +86,27 @@
 												{{ qdms_inputV2.length }}/50
 											</span>
 										</div> -->
-                    <div>
-                      <OrgClassCheck
-                        v-model:value="orgSelect"
-                        v-model:name="orgSelectName"
-                        :disabled="true"
-                      ></OrgClassCheck>
+                    <div
+                      v-if="orgSelectNames"
+                      style="
+                        margin-bottom: 10px;
+                        height: 27px;
+                        line-height: 27px;
+                        margin-left: 10px;
+                        font-weight: 450;
+                      "
+                    >
+                      <span
+                        v-for="(i, k) in orgSelectNames"
+                        :key="k"
+                        style="margin-right: 20px"
+                        >{{ i }}</span
+                      >
                     </div>
-                    <div style="margin-top: 10px">
+                    <div
+                      style="margin-bottom: 10px"
+                      v-if="selectJobId.length !== 0"
+                    >
                       <a-select
                         v-model:value="selectJobId" v-if="selectJobId.length > 0"
                         mode="multiple"
@@ -109,7 +122,7 @@
                         disabled
                       ></a-select>
                     </div>
-                    <div style="margin-top: 10px">
+                    <div v-if="selectBandId.length !== 0">
                       <a-select
                         v-model:value="selectBandId"  v-if="selectBandId.length > 0"
                         mode="multiple"
@@ -344,7 +357,7 @@
 <script>
 import { reactive, toRefs, defineComponent, watch, computed } from "vue";
 import { useStore } from "vuex";
-import OrgClassCheck from "@/components/project/OrgClassCheck";
+// import OrgClassCheck from "@/components/project/OrgClassCheck";
 import OrgClass from "@/components/project/OrgClass";
 import { detail } from "@/api/indexCourse";
 export default defineComponent({
@@ -359,7 +372,7 @@ export default defineComponent({
     },
   },
   components: {
-    OrgClassCheck,
+    // OrgClassCheck,
     OrgClass,
   },
   setup(props, { emit }) {
@@ -387,6 +400,7 @@ export default defineComponent({
       sourceBelongId: [],
       sourceBelongName: [],
       sourceBelongFullName: [],
+      orgSelectNames: "",
     });
 
     const sysTypeOptions = computed(() => store.state.content_type);
@@ -435,6 +449,7 @@ export default defineComponent({
               });
               console.log("arrObj-------------", arrObj);
               state.orgSelect = arrObj;
+              state.orgSelectNames = orgSelectNames;
             }
           }
         });
@@ -475,6 +490,19 @@ export default defineComponent({
     const handleCancel = () => {
       console.log("关闭");
       emit("cancel");
+      //目标任务
+      state.orgSelect = [];
+      state.orgSelectName = [];
+      state.orgSelectFullName = [];
+      state.selectJobName = [];
+      state.selectJobId = [];
+      state.selectBandName = [];
+      state.selectBandId = [];
+      //资源归属
+      state.sourceBelongId = [];
+      state.sourceBelongName = [];
+      state.sourceBelongFullName = [];
+      state.orgSelectNames = "";
     };
 
     function openDown(link) {

src/views/courselibrary/courseModal.vue

@@ -841,8 +841,8 @@ export default defineComponent({
       }
       files = files.slice(0, files.length - 1);
 
-      let orgSelectIds = [];
-      let orgSelectNames = [];
+      let orgSelectIds = "";
+      let orgSelectNames = "";
       if (state.orgSelect && state.orgSelect.length) {
         state.orgSelect.forEach((item) => {
           orgSelectIds += item.value + ",";

src/views/projectcenter/ProjectManage.vue

@@ -199,7 +199,7 @@
                   >结束</a-button
                 >
                 <a-button
-                  v-if="record.status !== -1 && record.type === 3"
+                  v-if="record.status == -1"
                   @click="showBackFinashModal(record.id)"
                   type="link"
                   >撤回</a-button

src/views/research/components/ResearchAddPin.vue

@@ -74,11 +74,11 @@
         <div class="inname">配置权重</div>
       </div>
       <div class="in" style="display: flex">
-        <div class="assess">
+        <!-- <div class="assess">
           <div class="assesstype">评估类型</div>
           <div class="assesswhole">整体评估</div>
-        </div>
-        <div class="assess" style="margin-left: 50px; position: relative">
+        </div> -->
+        <div class="assess" style="position: relative">
           <div class="assesstype">权重比例</div>
           <div class="assesswhole" style="background: #ffffff">
             <a-input-number