From 7ae4a28d6ef3c060170b1ce35f7aece25dd2780c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 08 Apr 2021 22:22:22 +0800
Subject: [PATCH] 20210408 核销

---
 zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html
index 6331095..806f771 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html
@@ -116,9 +116,11 @@
                 </el-table-column>
                 <el-table-column label="操作" width="200">
                     <template slot-scope="scope">
-                        <el-button type="primary" v-if="scope.row.awardWay == 2 && scope.row.state == 1"  @click="jumpTologistics(scope.row)" size="mini">发货</el-button>
+                        <el-button type="primary" v-if="scope.row.awardWay == 2 && scope.row.state == 2"  @click="jumpTologistics(scope.row)" size="mini">发货</el-button>
                         <el-button type="primary" v-if="scope.row.awardWay != 2 && scope.row.state == 1"  @click="jumpToWriteOff(scope.row)" size="mini">核销</el-button>
-                        <el-button type="primary" @click="jumpToWriteOff(scope.row)" size="mini">查看</el-button>
+
+                        <el-button type="primary" v-if="scope.row.awardWay == 2"  @click="jumpTologistics(scope.row)" size="mini">查看</el-button>
+                        <el-button type="primary" v-if="scope.row.awardWay != 2"  @click="jumpToWriteOff(scope.row)" size="mini">查看</el-button>
                     </template>
                 </el-table-column>
 

--
Gitblit v1.9.1