Merge branch 'termMap0909' into test

src/components/icss/dept/DeptManage.vue

@@ -49,11 +49,6 @@
         <el-table-column :resizable="false" prop="hisCode" 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="uniqueName" 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
@@ -61,6 +56,11 @@
             >{{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>

src/components/icss/disease/ChemicalAndCommonMapping.vue

@@ -48,11 +48,6 @@
         <el-table-column :resizable="false" prop="hisName" label="医院诊断名称" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="code" label="ICD-10编码" 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>{{scope.row.isMatch == 0?'未匹配':'已匹配'}}</span>
-          </template>
-        </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
             <span
@@ -60,6 +55,11 @@
             >{{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>

src/components/icss/drug/DrugManage.vue

@@ -71,7 +71,7 @@
             >{{scope.row.formStatus == 0?'禁用':'启用'}}</span>
           </template>
         </el-table-column>
-        <el-table-column :resizable="false" prop="operate" label="匹配状态：">
+        <el-table-column :resizable="false" prop="operate" label="匹配状态">
           <template slot-scope="scope">
             <span>{{scope.row.isMatch == 0?'未匹配':'已匹配'}}</span>
           </template>

src/components/icss/fusion/Fusion.vue

@@ -48,11 +48,6 @@
         <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>{{scope.row.isMatch == 0?'未匹配':'已匹配'}}</span>
-          </template>
-        </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
             <span
@@ -60,6 +55,11 @@
             >{{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>

src/components/icss/lis/Lis.vue

@@ -52,11 +52,6 @@
         <el-table-column :resizable="false" prop="hisName" label="检验套餐" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="hisDetailName" 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>{{scope.row.isMatch == 0?'未匹配':'已匹配'}}</span>
-          </template>
-        </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
             <span
@@ -64,6 +59,11 @@
             >{{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>

src/components/icss/nursing/nursing.vue

@@ -48,11 +48,6 @@
         <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>{{scope.row.isMatch == 0?'未匹配':'已匹配'}}</span>
-          </template>
-        </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
             <span
@@ -60,6 +55,11 @@
             >{{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>

src/components/icss/operation/Operation.vue

@@ -54,11 +54,6 @@
           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
@@ -66,6 +61,11 @@
             >{{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>

src/components/icss/pacs/Pacs.vue

@@ -48,11 +48,6 @@
         <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>{{scope.row.isMatch == 0?'未匹配':'已匹配'}}</span>
-          </template>
-        </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
             <span
@@ -60,6 +55,11 @@
             >{{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>

src/components/icss/scale/ScaleManage.vue

@@ -48,11 +48,6 @@
         <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>{{scope.row.isMatch == 0?'未匹配':'已匹配'}}</span>
-          </template>
-        </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
             <span
@@ -60,6 +55,11 @@
             >{{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>

src/components/icss/tcmdisease/tcmdisease.vue

@@ -54,11 +54,6 @@
           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
@@ -66,6 +61,11 @@
             >{{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>

src/components/icss/tcmdrome/tcmdrome.vue

@@ -54,11 +54,6 @@
           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
@@ -66,6 +61,11 @@
             >{{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>