| @@ -149,14 +149,14 @@ | |||||
| <view class="botbotmm"> | <view class="botbotmm"> | ||||
| <view class="item" @click="preValid">上一条</view> | <view class="item" @click="preValid">上一条</view> | ||||
| <template v-if="isShowMerge"> | <template v-if="isShowMerge"> | ||||
| <template v-if="userlistobj.disposeStatus == 0"> | |||||
| <template v-if="userlistobj.disposeStatus == 0 && userlistobj.violatedStatus == 0"> | |||||
| <view class="item" @click="setViolated(1)">确认有效</view> | <view class="item" @click="setViolated(1)">确认有效</view> | ||||
| <view class="item" @tap="showTagValid">确认无效</view> | <view class="item" @tap="showTagValid">确认无效</view> | ||||
| </template> | </template> | ||||
| <template v-if="userlistobj.disposeStatus == 1"> | |||||
| <template v-if="userlistobj.disposeStatus == 1 && userlistobj.violatedStatus == 1"> | |||||
| <view class="item" @tap="showTagValid">无效</view> | <view class="item" @tap="showTagValid">无效</view> | ||||
| </template> | </template> | ||||
| <template v-if="userlistobj.disposeStatus == 2"> | |||||
| <template v-if="userlistobj.disposeStatus == 1 && userlistobj.violatedStatus == 2"> | |||||
| <view class="item" @click="setViolated(1)">确认有效</view> | <view class="item" @click="setViolated(1)">确认有效</view> | ||||
| </template> | </template> | ||||
| </template> | </template> | ||||