8867

src/components/icss/drug/DrugManage.vue

@@ -12,11 +12,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="匹配状态：" class="selectMedicine">
-          <el-select size="mini" v-model="filter.match" placeholder="请选择" clearable>
-            <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="剂型术语状态：" class="selectMedicine">
           <el-select size="mini" v-model="filter.formStatus" placeholder="请选择" clearable>
             <el-option
@@ -27,6 +22,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="匹配状态：" class="selectMedicine">
+          <el-select size="mini" v-model="filter.match" placeholder="请选择" clearable>
+            <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>
@@ -58,11 +58,6 @@
         <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
@@ -77,6 +72,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>