Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-04 8e2a3bde018d84c7316d78939b022a93841ff5b9

 src/views/system/contract/contract-result/index.vue

@@ -71,7 +71,7 @@
      <!--          v-hasPermi="['system:checkResult:add']"-->
      <!--        >新增</el-button>-->
      <!--      </el-col>-->
      <el-col :span="1.5">
      <!-- <el-col :span="1.5">
        <el-button
          type="danger"
          plain
@@ -82,8 +82,8 @@
          @click="handleDelete"
          >删除</el-button
        >
      </el-col>
      <el-col :span="1.5">
      </el-col> -->
      <!-- <el-col :span="1.5">
        <el-button
          type="warning"
          plain
@@ -93,11 +93,11 @@
          @click="handleExport"
          >导出</el-button
        >
      </el-col>
      <right-toolbar
      </el-col> -->
      <!-- <right-toolbar
        :showSearch.sync="showSearch"
        @queryTable="getList"
      ></right-toolbar>
      ></right-toolbar> -->
    </el-row>

    <el-row v-loading="loading">
@@ -135,7 +135,7 @@
              style="float: right"
              @click="handlePublish(item)"
              v-show="item.publish != 1"
              v-hasPermi="['result:contract:publish']"
              v-hasPermi="['contract:result:publish']"
              >确认发布</el-button
            >
            <el-button
@@ -144,7 +144,7 @@
              style="float: right"
              disabled
              v-show="item.publish == 1"
              v-hasPermi="['result:contract:publish']"
              v-hasPermi="['contract:result:publish']"
              >已发布</el-button
            >
          </div>