Merge branch 'iteration_adminOptimiz' into online

src/views/returnVisitManager/returnVisitList.vue

@@ -245,12 +245,20 @@ export default {
     getList() {
       // cleanDeep
       let { timer, typeList, ...rest } = this.searchForm;
+      console.log(typeList)
+      let type,purpose=null;
+      if( typeList.length>0){
+        type=typeList[0]
+        purpose= typeList[1]
+      }
+
       let params = {
         ...rest,
         page: this.rules.page,
         rows: this.rules.limit,
         ...getTimes(timer, ["startTime", "endTime"]),
-        ...getTimes(typeList, ["type", "purpose"]),
+        type,
+        purpose
       };
       getVisitList(cleanDeep(params)).then((res) => {
         if (res.code == 200) {

src/views/teamBuild/modals/teambaseInfo.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>
+    <el-alert title="乐团基本信息" type="info" effect="dark" :closable="false">
+    </el-alert>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {};
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>

src/views/workBenchManager/journal/model/list.vue

@@ -28,7 +28,7 @@
               style="vertical-align: sub;"
             ></el-badge>
             <span v-if="scope.row.user">{{ scope.row.user.username }}</span>
-            <span style="color: red">
+            <span>
               （<copy-text>{{ scope.row.userId }}</copy-text
               >）
             </span>