ZaiZai 1 سال پیش
والد
کامیت
8dbff05a81

+ 1 - 1
src/views/data-fill/collapse-form/test-diaolg.vue

@@ -26,7 +26,7 @@
                 </div>
             </div>
             <div class="dialog-table">
-                <hc-table :column="testDialogTableColumn" :datas="testDialogTableData" :loading="testDialogTableLoading" border>
+                <hc-table :column="testDialogTableColumn" :datas="testDialogTableData" :loading="testDialogTableLoading" is-new :index-style="{ width: 60 }">
                     <template #reportNo="{ row }">
                         <span class="text-link" @click="testTableRowName(row)">{{ row?.reportNo }}</span>
                     </template>

+ 3 - 2
src/views/tentative/device/approach.vue

@@ -241,8 +241,9 @@
 
             <div class="hc-import-modal-table-box">
                 <HcTable
-                    ref="tableImportRef" :column="tableColumn" :datas="tableImportData" border
-                    :loading="tableImportLoading" is-check @selection-change="tableImportSelection"
+                    ref="tableImportRef" :column="tableColumn" :datas="tableImportData" :loading="tableImportLoading"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableImportSelection"
                 >
                     <template #status="{ row }">
                         {{ row.status === 1 ? '启用中' : '已停用' }}

+ 6 - 4
src/views/tentative/device/employ.vue

@@ -67,8 +67,9 @@
                     </div>
                 </template>
                 <HcTable
-                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    border @selection-change="tableSelection"
+                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableSelection"
                 />
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
@@ -185,8 +186,9 @@
             <HcDragUpload action="use/read-excel" @finished="uploadFinished" @progress="uploadprogress" />
             <div class="hc-import-modal-table-box">
                 <HcTable
-                    ref="tableImportRef" :column="tableColumn" :datas="tableImportData"
-                    :loading="tableImportLoading" is-check @selection-change="tableImportSelection"
+                    ref="tableImportRef" :column="tableColumn" :datas="tableImportData" :loading="tableImportLoading"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableImportSelection"
                 >
                     <template #status="{ row }">
                         {{ row.status == 1 ? '启用中' : '已停用' }}

+ 6 - 4
src/views/tentative/device/overhaul.vue

@@ -67,8 +67,9 @@
                     </div>
                 </template>
                 <HcTable
-                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    border @selection-change="tableSelection"
+                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableSelection"
                 />
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
@@ -156,8 +157,9 @@
             <HcDragUpload action="overhaul/read-excel" @finished="uploadFinished" @progress="uploadprogress" />
             <div class="hc-import-modal-table-box">
                 <HcTable
-                    ref="tableImportRef" :column="tableColumn" :datas="tableImportData" border
-                    :loading="tableImportLoading" is-check @selection-change="tableImportSelection"
+                    ref="tableImportRef" :column="tableColumn" :datas="tableImportData" :loading="tableImportLoading"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableImportSelection"
                 />
             </div>
         </HcDialog>

+ 3 - 2
src/views/tentative/laboratory/print.vue

@@ -43,8 +43,9 @@
                     </HcTooltip>
                 </template>
                 <HcTable
-                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    border @selection-change="tableSelection"
+                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableSelection"
                 />
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />

+ 3 - 2
src/views/tentative/laboratory/user.vue

@@ -36,8 +36,9 @@
                 </HcTooltip>
             </template>
             <HcTable
-                ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                border @selection-change="tableSelection"
+                ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                @selection-change="tableSelection"
             >
                 <template #sex="{ row }">
                     <span>{{ row.sex === 1 ? '男' : '女' }}</span>

+ 5 - 4
src/views/tentative/material/approach.vue

@@ -72,8 +72,9 @@
                 </div>
             </template>
             <HcTable
-                ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                border @selection-change="tableSelection"
+                ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                @selection-change="tableSelection"
             >
                 <template #materialType="{ row }">{{ getRowTableMaterialType(row.materialType) }}</template>
                 <template #materialCount="{ row }">{{ row.materialCount === -1 ? "" : row.materialCount }}</template>
@@ -178,7 +179,7 @@
             :loading="copyTableLoading" :show="copyTableModal" is-table title="复制材料登记信息" widths="60rem"
             @close="copyTableModalClose" @save="copyTableClick"
         >
-            <HcTable :column="copyTableColumn" :datas="copyTableData" border>
+            <HcTable :column="copyTableColumn" :datas="copyTableData" is-new :index-style="{ width: 60 }">
                 <template #materialNumber="{ row }">
                     <el-input
                         v-model="row.materialNumber" :class="row.isMaterialNumber ? 'is-error' : ''"
@@ -280,7 +281,7 @@
         >
             <HcTable
                 :column="samplingTableColumn" :datas="samplingTableData" :is-index="false"
-                :loading="samplingTableLoading" border
+                :loading="samplingTableLoading" is-new
             >
                 <template #isOutsourcing="{ row }">
                     <span>{{ row.isOutsourcing === 1 ? '是' : '否' }}</span>

+ 5 - 4
src/views/tentative/material/sampling.vue

@@ -90,8 +90,9 @@
                     </div>
                 </template>
                 <HcTable
-                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    border @selection-change="tableSelection"
+                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableSelection"
                 >
                     <template #materialCount="{ row }">{{ row.materialCount === -1 ? "" : row.materialCount }}</template>
                     <template #representativeCount="{ row }">
@@ -211,7 +212,7 @@
         >
             <HcTable
                 :column="linksApproachTableColumn" :datas="linksApproachTableData"
-                :is-index="false" :loading="linksApproachTableLoading" border
+                :is-index="false" :loading="linksApproachTableLoading" is-new
             >
                 <template #materialType="{ row }">{{ getRowTableMaterialType(row.materialType) }}</template>
                 <template #action="{ row }">
@@ -248,7 +249,7 @@
             :loading="copyTableLoading" :show="copyTableModal" is-table title="复制样品登记信息" widths="60rem"
             @close="copyTableModalClose" @save="copyTableClick"
         >
-            <HcTable :column="copyTableColumn" :datas="copyTableData" border>
+            <HcTable :column="copyTableColumn" :datas="copyTableData" is-new :index-style="{ width: 60 }">
                 <template #specificationNumber="{ row }">
                     <el-input v-model="row.specificationNumber" placeholder="请输入样品编号" />
                 </template>

+ 3 - 2
src/views/tentative/parameter/compactness.vue

@@ -22,8 +22,9 @@
                 </HcTooltip>
             </template>
             <HcTable
-                ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                border @selection-change="tableSelection"
+                ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                @selection-change="tableSelection"
             />
             <template #action>
                 <HcPages :pages="searchForm" @change="pageChange" />

+ 3 - 2
src/views/tentative/parameter/container.vue

@@ -69,8 +69,9 @@
                     </HcTooltip>
                 </template>
                 <HcTable
-                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    border @selection-change="tableSelection"
+                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableSelection"
                 />
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />

+ 3 - 2
src/views/tentative/parameter/sieve.vue

@@ -54,8 +54,9 @@
                     </HcTooltip>
                 </template>
                 <HcTable
-                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    border @selection-change="tableSelection"
+                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableSelection"
                 />
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />

+ 4 - 3
src/views/user/index.vue

@@ -208,7 +208,7 @@
                         </div>
                     </div>
                 </template>
-                <HcTable :column="logTableColumn" :datas="logTableData" :loading="logTableLoading" border>
+                <HcTable :column="logTableColumn" :datas="logTableData" :loading="logTableLoading" is-new :index-style="{ width: 60 }">
                     <template #operationContent="{ row }">
                         <div class="text-link text-cut" @click="tableOperationContent(row)">
                             {{ row?.operationContent }}
@@ -228,8 +228,9 @@
                     <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" @change="tabTypeChange" />
                 </template>
                 <HcTable
-                    ref="recycleTableRef" :column="recycleTableColumn" :datas="recycleTableData" border
-                    :loading="recycleTableLoading" is-check @selection-change="recycleTableSelectionChange"
+                    ref="recycleTableRef" :column="recycleTableColumn" :datas="recycleTableData" :loading="recycleTableLoading"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="recycleTableSelectionChange"
                 />
                 <template #action>
                     <div class="foot-recycle">