Merge branch 'master' of http://124.70.43.205:3000/GYEE_R.D/BusinessBenchmark

src/components/assessment/monthQuarterYearFrom.vue

@@ -619,7 +619,7 @@ export default {
                 }
                 headerArr.forEach(it =>{
                     if (it.flag === '1') {
-                        obj[it.code] = '1.00'
+                        obj[it.code] = '0.00'
                     } else {
                         obj[it.code] = ''
                     }

src/components/notification/notificationMangePage.vue

@@ -213,11 +213,11 @@
                 </div>
                 <template #footer v-if="!isDisable">
                     <span class="notificationFooter">
-                        <el-button type="primary" size="mini" @click="saveevaluaStart('ruleForm', '发布')">
+                        <el-button type="primary" size="mini" @click="saveevaluaStart('ruleForm', '发布')" :disabled="showButton">
                             <img :src="release" style="margin-right: 10px">
                             <span>发布公告</span>
                         </el-button>
-                        <el-button type="warning" size="mini" @click="saveevaluaStart('ruleForm', '草稿')">
+                        <el-button type="warning" size="mini" @click="saveevaluaStart('ruleForm', '草稿')" :disabled="showButton">
                             <img :src="draft" style="margin-right: 10px">
                             <span>保存草稿</span>
                         </el-button>
@@ -260,6 +260,7 @@ export default {
             dialogVisible: false,
             isSave: false,
             isDisable: false,
+            showButton: false,
             title: '',
             evalradio: {},
             changeDateSelect: [],
@@ -423,6 +424,7 @@ export default {
         //新增/修改考评启动数据
         saveAndEditnotificationData(type) {
             let that = this
+            that.showButton = true
             let params = {
                 serialNumber: that.ruleForm.serialNumber,
                 noticeTitle: that.ruleForm.noticeTitle,
@@ -448,6 +450,7 @@ export default {
                         message: datas.message,
                         type: 'error'
                     });
+                    that.showButton = false
                 } else {
                     const formData = new FormData()
                     if (that.filesList.length>0) {
@@ -467,6 +470,7 @@ export default {
                                         type: 'success'
                                     });
                                 }
+                                that.showButton = false
                                 that.dialogVisible = false
                                 that.changeDateSelect = []
                                 that.getevalunotificationList()
@@ -484,6 +488,7 @@ export default {
                                 type: 'success'
                             });
                         }
+                        that.showButton = false
                         that.dialogVisible = false
                         that.changeDateSelect = []
                         that.getevalunotificationList()

src/components/taskCenter/taskCenterEvlNewFrom.vue

@@ -690,7 +690,7 @@ export default {
                 }
                 headerArr.forEach(it =>{
                     if (it.flag === '1') {
-                        obj[it.code] = '1.00'
+                        obj[it.code] = '0.00'
                     } else {
                         obj[it.code] = ''
                     }