Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/views/business/resource/gyzj/comps/gyzjList.vue

@@ -132,7 +132,7 @@
           <el-table-column :label="$t('form.operate')" fixed="right" align="center"
             class-name="small-padding fixed-width" width="250px">
             <template slot-scope="scope">
-              <template v-if="scope.row.zjzt == 1 || scope.row.zjzt == 3 || scope.row.zjzt == 5 || scope.row.zjzt == 9">
+              <template v-if="scope.row.zjzt == 1 || scope.row.zjzt == 3 || scope.row.zjzt == 5 || scope.row.jyzt == 5 ">
                 <!-- 详情 -->
                 <el-button type="text" @click="handleXq(scope.row)" v-hasPermi="['business:resource:gyzj:xq']">{{
                   $t('page.business.resource.gyzj.detail') }}</el-button>
@@ -189,7 +189,7 @@
                 <el-button type="text" @click="handleRk(scope.row)" v-hasPermi="['business:resource:gyzj:rk']">{{
                   $t('page.business.resource.gyzj.qrrk') }}</el-button>
               </template>
-              <template v-if="scope.row.zjzt == 9">
+              <template v-if="scope.row.zjzt == 9&&scope.row.jyzt == 1">
                 <!-- 解档 -->
                 <el-button type="text" @click="handleJd(scope.row)" v-hasPermi="['business:resource:gyzj:jd']">{{
                   $t('page.business.resource.gyzj.jiedang') }}</el-button>