Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

src/pages/scheduling/scheduleBoard.vue

@@ -134,7 +134,7 @@
     margin-right: 15px;
     display: inline-block;
     text-align: right;
-    width:60px;
+    width: 60px;
   }
 
   .Scdu_benci::after {
@@ -270,7 +270,7 @@
               </template>
             </div>
           </div>
-        </div>  
+        </div>
       </div>
     </div>
 
@@ -330,8 +330,8 @@
           Id: 0,
           Shift: 0,
           Status: 0, //Status(1-值班打卡，2-交接打卡)
-          IsBurst:0, //突发
-          IsHandover:0 //交接
+          IsBurst: 0, //突发
+          IsHandover: 0 //交接
         },
         dataList: {},
         //是否显示访客操作按钮
@@ -345,11 +345,11 @@
           isShowEditAndDelete: false, //是否显示编辑和删除按钮【默认不显示】
         },
         isShowTuFA: false,
-        isHaveTufa:2, //是否有突发
-        isHaveHand:2, //是否有交接
-        isShowOne:false,
-        isShowTwo:false,
-        status:0
+        isHaveTufa: 2, //是否有突发
+        isHaveHand: 2, //是否有交接
+        isShowOne: false,
+        isShowTwo: false,
+        status: 0
       }
     },
     created() {
@@ -376,31 +376,34 @@
       //值班打卡或值班交接
       SetDutyCheck(status) {
         this.status = status;
-        this.checkMsg.IsBurst = this.$refs.schOrder.getTufaHand().IsBurst;
-        this.checkMsg.IsHandover = this.$refs.schOrder.getTufaHand().IsHandover;
-        //突发事件
-        if(this.$refs.schOrder.getTufaHand().IsBurst==0){
-          this.isShowOne=true;
-          this.isShowTuFA=true;
-        }
-        //交接工作
-        if(this.$refs.schOrder.getTufaHand().IsHandover==0){
-          this.isShowTwo=true;
-          this.isShowTuFA=true;
-        }
-        if(this.$refs.schOrder.getTufaHand().IsBurst>0&&this.$refs.schOrder.getTufaHand().IsHandover>0){
-          this.saveInfo()
+        if (this.status == 2) {
+          this.checkMsg.IsBurst = this.$refs.schOrder.getTufaHand().IsBurst;
+          this.checkMsg.IsHandover = this.$refs.schOrder.getTufaHand().IsHandover;
+          //突发事件
+          if (this.$refs.schOrder.getTufaHand().IsBurst == 0) {
+            this.isShowOne = true;
+            this.isShowTuFA = true;
+          }
+          //交接工作
+          if (this.$refs.schOrder.getTufaHand().IsHandover == 0) {
+            this.isShowTwo = true;
+            this.isShowTuFA = true;
+          }
+          if (this.$refs.schOrder.getTufaHand().IsBurst > 0 && this.$refs.schOrder.getTufaHand().IsHandover > 0) {
+            this.saveInfo()
+          }
+        } else {
+          this.saveInfo();
         }
       },
-
       //保存
-      saveInfo(){
-        let diaMsg='';
-        if(this.status==1){
-          diaMsg='是否确定值班打卡?'
+      saveInfo() {
+        let diaMsg = '';
+        if (this.status == 1) {
+          diaMsg = '是否确定值班打卡?'
         }
-        if(this.status==2){
-          diaMsg='是否确定值班交接?'
+        if (this.status == 2) {
+          diaMsg = '是否确定值班交接?'
         }
         this.$q.dialog({
           title: '消息提示',
@@ -437,8 +440,8 @@
       },
 
       //确定是否有突发
-      submitHand(){
-        if(this.isHaveTufa==2){
+      submitHand() {
+        if (this.isHaveTufa == 2) {
           this.$q.notify({
             type: 'negative',
             position: "top",
@@ -447,7 +450,7 @@
           this.isShowTuFA = false;
           return
         }
-        if(this.isHaveHand==2){
+        if (this.isHaveHand == 2) {
           this.$q.notify({
             type: 'negative',
             position: "top",
@@ -456,12 +459,12 @@
           this.isShowTuFA = false;
           return
         }
-        if(this.isHaveTufa==1){
-          this.checkMsg.IsBurst=1;
+        if (this.isHaveTufa == 1) {
+          this.checkMsg.IsBurst = 1;
           this.saveInfo();
         }
-        if(this.isHaveHand==1){
-          this.checkMsg.IsHandover=1;
+        if (this.isHaveHand == 1) {
+          this.checkMsg.IsHandover = 1;
           this.saveInfo();
         }
         this.isShowTuFA = false;