修改

src/views/components/DepartmentList.vue

@@ -98,7 +98,7 @@ export default {
     watch: {
         'querydepartmen.departmentName'(val) {
             this.querydepartmen.departmentName = val
-            this.Departmentlist();
+            this.Departmentlist(1);
         },
         modal(val) {
             this.vmodal = val
@@ -125,10 +125,13 @@ export default {
             this.HOSPITALlist = JSON.parse(localStorage.getItem('HOSPITALlist'))
         },
         nurseclick(item) {
-            this.itemid = null
+            if (this.querydepartmen.hospitalAgencyId != item.id) {
-            this.departmentName = null
+                this.querydepartmen.departmentName = ''
-            this.querydepartmen.hospitalAgencyId = item.id
+                this.itemid = null
-            this.Departmentlist();
+                this.departmentName = null
+                this.querydepartmen.hospitalAgencyId = item.id
+                this.Departmentlist();
+            }
             this.open = false
         },
         changeswitch(e) {
@@ -181,7 +184,7 @@ export default {
             this.$emit("clickdepartment", obj);
         },
         // 科室列表
-        Departmentlist() {
+        Departmentlist(val) {
             let method = undefined
             if (this.methods == 'listOperationNum') {
                 method = listOperationNum(this.querydepartmen)
@@ -226,18 +229,20 @@ export default {
             method.then(response => {
                 this.DepartmentoList = response.data.deptNumList;
                 this.hospitalAgencyName = response.data.hospitalAgencyName
-                this.count = 0;
+                if (!val) {
-                this.DepartmentoList.forEach((item) => {
+                    this.count = 0;
-                    if (item.countNum != null) {
+                    this.DepartmentoList.forEach((item) => {
-                        this.count += item.countNum;
+                        if (item.countNum != null) {
-                    }
+                            this.count += item.countNum;
-                });
+                        }
-                this.$emit("clickdepartment", {
+                    });
-                    hospitalAgencyId: this.querydepartmen.hospitalAgencyId,
+                    this.$emit("clickdepartment", {
-                    itemid: this.itemid,
+                        hospitalAgencyId: this.querydepartmen.hospitalAgencyId,
-                    itemName: this.departmentName,
+                        itemid: this.itemid,
-                    hospitalAgencyName: this.hospitalAgencyName
+                        itemName: this.departmentName,
-                });
+                        hospitalAgencyName: this.hospitalAgencyName
+                    });
+                }
             });
         },
     }

src/views/manage/message/index.vue

@@ -539,9 +539,9 @@ export default {
       this.queryParams.departmentId = null;
       this.informationqueryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
       this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
-      this.$refs.DepartmentList.resetQuery()
       this.resetForm("queryForms");
-      this.handleQuery();
+      this.$refs.DepartmentList.resetQuery()
+      // this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {

src/views/manage/propaganda/index.vue

@@ -1376,9 +1376,9 @@ export default {
       this.queryParams.createTimeStart = null
       this.informationqueryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
       this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
-      this.$refs.DepartmentList.resetQuery()
       this.resetForm("queryForms");
-      this.handleQuery();
+      this.$refs.DepartmentList.resetQuery()
+      // this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {

src/views/manage/script/index.vue

@@ -2,168 +2,66 @@
   <div class="app-container" ref="layout">
     <el-row :gutter="20">
       <el-col :span="5" :xs="24">
-        <DepartmentList
+        <DepartmentList ref="DepartmentList" @clickdepartment="clickdepartment" :methods="'listScriptNum'">
-          ref="DepartmentList"
-          @clickdepartment="clickdepartment"
-          :methods="'listScriptNum'"
-        >
         </DepartmentList>
       </el-col>
       <el-col :span="19" :xs="24">
         <div ref="topform" class="form">
-          <el-form
+          <el-form :model="queryParams" ref="queryForms" size="small" :inline="true" v-show="showSearch"
-            :model="queryParams"
+            label-width="68px">
-            ref="queryForms"
+            <el-form-item label="通用话术名称" prop="commonScriptName" label-width="100px">
-            size="small"
+              <el-input v-model="queryParams.commonScriptName" placeholder="请输入通用话术名称" clearable
-            :inline="true"
+                @keyup.enter.native="handleQuery" />
-            v-show="showSearch"
-            label-width="68px"
-          >
-            <el-form-item
-              label="通用话术名称"
-              prop="commonScriptName"
-              label-width="100px"
-            >
-              <el-input
-                v-model="queryParams.commonScriptName"
-                placeholder="请输入通用话术名称"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item label="话术名称" prop="scriptName">
-              <el-input
+              <el-input v-model="queryParams.scriptName" placeholder="请输入话术名称" clearable
-                v-model="queryParams.scriptName"
+                @keyup.enter.native="handleQuery" />
-                placeholder="请输入话术名称"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item label="话术ID" prop="scriptId">
-              <el-input
+              <el-input v-model="queryParams.scriptId" placeholder="请输入话术ID" clearable
-                v-model="queryParams.scriptId"
+                @keyup.enter.native="handleQuery" />
-                placeholder="请输入话术ID"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item label="平台ID" prop="platformId">
-              <el-input
+              <el-input v-model="queryParams.platformId" placeholder="请输入平台ID" clearable
-                v-model="queryParams.platformId"
+                @keyup.enter.native="handleQuery" />
-                placeholder="请输入平台ID"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item label="话术状态" prop="scriptStatus">
-              <el-select
+              <el-select v-model="queryParams.scriptStatus" placeholder="请选择">
-                v-model="queryParams.scriptStatus"
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item>
-              <el-button
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                type="primary"
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                icon="el-icon-search"
-                size="mini"
-                @click="handleQuery"
-                >搜索</el-button
-              >
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >重置</el-button
-              >
             </el-form-item>
           </el-form>
         </div>
         <div ref="mb8" class="mb8">
           <el-row :gutter="10" class="">
             <el-col :span="1.5">
-              <el-button
+              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
                 :disabled="queryParams.hospitalAgencyId ? false : true"
-                v-hasPermi="['manage:script:add']"
+                v-hasPermi="['manage:script:add']">新增</el-button>
-                >新增</el-button
+              <el-button type="warning" plain icon="el-icon-upload2" size="mini" @click="handleUpload">导入</el-button>
-              >
-              <el-button
-                type="warning"
-                plain
-                icon="el-icon-upload2"
-                size="mini"
-                @click="handleUpload"
-                >导入</el-button
-              >
             </el-col>
-            <right-toolbar
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-              :showSearch.sync="showSearch"
-              @queryTable="getList"
-            ></right-toolbar>
           </el-row>
         </div>
         <div ref="table">
-          <el-table
+          <el-table :max-height="maxTableHeight" v-loading="loading" :data="scriptList"
-            :max-height="maxTableHeight"
+            @selection-change="handleSelectionChange">
-            v-loading="loading"
+            <el-table-column label="序号" align="center" prop="sort" type="index" />
-            :data="scriptList"
+            <el-table-column label="通用话术名称" align="center" prop="commonScriptName" :show-overflow-tooltip="true" />
-            @selection-change="handleSelectionChange"
+            <el-table-column label="话术名称" align="center" prop="scriptName" :show-overflow-tooltip="true" />
-          >
+            <el-table-column label="话术ID" align="center" prop="scriptId" :show-overflow-tooltip="true" />
-            <el-table-column
+            <el-table-column label="平台ID" align="center" prop="platformId" :show-overflow-tooltip="true" />
-              label="序号"
+            <el-table-column label="话术状态" align="center" prop="scriptStatus">
-              align="center"
-              prop="sort"
-              type="index"
-            />
-            <el-table-column
-              label="通用话术名称"
-              align="center"
-              prop="commonScriptName"
-              :show-overflow-tooltip="true"
-            />
-            <el-table-column
-              label="话术名称"
-              align="center"
-              prop="scriptName"
-              :show-overflow-tooltip="true"
-            />
-            <el-table-column
-              label="话术ID"
-              align="center"
-              prop="scriptId"
-              :show-overflow-tooltip="true"
-            />
-            <el-table-column
-              label="平台ID"
-              align="center"
-              prop="platformId"
-              :show-overflow-tooltip="true"
-            />
-            <el-table-column
-              label="话术状态"
-              align="center"
-              prop="scriptStatus"
-            >
               <template slot-scope="scope">
-                <el-tag
+                <el-tag v-if="scope.row.scriptStatus == 'NORMAL'" type="success">
-                  v-if="scope.row.scriptStatus == 'NORMAL'"
-                  type="success"
-                >
                   正常
                 </el-tag>
-                <el-tag
+                <el-tag v-if="scope.row.scriptStatus == 'OFF_SHELF'" type="danger">
-                  v-if="scope.row.scriptStatus == 'OFF_SHELF'"
-                  type="danger"
-                >
                   下架
                 </el-tag>
                 <el-tag v-if="scope.row.scriptStatus == 'SUSPEND'" type="info">
@@ -171,187 +69,79 @@
                 </el-tag>
               </template>
             </el-table-column>
-            <el-table-column
+            <el-table-column label="话术简介" align="center" prop="scriptIntroduction" :show-overflow-tooltip="true" />
-              label="话术简介"
+            <el-table-column label="病种名称" align="center" prop="diseaseTypeName" :show-overflow-tooltip="true" />
-              align="center"
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
-              prop="scriptIntroduction"
-              :show-overflow-tooltip="true"
-            />
-            <el-table-column
-              label="病种名称"
-              align="center"
-              prop="diseaseTypeName"
-              :show-overflow-tooltip="true"
-            />
-            <el-table-column
-              label="操作"
-              align="center"
-              class-name="small-padding fixed-width"
-              width="200"
-            >
               <template slot-scope="scope">
                 <!-- <el-button size="mini" type="text"  icon="el-icon-folder-delete"
                 @click="norelease(scope.row)">取消发布</el-button>
               <el-button size="mini" icon="el-icon-folder-checked" type="text"  @click="release(scope.row)">发布</el-button> -->
                 <!-- <el-button size="mini" type="text" icon="el-icon-search" @click="handlesee(scope.row)">预览</el-button> -->
-                <el-button
+                <el-button size="mini" type="text" icon="el-icon-zoom-in" @click="see(scope.row)">话术</el-button>
-                  size="mini"
+                <el-button size="mini" type="text" icon="el-icon-picture-outline"
-                  type="text"
+                  @click="seescript(scope.row)">话术预览</el-button>
-                  icon="el-icon-zoom-in"
+                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                  @click="see(scope.row)"
+                  v-hasPermi="['manage:script:edit']">修改</el-button>
-                  >话术</el-button
+                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                >
+                  v-hasPermi="['manage:script:remove']">删除</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-picture-outline"
-                  @click="seescript(scope.row)"
-                  >话术预览</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['manage:script:edit']"
-                  >修改</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="['manage:script:remove']"
-                  >删除</el-button
-                >
               </template>
             </el-table-column>
           </el-table>
         </div>
-        <myPagination
+        <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-          v-show="total > 0"
+          :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
-          :total="total"
-          :pageSize="queryParams.pageSize"
-          :indexFromWrap="queryParams.pageNum"
-          @updateCPage="updateCPage"
-        ></myPagination>
         <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize" @pagination="getList" /> -->
       </el-col>
     </el-row>
     <!-- 添加或修改话术信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
-      <el-form
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px" :inline="true">
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="110px"
-        :inline="true"
-      >
         <el-form-item label="通用话术名称" prop="commonScriptName">
-          <el-input
+          <el-input maxlength="100" v-model="form.commonScriptName" placeholder="请输入通用话术名称" />
-            maxlength="100"
-            v-model="form.commonScriptName"
-            placeholder="请输入通用话术名称"
-          />
         </el-form-item>
         <el-form-item label="话术名称" prop="scriptName">
-          <el-input
+          <el-input v-model="form.scriptName" placeholder="请输入话术名称" maxlength="100" />
-            v-model="form.scriptName"
-            placeholder="请输入话术名称"
-            maxlength="100"
-          />
         </el-form-item>
         <el-form-item label="科室名称" prop="departmentId">
-          <el-button
+          <el-button type="" @click="clickinnerVisible()" :style="form.departmentName == '请选择科室' ? 'color: #c0c4cc;' : ''
-            type=""
+      " style="
-            @click="clickinnerVisible()"
-            :style="
-              form.departmentName == '请选择科室' ? 'color: #c0c4cc;' : ''
-            "
-            style="
               width: 206px;
               text-align: left;
               height: 36px;
               overflow: hidden;
-            "
+            ">{{ form.departmentName }}</el-button>
-            >{{ form.departmentName }}</el-button
-          >
         </el-form-item>
         <el-form-item label="病种名称" prop="diseaseTypeName">
-          <el-button
+          <el-button type="" @click="clickdisease()" :style="form.diseaseTypeName == '请选择病种' ? 'color: #c0c4cc;' : ''
-            type=""
+      " style="
-            @click="clickdisease()"
-            :style="
-              form.diseaseTypeName == '请选择病种' ? 'color: #c0c4cc;' : ''
-            "
-            style="
               width: 206px;
               text-align: left;
               height: 36px;
               overflow: hidden;
-            "
+            ">{{ form.diseaseTypeName }}</el-button>
-            >{{ form.diseaseTypeName }}</el-button
-          >
         </el-form-item>
         <el-form-item label="话术排序" prop="scriptSort">
-          <el-input-number
+          <el-input-number v-model="form.scriptSort" controls-position="right" :min="0" placeholder="请输入话术排序"
-            v-model="form.scriptSort"
+            style="width: 206px" />
-            controls-position="right"
-            :min="0"
-            placeholder="请输入话术排序"
-            style="width: 206px"
-          />
         </el-form-item>
-        <el-form-item
+        <el-form-item label="话术ID" prop="scriptId" v-if="title == '修改话术信息'">
-          label="话术ID"
+          <el-input disabled onKeyUp="value=value.replace(/[\W]/g,'')" v-model="form.scriptId" placeholder="请输入话术ID"
-          prop="scriptId"
+            maxlength="100" />
-          v-if="title == '修改话术信息'"
-        >
-          <el-input
-            disabled
-            onKeyUp="value=value.replace(/[\W]/g,'')"
-            v-model="form.scriptId"
-            placeholder="请输入话术ID"
-            maxlength="100"
-          />
         </el-form-item>
         <el-form-item label="平台ID" prop="platformId">
-          <el-input
+          <el-input onKeyUp="value=value.replace(/[\W]/g,'')" v-model="form.platformId" placeholder="请输入平台ID"
-            onKeyUp="value=value.replace(/[\W]/g,'')"
+            maxlength="100" />
-            v-model="form.platformId"
-            placeholder="请输入平台ID"
-            maxlength="100"
-          />
         </el-form-item>
-        <el-form-item
+        <el-form-item label="话术状态" prop="platformId" v-if="title == '修改话术信息'">
-          label="话术状态"
+          <el-select v-model="form.scriptStatus" placeholder="请选择" style="width: 206px">
-          prop="platformId"
+            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-          v-if="title == '修改话术信息'"
-        >
-          <el-select
-            v-model="form.scriptStatus"
-            placeholder="请选择"
-            style="width: 206px"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
             </el-option>
           </el-select>
         </el-form-item>
-     
+
         <el-form-item label="话术简介" prop="scriptIntroduction">
-          <el-input
+          <el-input maxlength="200" v-model="form.scriptIntroduction" placeholder="请输入话术简介" type="textarea" />
-            maxlength="200"
-            v-model="form.scriptIntroduction"
-            placeholder="请输入话术简介"
-            type="textarea"
-          
-          />
         </el-form-item>
         <!-- <el-form-item label="图片" prop="scriptFilePath">
           <stationAcatar @imgUrl="imgUrl" :img="form.scriptFilePath" :type="'scriptUrl'" />
@@ -363,165 +153,63 @@
       </div>
     </el-dialog>
     <!-- 科室弹框 -->
-    <el-dialog
+    <el-dialog title="" :visible.sync="innerVisibleshow" width="1000px" append-to-body
-      title=""
+      :before-close="innerVisiblecancel">
-      :visible.sync="innerVisibleshow"
+      <el-form ref="queryForm" :model="informationqueryParams" :rules="rules" label-width="80px" :inline="true">
-      width="1000px"
-      append-to-body
-      :before-close="innerVisiblecancel"
-    >
-      <el-form
-        ref="queryForm"
-        :model="informationqueryParams"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
         <el-form-item label="科室名称" prop="departmentName" label-width="120">
-          <el-input
+          <el-input v-model="informationqueryParams.departmentName" placeholder="请输入科室名称" clearable />
-            v-model="informationqueryParams.departmentName"
-            placeholder="请输入科室名称"
-            clearable
-          />
         </el-form-item>
         <el-form-item>
-          <el-button
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="informationInfoinfo">搜索</el-button>
-            type="primary"
+          <el-button icon="el-icon-refresh" size="mini" @click="addresetQuerylist">重置</el-button>
-            icon="el-icon-search"
-            size="mini"
-            @click="informationInfoinfo"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="addresetQuerylist"
-            >重置</el-button
-          >
         </el-form-item>
       </el-form>
-      <el-table
+      <el-table :data="infolist" @cell-dblclick="nurseclick" v-loading="loading">
-        :data="infolist"
-        @cell-dblclick="nurseclick"
-        v-loading="loading"
-      >
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
-            <el-button
+            <el-button type="primary" style="width: 15px; height: 15px" v-if="form.departmentId == scope.row.id" circle
-              type="primary"
+              @click="nurseclick(scope.row)"></el-button>
-              style="width: 15px; height: 15px"
+            <el-button v-else style="width: 15px; height: 15px" circle @click="nurseclick(scope.row)"></el-button>
-              v-if="form.departmentId == scope.row.id"
-              circle
-              @click="nurseclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="nurseclick(scope.row)"
-            ></el-button>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column property="departmentName" label="科室名称" align="center" :show-overflow-tooltip="true">
-          property="departmentName"
-          label="科室名称"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
         </el-table-column>
       </el-table>
-      <myPagination
+      <myPagination v-show="totaldepartment > 0" :total="totaldepartment" :pageSize="informationqueryParams.pageSize"
-        v-show="totaldepartment > 0"
+        :indexFromWrap="informationqueryParams.pageNum" @updateCPage="updateCPagetwo"></myPagination>
-        :total="totaldepartment"
-        :pageSize="informationqueryParams.pageSize"
-        :indexFromWrap="informationqueryParams.pageNum"
-        @updateCPage="updateCPagetwo"
-      ></myPagination>
       <!-- <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
         :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo"  /> -->
     </el-dialog>
     <!-- 病种弹框 -->
-    <el-dialog
+    <el-dialog title="" :visible.sync="diseaseshowst" width="1000px" append-to-body :before-close="canceldiseases">
-      title=""
+      <el-form ref="queryForm" :model="querydisease" :rules="rules" label-width="80px" :inline="true">
-      :visible.sync="diseaseshowst"
-      width="1000px"
-      append-to-body
-      :before-close="canceldiseases"
-    >
-      <el-form
-        ref="queryForm"
-        :model="querydisease"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
         <el-form-item label="病种名称" prop="diseaseTypeName" label-width="120">
-          <el-input
+          <el-input v-model="querydisease.diseaseTypeName" placeholder="请输入病种名称" clearable />
-            v-model="querydisease.diseaseTypeName"
-            placeholder="请输入病种名称"
-            clearable
-          />
         </el-form-item>
         <el-form-item>
-          <el-button
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="infodisease">搜索</el-button>
-            type="primary"
+          <el-button icon="el-icon-refresh" size="mini" @click="resetdisease">重置</el-button>
-            icon="el-icon-search"
-            size="mini"
-            @click="infodisease"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="resetdisease"
-            >重置</el-button
-          >
         </el-form-item>
       </el-form>
-      <el-table
+      <el-table :data="listdisease" @cell-dblclick="nurseclickdisease" v-loading="loading">
-        :data="listdisease"
-        @cell-dblclick="nurseclickdisease"
-        v-loading="loading"
-      >
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
-            <el-button
+            <el-button type="primary" style="width: 15px; height: 15px" v-if="form.diseaseTypeId == scope.row.id" circle
-              type="primary"
+              @click="nurseclickdisease(scope.row)"></el-button>
-              style="width: 15px; height: 15px"
+            <el-button v-else style="width: 15px; height: 15px" circle
-              v-if="form.diseaseTypeId == scope.row.id"
+              @click="nurseclickdisease(scope.row)"></el-button>
-              circle
-              @click="nurseclickdisease(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="nurseclickdisease(scope.row)"
-            ></el-button>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column property="diseaseTypeName" label="病种名称" align="center" :show-overflow-tooltip="true">
-          property="diseaseTypeName"
-          label="病种名称"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
         </el-table-column>
       </el-table>
       <!-- <pagination v-show="diseasetotal > 0" :total="diseasetotal" :page.sync="querydisease.pageNum"
         :limit.sync="querydisease.pageSize" @pagination="infodisease" /> -->
-      <myPagination
+      <myPagination v-show="diseasetotal > 0" :total="diseasetotal" :pageSize="querydisease.pageSize"
-        v-show="diseasetotal > 0"
+        :indexFromWrap="querydisease.pageNum" @updateCPage="updateCPagethree"></myPagination>
-        :total="diseasetotal"
-        :pageSize="querydisease.pageSize"
-        :indexFromWrap="querydisease.pageNum"
-        @updateCPage="updateCPagethree"
-      ></myPagination>
     </el-dialog>
     <!-- 预览弹框 -->
-    <el-dialog
+    <el-dialog title="预览" :visible.sync="dialogsee" width="40%" :before-close="seeClose">
-      title="预览"
-      :visible.sync="dialogsee"
-      width="40%"
-      :before-close="seeClose"
-    >
       <div class="dialog">
         <img :src="baseUrl + form.scriptFilePath" alt="" />
       </div>
@@ -530,17 +218,8 @@
       </span>
     </el-dialog>
     <!-- 导入弹框 -->
-    <el-dialog
+    <el-dialog title="" :visible.sync="innerexport" width="1000px" append-to-body :before-close="exportcancel">
-      title=""
+      <scriptexport @submit="submit" ref="childComponent"></scriptexport>
-      :visible.sync="innerexport"
-      width="1000px"
-      append-to-body
-      :before-close="exportcancel"
-    >
-      <scriptexport
-        @submit="submit"
-        ref="childComponent"
-      ></scriptexport>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitexport">确 定</el-button>
         <el-button @click="innerexport = false">取 消</el-button>
@@ -960,9 +639,9 @@ export default {
         hospitalAgencyId: JSON.parse(localStorage.getItem('user')).hospitalAgencyId
       }
       this.informationqueryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
-      this.$refs.DepartmentList.resetQuery()
       this.resetForm("queryForms");
-      this.handleQuery();
+      this.$refs.DepartmentList.resetQuery()
+      // this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -1108,7 +787,7 @@ export default {
 
 ::v-deep .el-textarea__inner {
   width: 530px;
-    height: 79px;
+  height: 79px;
 }
 
 .dialog {

src/views/manage/servicepackage/index.vue

@@ -2,611 +2,248 @@
   <div class="app-container" ref="layout">
     <el-row :gutter="20">
       <el-col :span="5">
-        <DepartmentList
+        <DepartmentList ref="DepartmentList" @clickdepartment="clickdepartment" :methods="'listServicePackageNum'">
-          ref="DepartmentList"
-          @clickdepartment="clickdepartment"
-          :methods="'listServicePackageNum'"
-        >
         </DepartmentList>
       </el-col>
       <el-col :span="19" :xs="24">
         <div ref="topform" class="form">
-          <el-form
+          <el-form :model="queryParams" ref="queryForms" size="small" :inline="true" v-show="showSearch"
-            :model="queryParams"
+            label-width="90px">
-            ref="queryForms"
-            size="small"
-            :inline="true"
-            v-show="showSearch"
-            label-width="90px"
-          >
             <el-form-item label="病种名称" prop="diseaseTypeName">
-              <el-input
+              <el-input v-model="queryParams.diseaseTypeName" placeholder="请输入病种名称" clearable
-                v-model="queryParams.diseaseTypeName"
+                @keyup.enter.native="handleQuery" />
-                placeholder="请输入病种名称"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item label="服务包名称" prop="packageName">
-              <el-input
+              <el-input v-model="queryParams.packageName" placeholder="请输入服务包名称" clearable
-                v-model="queryParams.packageName"
+                @keyup.enter.native="handleQuery" />
-                placeholder="请输入服务包名称"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item label="服务包版本" prop="packageVersion">
-              <el-input
+              <el-input v-model="queryParams.packageVersion" placeholder="请输入服务包版本" clearable
-                v-model="queryParams.packageVersion"
+                @keyup.enter.native="handleQuery" />
-                placeholder="请输入服务包版本"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item label="是否发布" prop="whetherRelease">
-              <el-select
+              <el-select v-model="queryParams.whetherRelease" placeholder="请选择">
-                v-model="queryParams.whetherRelease"
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="服务包价格" prop="packagePrice">
-              <el-input
+              <el-input oninput="value=value.replace(/[^\d.]/g,'')" v-model="queryParams.packagePrice"
-                oninput="value=value.replace(/[^\d.]/g,'')"
+                placeholder="请输入服务包价格" clearable @keyup.enter.native="handleQuery" />
-                v-model="queryParams.packagePrice"
-                placeholder="请输入服务包价格"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item>
-              <el-button
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                type="primary"
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                icon="el-icon-search"
-                size="mini"
-                @click="handleQuery"
-                >搜索</el-button
-              >
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >重置</el-button
-              >
             </el-form-item>
           </el-form>
         </div>
         <div ref="mb8" class="mb8">
           <el-row :gutter="10" class="">
             <el-col :span="1.5">
-              <el-button
+              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
                 :disabled="queryParams.hospitalAgencyId ? false : true"
-                v-hasPermi="['manage:servicepackage:add']"
+                v-hasPermi="['manage:servicepackage:add']">新增服务包</el-button>
-                >新增服务包</el-button
+              <el-button type="warning" plain icon="el-icon-upload2" size="mini" @click="handleUpload">导入</el-button>
-              >
-              <el-button
-                type="warning"
-                plain
-                icon="el-icon-upload2"
-                size="mini"
-                @click="handleUpload"
-                >导入</el-button
-              >
             </el-col>
-            <right-toolbar
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-              :showSearch.sync="showSearch"
-              @queryTable="getList"
-            ></right-toolbar>
           </el-row>
         </div>
         <div ref="table">
-          <el-table
+          <el-table :max-height="maxTableHeight" v-loading="loading" :data="servicepackageList"
-            :max-height="maxTableHeight"
+            @selection-change="handleSelectionChange">
-            v-loading="loading"
-            :data="servicepackageList"
-            @selection-change="handleSelectionChange"
-          >
             <el-table-column label="序号" align="center" type="index" />
-            <el-table-column
+            <el-table-column label="服务包名称" align="center" prop="packageName" :show-overflow-tooltip="true" />
-              label="服务包名称"
+            <el-table-column label="版本号" align="center" prop="packageVersion" />
-              align="center"
+            <el-table-column label="服务期限" align="center" prop="packageTermAndUnit" />
-              prop="packageName"
+            <el-table-column label="服务包简介" align="center" prop="packageIntroduction" :show-overflow-tooltip="true" />
-              :show-overflow-tooltip="true"
-            />
-            <el-table-column
-              label="版本号"
-              align="center"
-              prop="packageVersion"
-            />
-            <el-table-column
-              label="服务期限"
-              align="center"
-              prop="packageTermAndUnit"
-            />
-            <el-table-column
-              label="服务包简介"
-              align="center"
-              prop="packageIntroduction"
-              :show-overflow-tooltip="true"
-            />
             <el-table-column label="备注" align="center" prop="packageRemark" />
-            <el-table-column
+            <el-table-column label="是否发布" align="center" prop="whetherRelease">
-              label="是否发布"
-              align="center"
-              prop="whetherRelease"
-            >
               <template slot-scope="scope">
-                <el-tag type="warning" v-if="scope.row.whetherRelease == '0'"
+                <el-tag type="warning" v-if="scope.row.whetherRelease == '0'">未发布</el-tag>
-                  >未发布</el-tag
+                <el-tag type="success" v-else-if="scope.row.whetherRelease == '1'">已发布</el-tag>
-                >
-                <el-tag
-                  type="success"
-                  v-else-if="scope.row.whetherRelease == '1'"
-                  >已发布</el-tag
-                >
               </template>
             </el-table-column>
-            <el-table-column
+            <el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
-              label="病种名称"
+            <el-table-column width="180" label="操作" align="center" class-name="small-padding fixed-width">
-              align="center"
-              prop="diseaseTypeName"
-            />
-            <el-table-column
-              width="180"
-              label="操作"
-              align="center"
-              class-name="small-padding fixed-width"
-            >
               <template slot-scope="scope">
-                <el-button
+                <el-button size="mini" type="text" icon="el-icon-s-open" @click="copy(scope.row)">复制</el-button>
-                  size="mini"
+                <el-button size="mini" type="text" icon="el-icon-s-promotion" @click="release(scope.row)"
-                  type="text"
+                  v-if="scope.row.whetherRelease == 0">发布</el-button>
-                  icon="el-icon-s-open"
+                <el-button size="mini" type="text" icon="el-icon-notebook-2" @click="detail(scope.row)">详情</el-button>
-                  @click="copy(scope.row)"
+                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                  >复制</el-button
+                  v-hasPermi="['manage:servicepackage:edit']">修改</el-button>
-                >
+                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                <el-button
+                  v-hasPermi="['manage:servicepackage:remove']">删除</el-button>
-                  size="mini"
-                  type="text"
-                  icon="el-icon-s-promotion"
-                  @click="release(scope.row)"
-                  v-if="scope.row.whetherRelease == 0"
-                  >发布</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-notebook-2"
-                  @click="detail(scope.row)"
-                  >详情</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['manage:servicepackage:edit']"
-                  >修改</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="['manage:servicepackage:remove']"
-                  >删除</el-button
-                >
               </template>
             </el-table-column>
           </el-table>
         </div>
         <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize" @pagination="getList" /> -->
-        <myPagination
+        <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-          v-show="total > 0"
+          :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
-          :total="total"
-          :pageSize="queryParams.pageSize"
-          :indexFromWrap="queryParams.pageNum"
-          @updateCPage="updateCPage"
-        ></myPagination>
       </el-col>
     </el-row>
     <!-- 添加或修改服务包基础信息对话框 -->
-    <el-dialog
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-      :title="title"
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
-      :visible.sync="open"
-      width="1000px"
-      append-to-body
-    >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="100px"
-        :inline="true"
-      >
         <el-form-item label="科室名称" prop="departmentId">
-          <el-button
+          <el-button @click="clickinnerVisible()" style="
-            @click="clickinnerVisible()"
-            style="
               width: 208px;
               text-align: left;
               height: 36px;
               overflow: hidden;
-            "
+            " :style="form.departmentName == '请选择科室' ? 'color: #c0c4cc;' : ''
-            :style="
+      ">{{ form.departmentName }}</el-button>
-              form.departmentName == '请选择科室' ? 'color: #c0c4cc;' : ''
-            "
-            >{{ form.departmentName }}</el-button
-          >
         </el-form-item>
         <el-form-item label="病种名称" prop="diseaseTypeName">
-          <el-button
+          <el-button type="" @click="clickdisease()" :style="form.diseaseTypeName == '请选择病种' ? 'color: #c0c4cc;' : ''
-            type=""
+      " style="
-            @click="clickdisease()"
-            :style="
-              form.diseaseTypeName == '请选择病种' ? 'color: #c0c4cc;' : ''
-            "
-            style="
               width: 208px;
               text-align: left;
               height: 36px;
               overflow: hidden;
-            "
+            ">{{ form.diseaseTypeName }}</el-button>
-            >{{ form.diseaseTypeName }}</el-button
-          >
         </el-form-item>
         <el-form-item label="服务包名称" prop="packageName">
           <el-input v-model="form.packageName" placeholder="请输入服务包名称" />
         </el-form-item>
         <el-form-item label="服务包简介" prop="packageIntroduction">
-          <el-input
+          <el-input v-model="form.packageIntroduction" placeholder="请输入服务包简介" />
-            v-model="form.packageIntroduction"
-            placeholder="请输入服务包简介"
-          />
         </el-form-item>
         <el-form-item label="服务包价格" prop="packagePrice">
-          <el-input
+          <el-input oninput="value=value.replace(/[^\d.]/g,'')" v-model="form.packagePrice" placeholder="请输入服务包价格"
-            oninput="value=value.replace(/[^\d.]/g,'')"
+            style="width: 208px">
-            v-model="form.packagePrice"
-            placeholder="请输入服务包价格"
-            style="width: 208px"
-          >
             <template slot="append">元</template>
           </el-input>
         </el-form-item>
         <el-form-item label="服务包版本" prop="packageVersion">
-          <el-input
+          <el-input v-model="form.packageVersion" placeholder="请输入服务包版本" />
-            v-model="form.packageVersion"
-            placeholder="请输入服务包版本"
-          />
         </el-form-item>
         <el-form-item label="硬件类型" prop="hardwareType">
-          <el-select
+          <el-select v-model="form.hardwareType" placeholder="请选择硬件类型" style="width: 208px">
-            v-model="form.hardwareType"
+            <el-option v-for="item in optionstype" :key="item.value" :label="item.label" :value="item.value">
-            placeholder="请选择硬件类型"
-            style="width: 208px"
-          >
-            <el-option
-              v-for="item in optionstype"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="服务包期限" prop="packageTerm">
-          <el-input
+          <el-input v-model="form.packageTerm" placeholder="请输入服务包期限" style="width: 208px">
-            v-model="form.packageTerm"
+            <el-select style="width: 60px" slot="append" v-model="form.packageTermUnit" placeholder="请选择"
-            placeholder="请输入服务包期限"
+              @change="$forceUpdate()">
-            style="width: 208px"
+              <el-option v-for="item in optionstime" :key="item.value" :label="item.label" :value="item.label">
-          >
-            <el-select
-              style="width: 60px"
-              slot="append"
-              v-model="form.packageTermUnit"
-              placeholder="请选择"
-              @change="$forceUpdate()"
-            >
-              <el-option
-                v-for="item in optionstime"
-                :key="item.value"
-                :label="item.label"
-                :value="item.label"
-              >
               </el-option>
             </el-select>
           </el-input>
         </el-form-item>
         <br />
         <div v-for="(aitem, index) in form.voList" :key="index">
-          <el-form-item
+          <el-form-item label="服务包内容" :rules="rules.voList.serviceWayName" :prop="`voList.${index}.serviceWayName`">
-            label="服务包内容"
+            <el-select v-model="aitem.serviceWayName" placeholder="请选择服务方式" @change="changeway($event, index)"
-            :rules="rules.voList.serviceWayName"
+              style="width: 208px">
-            :prop="`voList.${index}.serviceWayName`"
+              <el-option v-for="item in optionsway" :key="item.id" :label="item.serviceWayName"
-          >
+                :value="item.serviceWayName">
-            <el-select
-              v-model="aitem.serviceWayName"
-              placeholder="请选择服务方式"
-              @change="changeway($event, index)"
-              style="width: 208px"
-            >
-              <el-option
-                v-for="item in optionsway"
-                :key="item.id"
-                :label="item.serviceWayName"
-                :value="item.serviceWayName"
-              >
               </el-option>
             </el-select>
-            <el-form-item
+            <el-form-item label="" :rules="rules.voList.serviceContent" :prop="`voList.${index}.serviceContent`">
-              label=""
+              <el-select style="margin-left: 10px; width: 208px" v-model="aitem.serviceContent" placeholder="请选择服务内容"
-              :rules="rules.voList.serviceContent"
+                @change="changcontent($event, index)">
-              :prop="`voList.${index}.serviceContent`"
+                <el-option v-for="item in optionscontent[index]" :key="item.id" :label="item.serviceContent"
-            >
+                  :value="item.serviceContent">
-              <el-select
-                style="margin-left: 10px; width: 208px"
-                v-model="aitem.serviceContent"
-                placeholder="请选择服务内容"
-                @change="changcontent($event, index)"
-              >
-                <el-option
-                  v-for="item in optionscontent[index]"
-                  :key="item.id"
-                  :label="item.serviceContent"
-                  :value="item.serviceContent"
-                >
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item
+            <el-form-item label="" :rules="rules.voList.serviceFrequencyText"
-              label=""
+              :prop="`voList.${index}.serviceFrequencyText`">
-              :rules="rules.voList.serviceFrequencyText"
+              <el-select v-model="aitem.serviceFrequencyText" placeholder="请选择服务频次" style="width: 208px">
-              :prop="`voList.${index}.serviceFrequencyText`"
+                <el-option v-for="item in optionsfrequency[index]" :key="item.id" :label="item.serviceFrequencyText"
-            >
+                  :value="item.serviceFrequencyText">
-              <el-select
-                v-model="aitem.serviceFrequencyText"
-                placeholder="请选择服务频次"
-                style="width: 208px"
-              >
-                <el-option
-                  v-for="item in optionsfrequency[index]"
-                  :key="item.id"
-                  :label="item.serviceFrequencyText"
-                  :value="item.serviceFrequencyText"
-                >
                 </el-option>
               </el-select>
             </el-form-item>
           </el-form-item>
-          <el-button
+          <el-button type="primary" plain icon="el-icon-circle-plus-outline" style="margin-top: 2px; margin-left: 6px"
-            type="primary"
+            v-if="index == 0" @click="addnurseClassifyitem"></el-button>
-            plain
-            icon="el-icon-circle-plus-outline"
-            style="margin-top: 2px; margin-left: 6px"
-            v-if="index == 0"
-            @click="addnurseClassifyitem"
-          ></el-button>
           <!-- circle -->
-          <el-button
+          <el-button type="danger" icon="el-icon-delete" plain style="margin-top: 2px; margin-left: 6px"
-            type="danger"
+            v-if="index != 0" @click="delnurseClassifyitem(index)"></el-button>
-            icon="el-icon-delete"
-            plain
-            style="margin-top: 2px; margin-left: 6px"
-            v-if="index != 0"
-            @click="delnurseClassifyitem(index)"
-          ></el-button>
         </div>
         <br />
         <el-form-item label="服务包备注" prop="packageRemark">
-          <el-input
+          <el-input style="width: 835px" type="textarea" v-model="form.packageRemark" placeholder="请输入服务包备注" />
-            style="width: 835px"
-            type="textarea"
-            v-model="form.packageRemark"
-            placeholder="请输入服务包备注"
-          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button
+        <el-button type="primary" @click="submitFormadd" v-if="title == '复制服务包基础信息'">确 定</el-button>
-          type="primary"
-          @click="submitFormadd"
-          v-if="title == '复制服务包基础信息'"
-          >确 定</el-button
-        >
         <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
     <!-- 科室弹框 -->
-    <el-dialog
+    <el-dialog title="" :visible.sync="innerVisibleshow" width="1000px" append-to-body
-      title=""
+      :before-close="innerVisiblecancel">
-      :visible.sync="innerVisibleshow"
+      <el-form ref="queryForm" :model="informationqueryParams" :rules="rules" label-width="80px" :inline="true">
-      width="1000px"
-      append-to-body
-      :before-close="innerVisiblecancel"
-    >
-      <el-form
-        ref="queryForm"
-        :model="informationqueryParams"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
         <el-form-item label="科室名称" prop="departmentName" label-width="120">
-          <el-input
+          <el-input v-model="informationqueryParams.departmentName" placeholder="请输入科室名称" clearable />
-            v-model="informationqueryParams.departmentName"
-            placeholder="请输入科室名称"
-            clearable
-          />
         </el-form-item>
         <el-form-item>
-          <el-button
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="informationInfoinfo">搜索</el-button>
-            type="primary"
+          <el-button icon="el-icon-refresh" size="mini" @click="addresetQuerylist">重置</el-button>
-            icon="el-icon-search"
-            size="mini"
-            @click="informationInfoinfo"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="addresetQuerylist"
-            >重置</el-button
-          >
         </el-form-item>
       </el-form>
-      <el-table
+      <el-table :data="infolist" @cell-dblclick="nurseclick" v-loading="loading">
-        :data="infolist"
-        @cell-dblclick="nurseclick"
-        v-loading="loading"
-      >
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
-            <el-button
+            <el-button type="primary" style="width: 15px; height: 15px" v-if="form.departmentId == scope.row.id" circle
-              type="primary"
+              @click="nurseclick(scope.row)"></el-button>
-              style="width: 15px; height: 15px"
+            <el-button v-else style="width: 15px; height: 15px" circle @click="nurseclick(scope.row)"></el-button>
-              v-if="form.departmentId == scope.row.id"
-              circle
-              @click="nurseclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="nurseclick(scope.row)"
-            ></el-button>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column property="departmentName" label="科室名称" align="center" :show-overflow-tooltip="true">
-          property="departmentName"
-          label="科室名称"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
         </el-table-column>
       </el-table>
-      <myPagination
+      <myPagination v-show="totaldepartment > 0" :total="totaldepartment" :pageSize="informationqueryParams.pageSize"
-        v-show="totaldepartment > 0"
+        :indexFromWrap="informationqueryParams.pageNum" @updateCPage="updateCPagetwo"></myPagination>
-        :total="totaldepartment"
-        :pageSize="informationqueryParams.pageSize"
-        :indexFromWrap="informationqueryParams.pageNum"
-        @updateCPage="updateCPagetwo"
-      ></myPagination>
       <!-- <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
         :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" /> -->
     </el-dialog>
     <!-- 病种弹框 -->
-    <el-dialog
+    <el-dialog title="" :visible.sync="diseaseshowst" width="1000px" append-to-body :before-close="canceldiseases">
-      title=""
+      <el-form ref="queryForm" :model="querydisease" :rules="rules" label-width="80px" :inline="true">
-      :visible.sync="diseaseshowst"
-      width="1000px"
-      append-to-body
-      :before-close="canceldiseases"
-    >
-      <el-form
-        ref="queryForm"
-        :model="querydisease"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
         <el-form-item label="病种名称" prop="diseaseTypeName" label-width="120">
-          <el-input
+          <el-input v-model="querydisease.diseaseTypeName" placeholder="请输入病种名称" clearable />
-            v-model="querydisease.diseaseTypeName"
-            placeholder="请输入病种名称"
-            clearable
-          />
         </el-form-item>
         <el-form-item>
-          <el-button
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="infodisease">搜索</el-button>
-            type="primary"
+          <el-button icon="el-icon-refresh" size="mini" @click="resetdisease">重置</el-button>
-            icon="el-icon-search"
-            size="mini"
-            @click="infodisease"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="resetdisease"
-            >重置</el-button
-          >
         </el-form-item>
       </el-form>
-      <el-table
+      <el-table :data="listdisease" @cell-dblclick="nurseclickdisease" v-loading="loading">
-        :data="listdisease"
-        @cell-dblclick="nurseclickdisease"
-        v-loading="loading"
-      >
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
-            <el-button
+            <el-button type="primary" style="width: 15px; height: 15px" v-if="form.diseaseTypeId == scope.row.id" circle
-              type="primary"
+              @click="nurseclickdisease(scope.row)"></el-button>
-              style="width: 15px; height: 15px"
+            <el-button v-else style="width: 15px; height: 15px" circle
-              v-if="form.diseaseTypeId == scope.row.id"
+              @click="nurseclickdisease(scope.row)"></el-button>
-              circle
-              @click="nurseclickdisease(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="nurseclickdisease(scope.row)"
-            ></el-button>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column property="diseaseTypeName" label="病种名称" align="center" :show-overflow-tooltip="true">
-          property="diseaseTypeName"
-          label="病种名称"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
         </el-table-column>
       </el-table>
       <!-- <pagination v-show="diseasetotal > 0" :total="diseasetotal" :page.sync="querydisease.pageNum"
         :limit.sync="querydisease.pageSize" @pagination="infodisease" /> -->
-      <myPagination
+      <myPagination v-show="diseasetotal > 0" :total="diseasetotal" :pageSize="querydisease.pageSize"
-        v-show="diseasetotal > 0"
+        :indexFromWrap="querydisease.pageNum" @updateCPage="updateCPagethree"></myPagination>
-        :total="diseasetotal"
-        :pageSize="querydisease.pageSize"
-        :indexFromWrap="querydisease.pageNum"
-        @updateCPage="updateCPagethree"
-      ></myPagination>
     </el-dialog>
     <!-- 详情弹框 -->
-    <el-dialog
+    <el-dialog title="详情" :visible.sync="detailshow" width="50%" :before-close="handleClose">
-      title="详情"
+      <el-form ref="form" :model="formdetail" label-width="150px" :inline="true">
-      :visible.sync="detailshow"
-      width="50%"
-      :before-close="handleClose"
-    >
-      <el-form
-        ref="form"
-        :model="formdetail"
-        label-width="150px"
-        :inline="true"
-      >
         <el-form-item label="病种名称:" prop="packageVersion">
           <span style="display: inline-block; width: 80px">
-            {{ formdetail.diseaseTypeName }}</span
+            {{ formdetail.diseaseTypeName }}</span>
-          >
         </el-form-item>
         <el-form-item label="服务包名称:" prop="packageVersion">
           <div class="container">
-            <el-tooltip
+            <el-tooltip class="item" effect="dark" :content="formdetail.packageName" placement="top-start">
-              class="item"
-              effect="dark"
-              :content="formdetail.packageName"
-              placement="top-start"
-            >
               <span>{{ formdetail.packageName }}</span>
             </el-tooltip>
           </div>
@@ -634,35 +271,16 @@
       </el-form>
       <el-table v-loading="loading" :data="datailList">
         <el-table-column label="序号" type="index" />
-        <el-table-column
+        <el-table-column label="服务方式" align="center" prop="serviceWayName" />
-          label="服务方式"
+        <el-table-column label="服务内容" align="center" prop="serviceContent" :show-overflow-tooltip="true" />
-          align="center"
+        <el-table-column label="服务频次" align="center" prop="serviceFrequencyText" />
-          prop="serviceWayName"
-        />
-        <el-table-column
-          label="服务内容"
-          align="center"
-          prop="serviceContent"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="服务频次"
-          align="center"
-          prop="serviceFrequencyText"
-        />
       </el-table>
       <span slot="footer" class="dialog-footer">
         <el-button @click="detailshow = false">关闭</el-button>
       </span>
     </el-dialog>
     <!-- 发布弹框 -->
-    <el-dialog
+    <el-dialog title="提示" :visible.sync="dialogexamine" width="30%" :before-close="amineClose" center>
-      title="提示"
-      :visible.sync="dialogexamine"
-      width="30%"
-      :before-close="amineClose"
-      center
-    >
       <span style="font-size: 18px; margin-left: 55px">是否同意发布？</span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="cancelamine">同意</el-button>
@@ -670,17 +288,8 @@
       </span>
     </el-dialog>
     <!-- 导入弹框 -->
-    <el-dialog
+    <el-dialog title="" :visible.sync="innerexport" width="1000px" append-to-body :before-close="exportcancel">
-      title=""
+      <servicepackageexport @submit="submit" ref="childComponent"></servicepackageexport>
-      :visible.sync="innerexport"
-      width="1000px"
-      append-to-body
-      :before-close="exportcancel"
-    >
-      <servicepackageexport
-        @submit="submit"
-        ref="childComponent"
-      ></servicepackageexport>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitexport">确 定</el-button>
         <el-button @click="innerexport = false">取 消</el-button>
@@ -1241,9 +850,9 @@ export default {
     resetQuery() {
       this.informationqueryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
       this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
-      this.$refs.DepartmentList.resetQuery()
       this.resetForm("queryForms");
-      this.handleQuery();
+      this.$refs.DepartmentList.resetQuery()
+      // this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {

src/views/manage/template/index.vue

@@ -545,9 +545,9 @@ export default {
       this.queryParams.departmentId = null;
       this.informationqueryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
       this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
-      this.$refs.DepartmentList.resetQuery()
       this.resetForm("queryForms");
-      this.handleQuery();
+      this.$refs.DepartmentList.resetQuery()
+      // this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {

src/views/operationInfo/operationInfo/index.vue

@@ -2,174 +2,77 @@
   <div class="app-container" ref="layout">
     <el-row :gutter="20">
       <el-col :span="5" :xs="24">
-        <DepartmentList
+        <DepartmentList ref="DepartmentList" @clickdepartment="clickdepartment" :methods="'listOperationNum'">
-          ref="DepartmentList"
-          @clickdepartment="clickdepartment"
-          :methods="'listOperationNum'"
-        >
         </DepartmentList>
       </el-col>
       <el-col :span="19" :xs="24">
         <div ref="topform" class="form">
-          <el-form
+          <el-form :model="queryParams" ref="queryForms" size="small" :inline="true" v-show="showSearch"
-            :model="queryParams"
+            label-width="68px" @submit.native.prevent>
-            ref="queryForms"
-            size="small"
-            :inline="true"
-            v-show="showSearch"
-            label-width="68px"
-            @submit.native.prevent
-          >
             <el-form-item label="手术名称" prop="operationName">
-              <el-input
+              <el-input v-model="queryParams.operationName" placeholder="请输入手术名称" clearable
-                v-model="queryParams.operationName"
+                @keyup.enter.native="handleQuery" />
-                placeholder="请输入手术名称"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item>
-              <el-button
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                type="primary"
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                icon="el-icon-search"
-                size="mini"
-                @click="handleQuery"
-                >搜索</el-button
-              >
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >重置</el-button
-              >
             </el-form-item>
           </el-form>
         </div>
         <div ref="mb8" class="mb8">
           <el-row :gutter="10" class="">
             <el-col :span="1.5">
-              <el-button
+              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
                 :disabled="queryParams.hospitalAgencyId ? false : true"
-                v-hasPermi="['operationInfo:operationInfo:add']"
+                v-hasPermi="['operationInfo:operationInfo:add']">新增手术</el-button>
-                >新增手术</el-button
+              <el-button type="warning" plain icon="el-icon-upload2" size="mini" @click="handleUpload">导入</el-button>
-              >
-              <el-button
-                type="warning"
-                plain
-                icon="el-icon-upload2"
-                size="mini"
-                @click="handleUpload"
-                >导入</el-button
-              >
             </el-col>
-            <right-toolbar
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-              :showSearch.sync="showSearch"
-              @queryTable="getList"
-            ></right-toolbar>
           </el-row>
         </div>
         <div ref="table">
-          <el-table
+          <el-table :max-height="maxTableHeight" v-loading="loading" :data="operationInfoList"
-            :max-height="maxTableHeight"
+            @selection-change="handleSelectionChange">
-            v-loading="loading"
+            <el-table-column label="序号" align="center" prop="sort" type="index" />
-            :data="operationInfoList"
+            <el-table-column label="手术名称" align="center" prop="operationName" />
-            @selection-change="handleSelectionChange"
+            <el-table-column label="术式信息" align="center" prop="operationInfo" />
-          >
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <el-table-column
-              label="序号"
-              align="center"
-              prop="sort"
-              type="index"
-            />
-            <el-table-column
-              label="手术名称"
-              align="center"
-              prop="operationName"
-            />
-            <el-table-column
-              label="术式信息"
-              align="center"
-              prop="operationInfo"
-            />
-            <el-table-column
-              label="操作"
-              align="center"
-              class-name="small-padding fixed-width"
-            >
               <template slot-scope="scope">
-                <el-button
+                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                  size="mini"
+                  v-hasPermi="['operationInfo:operationInfo:edit']">修改</el-button>
-                  type="text"
+                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                  icon="el-icon-edit"
+                  v-hasPermi="['operationInfo:operationInfo:remove']">删除</el-button>
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['operationInfo:operationInfo:edit']"
-                  >修改</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="['operationInfo:operationInfo:remove']"
-                  >删除</el-button
-                >
               </template>
             </el-table-column>
           </el-table>
         </div>
         <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" /> -->
-        <myPagination
+        <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-          v-show="total > 0"
+          :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
-          :total="total"
-          :pageSize="queryParams.pageSize"
-          :indexFromWrap="queryParams.pageNum"
-          @updateCPage="updateCPage"
-        ></myPagination>
       </el-col>
     </el-row>
     <!-- 添加或修改手术信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="科室名称" prop="departmentId">
-          <el-button
+          <el-button @click="clickinnerVisible()" style="
-            @click="clickinnerVisible()"
-            style="
               width: 379px;
               text-align: left;
               height: 36px;
               overflow: hidden;
-            "
+            " :style="form.departmentName == '请选择科室' ? 'color: #c0c4cc;' : ''
-            :style="
+      ">{{ form.departmentName }}</el-button>
-              form.departmentName == '请选择科室' ? 'color: #c0c4cc;' : ''
-            "
-            >{{ form.departmentName }}</el-button
-          >
         </el-form-item>
         <el-form-item label="手术名称" prop="operationName">
-          <el-input
+          <el-input v-model="form.operationName" placeholder="请输入手术名称" :disabled="disabled" />
-            v-model="form.operationName"
-            placeholder="请输入手术名称"
-            :disabled="disabled"
-          />
         </el-form-item>
         <el-form-item label="手术排序" prop="sort">
-          <el-input-number
+          <el-input-number v-model="form.sort" controls-position="right" :min="0" placeholder="请输入手术排序"
-            v-model="form.sort"
+            style="width: 380px" />
-            controls-position="right"
-            :min="0"
-            placeholder="请输入手术排序"
-            style="width: 380px"
-          />
         </el-form-item>
         <el-form-item label="术式信息" prop="operationInfo">
-          <el-input
+          <el-input v-model="form.operationInfo" placeholder="请输入术式信息" type="textarea" />
-            v-model="form.operationInfo"
-            placeholder="请输入术式信息"
-            type="textarea"
-          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -178,95 +81,36 @@
       </div>
     </el-dialog>
     <!-- 科室弹框 -->
-    <el-dialog
+    <el-dialog title="" :visible.sync="innerVisibleshow" width="1000px" append-to-body
-      title=""
+      :before-close="innerVisiblecancel">
-      :visible.sync="innerVisibleshow"
+      <el-form ref="queryForm" :model="informationqueryParams" :rules="rules" label-width="80px" :inline="true">
-      width="1000px"
-      append-to-body
-      :before-close="innerVisiblecancel"
-    >
-      <el-form
-        ref="queryForm"
-        :model="informationqueryParams"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
         <el-form-item label="科室名称" prop="departmentName" label-width="120">
-          <el-input
+          <el-input v-model="informationqueryParams.departmentName" placeholder="请输入科室名称" clearable />
-            v-model="informationqueryParams.departmentName"
-            placeholder="请输入科室名称"
-            clearable
-          />
         </el-form-item>
         <el-form-item>
-          <el-button
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="informationInfoinfo">搜索</el-button>
-            type="primary"
+          <el-button icon="el-icon-refresh" size="mini" @click="addresetQuerylist">重置</el-button>
-            icon="el-icon-search"
-            size="mini"
-            @click="informationInfoinfo"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="addresetQuerylist"
-            >重置</el-button
-          >
         </el-form-item>
       </el-form>
-      <el-table
+      <el-table :data="infolist" @cell-dblclick="nurseclick" v-loading="loading">
-        :data="infolist"
-        @cell-dblclick="nurseclick"
-        v-loading="loading"
-      >
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
-            <el-button
+            <el-button type="primary" style="width: 15px; height: 15px" v-if="form.departmentId == scope.row.id" circle
-              type="primary"
+              @click="nurseclick(scope.row)"></el-button>
-              style="width: 15px; height: 15px"
+            <el-button v-else style="width: 15px; height: 15px" circle @click="nurseclick(scope.row)"></el-button>
-              v-if="form.departmentId == scope.row.id"
-              circle
-              @click="nurseclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="nurseclick(scope.row)"
-            ></el-button>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column property="departmentName" label="科室名称" align="center" :show-overflow-tooltip="true">
-          property="departmentName"
-          label="科室名称"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
         </el-table-column>
       </el-table>
       <!-- <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
         :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" /> -->
-      <myPagination
+      <myPagination v-show="totaldepartment > 0" :total="totaldepartment" :pageSize="informationqueryParams.pageSize"
-        v-show="totaldepartment > 0"
+        :indexFromWrap="informationqueryParams.pageNum" @updateCPage="updateCPagetwo"></myPagination>
-        :total="totaldepartment"
-        :pageSize="informationqueryParams.pageSize"
-        :indexFromWrap="informationqueryParams.pageNum"
-        @updateCPage="updateCPagetwo"
-      ></myPagination>
     </el-dialog>
     <!-- 导入弹框 -->
-    <el-dialog
+    <el-dialog title="" :visible.sync="innerexport" width="1000px" append-to-body :before-close="exportcancel">
-      title=""
+      <addexport @submit="submit" ref="childComponent"></addexport>
-      :visible.sync="innerexport"
-      width="1000px"
-      append-to-body
-      :before-close="exportcancel"
-    >
-      <addexport
-        @submit="submit"
-        ref="childComponent"
-      ></addexport>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitexport">确 定</el-button>
         <el-button @click="innerexport = false">取 消</el-button>
@@ -504,9 +348,9 @@ export default {
       this.queryParams.operationName = null;
       this.informationqueryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
       this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
-      this.$refs.DepartmentList.resetQuery()
       this.resetForm("queryForms");
-      this.handleQuery();
+      this.$refs.DepartmentList.resetQuery()
+      // this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -520,7 +364,6 @@ export default {
       this.queryParams.hospitalAgencyName = item.hospitalAgencyName
       this.queryParams.departmentId = item.itemid
       this.departmentName = item.itemName
-      console.log(item, 'item')
       this.informationqueryParams.hospitalAgencyId = item.hospitalAgencyId
       if (item.hospitalAgencyId) {
         this.getList();