|
|
@@ -499,9 +499,6 @@
|
|
|
},
|
|
|
|
|
|
footBtn(t) {
|
|
|
-<<<<<<< HEAD
|
|
|
- this.operationType = t;
|
|
|
-=======
|
|
|
// this.operationType = t;
|
|
|
// 新增判断 *** 出现弹窗的时候不然右边数据消失
|
|
|
if (t == 'work' || t == 'workStep') {
|
|
|
@@ -509,7 +506,6 @@
|
|
|
} else {
|
|
|
this.operationType = t;
|
|
|
}
|
|
|
->>>>>>> 84a2352d571acd9b0391474c4774d67069ce10e0
|
|
|
if (
|
|
|
Object.keys(this.$store.state.user.taskObj).length === 0 &&
|
|
|
this.$store.state.user.taskObj.constructor === Object
|
695593266@qq.com