通用记录界面优化

src/components/icss/hemp/AddHemp.vue

@@ -1,4 +1,4 @@
-<<<<<<< .mine
+
 <template>
   <div class="AddChemicalAndCommonMappingWrapper clearfix">
     <crumbs
@@ -22,10 +22,10 @@
         <div class="leftBox clearfix">
           <el-row>
             <el-col :span="16">
-              <el-form-item label="麻醉类型：" prop="hisName">
+              <el-form-item label="麻醉名称：" prop="hisName">
                 <el-input v-model="form.hisName" clearable style="minWidth: 240px"></el-input>
               </el-form-item>
-              <el-form-item label="麻醉类型预览：">
+              <el-form-item label="麻醉名称预览：">
                 <span class="previewInfo" style="minWidth: 240px">{{form.hisName}}</span>
               </el-form-item>
             </el-col>
@@ -38,7 +38,7 @@
         <div class="rightBox">
           <el-row>
             <el-col :span="16">
-              <el-form-item label="麻醉类型：" prop="searchText">
+              <el-form-item label="麻醉名称：" prop="searchText">
                 <el-select
                   style="width:100%;minWidth: 240px"
                   v-model="form.searchText"
@@ -63,7 +63,7 @@
                   ></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="麻醉类型预览：">
+              <el-form-item label="麻醉名称预览：">
                 <span class="previewInfo" style="minWidth: 240px">{{form.searchText}}</span>
               </el-form-item>
             </el-col>
@@ -399,86 +399,7 @@ export default {
   }
 }
 </style>
-=======
-<template>
-  <div class="AddChemicalAndCommonMappingWrapper clearfix">
-    <crumbs
-      :title="isEdit ? '麻醉关联维护--修改关联' : '麻醉关联维护--添加关联'"
-      class="topBack"
-      :param="$route.params"
-      linkTo="Fusion"
-    ></crumbs>
-    <el-form
-      :model="form"
-      :rules="rules"
-      label-position="right"
-      label-width="120px"
-      ref="relationForm"
-    >
-      <div class="AddChemicalAndCommonMappingBox clearfix">
-        <div class="titleBox clearfix">
-          <p class="title">医院术语</p>
-          <p class="title">标准术语</p>
-        </div>
-        <div class="leftBox clearfix">
-          <el-row>
-            <el-col :span="16">
-              <el-form-item label="麻醉类型：" prop="hisName">
-                <el-input v-model="form.hisName" clearable style="minWidth: 240px"></el-input>
-              </el-form-item>
-              <el-form-item label="麻醉类型预览：">
-                <span class="previewInfo" style="minWidth: 240px">{{form.hisName}}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-        <div class="midBox">
-          <img class="midLogo" src="../../../images/relation.png" alt />
-          <p class="midTitle">相互关联</p>
-        </div>
-        <div class="rightBox">
-          <el-row>
-            <el-col :span="16">
-              <el-form-item label="麻醉类型：" prop="searchText">
-                <el-select
-                  style="width:100%;minWidth: 240px"
-                  v-model="form.searchText"
-                  filterable
-                  remote
-                  clearable
-                  :loading="showDrop"
-                  loading-text="加载中..."
-                  @change="changeWord"
-                  @focus="handleFocus"
-                  @visible-change="handleVisible"
-                  placeholder="搜索"
-                  :remote-method="searchTerms"
-                  reserve-keyword
-                >
-                  <el-option
-                    v-for="(item,idx) in uniqueNameList"
-                    :key="idx"
-                    :label="item"
-                    :value="item"
-                    :title="item"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="麻醉类型预览：">
-                <span class="previewInfo" style="minWidth: 240px">{{form.searchText}}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-      </div>
-      <div class="btn">
-        <el-form-item>
-          <el-button type="primary" :disabled="saveDisable" @click="submitForm">确定</el-button>
-        </el-form-item>
-      </div>
-    </el-form>
-  </div>
-</template>
+
 <script>
 import api from '@api/icss.js';
 export default {
@@ -494,8 +415,8 @@ export default {
       },
       rules: {
         hisName: [
-          { required: true, message: '请输入麻醉类型', trigger: 'change' },
-          { max: 80, message: '麻醉类型最多80字', trigger: 'change' }
+          { required: true, message: '请输入麻醉名称', trigger: 'change' },
+          { max: 80, message: '麻醉名称最多80字', trigger: 'change' }
         ],
         searchText: [
           { required: true, message: '请选择麻醉类型', trigger: 'change' }
@@ -800,4 +721,3 @@ export default {
   }
 }
 </style>
->>>>>>> .theirs

src/components/icss/hemp/Hemp.vue

@@ -1,4 +1,4 @@
-<<<<<<< .mine
+
 <template>
   <div>
     <crumbs title="麻醉关联维护" style="min-width: 980px" class="knowledgeTitle">
@@ -91,8 +91,8 @@
     <LtModal
       v-if="modalVisiable"
       @func="getMsgFormSon"
-      :meal="'麻醉类型'"
-      :standard="'麻醉类型'"
+      :meal="'麻醉名称'"
+      :standard="'麻醉名称'"
       :tip="'麻醉关联'"
       :type="14"
       :data="data"
@@ -675,107 +675,6 @@ export default {
   display: none;
 }
 </style>
-=======
-<template>
-  <div>
-    <crumbs title="麻醉关联维护" style="min-width: 980px" class="knowledgeTitle">
-      <el-form :inline="true" class="demo-form-inline">
-        <el-form-item class="selectMedicine" label="标准术语状态：">
-          <el-select size="mini" v-model="filter.status" placeholder="请选择">
-            <el-option
-              v-for="item in statusList"
-              :label="item.name"
-              :value="item.id"
-              :key="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="匹配状态：" class="selectMedicine">
-          <el-select size="mini" v-model="filter.match" placeholder="请选择">
-            <el-option v-for="item in matchList" :label="item.name" :value="item.id" :key="item.id"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="医院麻醉名称：">
-          <el-input size="mini" v-model="filter.hisName" placeholder="请输入" clearable></el-input>
-        </el-form-item>
-        <el-form-item label="标准麻醉名称：">
-          <el-input size="mini" v-model="filter.uniqueName" placeholder="请输入" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button size="mini" @click="filterDatas">检索</el-button>
-        </el-form-item>
-      </el-form>
-      <el-form class="secLine" :inline="true">
-        <el-form-item>
-          <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
-          <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" />
-          <!-- accept=".csv, application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -->
-          <el-button size="mini" @click="handleMatchData">预匹配</el-button>
-
-          <el-button size="mini" @click="importPage" style="margin:0 10px">{{uploadInfo}}</el-button>
-          <input type="file" name="uploadfile " id="upFileMatch" @change="uploadFileMatch($event)" />
-          <el-button size="mini" @click="exportData">导出</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button size="mini" type="warning" @click="addRelation">添加关联</el-button>
-        </el-form-item>
-      </el-form>
-    </crumbs>
-    <div class="contents knowledgeContents">
-      <el-table :data="list" border style="width: 100%">
-        <el-table-column :resizable="false" type="index" :index="indexMethod" label="编号" width="80"></el-table-column>
-        <el-table-column :resizable="false" prop="gmtModified" label="操作时间" width="180"></el-table-column>
-        <el-table-column :resizable="false" prop="hisName" label="医院麻醉名称" show-overflow-tooltip></el-table-column>
-        <el-table-column :resizable="false" prop="uniqueName" label="标准麻醉名称" show-overflow-tooltip></el-table-column>
-        <el-table-column :resizable="false" prop="operate" label="标准术语状态">
-          <template slot-scope="scope">
-            <span
-              v-if="scope.row.uniqueName && scope.row.uniqueName!=''"
-            >{{scope.row.status == 0?'禁用':'启用'}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :resizable="false" prop="operate" label="匹配状态">
-          <template slot-scope="scope">
-            <span>{{scope.row.isMatch == 0?'未匹配':'已匹配'}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :resizable="false" prop="operate" label="操作">
-          <template slot-scope="scope">
-            <el-button @click="modifyRelation(scope.row)" type="text" size="small">修改</el-button>
-            <span style="margin:0 3px;">|</span>
-            <el-button
-              @click="showDelDialog(scope.row.id)"
-              class="delete"
-              type="text"
-              size="small"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="pagination pagepage">
-        <el-pagination
-          :current-page.sync="currentPage"
-          @current-change="currentChange"
-          background
-          :page-size="pageSize"
-          :page-sizes="pageSizeArr"
-          @size-change="handleSizeChange"
-          :layout="pageLayout"
-          :total="total"
-        ></el-pagination>
-      </div>
-    </div>
-    <LtModal
-      v-if="modalVisiable"
-      @func="getMsgFormSon"
-      :meal="'麻醉类型'"
-      :standard="'麻醉类型'"
-      :tip="'麻醉关联'"
-      :type="14"
-      :data="data"
-    ></LtModal>
-  </div>
-</template>
 
 <script>
 import api from '@api/icss.js';
@@ -1352,4 +1251,3 @@ export default {
   display: none;
 }
 </style>
->>>>>>> .theirs