Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbom_dian...

MrShi

8 天以前 cb94ff4f0a46eb74c21dd7b34b8d958ef9a9f11c

 admin/src/views/business/importRecord.vue

@@ -56,8 +56,8 @@
        <el-table-column prop="title" label="内容" min-width="200px" show-overflow-tooltip></el-table-column>
        <el-table-column label="业务类型">
          <template slot-scope="{row}">
            <span v-if="row.type ==0 " >老师导入</span>
            <span v-if="row.type == 1"  >案例导入</span>
            <span v-if="row.type ==0 "  class="green">老师导入</span>
            <span v-if="row.type == 1"   class="orange" >案例导入</span>
          </template>
        </el-table-column>
        <el-table-column label="状态">
@@ -68,11 +68,26 @@
          </template>
        </el-table-column>
        <el-table-column prop="totalNum" label="总记录数" min-width="100px"></el-table-column>
        <el-table-column prop="doneNum" label="成功录入数量" min-width="100px"></el-table-column>
        <el-table-column prop="doneNum" label="成功录入数量" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.status == 1" class="red">{{row.ingNum}}</span>
            <span v-else>{{ row.doneNum }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="errorNum" label="录入失败数量" min-width="100px"></el-table-column>
        <el-table-column prop="updateUserName" label="操作人" min-width="100px"></el-table-column>
        <el-table-column prop="createTime" label="导入时间" min-width="150px"></el-table-column>
        <el-table-column prop="updateTime" label="最近操作时间" min-width="150px"></el-table-column>
        <el-table-column
            label="操作"
            min-width="120"
            fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text"  v-if="row.type ==1"  style="color: orange" @click="$refs.OperaCasesListWindow.open('查看导入案例【'+row.title+'】',null, row.id)" icon="el-icon-open">查看导入案例</el-button>
            <el-button type="text"  v-if="row.type ==0" style="color: green"   @click="$refs.OperaMemberListWindow.open('查看导入案例【'+row.title+'】', row.id)" icon="el-icon-open">查看导入老师</el-button>
          </template>
        </el-table-column>
      </el-table>
      <pagination
        @size-change="handleSizeChange"
@@ -82,7 +97,8 @@
      </pagination>
    </template>
    <!-- 新建/修改 -->
    <OperaCategoryWindow ref="operaCategoryWindow" @success="handlePageChange"/>
    <OperaMemberListWindow ref="OperaMemberListWindow" @success="handlePageChange"/>
    <OperaCasesListWindow ref="OperaCasesListWindow" @success="handlePageChange"/>
  </TableLayout>
</template>

@@ -90,11 +106,12 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaCategoryWindow from '@/components/business/OperaCategoryWindow'
import OperaMemberListWindow from '@/components/business/OperaMemberListWindow'
import OperaCasesListWindow from '@/components/business/OperaCasesListWindow'
export default {
  name: 'Category',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaCategoryWindow },
  components: { TableLayout, Pagination, OperaCasesListWindow,OperaMemberListWindow},
  data () {
    return {
      // 搜索