提交merge1.3

openhis-ui-vue3/src/views/catalog/device/index.vue

@@ -103,12 +103,7 @@
           :data="deviceList"
           @selection-change="handleSelectionChange"
           width="90%"
-<<<<<<< HEAD
-        />
-        <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange" width="90%" border resizable-column>
-=======
         >
->>>>>>> v1.3
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column
             label="编码"
@@ -116,11 +111,7 @@
             key="busNo"
             prop="busNo"
             :show-overflow-tooltip="true"
-<<<<<<< HEAD
-            width="200"
-=======
             width="150"
->>>>>>> v1.3
           />
           <el-table-column
             label="器材名称"
@@ -128,9 +119,6 @@
             key="name"
             prop="name"
             :show-overflow-tooltip="true"
-<<<<<<< HEAD
-            width="200"
-=======
             width="100"
           />
           <el-table-column
@@ -140,7 +128,6 @@
             prop="size"
             width="100"
             :show-overflow-tooltip="true"
->>>>>>> v1.3
           />
           <!-- <el-table-column
             label="拼音"
@@ -174,17 +161,6 @@
             width="100"
           />
           <el-table-column
-<<<<<<< HEAD
-            label="包装规格"
-            align="center"
-            key="size"
-            prop="size"
-            width="200"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-=======
->>>>>>> v1.3
             label="拆零比"
             align="center"
             key="partPercent"
@@ -206,11 +182,7 @@
             key="minUnitCode_dictText"
             prop="minUnitCode_dictText"
             :show-overflow-tooltip="true"
-<<<<<<< HEAD
-            width="120"
-=======
             width="100"
->>>>>>> v1.3
           />
           <!-- <el-table-column
             label="所属科室"