修改

src/views/projectManage/bugList/details/index.vue

@@ -949,7 +949,7 @@ export default {
       return arr.filter(item => { return !item.url.match(reg) })
     },
     beforeUpload(file) {
-      const reg = new RegExp(/.*(zip|xlsx|txt|csv|xls|mov|mp4|m4a|avi|amr|mp3|wav|3gpp|gif|jpeg|png|jpg)/i)
+      const reg = new RegExp(/.*(zip|xlsx|text|csv|xls|mov|mp4|m4a|avi|amr|mp3|wav|3gpp|gif|jpeg|png|jpg)/i)
       const isUpload = file.type.match(reg)
       if (!isUpload) {
         this.$message({

src/views/workbench/person/components/calenderList.vue

@@ -2,21 +2,23 @@
   <article>
     <div class="table-top">
       <el-radio-group v-model="busy" size="small">
-        <el-radio-button :label="Number(0)">忙碌</el-radio-button>
-        <el-radio-button :label="Number(1)">空闲</el-radio-button>
+        <el-radio-button :label="Number(1)">忙碌</el-radio-button>
+        <el-radio-button :label="Number(0)">空闲</el-radio-button>
       </el-radio-group>
-      <el-select v-model="form.searchScheduleInfo.status" placeholder="请选择" size="small" class="status" @change="queryWorkList">
-        <el-option
-          v-for="item in statusOptions"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        />
-      </el-select>
-      <el-checkbox-group v-model="form.searchScheduleInfo.origin" class="origin">
-        <el-checkbox :label="Number(0)" @change="queryWorkList">任务排期</el-checkbox>
-        <el-checkbox :label="Number(1)" @change="queryWorkList">日程</el-checkbox>
-      </el-checkbox-group>
+      <template v-show="busy === 1">
+        <el-select v-model="form_busy_1.searchScheduleInfo.status" placeholder="请选择" size="small" class="status" @change="queryWorkList">
+          <el-option
+            v-for="item in statusOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+        <el-checkbox-group v-model="form_busy_1.searchScheduleInfo.origin" class="origin">
+          <el-checkbox :label="Number(0)" @change="queryWorkList">任务排期</el-checkbox>
+          <el-checkbox :label="Number(1)" @change="queryWorkList">日程</el-checkbox>
+        </el-checkbox-group>
+      </template>
       <el-button type="primary" size="small" class="add" @click="add()">添加日程</el-button>
     </div>
     <el-table
@@ -68,7 +70,7 @@
   </article>
 </template>
 <script>
-import { queryWorkList } from '@/api/workSchedule.js'
+import { queryWorkList, queryIdleList } from '@/api/workSchedule.js'
 export default {
   filters: {
     peopleListHandler(val) {
@@ -112,7 +114,7 @@ export default {
   methods: {
     async queryWorkList() {
       if (this.busy === 1) {
-        const res = await queryWorkList(this.form)
+        const res = await queryWorkList(this.form_busy_1)
         if (res.code === 200) {
           this.tableData = res.data.list
         }