Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2023-05-17 6594dffd868ddb7c3fba888bbb5151c13d8ad3b3

 ruoyi-ui/src/views/doctor/index.vue

@@ -108,12 +108,11 @@
        </el-input>
      </el-form-item>
       <el-form-item>
            <el-button type="primary" icon="el-icon-search" size="mini" style=" width: 65px; height: 32px;background: #FFDDE3;
          border-radius: 6px 6px 6px 6px;opacity:1; " @click="handleQuery">搜索</el-button>
            <el-button icon="el-icon-refresh" size="mini" style=" width: 65px; height: 32px;background: #FFDDE3;
          border-radius: 6px 6px 6px 6px;opacity:1; " @click="resetQuery">重置</el-button>

          </el-form-item>
         <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
            border-radius: 7px 7px 7px 7px;opacity: 1; " >搜索</el-button>
         <el-button  size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
            border-radius: 7px 7px 7px 7px;opacity: 1; ">重置</el-button>
       </el-form-item>
    </el-form>
    <div>
      <div style="width: 100px;
@@ -164,7 +163,7 @@
            plain
            icon="el-icon-download"
            size="mini"
            @click="handleExport"
            @click="handleExportTemplate"
            v-hasPermi="['family:note:export']"
          >导入模板下载</el-button>
        </el-col>
@@ -186,35 +185,38 @@
        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
      </el-row>
    </div>
    <el-table v-loading="loading" :data="doctorList" @selection-change="handleSelectionChange"  @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
      <el-table-column type="selection" width="25"  align="center" />
<el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>      <el-table-column label="类型" prop="type" sortable width="80">

    <el-table v-loading="loading" :data="doctorList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
      <el-table-column type="selection" :reserve-selection="true" width="25"  align="center" />
      <el-table-column  label="序号" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
      <el-table-column label="类型" prop="type" sortable width="80" align="center">

        <template slot-scope="scope">{{scope.row.type? scope.row.type: '————'}}</template>
      </el-table-column>
      <el-table-column label="症状" prop="symptom" sortable :show-overflow-tooltip="true" width="80" >
      <el-table-column label="症状" prop="symptom" sortable :show-overflow-tooltip="true" width="120" align="center" >
        <template slot-scope="scope">{{scope.row.symptom? scope.row.symptom: '————'}}</template>
      </el-table-column>
      <el-table-column label="持续时间" prop="duration" sortable :show-overflow-tooltip="true" width="110" >
      <el-table-column label="持续时间" prop="duration" sortable :show-overflow-tooltip="true" width="160" align="center" >
        <template slot-scope="scope">{{scope.row.duration? scope.row.duration: '————'}}</template>
      </el-table-column>
      <el-table-column label="中医处方" prop="cmedical" sortable width="110"  >
      <el-table-column label="中医处方" prop="cmedical" sortable width="160" align="center" >
        <template slot-scope="scope">{{scope.row.cmedical? scope.row.cmedical: '————'}}</template>
      </el-table-column>
      <el-table-column label="西医处方" prop="wmedical" sortable width="110">
      <el-table-column label="西医处方" prop="wmedical" sortable width="160" align="center">
        <template slot-scope="scope">{{scope.row.wmedical? scope.row.wmedical: '————'}}</template>
      </el-table-column>
      <el-table-column label="功效" prop="effect" sortable width="80" >
      <el-table-column label="功效" prop="effect" sortable width="120" align="center" >
        <template slot-scope="scope">{{scope.row.effect? scope.row.effect: '————'}}</template>
      </el-table-column>

      <el-table-column label="适用人" prop="suitable" sortable width="110" >
      <el-table-column label="适用人" prop="suitable" sortable width="140" align="center" >
        <template slot-scope="scope">{{scope.row.suitable? scope.row.suitable: '————'}}</template>
      </el-table-column>

      <el-table-column label="备注" prop="remark" sortable width="120" >
      <el-table-column label="备注" prop="remark" sortable width="120" align="center">
          <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
          </el-table-column>
        <el-table-column label="电子文件" prop="url" width="160" >
        <el-table-column label="电子文件" prop="url" width="160" align="center">
             <template slot-scope="scope" >
               <img
                 class="el-upload-list__item-thumbnail"
@@ -222,7 +224,7 @@
                 alt=""
                 style="width: 35px; height: 35px;"
                 fit="cover"
                  v-if="scope.row.url !== null"
                  v-if="scope.row.url !== ','"
               >
        <img
                 class="el-upload-list__item-thumbnail"
@@ -230,7 +232,7 @@
                 alt=""
                 style="width: 35px; height: 35px;"
                 fit="cover"
                  v-if="scope.row.url === null"
                  v-if="scope.row.url ===',' "
               >
             </template>
          </el-table-column>
@@ -252,7 +254,7 @@
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
  

<el-button
             size="mini"
              type="text"
@@ -268,6 +270,7 @@
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      style="background: #FEF7FC;"
      @pagination="getList"
    />

@@ -578,6 +581,10 @@
      this.open = false;
      this.reset();
    },
    getRowId(row)
    {
      return row.id
    },
    // 取消按钮（数据权限）
    cancelDataScope() {
      this.openDataScope = false;
@@ -709,7 +716,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除编号为"' + Ids + '"的数据项？').then(function() {
      this.$modal.confirm('是否确认删除数据项？').then(function() {
        return delDoctor(Ids);
      }).then(() => {
        this.getList();
@@ -718,9 +725,24 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('zfDoctor/export', {
      const Ids = this.ids;
      
      if(Ids.length==0)
      {
      this.download('/zfDoctor/export', {
        ...this.queryParams
      }, `zfDoctor_${new Date().getTime()}.xlsx`)
      }else{
        this.download('/zfDoctor/export1/'+Ids, {
 
        }, `zfDoctor_${new Date().getTime()}.xlsx`)
      }
    },

    handleExportTemplate(){
      this.download('/zfDoctor/model', {

      }, `zfDoctor_${new Date().getTime()}.xlsx`)
    },
    /** 导入操作*/
    handleEnport(params){