Merge branch 'online' into iteration_active11

dist/static/css/chunk-0e04de35.d51330d1.css

@@ -1 +0,0 @@
-.right-code .title[data-v-41288ddb]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-41288ddb]{display:inline-block}.el-input[data-v-41288ddb]{width:180px!important}

dist/static/css/chunk-6d5d7025.46d64102.css

@@ -0,0 +1 @@
+.right-code .title[data-v-9391d9fc]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-9391d9fc]{display:inline-block}.el-input[data-v-9391d9fc]{width:180px!important}

src/views/sporadicManager/sporadicList.vue

@@ -378,6 +378,7 @@
 import { getEmployeeOrgan } from '@/api/buildTeam'
 import pagination from '@/components/Pagination/index'
 import { vaildStudentUrl } from '@/utils/validate'
+import cleanDeep from 'clean-deep'
 import { addZero, getZero, updateZero, removeZero, getBasic, updateOpenFlag, queryOrganMusicInfos, queryUserMusicInfos } from '@/api/zeroManager'
 import axios from 'axios'
 import qs from 'qs'
@@ -589,7 +590,7 @@ export default {
       maskForm.organId = row.organId
       maskForm.money = row.amount
       maskForm.subMoney = row.discountAmount
-      maskForm.maxNum = row.maxNum
+      maskForm.maxNum = row.maxNum ? row.maxNum : null
       maskForm.musicGroupId = row.musicGroupId ? row.musicGroupId : null
       // this.$refs['maskForm'].clearValidate()
       if (row.userId) {
@@ -618,14 +619,12 @@ export default {
     },
     updateZero() {
       let maskForm = this.maskForm
-      // 
-      console.log(maskForm)
       if(maskForm.type != 12) {
         this.zeroVisible = false
         return
       }
 
-      updateZero({ id: maskForm.id, maxNum: maskForm.maxNum }).then(res => {
+      updateZero(cleanDeep({ id: maskForm.id, maxNum: maskForm.maxNum })).then(res => {
         if (res.code == 200) {
             this.$message.success('更新成功')
             this.zeroVisible = false;