feige
2023-05-17 6594dffd868ddb7c3fba888bbb5151c13d8ad3b3
Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

# Conflicts:
# ruoyi-ui/src/views/collection/index.vue
# ruoyi-ui/src/views/contacts/index.vue
# ruoyi-ui/src/views/doctor/index.vue
7个文件已修改
653 ■■■■ 已修改文件
ruoyi-ui/src/views/bignote/index.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/collection/collectionInfo.vue 325 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/collection/index.vue 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/contacts/contactsInfo.vue 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/contacts/index.vue 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/doctor/doctorInfo.vue 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/doctor/index.vue 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/bignote/index.vue
@@ -63,13 +63,13 @@
          start-placeholder="开始日期"
          end-placeholder="结束日期"
        ></el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
      </el-form-item><el-form-item>
      <el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
          border-radius: 6px 6px 6px 6px;opacity:1; " >搜索</el-button>
        <el-button  size="mini" @click="resetQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
      <el-button  size="mini" @click="resetQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
          border-radius: 6px 6px 6px 6px;opacity:1; " >重置</el-button>
      </el-form-item>
    </el-form-item>
    </el-form>
    <div style="width: 72px;
ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -7,171 +7,192 @@
      <!--      <el-button type="primary" class="pt"   @click="handleExport"-->
      <!--                 v-hasPermi="['self:user:export']" >导出</el-button>-->
    </div>
    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
    <div style="padding-left:15px">
       <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="120px">
      <!--      <el-form-item label="id" prop="id">-->
      <!--        <el-input v-model="formData.id" placeholder="请输入id" :maxlength="11" show-word-limit :disabled="true"-->
      <!--                  clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>-->
      <!--      </el-form-item>-->
      <el-form-item label="获得时间" prop="happenTime">
        <el-input v-model="formData.happenTime" placeholder="请输入获得时间" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="类别" prop="type">
        <el-input v-model="formData.type" placeholder="请输入类别" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="名称" prop="name">
        <el-input v-model="formData.name" placeholder="请输入名称" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="来源" prop="source">
        <el-input v-model="formData.source" placeholder="请输入来源" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="持有者" prop="owner">
        <el-input v-model="formData.owner" placeholder="请输入持有者" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="价值" prop="price">
        <el-input v-model="formData.price" placeholder="请输入价值" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="存放位置" prop="location">
        <el-input v-model="formData.location" placeholder="请输入存放位置" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="备注" prop="remark">
        <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>
      <h4 class="form-header">电子文件 </h4>
      <el-upload
        action="#"
        list-type="picture-card"
        multiple
        :http-request="requestUpload"
        :file-list="fileList"
      >
        <i slot="default" class="el-icon-plus"></i>
        <div slot="file" slot-scope="{file}">
          <img
            class="el-upload-list__item-thumbnail"
            :src="file.url"
            alt=""
            style="width: 147px; height: 147px"
            fit="cover"
            :preview-src-list="[file.url]"
         <el-container>
           <el-row :span="12">
             <el-cow >
              <el-form-item label="获得时间" prop="happenTime" label-width="70px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formData.happenTime" placeholder="请输入获得时间" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
              </el-form-item>
             </el-cow>
             <el-cow >
               <el-form-item label="类别" prop="type" label-width="40px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formData.type" placeholder="请输入类别" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
              </el-form-item>
             </el-cow>
             <el-cow >
              <el-form-item label="名称" prop="name" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formData.name" placeholder="请输入名称" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
              </el-form-item>
             </el-cow>
             <el-cow >
               <el-form-item label="来源" prop="source" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formData.source" placeholder="请输入来源" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
              </el-form-item>
             </el-cow>
             <el-cow >
              <el-form-item label="持有者" prop="owner" label-width="65px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formData.owner" placeholder="请输入持有者" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
              </el-form-item>
             </el-cow>
             <el-cow >
               <el-form-item label="价值" prop="price" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formData.price" placeholder="请输入价值" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
              </el-form-item>
             </el-cow>
             <el-cow >
              <el-form-item label="存放位置" prop="location" label-width="80px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formData.location" placeholder="请输入存放位置" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
              </el-form-item>
             </el-cow>
             <el-cow >
               <el-form-item label="备注" prop="remark" label-width="45px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
            </el-form-item>
             </el-cow>
           </el-row>
         </el-container>
          <h4 class="form-header">电子文件 </h4>
          <el-upload
            action="#"
            list-type="picture-card"
            multiple
            :http-request="requestUpload"
            :file-list="fileList"
          >
          <span class="el-upload-list__item-actions" >
        <span
          v-if="isShow"
          class="el-upload-list__item-preview"
          @click="handlePictureCardPreview(file)"
        >
          <i class="el-icon-zoom-in"></i>
        </span>
        <span
          v-if="isShow"
          class="el-upload-list__item-delete"
          @click="handleDownload(file.url)"
        >
          <i class="el-icon-download"></i>
        </span>
        <span
          v-if="isShow"
          class="el-upload-list__item-delete"
          @click="handleRemove(file)"
        >
          <i class="el-icon-delete"></i>
        </span>
      </span>
            <i slot="default" class="el-icon-plus"></i>
            <div slot="file" slot-scope="{file}">
              <img
                class="el-upload-list__item-thumbnail"
                :src="file.url"
                alt=""
                style="width: 147px; height: 147px"
                fit="cover"
                :preview-src-list="[file.url]"
              >
              <span class="el-upload-list__item-actions" >
            <span
              v-if="isShow"
              class="el-upload-list__item-preview"
              @click="handlePictureCardPreview(file)"
            >
              <i class="el-icon-zoom-in"></i>
            </span>
            <span
              v-if="isShow"
              class="el-upload-list__item-delete"
              @click="handleDownload(file.url)"
            >
              <i class="el-icon-download"></i>
            </span>
            <span
              v-if="isShow"
              class="el-upload-list__item-delete"
              @click="handleRemove(file)"
            >
              <i class="el-icon-delete"></i>
            </span>
          </span>
        </div>
      </el-upload>
            </div>
          </el-upload>
      <!--<h4 class="form-header">其他附件 </h4>
      <el-upload
        action=""
        :file-list="fileListOther"
        class="upload-demo"
        multiple
        :on-preview="handlePreview"
          <!--<h4 class="form-header">其他附件 </h4>
          <el-upload
            action=""
            :file-list="fileListOther"
            class="upload-demo"
            multiple
            :on-preview="handlePreview"
        :on-remove="handleRemove"
        :http-request="requestUpload"
        :show-file-list="true"
      >
        <el-button v-if="isShow" type="primary" >点击上传</el-button>
        <template #tip>
          <div class="el-upload__tip">
          </div>
        </template>
      </el-upload>-->
      <h4 class="form-header">其他附件 </h4>
      <el-upload
        action=""
        :file-list="fileListOther"
        class="upload-demo"
        multiple
        list-type="picture-card"
        :on-preview="handleFileCardPreview"
        :on-remove="handleRemove"
        :http-request="requestUpload"
        :show-file-list="true"
      >
        <i slot="default" class="el-icon-plus"></i>
        <div slot="file" slot-scope="{file}">
          <img
            class="el-upload-list__item-thumbnail"
            src="../../assets/401_images/401.gif"
            alt=""
            style="width: 147px; height: 147px"
            fit="cover"
            :on-remove="handleRemove"
            :http-request="requestUpload"
            :show-file-list="true"
          >
          <span class="el-upload-list__item-actions">
                <span v-if="isShow"
                  class="el-upload-list__item-preview"
                  @click="handleFileCardPreview(file)"
                >
                  <i class="el-icon-zoom-in"></i>
                </span>
                <span
                  v-if="isShow"
                  @click="handleRemove(file)"
                  class="el-upload-list__item-delete"
                >
                  <i class="el-icon-download"></i>
                </span>
                <span
                  v-if="isShow"
                  class="el-upload-list__item-delete"
                  @click="handleRemoveFile(file)"
                >
                  <i class="el-icon-delete"></i>
                </span>
              </span>
            <el-button v-if="isShow" type="primary" >点击上传</el-button>
            <template #tip>
              <div class="el-upload__tip">
              </div>
            </template>
        </div>
          </el-upload>-->
          <h4 class="form-header">其他附件 </h4>
          <el-upload
            action=""
            :file-list="fileListOther"
            class="upload-demo"
            multiple
            list-type="picture-card"
            :on-preview="handleFileCardPreview"
            :on-remove="handleRemove"
            :http-request="requestUpload"
            :show-file-list="true"
          >
            <i slot="default" class="el-icon-plus"></i>
            <div slot="file" slot-scope="{file}">
              <img
                class="el-upload-list__item-thumbnail"
                src="../../assets/401_images/401.gif"
                alt=""
                style="width: 147px; height: 147px"
                fit="cover"
              >
              <span class="el-upload-list__item-actions">
                    <span v-if="isShow"
                      class="el-upload-list__item-preview"
                      @click="handleFileCardPreview(file)"
                    >
                      <i class="el-icon-zoom-in"></i>
                    </span>
                    <span
                      v-if="isShow"
                      @click="handleRemove(file)"
                      class="el-upload-list__item-delete"
                    >
                      <i class="el-icon-download"></i>
                    </span>
                    <span
                      v-if="isShow"
                      class="el-upload-list__item-delete"
                      @click="handleRemoveFile(file)"
                    >
                      <i class="el-icon-delete"></i>
                    </span>
                  </span>
      </el-upload>
            </div>
      <el-form-item size="large">
        <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb" >修改</el-button>
      </el-form-item>
    </el-form>
    <el-dialog  :visible.sync="dialogVisible">
      <img w-full :src="dialogImageUrl" alt="Preview Image" />
    </el-dialog>
          </el-upload>
          <el-form-item size="large">
            <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb" >修改</el-button>
          </el-form-item>
        </el-form>
    </div>
        <el-dialog  :visible.sync="dialogVisible">
          <img w-full :src="dialogImageUrl" alt="Preview Image" />
        </el-dialog>
  </div>
</template>
@@ -459,4 +480,10 @@
  display: block;
  position: absolute;
}
.form_item{
  font-size: 12px;
  font-family: Microsoft YaHei-Regular, Microsoft YaHei;
  font-weight: 400;
  color: #000000;
}
</style>
ruoyi-ui/src/views/collection/index.vue
@@ -94,11 +94,10 @@
      <el-cntainer>
        <el-col :span="9" >
          <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-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-col>
      </el-cntainer>
@@ -190,7 +189,6 @@
            <el-button size="mini"   type="primary"
                       plain
                       icon="el-icon-plus" >导入</el-button>
          </el-upload>
        </el-col>
        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -202,31 +200,34 @@
      <el-table-column label="获得时间" prop="happenTime" sortable width="100" align="center">
        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
      </el-table-column>
      <el-form-item label="类别" prop="type">
      <el-form-item label="类别" prop="type" width="120">
        <el-select v-model="formDat.type" placeholder="请选择类别" clearable :style="{width: '100%'}"  >
          <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
          ></el-option>
        </el-select>
      </el-form-item>
      <el-table-column label="名称" prop="name" sortable :show-overflow-tooltip="true" width="90" align="center" >
      <el-table-column label="名称" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" >
        <template slot-scope="scope">{{scope.row.name? scope.row.name: '————'}}</template>
      </el-table-column>
      <el-table-column label="来源" prop="source" sortable width="90" align="center" >
      <el-table-column label="来源" prop="source" sortable width="120" align="center" >
        <template slot-scope="scope">{{scope.row.source? scope.row.source: '————'}}</template>
      </el-table-column>
      <el-table-column label="拥有者" prop="owner" sortable width="110" align="center">
        <template slot-scope="scope">{{scope.row.owner? scope.row.owner: '————'}}</template>
      </el-table-column>
      <el-table-column label="价值" prop="price" sortable width="90" align="center">
      <el-table-column label="价值" prop="price" sortable width="120" align="center">
        <template slot-scope="scope">{{scope.row.price? scope.row.price: '————'}}</template>
      </el-table-column>
      <el-table-column label="存放位置" prop="location" sortable width="130" align="center">
      <el-table-column label="存放位置" prop="location" sortable width="160" align="center">
        <template slot-scope="scope">{{scope.row.location? scope.row.location: '————'}}</template>
      </el-table-column>
      <el-table-column label="备注" prop="remark" sortable width="90" align="center">
        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
      </el-table-column>
      <el-table-column label="电子文件" prop="url" width="180" >
        <template slot-scope="scope" >
          <img
            class="el-upload-list__item-thumbnail"
@@ -246,8 +247,6 @@
          >
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <el-button
ruoyi-ui/src/views/contacts/contactsInfo.vue
@@ -7,52 +7,75 @@
      <!--      <el-button type="primary" class="pt"   @click="handleExport"-->
      <!--                 v-hasPermi="['self:user:export']" >导出</el-button>-->
    </div>
    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
    <div style="padding-left:15px">
     <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="100px">
      <!--      <el-form-item label="id" prop="id">-->
      <!--        <el-input v-model="formData.id" placeholder="请输入id" :maxlength="11" show-word-limit :disabled="true"-->
      <!--                  clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>-->
      <!--      </el-form-item>-->
      <el-form-item label="成员姓名" prop="myName">
        <el-input v-model="formData.myName" placeholder="请输入成员姓名" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="称呼" prop="nickName">
        <el-input v-model="formData.nickName" placeholder="请输入称呼" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="姓名" prop="name">
        <el-input v-model="formData.name" placeholder="请输入姓名" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="工作单位" prop="work">
        <el-input v-model="formData.work" placeholder="请输入具体位置" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="手机" prop="phone">
        <el-input v-model="formData.phone" placeholder="请输入手机" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="微信" prop="wx">
        <el-input v-model="formData.wx" placeholder="请输入微信" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="QQ" prop="qq">
        <el-input v-model="formData.qq" placeholder="请输入QQ" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="twitter" prop="twitter">
        <el-input v-model="formData.twitter" placeholder="请输入twitter" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="是否常联系" prop="isAlways">
        <el-input v-model="formData.isAlways === 1 ? '是':'否' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="备注(是否存在金钱关系)" prop="remark">
        <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>
       <el-container>
         <el-row :span="12">
           <el-cow>
            <el-form-item label="成员姓名" prop="myName" label-width="80px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.myName" placeholder="请输入成员姓名" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>
           <el-cow>
            <el-form-item label="称呼" prop="nickName" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.nickName" placeholder="请输入称呼" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>
           <el-cow>
             <el-form-item label="姓名" prop="name" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.name" placeholder="请输入姓名" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>
           <el-cow>
            <el-form-item label="工作单位" prop="work" label-width="80px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.work" placeholder="请输入具体位置" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>
           <el-cow>
            <el-form-item label="手机" prop="phone" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.phone" placeholder="请输入手机" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>
           <el-cow>
            <el-form-item label="微信" prop="wx" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.wx" placeholder="请输入微信" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>
           <el-cow>
            <el-form-item label="QQ" prop="qq" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.qq" placeholder="请输入QQ" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>
           <el-cow>
            <el-form-item label="twitter" prop="twitter" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.twitter" placeholder="请输入twitter" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>
           <el-cow>
            <el-form-item label="是否常联系" prop="isAlways" label-width="90px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.isAlways === 1 ? '是':'否' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>
           <el-cow>
            <el-form-item label="备注(是否存在金钱关系)" prop="remark" label-width="180px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
            <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
          </el-form-item>
           </el-cow>
         </el-row>
       </el-container>
      <h4 class="form-header">电子名片 </h4>
      <el-upload
        action="#"
@@ -156,7 +179,7 @@
        <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">修改</el-button>
      </el-form-item>
    </el-form>
    </div>
    <el-dialog  :visible.sync="dialogVisible">
      <img w-full :src="dialogImageUrl" alt="Preview Image" />
    </el-dialog>
@@ -164,7 +187,7 @@
</template>
<script>
import {getContactList, getContactIdList, addContact,updateContact, download,delContact,uploadPic} from "@/api/contacts/index";
import {getContactIdList, updateContact, download,uploadPic} from "@/api/contacts/index";
import {addRole, updateRole} from "@/api/system/role";
import {blobValidate} from "@/utils/ruoyi";
import errorCode from "@/utils/errorCode";
ruoyi-ui/src/views/contacts/index.vue
@@ -62,14 +62,12 @@
            <i slot="prefix" class="el-input__icon el-icon-search"></i>
          </el-input>
        </el-form-item>
   <el-form-item>
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
                     style=" width: 65px; height: 32px;background: #FFDDE3;
          border-radius: 6px 6px 6px 6px;opacity:1;">搜索</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
          border-radius: 6px 6px 6px 6px;opacity:1; " >重置</el-button>
         </el-form-item>
     <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: 72px;
@@ -92,7 +90,6 @@
          v-hasPermi="['system:role:add']"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="danger"
@@ -114,7 +111,7 @@
          v-hasPermi="['family:note:export']"
        >导出</el-button>
              </el-col>
        <el-col :span="1.5">
      <el-col :span="1.5">
          <el-button
            type="warning"
            plain
@@ -124,7 +121,7 @@
            v-hasPermi="['family:note:export']"
          >导入模板下载</el-button>
        </el-col>
        <el-col :span="1.2">
      <el-col :span="1.2">
          <el-upload
            action=""
@@ -139,16 +136,15 @@
          </el-upload>
        </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
  </div>
    <el-table v-loading="loading" :data="contactList"  :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" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
      <el-table-column label="成员姓名" prop="myName" sortable width="100" >
      <el-table-column label="成员姓名" prop="myName" sortable width="160" >
        <template slot-scope="scope">
          <div>
            <a href="javascript:;" @click="handleCheck(scope.row)">{{scope.row.myName}}</a>
@@ -156,15 +152,15 @@
        </template>
      </el-table-column>
      <el-table-column label="称呼" prop="nickName" sortable :show-overflow-tooltip="true" width="80" align="center" />
      <el-table-column label="姓名" prop="name" sortable :show-overflow-tooltip="true" width="80" align="center"/>
      <el-table-column label="工作单位" prop="work" sortable width="100" align="center" >
      <el-table-column label="称呼" prop="nickName" sortable :show-overflow-tooltip="true" width="120" align="center" />
      <el-table-column label="姓名" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center"/>
      <el-table-column label="工作单位" prop="work" sortable width="160" align="center" >
        <template slot-scope="scope">{{scope.row.work? scope.row.work: '————'}}</template>
      </el-table-column>
      <el-table-column label="手机" prop="phone" sortable width="110" align="center" >
      <el-table-column label="手机" prop="phone" sortable width="120" align="center" >
        <template slot-scope="scope">{{scope.row.phone? scope.row.phone: '————'}}</template>
      </el-table-column>
      <el-table-column label="其它联系方式" prop="wx qq twitter" sortable width="130" align="center" >
      <el-table-column label="其它联系方式" prop="wx qq twitter" sortable width="180" align="center" >
        <template slot-scope="scope">
          <span v-if="scope.row.wx || scope.row.qq || scope.row.twitter == true">
            {{scope.row.wx}}<br>
@@ -174,7 +170,7 @@
          <span v-else>————</span>
        </template>
      </el-table-column>
      <el-table-column label="是否常联系" prop="isAlways" sortable width="120" align="center" >
      <el-table-column label="是否常联系" prop="isAlways" sortable width="170" align="center" >
        <template slot-scope="scope">
          <span v-if="scope.row.isAlways===1">是</span>
          <span v-if="scope.row.isAlways===0">否</span>
@@ -182,13 +178,11 @@
        </template>
      </el-table-column>
      <el-table-column label="备注(是否存在金钱关系)" prop="remark" sortable width="200" >
      <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"
@@ -226,19 +220,12 @@
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-d-arrow-right"
             @click="handleCheck(scope.row)">
查看详情</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -376,7 +363,7 @@
import { Notification, MessageBox, Message, Loading } from 'element-ui'
//导入接口函数
import {getContactList,enload, getContactIdList, addContact,updateContact, delContact,uploadPic} from "@/api/contacts/index";
import {getContactList,enload,  addContact, delContact,uploadPic} from "@/api/contacts/index";
export default {
  name: "index",
  dicts: ['sys_normal_disable'],
@@ -728,7 +715,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除编号为"' + Ids + '"的数据项?').then(function() {
      this.$modal.confirm('是否确认删除数据项?').then(function() {
        return delContact(Ids);
      }).then(() => {
        this.getList();
@@ -738,7 +725,7 @@
    /** 导出按钮操作 */
    handleExport() {
      const Ids = this.ids;
      if(Ids.length==0)
      {
      this.download('zfContact/export', {
ruoyi-ui/src/views/doctor/doctorInfo.vue
@@ -7,45 +7,73 @@
      <!--      <el-button type="primary" class="pt"   @click="handleExport"-->
      <!--                 v-hasPermi="['self:user:export']" >导出</el-button>-->
    </div>
    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
    <div>
      <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="100px">
      <!--      <el-form-item label="id" prop="id">-->
      <!--        <el-input v-model="formData.id" placeholder="请输入id" :maxlength="11" show-word-limit :disabled="true"-->
      <!--                  clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>-->
      <!--      </el-form-item>-->
      <el-form-item label="类型" prop="type">
        <el-input v-model="formData.type" placeholder="请输入类型" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="症状" prop="symptom">
        <el-input v-model="formData.symptom" placeholder="请输入症状" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="持续时间" prop="duration">
        <el-input v-model="formData.duration" placeholder="请输入持续时间" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="中医处方" prop="cmedical">
        <el-input v-model="formData.cmedical" placeholder="请输入中医处方" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="西医处方" prop="wmedical">
        <el-input v-model="formData.wmedical" placeholder="请输入西医处方" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="功效" prop="effect">
        <el-input v-model="formData.effect" placeholder="请输入功效" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="适用人" prop="suitable">
        <el-input v-model="formData.suitable" placeholder="请输入适用人" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="备注" prop="remark">
        <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>
      <el-container>
      <div>
        <el-container>
          <el-row>
            <el-cow :span="8">
              <el-form-item label="类型" prop="type" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.type" placeholder="请输入类型" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
            </el-cow>
            <el-cow :span="8">
              <el-form-item label="症状" prop="symptom" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formData.symptom" placeholder="请输入症状" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
              </el-form-item>
            </el-cow>
            <el-cow :span="8">
              <el-form-item label="持续时间" prop="duration" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formData.duration" placeholder="请输入持续时间" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
              </el-form-item>
            </el-cow>
            <el-cow :span="8">
              <el-form-item label="功效" prop="effect" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formData.effect" placeholder="请输入功效" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
              </el-form-item>
            </el-cow>
            <el-cow :span="8">
              <el-form-item label="适用人" prop="suitable" label-width="65px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formData.suitable" placeholder="请输入适用人" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
              </el-form-item>
            </el-cow>
            <el-cow :span="8">
              <el-form-item label="备注" prop="remark" label-width="45px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
          <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        </el-form-item>
            </el-cow>
          </el-row>
        </el-container>
      </div>
      <div style="padding-left:120px">
        <el-container>
          <el-row>
            <el-cow :span="8">
              <el-form-item label="中医处方" prop="cmedical" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formData.cmedical" placeholder="请输入中医处方" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
              </el-form-item>
            </el-cow>
            <el-cow :span="8">
              <el-form-item label="西医处方" prop="wmedical" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
            <el-input v-model="formData.wmedical" placeholder="请输入西医处方" clearable :style="{width: '100%'}" :disabled="dsb">
            </el-input>
          </el-form-item>
            </el-cow>
          </el-row>
        </el-container>
      </div>
      </el-container>
      <h4 class="form-header">电子文件 </h4>
      <el-upload
        action="#"
@@ -149,7 +177,7 @@
        <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">修改</el-button>
      </el-form-item>
    </el-form>
    </div>
    <el-dialog  :visible.sync="dialogVisible">
      <img w-full :src="dialogImageUrl" alt="Preview Image" />
    </el-dialog>
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;
@@ -186,36 +185,38 @@
        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
      </el-row>
    </div>
    <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" align="center" >
      <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" align="center" >
      <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" align="center" >
      <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" align="center">
      <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" align="center" >
      <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" align="center" >
      <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" align="center">
          <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
          </el-table-column>
        <el-table-column label="电子文件" prop="url" width="140" align="center">
        <el-table-column label="电子文件" prop="url" width="160" align="center">
             <template slot-scope="scope" >
               <img
                 class="el-upload-list__item-thumbnail"