解决合并冲突

openhis-ui-vue3/src/views/catalog/medicine/components/medicineYbDialog.vue

@@ -3,7 +3,7 @@
     <el-dialog
       title="医保药品目录"
       v-model="visible"
-      width="1500px"
+      width="1800px"
       append-to-body
       destroy-on-close
       @close="cancel"
@@ -29,22 +29,32 @@
             <span v-else>{{ scope.row.registeredName }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="药品类别" prop="drugCategoryName">
+        <el-table-column align="center" label="药品类别" prop="drugCategoryName" width="120">
           <template #default="scope">
             {{ formatStr(scope.row.drugCategoryName) }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="国药准字" prop="drugCategoryName">
+          <template #default="scope">
+            {{ formatStr(scope.row.approvalNo) }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="药品规格" prop="drugSpecification">
           <template #default="scope">
             <span v-if="props.currentCategoryEnum == '4'">{{ scope.row.conventionalUsage }}</span>
             <span v-else>{{ scope.row.drugSpecification }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="处方药" prop="otcFlagName">
+        <el-table-column align="center" label="处方药" prop="otcFlagName" width="120">
           <template #default="scope">
             {{ formatStr(scope.row.otcFlagName) }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="厂家" prop="manufacturerName">
+          <template #default="scope">
+            {{ formatStr(scope.row.manufacturerName) }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="批准文号" prop="approvalNo" />
         <el-table-column align="center" label="操作" width="80">
           <template #default="scope">