Merge branch 'qinqiao_new' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into qinqiao_new

src/api/versionsCalendar.js

@@ -64,4 +64,4 @@ export function deleteEvent(id, data) {
     method: 'post',
     data
   })
-}
+}

src/views/projectManage/taskList/versionsCalendar.vue

@@ -4,8 +4,8 @@
       <el-header class="bgborder" style=" margin: 2%;align-items: center;justify-content: space-between;">
         <div style="margin-left:1%;margin-top:1.8%">
           <el-dropdown @command="handleCommand">
-            <span class="el-dropdown-link drop_down" style="cursor: pointer;">{{ isCommand === '' ? typeOpt[0].msg : clientType }}<i class="el-icon-arrow-down el-icon--right" /></span>
-            <el-dropdown-menu slot="dropdown" align="center">
+            <span v-if="typeOpt !== []" class="el-dropdown-link drop_down" style="cursor: pointer;">{{ isCommand === '' ? defaultTypeOpt : clientType }}<i class="el-icon-arrow-down el-icon--right" /></span>
+            <el-dropdown-menu v-if="typeOpt !== []" slot="dropdown" align="center">
               <el-dropdown-item v-for="item in typeOpt" :key="item.code" :command="{value:item.code,flag:item}">{{ item.msg }}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -15,7 +15,7 @@
       <el-main class="bgborder" style=" margin: 0 2%;min-height: 120.5vh;padding:0 !important">
         <div style="margin: 1.9%; font-weight: 600; white-space: nowrap;"><b style="color: #409EFF;margin: 0 0.5%; font-size: 20px; ">I</b>版本日历 <el-button type="primary" size="mini" icon="el-icon-plus" style="float: right;" @click="adds()">添加版本事件</el-button></div>
         <div class="bgColorSz">
-          <full-calendar :events="events" lang="zh" class="test-fc" first-day="1" locale="fr" style="width:100%" @changeMonth="changeMonth" @eventClick="eventClick" @dayClick="dayClick" @moreClick="moreClick"> />
+          <full-calendar :events="events" lang="zh" class="test-fc" first-day="1" locale="fr" style="width:100%"> />
             <div id="calendar" style="height: 800px;" />
           </full-calendar></div>
 
@@ -171,7 +171,19 @@ export default {
   },
 
   data() {
+    var checkVersion = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error('请输入版本号'))
+      }
+      if (this.pauseVersionCallBack === 15000) {
+        this.pauseVersionCallBack = ''
+        return callback(new Error('版本已经存在请勿重复添加'))
+      } else {
+        callback()
+      }
+    }
     return {
+      pauseVersionCallBack: '',
       userInformation: localStorage.getItem('username'),
       userName: localStorage.getItem('realname'),
       curIndex: 1,
@@ -213,6 +225,7 @@ export default {
         { type: 'warning' }
       ],
       value: '',
+      defaultTypeOpt: '',
       user: {},
       deleteEve: {},
       typeOpt: [],
@@ -225,7 +238,7 @@ export default {
         name: ''
       },
       addVersionDataRules: {
-        version: [{ required: true, message: '请输入版本号', trigger: 'change' }]
+        version: [{ validator: checkVersion, trigger: 'change' }]
       },
       addEventDataRules: {
         name: [{ required: true, message: '请输入事件名称', trigger: 'change' }],
@@ -242,8 +255,6 @@ export default {
     handleCommand(command) {
       this.isCommand = command.value
       this.clientType = command.flag.msg
-      console.log('isCommand' + this.isCommand)
-      console.log('clientType' + this.clientType)
       this.getVersionList()
     },
     random(index) {
@@ -300,6 +311,7 @@ export default {
     getVersionType() {
       showAppClientEnum().then(res => {
         this.typeOpt = res.data.appClient
+        this.defaultTypeOpt = this.typeOpt[0].msg
       })
     },
     handelDeleteBiz(ele) {
@@ -307,11 +319,9 @@ export default {
     },
     // 点击版本后回调
     cellBack(row, column, event) {
-      console.log(row)
       this.getEventList(row.id)
       this.versionNum = row.version
       this.vid = row.id
-      console.log('1s11' + this.vid)
     },
     // 遍历首页列表
     versionlist() {
@@ -322,7 +332,6 @@ export default {
         event.start = this.formatDate(this.eventData[j].startTime)
         event.end = this.formatDate(this.eventData[j].endTime)
         this.events.push(event)
-        console.log('2222' + JSON.stringify(this.events))
       }
     },
 
@@ -332,8 +341,7 @@ export default {
       this.dialogFormVisible = true
       this.getVersionBytpye(this.isCommand === '' ? this.typeOpt[0].code : this.isCommand)
       this.versionlist()
-      this.getAllVersionList()
-      // console.log('tableData' + JSON.stringify(this.tableData))
+      // this.getAllVersionList()
     },
     // 获取所有版本
     getVersionBytpye(ele) {
@@ -356,7 +364,6 @@ export default {
           data1.time = this.formatDate1(response.data[j].startTime) + ' - ' + this.formatDate1(response.data[j].endTime)
           this.tableData1.push(data1)
         }
-        console.log('time' + this.tableData1.time)
       })
     },
     // 新增
@@ -366,7 +373,6 @@ export default {
       this.$refs.addVersionForms.resetFields()
       this.$set(this.addVersionData, 'version', '')
       this.addBizData = {}
-      console.log('1111' + this.typeOpt[0].msg)
     },
 
     // 添加版本
@@ -390,7 +396,9 @@ export default {
               this.dialogCraeteVisible = false
               this.getVersionBytpye(this.isCommand === '' ? 1 : this.isCommand)
             } else {
-              this.errorFun(response.msg)
+              this.pauseVersionCallBack = response.code
+              // this.errorFun(response.msg)
+              this.$refs['addVersionForms'].validate()
             }
           })
         }
@@ -399,8 +407,6 @@ export default {
     // 删除版本
     handelDeleteVer(ele) {
       this.deleteVer = ele
-      console.log('000' + JSON.stringify(this.deleteVer))
-      console.log('id' + JSON.stringify(this.deleteVer.id))
       this.dialogDeleteVerVisible = true
     },
     deleteBizType() {
@@ -452,7 +458,6 @@ export default {
     handelDeleteEvent(ele) {
       this.deleteEve = ele
       this.dialogDeleteVerVisible = true
-      console.log('id' + this.deleteEve.id)
     },
     deleteEventTpye() {
       this.user = { id: '', ename: this.userInformation, name: this.userName }