Merge remote-tracking branch 'origin/develop'

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.beginTime, "YYYY-MM-DD HH-mm"),
-            dayjs(result.endTime, "YYYY-MM-DD"),
+            dayjs(result.endTime, "YYYY-MM-DD HH-mm"),
           ];
         } else {
           state.chooseTime = [];

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 {defineEmits, defineProps, ref, watch} from "vue";
-import {useStore} from "vuex";
+import {request, useBoeApi} from "@/api/request";
-
+import {ORG_CHILD_LIST, ORG_LIST} from "@/api/ThirdApi";
-const store = useStore();
 
 const props = defineProps({
   value: String,
+  name: String,
   disabled: {
     type: Boolean,
     default: false
   }
 })
 const emit = defineEmits({})
-
+const stuTreeExpandedKeys = ref([])
-const options = computed(() => store.state.orgtreeList)
+const labelValue = ref({})
-
+const {
-const id = computed(() => {
+  data: options,
-  return props.value
+  loading: orgLoading,
+} = useBoeApi(ORG_LIST, {keyword: ''}, {
+  init: true,
+  result: (res) => res.result.map(e => ({...e, isLeaf: false})),
 })
 
-function change(key, obj, {triggerNode: {props: {namePath}}}) {
+watch(props, () => {
-  emit('update:name', obj[0])
+  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>

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 {request, useBoeApi, useBoeApiPage} from "@/api/request";
-import {useBoeApiPage} from "@/api/request";
+import {AUDIENCE_LIST, ORG_CHILD_LIST, ORG_LIST, USER_LIST} from "@/api/ThirdApi";
-import {AUDIENCE_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(() => {
+// const treeData = computed(() => {
-  return store.state.orgtreeList ? store.state.orgtreeList : [];
+//   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)

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 (
+          if (res.data.data.projectAuditLogDtoList && res.data.data.projectAuditLogDtoList.length) {
-            res.data.data.status == -5 &&
-            res.data.data.projectAuditLogDtoList !== null
-          ) {
             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++) {

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

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"
         />

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>

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>

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>

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>