8877

src/components/cdssManage/dept/DeptManage.vue

@@ -118,7 +118,8 @@ export default {
       filter: {
         hisName: '', // 医院诊断名称
         uniqueName: '', //标准诊断名称
-        match: ''
+        match: '',
+        status:''
       },
       matchList: [
         { id: '', name: '全部' },

src/components/cdssManage/disease/Disease.vue

@@ -131,7 +131,8 @@ export default {
       filter: {
         hisName: '', // 医院诊断名称
         uniqueName: '', //标准诊断名称
-        match: ''
+        match: '',
+        status:''
       },
       currentPage: 1,
       pageSize: config.pageSize,

src/components/cdssManage/drug/DrugManage.vue

@@ -25,20 +25,20 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="匹配状态：" class="selectMedicine">
-            <el-select size="mini" v-model="filter.match" placeholder="请选择" clearable>
+          <el-form-item label="剂型术语状态：" class="selectMedicine">
+            <el-select size="mini" v-model="filter.formStatus" placeholder="请选择" clearable>
               <el-option
-                v-for="item in matchList"
+                v-for="item in formstatusList"
                 :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.formStatus" placeholder="请选择" clearable>
+          <el-form-item label="匹配状态：" class="selectMedicine">
+            <el-select size="mini" v-model="filter.match" placeholder="请选择" clearable>
               <el-option
-                v-for="item in formstatusList"
+                v-for="item in matchList"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
@@ -68,11 +68,7 @@
         <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="form" label="药品剂型" show-overflow-tooltip></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">
             <span
@@ -87,6 +83,11 @@
             >{{scope.row.formStatus == 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>

src/components/cdssManage/fusion/Fusion.vue

@@ -118,7 +118,8 @@ export default {
       filter: {
         hisName: '', // 医院诊断名称
         uniqueName: '', //标准诊断名称
-        match:''
+        match:'',
+        status:''
       },
       matchList: [
         { id: '', name: '全部' },

src/components/cdssManage/nursing/nursing.vue

@@ -129,7 +129,8 @@ export default {
       filter: {
         hisName: '', // 医院诊断名称
         uniqueName: '', //标准诊断名称
-        match: ''
+        match: '',
+        status:''
       },
       currentPage: 1,
       pageSize: config.pageSize,

src/components/cdssManage/operation/Operation.vue

@@ -125,7 +125,8 @@ export default {
       filter: {
         hisName: '', // 医院诊断名称
         uniqueName: '', //标准诊断名称
-        match: ''
+        match: '',
+        status:''
       },
       matchList: [
         { id: '', name: '全部' },

src/components/cdssManage/pacs/Pacs.vue

@@ -118,7 +118,8 @@ export default {
       filter: {
         hisName: '', // 医院诊断名称
         uniqueName: '', //标准诊断名称
-        match: ''
+        match: '',
+        status:''
       },
       matchList: [
         { id: '', name: '全部' },

src/components/cdssManage/scale/ScaleManage.vue

@@ -118,7 +118,8 @@ export default {
       filter: {
         hisName: '', // 医院诊断名称
         uniqueName: '', //标准诊断名称
-        match: ''
+        match: '',
+        status:''
       },
       matchList: [
         { id: '', name: '全部' },

src/components/cdssManage/tcmdisease/tcmdisease.vue

@@ -125,7 +125,8 @@ export default {
       filter: {
         hisName: '', // 医院诊断名称
         uniqueName: '', //标准诊断名称
-        match: ''
+        match: '',
+        status:''
       },
       matchList: [
         { id: '', name: '全部' },

src/components/cdssManage/tcmdrome/tcmdrome.vue

@@ -124,7 +124,8 @@ export default {
       filter: {
         hisName: '', // 医院诊断名称
         uniqueName: '', //标准诊断名称
-        match: ''
+        match: '',
+        status:''
       },
       matchList: [
         { id: '', name: '全部' },
@@ -542,7 +543,6 @@ export default {
           if (that.result != undefined) {
             let r = new FileReader();
             r.onload = function() {
-              console.log(that.result);
               const code = JSON.parse(that.result);
               if (code.code === '00020007') {
                 that