v6.0.2

src/api/config.js

@@ -157,6 +157,14 @@ export default {
         "key":4
     },
     
+  ],
+  drugForm: [
+    // { "name": "","val": "0"},
+    { "name": "注射剂","val": "1"},
+    { "name": "片剂","val": "2"},
+    { "name": "缓释片","val": "3"},
+    { "name": "胶囊剂","val": "4"},
+    { "name": "滴丸剂","val": "5"},
   ]
 
 }

src/components/icss/AddMedicinePrompt.vue

@@ -86,13 +86,13 @@
           <div class="uploadInfo" v-if="isSuccessUpload===1">文件上传中，请稍等...</div>
         </el-form-item>
       </el-form>
-      <el-row :gutter="20">
-        <el-col :span="16">
+      <!-- <el-row :gutter="24"> -->
+        <!-- <el-col :span="16"> -->
           <div class="btn">
             <el-button type="primary" :disabled="saveDisable" @click="submitForm">确 定</el-button>
           </div>
-        </el-col>
-      </el-row>
+        <!-- </el-col> -->
+      <!-- </el-row> -->
       <!-- <div class="btn">
         <el-button type="primary" :disabled="saveDisable" @click="submitForm">确 定</el-button>
       </div>-->

src/components/icss/dept/AddDept.vue

@@ -107,7 +107,7 @@ export default {
   created() {
     //修改
     const { isEdit, data } = this.$route.params;
-    console.log(data,'data');
+    console.log(data, 'data');
     if (isEdit) {
       this.isEdit = isEdit;
       this.editId = data.id;
@@ -393,4 +393,16 @@ export default {
     }
   }
 }
+body {
+  .el-select-dropdown {
+    /deep/ .el-select-dropdown__item {
+      span {
+        color: #333;
+      }
+    }
+    ul {
+      max-width: 300px;
+    }
+  }
+}
 </style>

src/components/icss/dept/DeptManage.vue

@@ -421,17 +421,5 @@ export default {
   }
 }
 
-body{
-  .el-select-dropdown{
-    /deep/ .el-select-dropdown__item{
-      span{
-        color: #333
-      }
-      
-    }
-    ul{
-      width: 200px;
-    }
-  }
-}
+
 </style>

src/components/icss/disease/AddChemicalAndCommonMapping.vue

@@ -155,7 +155,7 @@ export default {
     submitForm() {
       this.$refs.relationForm.validate(valid => {
         if (valid) {
-          const { searchText, hisName,icdCode } = this.form;
+          const { searchText, hisName, icdCode } = this.form;
           let params = {
             hisName: hisName,
             uniqueName: searchText,
@@ -237,7 +237,7 @@ export default {
   }
 };
 </script>
-<style lang="less" scoped>
+<style lang="less">
 .AddChemicalAndCommonMappingWrapper {
   .AddChemicalAndCommonMappingBox {
     min-width: 940px;
@@ -398,4 +398,16 @@ export default {
     }
   }
 }
+body {
+  .el-select-dropdown {
+    /deep/ .el-select-dropdown__item {
+      span {
+        color: #333;
+      }
+    }
+    ul {
+      max-width: 200px;
+    }
+  }
+}
 </style>

src/components/icss/drug/AddDrug.vue

@@ -6,7 +6,13 @@
       :param="$route.params"
       linkTo="DrugManage"
     ></crumbs>
-    <el-form :model="form"  :rules="rules" label-position="right" label-width="120px" ref="relationForm">
+    <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>
@@ -31,7 +37,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%"
                   v-model="form.searchText"
@@ -57,6 +63,16 @@
               <el-form-item label="药品名称预览：">
                 <span class="previewInfo">{{form.searchText}}</span>
               </el-form-item>
+              <el-form-item label="药品剂型：">
+                <el-select v-model="form.form" placeholder="请选择" clearable>
+                  <el-option
+                    v-for="item in drugForm"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.name"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
             </el-col>
           </el-row>
         </div>
@@ -71,6 +87,7 @@
 </template>
 <script>
 import api from '@api/icss.js';
+import config from '@api/config';
 export default {
   name: 'AddDrug',
   data() {
@@ -80,9 +97,10 @@ export default {
       uniqueNameList: [],
       form: {
         searchText: '', //搜索字段
-        hisName: ''
+        hisName: '',
+        form: ''
       },
-       rules: {
+      rules: {
         hisName: [
           { required: true, message: '请输入药品名称', trigger: 'change' }
         ],
@@ -91,7 +109,8 @@ export default {
         ]
       },
       saveDisable: false, //保存按钮禁止点击
-      showDrop: false //下拉框显示文字
+      showDrop: false, //下拉框显示文字
+      drugForm: config.drugForm
     };
   },
   created() {
@@ -102,6 +121,7 @@ export default {
       this.editId = data.id;
       this.form.hisName = data.hisName;
       this.form.searchText = data.uniqueName;
+      this.form.form = data.form;
     }
   },
   methods: {
@@ -138,10 +158,11 @@ export default {
     submitForm() {
       this.$refs.relationForm.validate(valid => {
         if (valid) {
-          const { searchText, hisName } = this.form;
+          const { searchText, hisName,form } = this.form;
           let params = {
             hisName: hisName,
-            uniqueName: searchText
+            uniqueName: searchText,
+            form: form
           };
           this.showSaveDialog(params);
         } else {

src/components/icss/drug/DrugManage.vue

@@ -34,7 +34,7 @@
         <el-table-column :resizable="false" prop="hisName" label="医院药品名称" show-overflow-tooltip></el-table-column>
         <!-- <el-table-column :resizable="false" prop="uniqueCode" 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="u" label="药品剂型" show-overflow-tooltip></el-table-column>
+        <el-table-column :resizable="false" prop="form" label="药品剂型" show-overflow-tooltip></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>

src/components/icss/fusion/Fusion.vue

@@ -29,10 +29,8 @@
     <div class="contents">
       <el-table :data="list" border style="width: 100%">
         <el-table-column :resizable="false" type="index" :index="indexMethod" label="编号" width="60"></el-table-column>
-        <el-table-column :resizable="false" prop="gmtModified" label="操作时间" width="180"></el-table-column>
-        <!-- <el-table-column :resizable="false" prop="mealName" label="化验大项" show-overflow-tooltip></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="uniqueCode" 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">

src/components/icss/operation/Operation.vue

@@ -32,7 +32,7 @@
         <el-table-column :resizable="false" prop="gmtModified" label="操作时间" width="180"></el-table-column>
         <!-- <el-table-column :resizable="false" prop="mealName" label="化验大项" show-overflow-tooltip></el-table-column> -->
         <el-table-column :resizable="false" prop="hisName" label="医院手术/操作名称" show-overflow-tooltip></el-table-column>
-        <el-table-column :resizable="false" prop="uniqueCode" label="对应项编码" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column :resizable="false" prop="uniqueCode" label="对应项编码" show-overflow-tooltip></el-table-column> -->
         <el-table-column
           :resizable="false"
           prop="uniqueName"