Merge remote-tracking branch 'origin/develop' into develop

2021-12-02 13:40:43 +08:00
parent acbb06db12 ec2091875f
commit 4b67e96813
7 changed files with 1399 additions and 587 deletions
@@ -190,7 +190,7 @@
              <template slot-scope="scope">
 <!--                <el-button @click="changeState(scope.row)">符合性状态</el-button>-->
                <div class="table-jump" @click="changeState(scope.row)">
-                  <div v-if="scope.row.sarState === 0">符合</div>
+                  <div v-if="scope.row.unCount === '0'">符合</div>
                  <div v-else >不符合</div>
                </div>
              </template>