调整智能开方协定方列表展示界面

src/api/city.js

@@ -91,5 +91,5 @@ export async function getHospitalCategory() {
 
 export async function getHospitalDepartment(params) {
     const data = (await getHospitalCategoryAndDepartment())[params.hospital || ''] || []
-    return data.map(name => ({id: name, name}));
+    return data.filter(Boolean).map(name => ({id: name, name}));
 }

src/views/business/AccordEdit.vue

@@ -76,20 +76,14 @@
             <span></span>
             <div class="name">医派：</div>
             <div class="input">
-              <el-select v-model="form.sectCategory" @change="getHospitalDepartment(form.sectCategory)"
-                         placeholder="请选择" size="mini" clearable>
-                <el-option v-for="item in hospitalCategory" :key="item.id" :label="item.name" :value="item.id"></el-option>
-              </el-select>
+              <el-input v-model="form.sectCategory" placeholder="请输入"></el-input>
             </div>
           </div>
           <div class="item flex-vertical-center-l">
             <span></span>
             <div class="name">科室：</div>
             <div class="input">
-              <el-select v-model="form.sectDept"
-                         placeholder="请选择" size="small" clearable>
-                <el-option v-for="item in hospitalDepartment" :key="item.id" :label="item.name" :value="item.id"></el-option>
-              </el-select>
+              <el-input v-model="form.sectDept" placeholder="请输入"></el-input>
             </div>
           </div>
         </template>

src/views/diagnosis/components/prescription-unify.vue

@@ -3,7 +3,7 @@
   <div class="prescription">
     <!-- 搜索条件 -->
     <div class="top-filter">
-      <el-form label-position="left" label-width="70px" :model="form" inline>
+      <el-form label-position="right" label-width="70px" :model="form" inline>
         <el-form-item label="方名">
           <el-input v-model="form.name" size="small" placeholder="请输入"></el-input>
         </el-form-item>
@@ -41,22 +41,22 @@
     <div class="table">
       <!-- 统建处方(协定方)表格 -->
       <el-table :data="tableData1" border style="width: 100%" v-if="activeName === '2'">
-        <el-table-column prop="sectCategory" label="医派" align="center" width="120"></el-table-column>
-        <el-table-column prop="sectDept" label="科室" align="center" width="120"></el-table-column>
-        <el-table-column prop="name" label="方名" align="center"></el-table-column>
+        <el-table-column prop="sectCategory" label="医派" align="center" width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="sectDept" label="科室" align="center" width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="name" label="方名" align="center" show-overflow-tooltip></el-table-column>
         <!--<el-table-column prop="chinesesymptom" label="是否可修改" align="center" width="95">
           <template slot-scope="scope">
             <div>{{ scope.row.type==0?'是':'否' }}</div>
           </template>
         </el-table-column>-->
-        <el-table-column prop="effect" label="功效与适用症" align="center"></el-table-column>
-        <el-table-column prop="drugInformation" label="中药信息" align="center"></el-table-column>
+        <el-table-column prop="effect" label="功效与适用症" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="drugInformation" label="中药信息" align="center" show-overflow-tooltip></el-table-column>
         <!--<el-table-column prop="book" label="共享状态" align="center" width="100">
           <template slot-scope="scope">
             <div>{{ scope.row.showType |filterShowType}}</div>
           </template>
         </el-table-column>-->
-        <el-table-column prop="provenance" label="处方出处" align="center" width="150"></el-table-column>
+        <el-table-column prop="provenance" label="处方出处" align="center" width="150" show-overflow-tooltip></el-table-column>
         <el-table-column prop="address" label="操作" width="80" align="center">
           <template slot-scope="scope">
             <el-button size="mini" type="primary" @click="handleAgree(scope)">转方</el-button>

src/views/diagnosis/components/prescription.vue

@@ -10,7 +10,7 @@
     </div>
     <!-- 搜索条件 -->
     <div class="top-filter">
-      <el-form label-position="left" label-width="70px" :model="form" inline>
+      <el-form label-position="right" label-width="70px" :model="form" inline>
         <el-form-item label="方名">
           <el-input v-model="form.name" size="small" placeholder="请输入"></el-input>
         </el-form-item>
@@ -47,11 +47,11 @@
     <div class="table">
       <!-- 方剂表格 -->
       <el-table :data="tableData" border style="width: 100%" v-if="activeName==1">
-        <el-table-column prop="prename" label="方名" align="center"></el-table-column>
+        <el-table-column prop="prename" label="方名" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="efficacyName" label="类型" align="center"></el-table-column>
-        <el-table-column prop="efficacy" label="功效与适用症" align="center" width="150"></el-table-column>
-        <el-table-column prop="matnames" label="中药信息" align="center"></el-table-column>
-        <el-table-column prop="book" label="来源" align="center"></el-table-column>
+        <el-table-column prop="efficacy" label="功效与适用症" align="center" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="matnames" label="中药信息" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="book" label="来源" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="address" label="操作" width="150" align="center">
           <template slot-scope="scope">
             <el-button size="mini" type="primary" @click="handleFj(scope,1)">换方</el-button>
@@ -67,9 +67,9 @@
             <div>{{ scope.row.type==0?'是':'否' }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="effect" label="功效与适用症" align="center" width="150"></el-table-column>
-        <el-table-column prop="drugInformation" label="中药信息" align="center"></el-table-column>
-        <el-table-column prop="provenance" label="处方出处" align="center" width="150"></el-table-column>
+        <el-table-column prop="effect" label="功效与适用症" align="center" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="drugInformation" label="中药信息" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="provenance" label="处方出处" align="center" width="150" show-overflow-tooltip></el-table-column>
         <el-table-column prop="book" label="共享状态" align="center" width="100">
           <template slot-scope="scope">
             <div>{{ scope.row.showType |filterShowType}}</div>