9/18 bug修改

src/vab/components/VabNav/index.vue

@@ -186,8 +186,10 @@
             '提示',
             {
               confirmButtonText: '去完善',
-              cancelButtonText: '我知道了',
               type: 'warning',
+              showCancelButton: false,
+              closeOnClickModal: false,
+              showClose: false,
             }
           )
             .then(() => {

src/vab/components/VabSideBar/index.vue

@@ -19,6 +19,7 @@
       :text-color="variables['menu-color']"
       :unique-opened="uniqueOpened"
       @open="openMenu"
+      @select="selectMenu"
     >
       <template v-for="route in handleRoutes">
         <vab-menu
@@ -38,6 +39,8 @@
   import { mapGetters } from 'vuex'
   import { defaultOpeneds, uniqueOpened } from '@/config'
   import { handleActivePath } from '@/utils/routes'
+  import { getUserInfo } from '@/api/user'
+  import router from '@/router'
 
   export default {
     name: 'VabSideBar',
@@ -100,6 +103,31 @@
       openMenu(index) {
         console.log(index, '33333333333pppp')
       },
+      selectMenu(index) {
+        console.log(index, '44444444pppp')
+        this.getUserInfo()
+      },
+      async getUserInfo() {
+        const { data } = await getUserInfo()
+        const { mobile, email } = data
+        if (!mobile || !email) {
+          this.$confirm(
+            '您还有手机号或者邮箱没有完善，请先完善信息后在进行操作！',
+            '提示',
+            {
+              confirmButtonText: '去完善',
+              type: 'warning',
+              showCancelButton: false,
+              closeOnClickModal: false,
+              showClose: false,
+            }
+          )
+            .then(() => {
+              router.push({ path: '/baseMess/infoIndex' })
+            })
+            .catch(() => {})
+        }
+      },
     },
   }
 </script>

src/views/courseTable/components/checkStep.vue

@@ -70,7 +70,7 @@
           >
             <h4>
               实验中心审核
-              <span class="fail">(审核失败)</span>
+              <span class="fail">(被驳回)</span>
             </h4>
             <p>
               审核人：{{
@@ -139,7 +139,7 @@
           >
             <h4>
               <!-- 课程所在院系审核 -->
-              <span class="fail">【{{ lesson_department }}】审核失败</span>
+              <span class="fail">【{{ lesson_department }}】被驳回</span>
             </h4>
             <p>
               审核人：{{
@@ -192,7 +192,7 @@
                 stepDetail.grade.check_admin
                   ? stepDetail.grade.check_admin.name
                   : '--'
-              }}
+              }}审核失败
             </p>
             <p>审核时间：{{ stepDetail.grade.check_time }}</p>
 
@@ -211,7 +211,7 @@
           >
             <h4>
               <!-- 专业所在院系审核 -->
-              <span class="fail">【{{ grade_department }}】审核失败</span>
+              <span class="fail">【{{ grade_department }}】被驳回</span>
             </h4>
             <p>
               审核人：{{
@@ -291,7 +291,7 @@
           >
             <h4>
               <!-- 教务处审核 -->
-              <span class="fail">(审核失败)</span>
+              <span class="fail">(被驳回)</span>
             </h4>
             <p>
               审核人：{{

src/views/courseTable/components/sheduleTimeDialog.vue

@@ -2,7 +2,7 @@
  * @Author: 阿小凉
  * @Date: 2022-06-30 17:16:35
  * @LastEditTime: 2022-08-06 16:18:07
- * @Description: 
+ * @Description:
  * @LastEditors: 阿小凉
 -->
 
@@ -87,7 +87,23 @@
               :key="index + 'time'"
               class="jie-item"
             >
-              <div class="heng">{{ item.name }}</div>
+              <div class="heng" style="flex-direction: column">
+                <div>{{ item.name }}</div>
+                <div
+                  v-if="item.name === '中午'"
+                  class="course-class"
+                  style="font-size: 12px; margin-top: 5px"
+                >
+                  12:30 ~ 14:00
+                </div>
+                <div
+                  v-if="item.name === '傍晚'"
+                  class="course-class"
+                  style="font-size: 12px; margin-top: 5px"
+                >
+                  6:00 ~ 7:00
+                </div>
+              </div>
             </div>
           </div>
           <div class="day">

src/views/courseTable/importDetail.vue

@@ -410,11 +410,11 @@
           <div class="tips">
             <div class="tips-item">
               <span class="dian" style="background-color: #eee"></span>
-              <span>主表课程</span>
+              <span>已排课程</span>
             </div>
             <div class="tips-item">
               <span class="dian" style="background-color: red"></span>
-              <span>冲突课程</span>
+              <span>与已排课程冲突</span>
             </div>
             <div class="tips-item">
               <span class="dian" style="background-color: #1890ff"></span>

src/views/courseTable/table.vue

@@ -103,7 +103,23 @@
                 :key="index"
                 class="jie-item"
               >
-                <div class="heng">{{ item.name }}</div>
+                <div class="heng" style="flex-direction: column">
+                  <div>{{ item.name }}</div>
+                  <div
+                    v-if="item.name === '中午'"
+                    class="course-class"
+                    style="font-size: 12px; margin-top: 5px"
+                  >
+                    12:30 ~ 14:00
+                  </div>
+                  <div
+                    v-if="item.name === '傍晚'"
+                    class="course-class"
+                    style="font-size: 12px; margin-top: 5px"
+                  >
+                    6:00 ~ 7:00
+                  </div>
+                </div>
               </div>
             </div>
             <div class="day">

src/views/index/components/courseTable.vue

@@ -77,7 +77,23 @@
               :key="index"
               class="jie-item"
             >
-              <div class="heng">{{ item.name }}</div>
+              <div class="heng" style="flex-direction: column">
+                <div>{{ item.name }}</div>
+                <div
+                  v-if="item.name === '中午'"
+                  class="course-class"
+                  style="font-size: 12px; margin-top: 5px"
+                >
+                  12:30 ~ 14:00
+                </div>
+                <div
+                  v-if="item.name === '傍晚'"
+                  class="course-class"
+                  style="font-size: 12px; margin-top: 5px"
+                >
+                  6:00 ~ 7:00
+                </div>
+              </div>
             </div>
           </div>
           <div class="day">

src/views/index/components/openDetailDialog.vue

@@ -2,7 +2,7 @@
  * @Author: 阿小凉
  * @Date: 2022-06-30 17:16:35
  * @LastEditTime: 2022-08-04 16:12:06
- * @Description: 
+ * @Description:
  * @LastEditors: 阿小凉
 -->
 <template>
@@ -53,13 +53,13 @@
       <div class="form">
         <div class="label">申请原因：</div>
         <div class="text">
-          {{ detail.use_need ? detail.use_need : '暂无' }}
+          {{ detail.use_reason }}
         </div>
       </div>
       <div class="form">
         <div class="label">使用需求：</div>
         <div class="text">
-          {{ detail.use_reason }}
+          {{ detail.use_need ? detail.use_need : '暂无' }}
         </div>
       </div>
     </div>

src/views/index/index.vue

@@ -2,7 +2,7 @@
  * @Author: 阿小凉
  * @Date: 2022-06-29 14:27:25
  * @LastEditTime: 2022-09-28 15:05:42
- * @Description: 
+ * @Description:
  * @LastEditors: 阿小凉
 -->
 <template>
@@ -109,7 +109,8 @@
         this.$router.push('/openOrder/orderList')
       },
       stopLesson() {
-        this.$router.push('/courseTable/courseHandle')
+        // this.$router.push('/courseTable/courseHandle')
+        this.$router.push('/courseTable/daishenhe')
       },
       // 获取当前日期
       getToday(e) {

src/views/openOrder/components/detailDialog.vue

@@ -82,7 +82,7 @@
       <div class="form">
         <div class="label">申请信息：</div>
         <div class="text">
-          <el-table border :data="detail.use_data" style="width: 100%">
+          <el-table border :data="filteredData" style="width: 100%">
             <el-table-column
               label="实验室名称"
               min-width="200"
@@ -100,6 +100,13 @@
               <template #default="{ row }">{{ row.time_name }}</template>
             </el-table-column>
           </el-table>
+          <el-button
+            v-if="detail.use_data.length > 3"
+            style="width: 100%; border-top: none"
+            @click="showAllData"
+          >
+            {{ showButtonText }}
+          </el-button>
         </div>
       </div>
       <div class="item">
@@ -126,7 +133,7 @@
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      <el-button type="primary" @click="handleClose">确 定</el-button>
     </span>
     <enclosureDetail ref="enclosure-detil" />
   </el-dialog>
@@ -147,15 +154,37 @@
       return {
         dialogVisible: false,
         detail: '',
+        visibleData: [], // 仅显示的前三行数据
+        showAll: false, // 控制是否显示全部数据
       }
     },
-
     computed: {
       ...mapGetters({
         token: 'user/token',
       }),
+      // 计算属性，根据showAll状态切换显示的数据
+      filteredData() {
+        return this.showAll
+          ? this.detail.use_data
+          : this.detail.use_data.slice(0, 3)
+      },
+      showButtonText() {
+        return this.showAll ? '收起' : '更多'
+      },
+    },
+    watch: {
+      // 监听showAll状态的变化，切换visibleData数据
+      showAll(newVal) {
+        this.visibleData = newVal
+          ? this.detail.use_data
+          : this.detail.use_data.slice(0, 3)
+      },
     },
     methods: {
+      showAllData() {
+        // 点击更多按钮时切换showAll状态
+        this.showAll = !this.showAll
+      },
       //查看文件
       lookEnclosure(row, type) {
         this.$refs['enclosure-detil'].showEdit(row, type)
@@ -169,6 +198,7 @@
       },
       handleClose() {
         this.dialogVisible = false
+        this.showAll = false
       },
       showEdit(id) {
         this.recordDetail(id)

src/views/openOrder/components/timeDialog.vue

@@ -91,7 +91,23 @@
               :key="index"
               class="jie-item"
             >
-              <div class="heng">{{ item.name }}</div>
+              <div class="heng" style="flex-direction: column">
+                <div>{{ item.name }}</div>
+                <div
+                  v-if="item.name === '中午'"
+                  class="course-class"
+                  style="font-size: 12px; margin-top: 5px"
+                >
+                  12:30 ~ 14:00
+                </div>
+                <div
+                  v-if="item.name === '傍晚'"
+                  class="course-class"
+                  style="font-size: 12px; margin-top: 5px"
+                >
+                  6:00 ~ 7:00
+                </div>
+              </div>
             </div>
           </div>
           <div class="day">

src/views/openOrder/orderApply.vue

@@ -39,7 +39,7 @@
               </el-form-item>
             </div>
             <div class="inline">
-              <el-form-item label="所属部门" prop="branch_id">
+              <el-form-item label="使用部门" prop="branch_id">
                 <!-- <el-input
                   v-model="form.department"
                   placeholder="请输入所属部门"
@@ -61,7 +61,7 @@
                 <el-select
                   ref="selectblur"
                   v-model="form.name"
-                  placeholder="请选择上级部门"
+                  placeholder="请选择使用部门"
                   style="width: 100%"
                 >
                   <el-option

src/views/openOrder/orderList.vue

@@ -162,12 +162,23 @@
           <template #default="{ row }">
             <div v-if="row.status !== 0">
               <div
-                v-if="row.enclosure.length > 0"
+                v-if="row.enclosure.length > 0 && row.receipt == null"
                 class="status_text"
                 @click="lookEnclosure(row.enclosure_resource, '1')"
               >
                 查看附件
               </div>
+              <div
+                v-else-if="
+                  row.enclosure.length > 0 &&
+                  row.receipt &&
+                  row.receipt.length > 0
+                "
+                class="status_text"
+                @click="lookEnclosure(row.receipt_resource, '2')"
+              >
+                查看回执
+              </div>
               <div v-else class="loading" @click="uploadEnclosure(row)">
                 立即上传
               </div>
@@ -561,7 +572,7 @@
         // var index = row[0].url.lastIndexOf('.')
         // //获取后缀
         // var ext = row[0].url.substr(index + 1)
-        // console.log(ext, '---------------------------------------------')
+        console.log(row, '---------------------------------------------')
         // if (ext == 'pdf') {
         //   window.open(row[0].url, '_blank')
         // } else {

src/views/organization/components/userEdit.vue

@@ -33,10 +33,10 @@
       <el-form-item label="姓名" prop="name">
         <el-input v-model="form.name" />
       </el-form-item>
-      <el-form-item label="手机号" prop="mobile">
+      <el-form-item label="手机号">
         <el-input v-model="form.mobile" />
       </el-form-item>
-      <el-form-item label="邮箱" prop="email">
+      <el-form-item label="邮箱">
         <el-input v-model="form.email" />
       </el-form-item>
       <el-form-item label="角色" prop="role_ids">

src/views/room/table.vue

@@ -79,7 +79,24 @@
               :key="index"
               class="jie-item"
             >
-              <div class="heng">{{ item.name }}</div>
+              <!-- <div class="heng">{{ item.name }}</div> -->
+              <div class="heng" style="flex-direction: column">
+                <div>{{ item.name }}</div>
+                <div
+                  v-if="item.name === '中午'"
+                  class="course-class"
+                  style="font-size: 12px; margin-top: 5px"
+                >
+                  12:30 ~ 14:00
+                </div>
+                <div
+                  v-if="item.name === '傍晚'"
+                  class="course-class"
+                  style="font-size: 12px; margin-top: 5px"
+                >
+                  6:00 ~ 7:00
+                </div>
+              </div>
             </div>
           </div>
           <div class="day">

src/views/table/components/courseTable.vue

@@ -77,7 +77,24 @@
               :key="index"
               class="jie-item"
             >
-              <div class="heng">{{ item.name }}</div>
+              <!-- <div class="heng">{{ item.name }}</div> -->
+              <div class="heng" style="flex-direction: column">
+                <div>{{ item.name }}</div>
+                <div
+                  v-if="item.name === '中午'"
+                  class="course-class"
+                  style="font-size: 12px; margin-top: 5px"
+                >
+                  12:30 ~ 14:00
+                </div>
+                <div
+                  v-if="item.name === '傍晚'"
+                  class="course-class"
+                  style="font-size: 12px; margin-top: 5px"
+                >
+                  6:00 ~ 7:00
+                </div>
+              </div>
             </div>
           </div>
           <div class="day">

src/views/table/index.vue

@@ -80,7 +80,23 @@
                 :key="index"
                 class="jie-item"
               >
-                <div class="heng">{{ item.name }}</div>
+                <div class="heng" style="flex-direction: column">
+                  <div>{{ item.name }}</div>
+                  <div
+                    v-if="item.name === '中午'"
+                    class="course-class"
+                    style="font-size: 12px; margin-top: 5px"
+                  >
+                    12:30 ~ 14:00
+                  </div>
+                  <div
+                    v-if="item.name === '傍晚'"
+                    class="course-class"
+                    style="font-size: 12px; margin-top: 5px"
+                  >
+                    6:00 ~ 7:00
+                  </div>
+                </div>
               </div>
             </div>
             <div class="day">