qx
qx
2 天以前 de9ec81f888e006f3168fc8ea439a83696c891f7
qx
5个文件已修改
270 ■■■■■ 已修改文件
src/views/doctor/checkAll/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/standard/tijianxinxi/index.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/comp/index.vue 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/team/reporting/index.vue 186 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doctor/checkAll/index.vue
@@ -536,16 +536,16 @@
                  </span>
                  <div v-if="xmChange.length > 0" style="display: flex;">
                    <div style="margin:0 40px;font-size: 0.8vw;">项目名称:{{ xmChange[0].proName || "" }}</div>
                    <div style="margin:0 40px ;font-size: 0.8vw;">价格:{{ xmChange[0].price || "" }}</div>
                    <div style="margin:0 80px ;font-size: 0.8vw;">价格:{{ xmChange[0].price || "" }}</div>
                  </div>
                  <div v-else style="display: flex;">
                    <div style="margin:0 40px;font-size: 0.8vw;">项目名称:{{ }}</div>
                    <div style="margin:0 40px ;font-size: 0.8vw;">价格:{{ }}</div>
                    <div style="margin:0 80px ;font-size: 0.8vw;">价格:{{ }}</div>
                  </div>
                  <el-button type="primary" size="mini" @click="handleaddClick()">添加</el-button>
                </div>
                <el-table :row-style="redxiangmu" :data="fcList" style="width: 100%">
                <el-table :row-style="redxiangmu" :data="fcList" style="width: 90%" border>
                  <el-table-column type="selection" width="40" align="center" />
                  <el-table-column label="序号" align="center" prop="newID" />
                  <el-table-column label="名称" align="center" prop="proName" width="100px" />
src/views/standard/tijianxinxi/index.vue
@@ -1,7 +1,9 @@
<template>
    <div class="app-container">
      <el-row :gutter="18">
        <el-col :span="6" :xs="18">
        <el-col :span="6" :xs="18" style="max-height: 700px;
  overflow-y:auto;
  flex-direction: column;">
          <div class="head-container">
            <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
              style="margin-bottom: 15px" />
src/views/system/comp/index.vue
@@ -1230,7 +1230,7 @@
          ref="form"
          :model="form"
          :rules="rules"
          label-width="106px"
          label-width="98px"
          :inline="true"
          @submit.native.prevent
        >
@@ -1240,10 +1240,11 @@
              <el-radio :label="1">职业病单位</el-radio>
            </el-radio-group>
          </el-form-item>
          <br/>
          <el-form-item
            label="单位名称"
            prop="cnName"
            style="display: block; width: 100%"
          >
            <el-input
              v-model="form.cnName"
@@ -1282,14 +1283,14 @@
            <el-input
              v-model="form.registerAddress"
              placeholder="请输入注册地址"
              style="width: 1157px"
              style="width: 1156px"
            />
          </el-form-item>
          <el-form-item label="通讯地址" prop="mailingAddress">
            <el-input
              v-model="form.mailingAddress"
              placeholder="请输入通讯地址"
              style="width: 1157px"
              style="width: 1156px"
            />
          </el-form-item>
          <el-form-item label="所属地区" prop="zybCode" v-if="form.isZybUnit">
@@ -1309,7 +1310,7 @@
              v-model="form.industryType"
              placeholder="请选择隶属关系"
              clearable
              style="width: 70px"
              style="width: 208px"
            >
              <el-option
                v-for="dict in dict.type.sys_yes_no"
@@ -1320,16 +1321,55 @@
            </el-select>
          </el-form-item>
          <el-form-item label="经济类型" prop="jjType" v-if="form.isZybUnit">
            <el-input v-model="form.jjType" placeholder="请输入经济类型" />
             <el-select
              filterable
              v-model="form.jjType"
              placeholder="请选择经济类型"
              clearable
              style="width: 208px"
            >
              <el-option
                v-for="dict in dict.type.sys_yes_no"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
          <el-form-item label="企业规模" prop="qygm" v-if="form.isZybUnit">
            <el-input v-model="form.qygm" placeholder="请输入企业规模" />
          </el-form-item>
          <el-form-item label="行业分类" prop="hyfl" v-if="form.isZybUnit">
            <el-input v-model="form.hyfl" placeholder="请输入行业分类" />
            <el-select
              filterable
              v-model="form.hyfl"
              placeholder="请选择行业分类"
              clearable
              style="width: 208px"
            >
              <el-option
                v-for="dict in dict.type.sys_yes_no"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
          <el-form-item label="风险评估" prop="fxpg" v-if="form.isZybUnit">
            <el-input v-model="form.fxpg" placeholder="请输入风险评估" />
             <el-select
              filterable
              v-model="form.fxpg"
              placeholder="请选择风险评估"
              clearable
              style="width: 208px"
            >
              <el-option
                v-for="dict in dict.type.sys_yes_no"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
          <el-form-item label="开户银行" prop="bankAccount">
            <el-input
@@ -1356,10 +1396,20 @@
          </el-form-item>
          <el-form-item label="行政区划名称" prop="areaName">
            <el-input
            <el-select
              filterable
              v-model="form.areaName"
              placeholder="请输入行政区划名称"
            />
              placeholder="请选择行政区划名称"
              clearable
              style="width: 208px"
            >
              <el-option
                v-for="dict in dict.type.sys_yes_no"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
          <el-form-item label="备注" prop="remark">
src/views/team/reporting/index.vue
@@ -1,17 +1,15 @@
<template>
  <div class="app-container">
    <el-row :gutter="20">
      <el-col :span="3" :xs="24" style="margin-top: 30px">
      <el-col :span="5" :xs="24" style="margin-top: 30px; max-height: 700px;
  overflow-y:auto;
  flex-direction: column;">
        <!-- <div class="head-container">
          <el-input v-model="dwName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
            style="margin-bottom: 15px" />
        </div> -->
        <el-collapse v-model="index" accordion>
          <div
            class="info1"
            v-for="(item, index) in deptOptions"
            :key="'info1-' + index"
          >
          <div class="info1" v-for="(item, index) in deptOptions" :key="'info1-' + index">
            <el-collapse-item>
              <template #title>
                <div class="projectItem">
@@ -21,20 +19,15 @@
                  </div>
                </div>
              </template>
              <div
                style="
              <div style="
                  display: flex;
                  flex-direction: column;
                  align-items: center;
                "
              >
                <span
                  class="txt"
                  v-for="(items, index) in item.dwDepts"
                  :key="index"
                  @click="mianban(items.id)"
                  >{{ items.dwDeptName }}</span
                >
                ">
                <span class="txt" v-for="(items, index) in item.dwDepts" :key="index" @click="mianban(items.id)">{{
                  items.dwDeptName
                }}</span>
              </div>
            </el-collapse-item>
          </div>
@@ -45,154 +38,54 @@
            @node-click="handleNodeClick" />
        </div> -->
      </el-col>
      <el-col :span="20" :xs="24">
        <el-form
          :model="queryParams"
          ref="queryForm"
          size="small"
          :inline="true"
          label-width="68px"
        >
      <el-col :span="18" :xs="24">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
          <el-form-item label="时间" prop="applicationTime">
            <el-date-picker
              clearable
              v-model="createTimeList"
              @change="dateChangebirthday1"
             :default-time="['00:00:00', '23:00:00']"
              format="yyyy-MM-dd HH:mm:ss"
              value-format="yyyy-MM-dd HH:mm:ss"
              type="daterange"
              range-separator="-"
              start-placeholder="开始日期"
              end-placeholder="结束日期"
              :picker-options="pickerOptions"
            ></el-date-picker>
            <el-date-picker clearable v-model="createTimeList" @change="dateChangebirthday1"
              :default-time="['00:00:00', '23:00:00']" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
              type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
              :picker-options="pickerOptions"></el-date-picker>
          </el-form-item>
          <el-form-item>
            <el-button
              type="primary"
              icon="el-icon-search"
              size="mini"
              @click="handleQuery"
              style="margin: 0 15px;"
              >查询</el-button
            >
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
              >重置</el-button
            >
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
              style="margin: 0 15px;">查询</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
          </el-form-item>
        </el-form>
        <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
            <el-button type="primary" size="mini" @click="dialogVisible = true"
              >生成报告</el-button
            >
            <el-button type="primary" size="mini" @click="dialogVisible = true">生成报告</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button type="primary" size="mini">删除报告</el-button>
          </el-col>
        </el-row>
        <el-table :data="baogaoList" style="width: 100%" border>
          <el-table-column
            prop="bgType"
            label="报告类型"
            width="180"
            :show-overflow-tooltip="true"
            align="center"
          ></el-table-column>
          <el-table-column
            prop="dwName"
            label="单位"
            width="180"
            :show-overflow-tooltip="true"
            align="center"
          ></el-table-column>
          <el-table-column
            prop="batch"
            label="批次"
            :show-overflow-tooltip="true"
            align="center"
          ></el-table-column>
          <el-table-column
            prop="dept"
            label="部门"
            :show-overflow-tooltip="true"
            align="center"
          ></el-table-column>
          <el-table-column
            prop="peopleCount"
            label="总人数"
            :show-overflow-tooltip="true"
            align="center"
          ></el-table-column>
          <el-table-column
            prop="yjCount"
            label="已检"
            :show-overflow-tooltip="true"
            align="center"
          ></el-table-column>
          <el-table-column
            prop="wjCount"
            label="未检"
            :show-overflow-tooltip="true"
            align="center"
          ></el-table-column>
          <el-table-column
            prop="startTime"
            label="开始时间"
            :show-overflow-tooltip="true"
            align="center"
          ></el-table-column>
          <el-table-column
            prop="enfTime"
            label="结束时间"
            :show-overflow-tooltip="true"
            align="center"
          ></el-table-column>
          <el-table-column prop="bgType" label="报告类型" width="180" :show-overflow-tooltip="true"
            align="center"></el-table-column>
          <el-table-column prop="dwName" label="单位" width="180" :show-overflow-tooltip="true"
            align="center"></el-table-column>
          <el-table-column prop="batch" label="批次" :show-overflow-tooltip="true" align="center"></el-table-column>
          <el-table-column prop="dept" label="部门" :show-overflow-tooltip="true" align="center"></el-table-column>
          <el-table-column prop="peopleCount" label="总人数" :show-overflow-tooltip="true"
            align="center"></el-table-column>
          <el-table-column prop="yjCount" label="已检" :show-overflow-tooltip="true" align="center"></el-table-column>
          <el-table-column prop="wjCount" label="未检" :show-overflow-tooltip="true" align="center"></el-table-column>
          <el-table-column prop="startTime" label="开始时间" :show-overflow-tooltip="true" align="center"></el-table-column>
          <el-table-column prop="enfTime" label="结束时间" :show-overflow-tooltip="true" align="center"></el-table-column>
        </el-table>
        <el-dialog
          title="提示"
          :visible.sync="dialogVisible"
          width="30%"
          :before-close="handleClose"
        >
          <el-form
            ref="form"
            :model="form"
            :rules="rules"
            label-width="100px"
            :inline="true"
          >
        <el-dialog title="提示" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
          <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
            <el-form-item label="单位" prop="compId">
              <el-select
                v-model="compId"
                placeholder="请选择单位"
                clearable
                style="width: 200px"
                @change="cmp"
              >
                <el-option
                  v-for="dict in compList"
                  :key="dict.drugManufacturerId"
                  :label="dict.cnName"
                  :value="dict.drugManufacturerId"
                />
              <el-select v-model="compId" placeholder="请选择单位" clearable style="width: 200px" @change="cmp">
                <el-option v-for="dict in compList" :key="dict.drugManufacturerId" :label="dict.cnName"
                  :value="dict.drugManufacturerId" />
              </el-select>
              <!-- <el-input v-model="queryParams.compId" placeholder="请输入单位" clearable @keyup.enter.native="handleQuery" style="width: 170px"/> -->
            </el-form-item>
            <el-form-item label="单位部门" prop="dwDeptId">
              <el-select
                v-model="dwDeptId"
                placeholder="请选择单位部门"
                clearable
                style="width: 200px"
              >
                <el-option
                  v-for="dict in dwList"
                  :key="dict.id"
                  :label="dict.dwDeptName"
                  :value="dict.id"
                />
              <el-select v-model="dwDeptId" placeholder="请选择单位部门" clearable style="width: 200px">
                <el-option v-for="dict in dwList" :key="dict.id" :label="dict.dwDeptName" :value="dict.id" />
              </el-select>
              <!-- <el-input v-model="queryParams.dwDeptId" placeholder="请输入单位部门" clearable @keyup.enter.native="handleQuery" style="width: 110px"/> -->
            </el-form-item>
@@ -415,6 +308,7 @@
.txt {
  margin-top: 10px;
}
.txt:hover {
  cursor: pointer;
}
vue.config.js
@@ -54,7 +54,7 @@
      [process.env.VUE_APP_BASE_API]: {
        // target: `https://ltpeis.xaltjdkj.cn:5801/`,
        // target: `http://192.168.1.99:5012`,
        target: `http://192.168.1.113:5011`,
        target: `http://192.168.1.2:5011`,
        // // target: `http://192.168.0.99:8080/ltkj-admin`,
        // target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
        // target: `http://10.168.0.9:5011`,