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

src/components/schedul/schedul-orderlist.vue

@@ -138,6 +138,7 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
+    height:25px;
   }
 
   .tufa_xiugai {

src/pages/scheduling/scheduleBoard.vue

@@ -333,27 +333,46 @@
       },
       //值班打卡或值班交接
       SetDutyCheck(status) {
-        this.checkMsg.Status = status;
-        saveDutyCheck(this.checkMsg).then(res => {
-          if (res.Code == 1) {
-            this.getList();
-            this.$q.notify({
-              icon: 'iconfont icon-chenggong',
-              color: 'accent',
-              timeout: 2000,
-              message: '数据保存成功！',
-              position: 'top'
-            })
-          } else {
-            this.$q.notify({
-              icon: 'iconfont icon-chenggong',
-              color: 'accent',
-              timeout: 2000,
-              message: res.Message,
-              position: 'top'
-            })
-          }
-        })
+        let diaMsg='';
+        if(status==1){
+          diaMsg='是否确定值班打卡?'
+        }
+        if(status==2){
+          diaMsg='是否确定值班交接?'
+        }
+        this.$q.dialog({
+          title: '删除提示',
+          message: diaMsg,
+          cancel: true,
+          persistent: true,
+          ok: "确定",
+          cancel: "取消",
+        }).onOk(() => {
+          this.checkMsg.Status = status;
+          saveDutyCheck(this.checkMsg).then(res => {
+            if (res.Code == 1) {
+              this.getList();
+              this.$q.notify({
+                icon: 'iconfont icon-chenggong',
+                color: 'accent',
+                timeout: 2000,
+                message: '数据保存成功！',
+                position: 'top'
+              })
+            } else {
+              this.$q.notify({
+                icon: 'iconfont icon-chenggong',
+                color: 'accent',
+                timeout: 2000,
+                message: res.Message,
+                position: 'top'
+              })
+            }
+          })
+        }).onCancel(() => {
+
+        });
+       
       },
       //刷新父页面
       refreshPage() {