From cd5e3fd0979b40fa3b10948adce7f54e907bace1 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Thu, 29 Dec 2022 11:12:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=9D=A2=E6=8E=88=E8=AF=BE=E7=BC=96=E8=BE=91=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E6=97=B6=E6=97=B6=E9=97=B4=E5=9B=9E=E6=98=BE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA=E8=B0=83?=
 =?UTF-8?q?=E7=A0=94=E9=97=AE=E9=A2=98=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue             | 4 ++--
 src/views/research/ResearchAdd.vue                  | 4 ++--
 src/views/research/components/ResearchAddAsk.vue    | 3 ++-
 src/views/research/components/ResearchAddItem.vue   | 2 +-
 src/views/research/components/ResearchAddMulti.vue  | 2 +-
 src/views/research/components/ResearchAddPin.vue    | 2 +-
 src/views/research/components/ResearchAddSingle.vue | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index ebb0a811..8f5c07be 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -593,8 +593,8 @@ export default {
         state.duration = result.duration;
         if (result.beginTime && result.endTime) {
           state.chooseTime = [
-            dayjs(result.beginTime, "YYYY-MM-DD"),
-            dayjs(result.endTime, "YYYY-MM-DD"),
+            dayjs(result.beginTime, "YYYY-MM-DD HH-mm"),
+            dayjs(result.endTime, "YYYY-MM-DD HH-mm"),
           ];
         } else {
           state.chooseTime = [];
diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index a2007c8c..e144479d 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -46,7 +46,7 @@
         @del="handleDel"
       />
     </div>
-    <div class="opinion name2">
+    <!-- <div class="opinion name2">
       <div class="namebox">
         <div class="inname" style="margin-top: 13px">您的其他意见</div>
       </div>
@@ -58,7 +58,7 @@
           :maxlength="200"
         />
       </div>
-    </div>
+    </div> -->
     <div class="footer">
       <div class="btn">
         <a-button
diff --git a/src/views/research/components/ResearchAddAsk.vue b/src/views/research/components/ResearchAddAsk.vue
index 62c40105..11ea58c6 100644
--- a/src/views/research/components/ResearchAddAsk.vue
+++ b/src/views/research/components/ResearchAddAsk.vue
@@ -22,7 +22,7 @@
           v-model:value="curItem.valueAsk"
           placeholder="请输入标题名称"
           show-count
-          :maxlength="20"
+          :maxlength="100"
           style="border-radius: 8px"
         />
       </div>
@@ -33,6 +33,7 @@
       </div>
       <div class="in">
         <a-textarea
+        :maxlength="100"
           v-model:value="curItem.valueAskDesc"
           style="height: 148px"
         />
diff --git a/src/views/research/components/ResearchAddItem.vue b/src/views/research/components/ResearchAddItem.vue
index bc6318d7..2e1c5b90 100644
--- a/src/views/research/components/ResearchAddItem.vue
+++ b/src/views/research/components/ResearchAddItem.vue
@@ -10,7 +10,7 @@
           <a-input
             v-model:value="curItem.inputVal"
             show-count
-            :maxlength="30"
+            :maxlength="100"
             style="border-radius: 8px"
           />
         </div>
diff --git a/src/views/research/components/ResearchAddMulti.vue b/src/views/research/components/ResearchAddMulti.vue
index c46bb8af..14afd2e7 100644
--- a/src/views/research/components/ResearchAddMulti.vue
+++ b/src/views/research/components/ResearchAddMulti.vue
@@ -22,7 +22,7 @@
           v-model:value="curItem.valueMutil"
           placeholder="请输入题干名称"
           show-count
-          :maxlength="20"
+          :maxlength="100"
           style="border-radius: 8px"
         />
       </div>
diff --git a/src/views/research/components/ResearchAddPin.vue b/src/views/research/components/ResearchAddPin.vue
index d59303e5..fd2ed4d7 100644
--- a/src/views/research/components/ResearchAddPin.vue
+++ b/src/views/research/components/ResearchAddPin.vue
@@ -22,7 +22,7 @@
           v-model:value="curItem.valuePin"
           placeholder="请输入标题名称"
           show-count
-          :maxlength="20"
+          :maxlength="100"
           style="border-radius: 8px"
         />
       </div>
diff --git a/src/views/research/components/ResearchAddSingle.vue b/src/views/research/components/ResearchAddSingle.vue
index 0130ab54..3275828e 100644
--- a/src/views/research/components/ResearchAddSingle.vue
+++ b/src/views/research/components/ResearchAddSingle.vue
@@ -22,7 +22,7 @@
           v-model:value="curItem.valueSingle"
           placeholder="请输入题干名称"
           show-count
-          :maxlength="20"
+          :maxlength="100"
           style="border-radius: 8px"
         />
       </div>

From d181177f4196822aee10e25085565279d37b9aba Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 29 Dec 2022 12:12:46 +0800
Subject: [PATCH 2/3] =?UTF-8?q?---=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskPage.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index cace7ae2..e6093d67 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -958,7 +958,7 @@
                       <span style="color: #999999">{{ remark }}</span>
                     </div>
                   </div>
-                  <div class="set_content" v-if="isPass">
+                  <div class="set_content" v-if="passInfo">
                     <div class="setc_name"><span>审核意见：</span></div>
                     <div class="setc_main">
                       <span style="color: #333333">{{ passInfo }}</span>
@@ -3351,13 +3351,10 @@ export default {
         console.log("get task", res.data.data);
         if (res.data.code === 200) {
           // 判断当前审核是否通过
-          if (
-            res.data.data.status == -5 &&
-            res.data.data.projectAuditLogDtoList !== null
-          ) {
+          if (res.data.data.projectAuditLogDtoList && res.data.data.projectAuditLogDtoList.length) {
             console.log("审核信息是什么", res.data.data.projectAuditLogDtoList);
             let dataset = res.data.data.projectAuditLogDtoList;
-            state.passInfo = dataset[dataset.length - 1];
+            state.passInfo = dataset[dataset.length - 1].description;
 
             /**
              for (let i = 0; i < dataset.length; i++) {

From daf8d29570cdfa3e9c5e4306320fdbe0e118a631 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 29 Dec 2022 18:58:49 +0800
Subject: [PATCH 3/3] =?UTF-8?q?---=E9=A1=B9=E7=9B=AE=E7=BB=8F=E7=90=86=20?=
 =?UTF-8?q?=E5=92=8C=20=E7=BB=84=E7=BB=87=E6=A0=91=E5=BC=82=E6=AD=A5?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/OrgClass.vue      | 50 ++++++++++++++++++------
 src/components/student/CommonStudent.vue | 34 ++++++++++------
 2 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
index 73f44421..e5bd8f08 100644
--- a/src/components/project/OrgClass.vue
+++ b/src/components/project/OrgClass.vue
@@ -5,11 +5,15 @@
                             return triggerNode.parentNode || document.body;
                           }
                         "
-      v-model:value="id"
+      v-model:value="labelValue"
       style="width: 100%"
       :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
       placeholder="请选择归属组织"
+      :labelInValue="true"
       allow-clear
+      v-model:treeExpandedKeys="stuTreeExpandedKeys"
+      :loading="orgLoading"
+      :load-data="onLoadData"
       :tree-data="options"
       :fieldNames="{
                 children: 'treeChildList',
@@ -23,30 +27,50 @@
   </a-tree-select>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps} from "vue";
-import {useStore} from "vuex";
-
-const store = useStore();
+import {defineEmits, defineProps, ref, watch} from "vue";
+import {request, useBoeApi} from "@/api/request";
+import {ORG_CHILD_LIST, ORG_LIST} from "@/api/ThirdApi";
 
 const props = defineProps({
   value: String,
+  name: String,
   disabled: {
     type: Boolean,
     default: false
   }
 })
 const emit = defineEmits({})
-
-const options = computed(() => store.state.orgtreeList)
-
-const id = computed(() => {
-  return props.value
+const stuTreeExpandedKeys = ref([])
+const labelValue = ref({})
+const {
+  data: options,
+  loading: orgLoading,
+} = useBoeApi(ORG_LIST, {keyword: ''}, {
+  init: true,
+  result: (res) => res.result.map(e => ({...e, isLeaf: false})),
 })
 
-function change(key, obj, {triggerNode: {props: {namePath}}}) {
-  emit('update:name', obj[0])
+watch(props, () => {
+  stuTreeExpandedKeys.value = []
+  if (labelValue.value.value !== props.value) {
+    labelValue.value = {value: props.value, label: props.name}
+  }
+  if (labelValue.value.label !== props.name) {
+    labelValue.value = {value: props.value, label: props.name}
+  }
+})
+
+function onLoadData(treeNode) {
+  return request(ORG_CHILD_LIST, {keyword: '', orgId: treeNode.id}).then(r => {
+    treeNode.dataRef.treeChildList = r.result.directChildList
+    options.value = [...options.value]
+  })
+}
+
+function change({label,value}, obj, {triggerNode: {props: {namePath}}}) {
+  emit('update:name', label)
   emit('update:fullName', namePath)
-  emit('update:value', key)
+  emit('update:value', value)
 }
 
 </script>
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 19f097dd..cc9ad30e 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -28,7 +28,7 @@
                     <a-form-item label="姓名">
                       <a-input
                           v-model:value="nameSearch.keyword"
-                          
+
                           style="width: 270px; height: 40px; border-radius: 8px"
                           placeholder="请输入姓名"
                           @change="peopleName"
@@ -67,6 +67,8 @@
                             allow-clear
                             tree-default-expand-all
                             :tree-data="treeData"
+                            :loading="orgLoading"
+                            :load-data="onLoadData"
                             v-model:selectedKeys="stuTreeSelectKeys"
                             v-model:expandedKeys="stuTreeExpandedKeys"
                             :fieldNames="{
@@ -393,12 +395,10 @@
 </template>
 <script setup>
 import {computed, defineEmits, defineProps, ref, watch} from "vue";
-import {useStore} from "vuex";
-import {useBoeApiPage} from "@/api/request";
-import {AUDIENCE_LIST, USER_LIST} from "@/api/ThirdApi";
+import {request, useBoeApi, useBoeApiPage} from "@/api/request";
+import {AUDIENCE_LIST, ORG_CHILD_LIST, ORG_LIST, USER_LIST} from "@/api/ThirdApi";
 import {saveStu} from "@/api/index1";
 
-const store = useStore();
 const emit = defineEmits({});
 const props = defineProps({
   type: Number,
@@ -457,7 +457,14 @@ const {
 // const {
 //   data: orgData,
 //   fetch: searchOrg,
-// } = useBoeApi(ORG_LIST, searchOrgName.value)
+// } = useBoeApiPage(ORG_LIST, searchOrgName.value)
+const {
+  data: treeData,
+  loading: orgLoading,
+} = useBoeApi(ORG_LIST, {keyword: ''}, {
+  init: true,
+  result: (res) => res.result.map(e => ({...e,isLeaf:false})),
+})
 const {
   data: audiData,
   fetch: searchAudi,
@@ -578,9 +585,13 @@ const closeDrawer = () => {
   visiable.value = false;
   stuData.value = [];
   nameSearch.value.keyword = "";
-
-
 };
+function onLoadData(treeNode){
+  return request(ORG_CHILD_LIST, {keyword:'',orgId:treeNode.id}).then(r => {
+    treeNode.dataRef.treeChildList = r.result.directChildList
+    treeData.value = [...treeData.value]
+  })
+}
 const closeChangeModal = () => {
   stageVisible.value = false;
 };
@@ -588,9 +599,9 @@ const openDrawer = () => {
   visiable.value = true;
 };
 //获取组织树
-const treeData = computed(() => {
-  return store.state.orgtreeList ? store.state.orgtreeList : [];
-});
+// const treeData = computed(() => {
+//   return store.state.orgtreeList ? store.state.orgtreeList : [];
+// });
 
 function onSearchStu() {
   nameSearch.value.page = 1;
@@ -654,6 +665,7 @@ const auditChangePagination = (page) => {
   audienceName.value.page = page;
   searchAudi();
 };
+
 //重置
 function peopleName(name) {
   console.log('people-name', name.target.value)