Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity

liuyg

2021-08-10 a6f0596a6365b3ebdfd32af7fa2a740577aaef9d

 src/views/feedbackReport/feedbackReport.vue

@@ -34,7 +34,7 @@

      <template slot-scope="{type,size, row}" slot="menu">
        <el-button
          v-if="row.type != 0"
          v-if="row.type != 1"
          icon="el-icon-check" :size="size" :type="type" @click="setReal(row)">接收</el-button>
      </template>

@@ -431,8 +431,7 @@
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning",
          cancelButtonText: "取消",           type: "warning",
        })
          .then(() => {
            return remove(row.id);