新主题

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

@@ -2,47 +2,49 @@
     <div class="adding-form-dialog-box">
         <div class="dialog-tree-box">
             <el-scrollbar>
-                <TestTree :autoExpandKey="testTreeExpandKeys"
-                          :contractId="contractId"
-                          :projectId="projectId"
-                          :tenantId="tenant_id"
-                          :wbsId="wbsTempId"
-                          :wbsType="wbs_type"
-                          @nodeTap="testElTreeClick"/>
+                <TestTree
+                    :auto-expand-key="testTreeExpandKeys"
+                    :contract-id="contractId"
+                    :project-id="projectId"
+                    :tenant-id="tenant_id"
+                    :wbs-id="wbsTempId"
+                    :wbs-type="wbs_type"
+                    @nodeTap="testElTreeClick"
+                />
             </el-scrollbar>
         </div>
         <div class="dialog-table-box">
             <div class="dialog-search">
                 <div class="w-64 ml-2">
-                    <HcDatePicker :dates="testBetweenTime" clearable @change="testBetweenTimeUpdate"/>
+                    <HcDatePicker :dates="testBetweenTime" clearable @change="testBetweenTimeUpdate" />
                 </div>
                 <div class="ml-2">
                     <el-button type="primary" @click="testSearchClick">
-                        <HcIcon name="search-2"/>
+                        <HcIcon name="search-2" />
                         <span>搜索</span>
                     </el-button>
                 </div>
             </div>
             <div class="dialog-table">
-                <HcTable :column="testDialogTableColumn" :datas="testDialogTableData" :loading="testDialogTableLoading">
-                    <template #reportNo="{row}">
+                <HcTable :column="testDialogTableColumn" :datas="testDialogTableData" :loading="testDialogTableLoading" border>
+                    <template #reportNo="{ row }">
                         <span class="text-link" @click="testTableRowName(row)">{{ row?.reportNo }}</span>
                     </template>
                 </HcTable>
             </div>
             <div class="dialog-pages">
-                <HcPages :pages="testSearchFormPage" @change="testSearchFormPageChange"/>
+                <HcPages :pages="testSearchFormPage" @change="testSearchFormPageChange" />
             </div>
         </div>
     </div>
 </template>
 
 <script setup>
-import {ref, watch, onMounted} from "vue";
-import TestTree from "./testTree.vue"
-import {getArrValue} from "js-fast-way"
-import {getStoreValue, setStoreValue} from "~uti/storage";
-import samplingApi from "~api/tentative/material/sampling";
+import { onMounted, ref, watch } from 'vue'
+import TestTree from './testTree.vue'
+import { getArrValue } from 'js-fast-way'
+import { getStoreValue, setStoreValue } from '~uti/storage'
+import samplingApi from '~api/tentative/material/sampling'
 
 const props = defineProps({
     projectId: [String, Number],
@@ -52,8 +54,10 @@ const props = defineProps({
     wbsType: [String, Number],
 })
 
-const projectId = ref(props.projectId);
-const contractId = ref(props.contractId);
+//事件
+const emit = defineEmits(['change'])
+const projectId = ref(props.projectId)
+const contractId = ref(props.contractId)
 
 const wbsTempId = ref(props.wbsId)
 const tenant_id = ref(props.tenantId)
@@ -81,12 +85,9 @@ onMounted(() => {
     testTreeExpandKeys.value = getStoreValue('testTreeAutoExpandKeys') || []
 })
 
-//事件
-const emit = defineEmits(['change'])
-
 //实验树被点击
 const treeId = ref('')
-const testElTreeClick = ({data, keys}) => {
+const testElTreeClick = ({ data, keys }) => {
     const nodeId = data?.primaryKeyId || ''
     treeId.value = nodeId
     testSearchFormPage.value.nodeId = nodeId
@@ -98,12 +99,12 @@ const testElTreeClick = ({data, keys}) => {
 
 //搜索表单
 const testSearchFormPage = ref({
-    startTime: null, endTime: null, nodeId: null, current: 1, size: 20, total: 0
+    startTime: null, endTime: null, nodeId: null, current: 1, size: 20, total: 0,
 })
 
 //时间日期
 const testBetweenTime = ref([])
-const testBetweenTimeUpdate = ({arr}) => {
+const testBetweenTimeUpdate = ({ arr }) => {
     testBetweenTime.value = arr
     testSearchFormPage.value.startTime = arr[0]
     testSearchFormPage.value.endTime = arr[1]
@@ -111,12 +112,12 @@ const testBetweenTimeUpdate = ({arr}) => {
 
 //搜索
 const testSearchClick = () => {
-    testSearchFormPage.value.current = 1;
+    testSearchFormPage.value.current = 1
     getDialogTableData()
 }
 
 //分页
-const testSearchFormPageChange = ({current, size}) => {
+const testSearchFormPageChange = ({ current, size }) => {
     testSearchFormPage.value.current = current
     testSearchFormPage.value.size = size
     getDialogTableData()
@@ -124,10 +125,10 @@ const testSearchFormPageChange = ({current, size}) => {
 
 //表格数据
 const testDialogTableColumn = ref([
-    {key: 'reportNo', name: '报告编号'},
-    {key: 'reportDate', name: '报告日期'},
-    {key: 'projectPositionName', name: '工程用途及部位'},
-    {key: 'detectionResultName', name: '检测结果'},
+    { key: 'reportNo', name: '报告编号' },
+    { key: 'reportDate', name: '报告日期' },
+    { key: 'projectPositionName', name: '工程用途及部位' },
+    { key: 'detectionResultName', name: '检测结果' },
 ])
 const testDialogTableData = ref([])
 
@@ -135,10 +136,10 @@ const testDialogTableData = ref([])
 const testDialogTableLoading = ref(false)
 const getDialogTableData = async () => {
     testDialogTableLoading.value = true
-    const {error, code, data} = await samplingApi.gettrialPage({
+    const { error, code, data } = await samplingApi.gettrialPage({
         ...testSearchFormPage.value,
         projectId: projectId.value,
-        contractId: contractId.value
+        contractId: contractId.value,
     })
     //处理数据
     testDialogTableLoading.value = false
@@ -153,7 +154,7 @@ const getDialogTableData = async () => {
 
 //名称被点击
 const testTableRowName = (row) => {
-    emit('change', {row: row, treeId: treeId.value})
+    emit('change', { row: row, treeId: treeId.value })
 }
 </script>
 

src/views/data-fill/collapse-form/test-file.vue

@@ -10,80 +10,85 @@
         <div class="dialog-tree-box">
             <el-scrollbar>
                 <!-- 试验检测树 -->
-                <TestTree v-if="fileModalradio==1"
-                          :contractId="contractId"
-                          :projectId="projectId"
-                          :tenantId="tenant_id"
-                          :wbsId="wbsTempId"
-                          :wbsType="wbs_type"
-                          @nodeTap="fileModalElTreeClick"
-                >
-                </TestTree>
+                <TestTree
+                    v-if="fileModalradio == 1"
+                    :contract-id="contractId"
+                    :project-id="projectId"
+                    :tenant-id="tenant_id"
+                    :wbs-id="wbsTempId"
+                    :wbs-type="wbs_type"
+                    @nodeTap="fileModalElTreeClick"
+                />
                 <!-- 第三方树 -->
                 <ElTree
                     v-else
                     ref="ElTreeRef2" :data="thirdtreeDatas" :indent="0" :props="thirdElTreeProps"
                     accordion class="hc-tree-node" highlight-current
-                    node-key="id" @node-click="thirdtreeDatasElTreeClick">
-                </ElTree>
+                    node-key="id" @node-click="thirdtreeDatasElTreeClick"
+                />
             </el-scrollbar>
         </div>
         <div class="dialog-table-box">
             <div class="dialog-search">
                 <div class="w-64 ml-2">
-                    <HcDatePicker :dates="filebetweenTime" clearable @change="filebetweenTimeUpdate"/>
+                    <HcDatePicker :dates="filebetweenTime" clearable @change="filebetweenTimeUpdate" />
                 </div>
                 <div class="ml-2">
                     <el-button type="primary" @click="filesearchClick">
-                        <HcIcon name="search-2"/>
+                        <HcIcon name="search-2" />
                         <span>搜索</span>
                     </el-button>
                 </div>
             </div>
             <div class="dialog-table">
-                <HcTable v-if="fileModalradio==1" ref="dialogTableRef1" :column="filedialogTableColumn"
-                         :datas="filedialogTableData" :loading="filedialogTableLoading" isCheck
-                         @selection-change="filedialogTableSelection1">
-                    <template #reportNo="{row}">
-                        <span :class="[row?.isSelectedStatus==1?'text-green':'']">{{ row?.reportNo }}</span>
+                <HcTable
+                    v-if="fileModalradio == 1" ref="dialogTableRef1" :column="filedialogTableColumn"
+                    :datas="filedialogTableData" :loading="filedialogTableLoading" is-check border
+                    @selection-change="filedialogTableSelection1"
+                >
+                    <template #reportNo="{ row }">
+                        <span :class="[row?.isSelectedStatus == 1 ? 'text-green' : '']">{{ row?.reportNo }}</span>
                     </template>
                 </HcTable>
-                <HcTable v-if="fileModalradio==2" ref="dialogTableRef2" :column="filedialogTableColumn1"
-                         :datas="filedialogTableData" :loading="filedialogTableLoading" isCheck
-                         @selection-change="filedialogTableSelection">
-                    <template #reportNo="{row}">
-                        <span :class="[row?.isSelectedStatus===1?'text-green':'']">{{ row?.reportNo }}</span>
+                <HcTable
+                    v-if="fileModalradio == 2" ref="dialogTableRef2" :column="filedialogTableColumn1"
+                    :datas="filedialogTableData" :loading="filedialogTableLoading" is-check border
+                    @selection-change="filedialogTableSelection"
+                >
+                    <template #reportNo="{ row }">
+                        <span :class="[row?.isSelectedStatus === 1 ? 'text-green' : '']">{{ row?.reportNo }}</span>
                     </template>
-                    <template #status="{row}">
+                    <template #status="{ row }">
                         <span>{{ row?.status == 1 ? '合格' : '不合格' }}</span>
                     </template>
                 </HcTable>
-                <HcTable v-if="fileModalradio==3" ref="dialogTableRef" :column="filedialogTableColumn1"
-                         :datas="filedialogTableData" :loading="filedialogTableLoading" isCheck
-                         @selection-change="filedialogTableSelection">
-                    <template #reportNo="{row}">
-                        <span :class="[row?.isSelectedStatus===1?'text-green':'']">{{ row?.reportNo }}</span>
+                <HcTable
+                    v-if="fileModalradio == 3" ref="dialogTableRef" :column="filedialogTableColumn1"
+                    :datas="filedialogTableData" :loading="filedialogTableLoading" is-check border
+                    @selection-change="filedialogTableSelection"
+                >
+                    <template #reportNo="{ row }">
+                        <span :class="[row?.isSelectedStatus === 1 ? 'text-green' : '']">{{ row?.reportNo }}</span>
                     </template>
-                    <template #status="{row}">
+                    <template #status="{ row }">
                         <span>{{ row?.status == 1 ? '合格' : '不合格' }}</span>
                     </template>
                 </HcTable>
-
             </div>
             <div class="dialog-pages">
-                <HcPages :pages="filesearchFormPage" @change="filesearchFormPageChange"/>
+                <HcPages :pages="filesearchFormPage" @change="filesearchFormPageChange" />
             </div>
         </div>
     </div>
 </template>
 
 <script setup>
-import {ref, watch, onMounted, nextTick} from "vue";
-import {getArrValue} from "js-fast-way"
-import {getTreeAll} from "~api/tentative/detect";
-import thirdApi from "~api/tentative/detect/third";
-import samplingApi from "~api/tentative/material/sampling";
-import TestTree from "./testTree.vue"
+import { nextTick, onMounted, ref, watch } from 'vue'
+import { getArrValue } from 'js-fast-way'
+import { getTreeAll } from '~api/tentative/detect'
+import thirdApi from '~api/tentative/detect/third'
+import samplingApi from '~api/tentative/material/sampling'
+import TestTree from './testTree.vue'
 
 const props = defineProps({
     projectId: [String, Number],
@@ -94,8 +99,8 @@ const props = defineProps({
     treeId: [String, Number],
 })
 
-const projectId = ref(props.projectId);
-const contractId = ref(props.contractId);
+const projectId = ref(props.projectId)
+const contractId = ref(props.contractId)
 
 const wbsTempId = ref(props.wbsId)
 const tenant_id = ref(props.tenantId)
@@ -109,7 +114,7 @@ watch(() => [
     props.wbsId,
     props.tenantId,
     props.wbsType,
-    props.treeId
+    props.treeId,
 ], ([pid, cid, wbs_id, tid, type, treeId]) => {
     projectId.value = pid
     contractId.value = cid
@@ -124,7 +129,7 @@ const defaultExpandedCids = ref([])
 const ElTreeProps = ref({
     label: 'title',
     children: 'children',
-    isLeaf: 'hasChildren'
+    isLeaf: 'hasChildren',
 })
 
 
@@ -144,13 +149,13 @@ const filenodeItemInfo = ref({})
 const filenodeDataInfo = ref({})
 const fileTableData1 = ref([])
 const fileTableColumn = ref([
-    {key: 'recordNo', name: '报告编号'},
-    {key: 'reportDate', name: '报告日期'},
-    {key: 'projectPositionName', name: '工程用途及部位'},
-    {key: 'detectionResultName', name: '检测结果'},
+    { key: 'recordNo', name: '报告编号' },
+    { key: 'reportDate', name: '报告日期' },
+    { key: 'projectPositionName', name: '工程用途及部位' },
+    { key: 'detectionResultName', name: '检测结果' },
 ])
 
-const fileModalElTreeClick = async ({data, node}) => {
+const fileModalElTreeClick = async ({ data, node }) => {
     filenodeItemInfo.value = node
     filenodeDataInfo.value = data
     getfileNodeData()
@@ -164,13 +169,13 @@ const thirdElTreeProps = ref({
     label: 'nodeName',
     children: 'children',
     isLeaf: function (data) {
-          return !data.hasChildren;
+          return !data.hasChildren
     },
 })
 const getthirdTreeDatas = async (type) => {
-    const {error, code, data} = await getTreeAll({
+    const { error, code, data } = await getTreeAll({
         projectId: projectId.value,
-        contractId: contractId.value
+        contractId: contractId.value,
     })
     if (!error && code === 200) {
         if (type == 2) {
@@ -189,7 +194,7 @@ const thirdfilenodeDataInfo = ref({})
 //获取第三方树节点下的数据
 const getthirdTreetavleDatas = async () => {
     filedialogTableLoading.value = true
-    const {error, code, data} = await thirdApi.queryPage({
+    const { error, code, data } = await thirdApi.queryPage({
         projectId: projectId.value,
         contractId: contractId.value,
         nodeId: thirdfilenodeDataInfo.value.id,
@@ -197,7 +202,7 @@ const getthirdTreetavleDatas = async () => {
         size: filesearchFormPage.value.size,
         startTime: filesearchFormPage.value.startTime,
         endTime: filesearchFormPage.value.lastTime,
-        qualityTestPKeyId: isPrimaryKeyId.value
+        qualityTestPKeyId: isPrimaryKeyId.value,
 
 
     })
@@ -213,7 +218,7 @@ const getthirdTreetavleDatas = async () => {
                     defaultarr.push(item)
 
                 }
-                if (fileModalradio === 2) {
+                if (fileModalradio.value === 2) {
                     outtabtoggleSelection(defaultarr)
                 } else {
                     thirdtabtoggleSelection(defaultarr)
@@ -236,50 +241,50 @@ const thirdtreeDatasElTreeClick = (data, node) => {
 
 const filebetweenTime = ref([])
 const filesearchFormPage = ref({
-    startTime: null, lastTime: null, wbsId: null, current: 1, size: 20, total: 0
+    startTime: null, lastTime: null, wbsId: null, current: 1, size: 20, total: 0,
 })
-const filesearchFormPageChange = ({current, size}) => {
+const filesearchFormPageChange = ({ current, size }) => {
     filesearchFormPage.value.current = current
     filesearchFormPage.value.size = size
     // getDialogTableData()
 }
-const filebetweenTimeUpdate = ({arr}) => {
+const filebetweenTimeUpdate = ({ arr }) => {
     filebetweenTime.value = arr
     filesearchFormPage.value.startTime = arr[0]
     filesearchFormPage.value.lastTime = arr[1]
 }
 
 const filesearchClick = () => {
-    filesearchFormPage.value.current = 1;
+    filesearchFormPage.value.current = 1
     getfileNodeData()
 }
 const filedialogTableLoading = ref(false)
 
 const filedialogTableColumn = ref([
     // reportNo
-    {key: 'reportNo', name: '报告编号'},
-    {key: 'reportDate', name: '报告日期'},
-    {key: 'projectPositionName', name: '工程用途及部位'},
-    {key: 'detectionResultName', name: '检测结果'},
+    { key: 'reportNo', name: '报告编号' },
+    { key: 'reportDate', name: '报告日期' },
+    { key: 'projectPositionName', name: '工程用途及部位' },
+    { key: 'detectionResultName', name: '检测结果' },
 ])
 const filedialogTableColumn1 = ref([
     // reportNo
-    {key: 'reportNo', name: '报告编号'},
-    {key: 'reportDate', name: '报告日期'},
-    {key: 'projectPosition', name: '工程用途及部位'},
-    {key: 'status', name: '检测结果'},
+    { key: 'reportNo', name: '报告编号' },
+    { key: 'reportDate', name: '报告日期' },
+    { key: 'projectPosition', name: '工程用途及部位' },
+    { key: 'status', name: '检测结果' },
 ])
 
 //多选
-const filetableCheckedKeys = ref([]);
+const filetableCheckedKeys = ref([])
 const filedialogTableSelection1 = (rows) => {
     filetableCheckedKeys.value = rows.filter((item) => {
-        return (item ?? '') !== '';
+        return (item ?? '') !== ''
     })
 }
 const filedialogTableSelection = (rows) => {
     filetableCheckedKeys.value = rows.filter((item) => {
-        return (item ?? '') !== '';
+        return (item ?? '') !== ''
     })
 }
 
@@ -287,14 +292,14 @@ const filedialogTableSelection = (rows) => {
 const getfileNodeData = async () => {
     //获取数据
     filedialogTableLoading.value = true
-    const {error, code, data} = await samplingApi.gettrialPage({
+    const { error, code, data } = await samplingApi.gettrialPage({
         contractId: contractId.value,
         nodeId: filenodeDataInfo.value.primaryKeyId,
         current: filesearchFormPage.value.current,
         size: filesearchFormPage.value.size,
         startTime: filesearchFormPage.value.startTime,
         endTime: filesearchFormPage.value.lastTime,
-        qualityTestPKeyId: isPrimaryKeyId.value
+        qualityTestPKeyId: isPrimaryKeyId.value,
     })
     //处理数据
     if (!error && code === 200) {
@@ -324,11 +329,11 @@ const tabtoggleSelection = (rows) => {
     if (rows) {
         rows.forEach(row => {
             nextTick(() => {
-                dialogTableRef1.value?.toggleRowSelection(row, true);
+                dialogTableRef1.value?.toggleRowSelection(row, true)
             })
-        });
+        })
     } else {
-        dialogTableRef1.value?.clearSelection();
+        dialogTableRef1.value?.clearSelection()
 
     }
 }
@@ -345,12 +350,12 @@ const savefileSubmit = async () => {
 
 //关联试验文件
 const savesubmitRelationFile = async (ids) => {
-    const {error, code, data} = await samplingApi.submitRelationFile({
+    const { error, code, data } = await samplingApi.submitRelationFile({
         projectId: projectId.value,
         contractId: contractId.value,
         nodeId: isPrimaryKeyId.value,
         type: fileModalradio.value,
-        ids
+        ids,
     })
     if (!error && code === 200) {
         window?.$message?.success('操作成功')
@@ -359,7 +364,7 @@ const savesubmitRelationFile = async (ids) => {
 
 // 暴露出去
 defineExpose({
-    savefileSubmit
+    savefileSubmit,
 })
 </script>
 

src/views/data-fill/division.vue

@@ -449,7 +449,7 @@
                     <div class="dialog-table">
                         <HcTable
                             ref="dialogTableRef" :column="dialogTableColumn" :datas="dialogTableData"
-                            :loading="dialogTableLoading" is-check
+                            :loading="dialogTableLoading" is-check border
                             @select="dialogTableSelect"
                             @select-all="dialogTableSelectAll"
                         />

src/views/gauge/bezier.vue

@@ -54,7 +54,7 @@
                 </HcTooltip>
             </template>
 
-            <HcTable :column="tableColumn" :datas="tableData" :loading="tableLoading">
+            <HcTable :column="tableColumn" :datas="tableData" :loading="tableLoading" border>
                 <template #name="{ row }">
                     {{ row.valueStr }}~{{ row.valueEndStr }}
                 </template>
@@ -663,7 +663,7 @@ const importModalClick = () => {
 //下载导入模板
 const tmportTmpClick = () => {
     window.open('https://bladex-chongqing-info.oss-cn-hangzhou.aliyuncs.com//upload/20230817/063231e1b4813060e67d872cc732e82d.xlsx', '_blank')
-    
+
 }
 //上传一个文件时，重置
 const handleUploadExceed = (files) => {

src/views/gauge/station.vue

@@ -37,7 +37,7 @@
                 <HcNewSwitch :datas="tabsTypeData" :keys="tabsTypeKey" @change="tabsTypeChange" />
             </template>
 
-            <HcTable v-if="tabsTypeKey === '0'" :column="levelTableColumn" :datas="levelTable" :loading="tableLoading">
+            <HcTable v-if="tabsTypeKey === '0'" :column="levelTableColumn" :datas="levelTable" :loading="tableLoading" border>
                 <template #action="{ row }">
                     <HcTooltip keys="gauge-station-edit">
                         <el-button size="small" text type="primary" @click="handleLevelEdit(row)">编辑</el-button>
@@ -50,7 +50,7 @@
 
             <HcTable
                 v-if="tabsTypeKey === '1'" :column="traverseTableColumn" :datas="traverseTable"
-                :loading="tableLoading"
+                :loading="tableLoading" border
             >
                 <template #action="{ row }">
                     <HcTooltip keys="gauge-station-edit">

src/views/gauge/testdata.vue

@@ -9,7 +9,7 @@
                         <span>新增</span>
                     </el-button>
                 </HcTooltip>
-        
+
                 <HcTooltip keys="gauge-testdata-import">
                     <el-button hc-btn @click="importModalClick">
                         <HcIcon name="upload-cloud" />
@@ -32,7 +32,7 @@
             <template #extra>
                 <HcNewSwitch :datas="tabsTypeData" :keys="tabsTypeKey" @change="tabsTypeChange" />
             </template>
-            <HcTable v-if="tabsTypeKey === '0'" :column="tableColumn" :datas="tableData" :laoding="tableLoading">
+            <HcTable v-if="tabsTypeKey === '0'" :column="tableColumn" :datas="tableData" :laoding="tableLoading" border>
                 <template #action="{ row }">
                     <HcTooltip keys="gauge-station-edit">
                         <el-button size="small" text type="primary" @click="handleLevelEdit(row)">编辑</el-button>
@@ -42,7 +42,7 @@
                     </HcTooltip>
                 </template>
             </HcTable>
-            <HcTable v-if="tabsTypeKey === '1'" :column="matchTableColumn" :datas="matchData" :laoding="matchtableLoading">
+            <HcTable v-if="tabsTypeKey === '1'" :column="matchTableColumn" :datas="matchData" :laoding="matchtableLoading" border>
                 <template #action="{ row }">
                     <HcTooltip keys="gauge-testdata-edit">
                         <el-button size="small" text type="primary" @click="handmatchEdit(row)">编辑</el-button>
@@ -58,8 +58,8 @@
 
             <!-- 新增/编辑 弹框 -->
             <HcDialog
-                is-to-body 
-                :show="testModal" 
+                is-to-body
+                :show="testModal"
                 :title="`${formRowValue?.id || matchformRowValue?.id ? '编辑' : '新增'}${tabsTypeKey === '0' ? '原材' : '配合比'}`"
                 widths="47rem"
                 :is-table="tabsTypeKey === '1'"
@@ -151,7 +151,7 @@
                             v-model="matchformRowValue.slumps" placeholder="请输入"
                         />
                     </el-form-item>
-           
+
                     <el-form-item label="单位体积重" prop="bulkDensity">
                         <el-input
                             v-model="matchformRowValue.bulkDensity	" placeholder="请输入"
@@ -306,7 +306,7 @@ const getMatchTableData = async () => {
         let records = getArrValue(data['records'])
         if (tabsTypeKey.value === '1') {
             matchData.value = records
-        } 
+        }
         searchForm.value.total = data.total || 0
     } else {
         matchData.value = []
@@ -328,7 +328,7 @@ const getTableData = async () => {
         let records = getArrValue(data['records'])
         if (tabsTypeKey.value === '0') {
             tableData.value = records
-        } 
+        }
         searchForm.value.total = data.total || 0
     } else {
         tableData.value = []
@@ -365,7 +365,7 @@ const searchClick = ()=>{
     searchForm.value.current = 1
     getDataBytype()
 
-  
+
 }
 const keyUpEvent = (e)=>{
     if (e.key === 'Enter') {
@@ -551,7 +551,7 @@ const handmathDelete = (row)=>{
                 done()
             }
     })
-    
+
 }
 const saveFormLoading = ref(false)
 const saveFormClick = async ()=>{
@@ -597,7 +597,7 @@ const matchsaveFormClick = async ()=>{
         form.contractId = contractId.value
         if (form.id) {
             saveFormLoading.value = true
-            
+
             const { error, code } = await testApi.matchupdateSave(form, false)
             //判断状态
             saveFormLoading.value = false
@@ -645,7 +645,7 @@ const importModalClick = () => {
     addition.value = {
         projectId: projectId.value,
         contractId: contractId.value,
-       
+
     }
     importLoading.value = false
     importModal.value = true
@@ -690,4 +690,4 @@ myError = JSON.parse(myError)//转对象
     position: relative;
     height: 100%;
 }
-</style>
+</style>

src/views/ledger/components/construction.vue

@@ -1,104 +1,113 @@
 <template>
     <HcCard>
-        <HcTable :column="tableConstructionColumn" :datas="tableConstructionData" :loading="tableConstructionLoading">
-            <template #action="{row}">
+        <HcTable :column="tableConstructionColumn" :datas="tableConstructionData" :loading="tableConstructionLoading" border>
+            <template #action="{ row }">
                 <HcTooltip keys="write_construction_edit">
                     <el-button plain size="small" type="primary" @click="tableConstructionEdit(row)">
-                        <HcIcon name="edit"/>
+                        <HcIcon name="edit" />
                         <span>编辑</span>
                     </el-button>
                 </HcTooltip>
             </template>
         </HcTable>
         <template #action>
-            <HcPages :pages="searchConstructionForm" @change="pageConstructionChange"/>
+            <HcPages :pages="searchConstructionForm" @change="pageConstructionChange" />
         </template>
     </HcCard>
 
-    <!--编辑施工台账-->
+    <!-- 编辑施工台账 -->
     <el-dialog v-model="showConstructionEditModal" class="hc-modal-border" title="编辑施工台账" width="38rem">
-        <el-form ref="constructionFormRef" :model="constructionFormModel" :rules="constructionFormRules"
-                 label-position="top" label-width="auto" size="large">
+        <el-form
+            ref="constructionFormRef" :model="constructionFormModel" :rules="constructionFormRules"
+            label-position="top" label-width="auto" size="large"
+        >
             <div class="flex">
                 <el-form-item class="flex-1" label="施工起始日期" prop="siteStartTime">
-                    <el-date-picker v-model="constructionFormModel.siteStartTime" class="block" format="YYYY-MM-DD"
-                                    placeholder="施工起始日期" type="date" value-format="YYYY-MM-DD"/>
+                    <el-date-picker
+                        v-model="constructionFormModel.siteStartTime" class="block" format="YYYY-MM-DD"
+                        placeholder="施工起始日期" type="date" value-format="YYYY-MM-DD"
+                    />
                 </el-form-item>
                 <el-form-item class="mx-4" label=" ">至</el-form-item>
                 <el-form-item class="flex-1" label="施工停止日期" prop="siteEndTime">
-                    <el-date-picker v-model="constructionFormModel.siteEndTime" class="block" format="YYYY-MM-DD"
-                                    placeholder="施工停止日期" type="date" value-format="YYYY-MM-DD"/>
+                    <el-date-picker
+                        v-model="constructionFormModel.siteEndTime" class="block" format="YYYY-MM-DD"
+                        placeholder="施工停止日期" type="date" value-format="YYYY-MM-DD"
+                    />
                 </el-form-item>
             </div>
             <div class="flex">
                 <el-form-item class="flex-1" label="检测起始日期" prop="detectionStartTime">
-                    <el-date-picker v-model="constructionFormModel.detectionStartTime" :disabled="!constructionFormModel.siteStartTime || !constructionFormModel.siteEndTime"
-                                    class="block"
-                                    format="YYYY-MM-DD" placeholder="检测起始日期" type="date"
-                                    value-format="YYYY-MM-DD"/>
+                    <el-date-picker
+                        v-model="constructionFormModel.detectionStartTime" :disabled="!constructionFormModel.siteStartTime || !constructionFormModel.siteEndTime"
+                        class="block"
+                        format="YYYY-MM-DD" placeholder="检测起始日期" type="date"
+                        value-format="YYYY-MM-DD"
+                    />
                 </el-form-item>
                 <el-form-item class="mx-4" label=" ">至</el-form-item>
                 <el-form-item class="flex-1" label="检测停止日期" prop="detectionEndTime">
-                    <el-date-picker v-model="constructionFormModel.detectionEndTime" :disabled="!constructionFormModel.siteStartTime || !constructionFormModel.siteEndTime"
-                                    class="block"
-                                    format="YYYY-MM-DD" placeholder="检测停止日期" type="date"
-                                    value-format="YYYY-MM-DD"/>
+                    <el-date-picker
+                        v-model="constructionFormModel.detectionEndTime" :disabled="!constructionFormModel.siteStartTime || !constructionFormModel.siteEndTime"
+                        class="block"
+                        format="YYYY-MM-DD" placeholder="检测停止日期" type="date"
+                        value-format="YYYY-MM-DD"
+                    />
                 </el-form-item>
             </div>
             <el-form-item label="设计方量">
-                <el-input v-model="constructionFormModel.designVolume" placeholder="请输入设计方量"/>
+                <el-input v-model="constructionFormModel.designVolume" placeholder="请输入设计方量" />
             </el-form-item>
             <el-form-item label="实际方量">
-                <el-input v-model="constructionFormModel.actualVolume" placeholder="请输入实际方量"/>
+                <el-input v-model="constructionFormModel.actualVolume" placeholder="请输入实际方量" />
             </el-form-item>
         </el-form>
         <template #footer>
             <div class="dialog-footer">
                 <el-button size="large" @click="showConstructionEditModal = false">
-                    <HcIcon name="close"/>
+                    <HcIcon name="close" />
                     <span>取消</span>
                 </el-button>
                 <el-button :loading="saveConstructionLoading" hc-btn type="primary" @click="saveConstructionClick">
-                    <HcIcon name="save"/>
+                    <HcIcon name="save" />
                     <span>提交保存</span>
                 </el-button>
             </div>
         </template>
     </el-dialog>
-
 </template>
 
 <script setup>
-import {ref, nextTick, watch} from "vue";
-import {deepClone, formValidate, getArrValue} from "js-fast-way"
-import constructionApi from '~api/ledger/construction';
+import { nextTick, ref, watch } from 'vue'
+import { deepClone, formValidate, getArrValue } from 'js-fast-way'
+import constructionApi from '~api/ledger/construction'
 
 //参数
 const props = defineProps({
     projectId: {
         type: [String, Number],
-        default: ''
+        default: '',
     },
     contractId: {
         type: [String, Number],
-        default: ''
+        default: '',
     },
     treeData: {
         type: Object,
-        default: () => ({})
-    }
+        default: () => ({}),
+    },
 })
 
 //变量
-const projectId = ref(props.projectId);
-const contractId = ref(props.contractId);
-const nodeData = ref(props.treeData);
+const projectId = ref(props.projectId)
+const contractId = ref(props.contractId)
+const nodeData = ref(props.treeData)
 
 //监听
 watch(() => [
-    props.treeData
+    props.treeData,
 ], ([treeData]) => {
-    nodeData.value = treeData;
+    nodeData.value = treeData
     setQueryData(treeData)
 })
 
@@ -112,7 +121,7 @@ const setQueryData = (data) => {
     const cid = data?.contractIdRelation || ''
     const wbsId = data['contractIdRelation'] ? data['id'] : data['primaryKeyId']
     if (wbsId) {
-        searchConstructionForm.value.contractId = cid ? cid : contractId.value;
+        searchConstructionForm.value.contractId = cid ? cid : contractId.value
         searchConstructionForm.value.contractIdRelation = data['contractIdRelation']
         searchConstructionForm.value.wbsIds = [wbsId]
         searchConstructionClick()
@@ -120,12 +129,12 @@ const setQueryData = (data) => {
 }
 
 //搜索表单
-const searchConstructionForm = ref({current: 1, size: 20, total: 0})
+const searchConstructionForm = ref({ current: 1, size: 20, total: 0 })
 
 //搜索
 const searchConstructionClick = () => {
     if (searchConstructionForm.value?.wbsIds) {
-        searchConstructionForm.value.current = 1;
+        searchConstructionForm.value.current = 1
         getTableConstructionData()
     } else {
         window?.$message?.warning('请先选择一个树节点')
@@ -133,7 +142,7 @@ const searchConstructionClick = () => {
 }
 
 //分页被点击
-const pageConstructionChange = ({current, size}) => {
+const pageConstructionChange = ({ current, size }) => {
     searchConstructionForm.value.current = current
     searchConstructionForm.value.size = size
     getTableConstructionData()
@@ -141,13 +150,13 @@ const pageConstructionChange = ({current, size}) => {
 
 //施工台账表头
 const tableConstructionColumn = ref([
-    {key: 'station', name: '施工桩号'},
-    {key: 'site', name: '施工部位'},
-    {key: 'siteTimeStr', name: '施工起止日期'},
-    {key: 'detectionTimeStr', name: '检测日期'},
-    {key: 'designVolume', name: '设计方量'},
-    {key: 'actualVolume', name: '实际方量'},
-    {key: 'action', name: '操作', width: 100}
+    { key: 'station', name: '施工桩号' },
+    { key: 'site', name: '施工部位' },
+    { key: 'siteTimeStr', name: '施工起止日期' },
+    { key: 'detectionTimeStr', name: '检测日期' },
+    { key: 'designVolume', name: '设计方量' },
+    { key: 'actualVolume', name: '实际方量' },
+    { key: 'action', name: '操作', width: 100 },
 ])
 const tableConstructionData = ref([])
 
@@ -155,7 +164,7 @@ const tableConstructionData = ref([])
 const tableConstructionLoading = ref(false)
 const getTableConstructionData = async () => {
     tableConstructionLoading.value = true
-    const {error, code, data} = await constructionApi.queryConstructionPage({
+    const { error, code, data } = await constructionApi.queryConstructionPage({
         ...searchConstructionForm.value,
         projectId: projectId.value,
     })
@@ -187,7 +196,7 @@ const constructionFormModel = ref({
     detectionStartTime: null,
     detectionEndTime: null,
     designVolume: '',
-    actualVolume: ''
+    actualVolume: '',
 })
 const constructionFormRules = ref({
     siteStartTime: {
@@ -200,7 +209,7 @@ const constructionFormRules = ref({
                 callback()
             }
         },
-        trigger: "blur",
+        trigger: 'blur',
     },
     siteEndTime: {
         required: true,
@@ -214,7 +223,7 @@ const constructionFormRules = ref({
                 callback()
             }
         },
-        trigger: "blur",
+        trigger: 'blur',
     },
     detectionStartTime: {
         required: true,
@@ -229,7 +238,7 @@ const constructionFormRules = ref({
                 callback()
             }
         },
-        trigger: "blur",
+        trigger: 'blur',
     },
     detectionEndTime: {
         required: true,
@@ -243,17 +252,17 @@ const constructionFormRules = ref({
                 callback()
             }
         },
-        trigger: "blur",
+        trigger: 'blur',
     },
     designVolume: {
         required: true,
         trigger: 'blur',
-        message: "请输入设计方量"
+        message: '请输入设计方量',
     },
     actualVolume: {
         required: true,
         trigger: 'blur',
-        message: "请输入实际方量"
+        message: '请输入实际方量',
     },
 })
 
@@ -262,7 +271,7 @@ const saveConstructionClick = async () => {
     const validate = await formValidate(constructionFormRef.value)
     if (validate) {
         const formData = constructionFormModel.value
-        const {siteStartTime, siteEndTime, detectionStartTime, detectionEndTime} = formData
+        const { siteStartTime, siteEndTime, detectionStartTime, detectionEndTime } = formData
         //施工时间
         formData.siteTimeStr = siteStartTime + '~' + siteEndTime
         //检测时间
@@ -276,16 +285,16 @@ const saveConstructionLoading = ref(false)
 const updateConstructionPage = async (formData) => {
     //发起请求
     saveConstructionLoading.value = true
-    const {error, code} = await constructionApi.updateConstructionPage({
+    const { error, code } = await constructionApi.updateConstructionPage({
         ...formData,
         projectId: projectId.value,
-        contractId: contractId.value
+        contractId: contractId.value,
     }, false)
     //处理数据
     saveConstructionLoading.value = false
     if (!error && code === 200) {
         window?.$message?.success('保存成功')
-        showConstructionEditModal.value = false;
+        showConstructionEditModal.value = false
         getTableConstructionData()
     } else {
         window?.$message?.error('保存失败')

src/views/ledger/components/internal.vue

@@ -3,111 +3,123 @@
         <template #header>
             <div class="w-32">
                 <el-select v-model="searchInternalForm.taskStatus" clearable placeholder="审批状态" size="large">
-                    <el-option v-for="item in InternalApproval" :key="item.value" :label="item['label']"
-                               :value="item['value']"/>
+                    <el-option
+                        v-for="item in InternalApproval" :key="item.value" :label="item.label"
+                        :value="item.value"
+                    />
                 </el-select>
             </div>
             <div class="w-32 ml-2">
                 <el-select v-model="searchInternalForm.isEvaluate" clearable placeholder="是否评定" size="large">
-                    <el-option v-for="item in InternalAssess" :key="item.value" :label="item['label']"
-                               :value="item['value']"/>
+                    <el-option
+                        v-for="item in InternalAssess" :key="item.value" :label="item.label"
+                        :value="item.value"
+                    />
                 </el-select>
             </div>
             <div class="w-32 ml-2">
                 <el-select v-model="searchInternalForm.reportNumber" clearable placeholder="上报批次" size="large">
-                    <el-option v-for="item in InternalReportBatch" :key="item" :label="item" :value="item"/>
+                    <el-option v-for="item in InternalReportBatch" :key="item" :label="item" :value="item" />
                 </el-select>
             </div>
             <div class="w-32 ml-2">
                 <el-select v-model="searchInternalForm.isExperiment" clearable placeholder="关联试验" size="large">
-                    <el-option v-for="item in InternalAssociation" :key="item.value" :label="item['label']"
-                               :value="item['value']"/>
+                    <el-option
+                        v-for="item in InternalAssociation" :key="item.value" :label="item.label"
+                        :value="item.value"
+                    />
                 </el-select>
             </div>
             <div class="w-60 ml-2">
-                <el-input v-model="searchInternalForm.queryStr" clearable placeholder="请输入名称关键词检索"
-                          size="large" @keyup="searchInternalKeyUp"/>
+                <el-input
+                    v-model="searchInternalForm.queryStr" clearable placeholder="请输入名称关键词检索"
+                    size="large" @keyup="searchInternalKeyUp"
+                />
             </div>
             <div class="ml-2">
                 <el-button size="large" type="primary" @click="searchInternalClick">
-                    <HcIcon name="search-2"/>
+                    <HcIcon name="search-2" />
                     <span>搜索</span>
                 </el-button>
             </div>
         </template>
         <template #extra>
             <HcTooltip keys="write_industry_download">
-                <el-button :disabled="tableInternalKeys.length <= 0" :loading="downloadLoading" hc-btn type="primary"
-                           @click="batchDownload">
-                    <HcIcon name="download"/>
+                <el-button
+                    :disabled="tableInternalKeys.length <= 0" :loading="downloadLoading" hc-btn type="primary"
+                    @click="batchDownload"
+                >
+                    <HcIcon name="download" />
                     <span>下载</span>
                 </el-button>
             </HcTooltip>
             <HcTooltip keys="write_industry_print">
                 <el-button :disabled="tableInternalKeys.length <= 0" :loading="printLoading" hc-btn @click="batchPrint">
-                    <HcIcon name="printer"/>
+                    <HcIcon name="printer" />
                     <span>打印</span>
                 </el-button>
             </HcTooltip>
         </template>
-        <HcTable ref="tableInternalRef" :column="tableInternalColumn" :datas="tableInternalData"
-                 :loading="tableInternalLoading" isCheck @selection-change="tableInternalSelection">
-            <template #taskStatus="{row}">
-                <el-tag v-if="row['taskStatus'] === '已审批'" class="mx-1" effect="dark" type="success">已审批</el-tag>
-                <el-tag v-if="row['taskStatus'] === '待审批'" class="mx-1" effect="dark" type="danger">待审批</el-tag>
-                <el-tag v-if="row['taskStatus'] === '未上报'" class="mx-1" effect="dark" type="warning">未上报</el-tag>
+        <HcTable
+            ref="tableInternalRef" :column="tableInternalColumn" :datas="tableInternalData" border
+            :loading="tableInternalLoading" is-check @selection-change="tableInternalSelection"
+        >
+            <template #taskStatus="{ row }">
+                <el-tag v-if="row.taskStatus === '已审批'" class="mx-1" effect="dark" type="success">已审批</el-tag>
+                <el-tag v-if="row.taskStatus === '待审批'" class="mx-1" effect="dark" type="danger">待审批</el-tag>
+                <el-tag v-if="row.taskStatus === '未上报'" class="mx-1" effect="dark" type="warning">未上报</el-tag>
             </template>
-            <template #isEvaluate="{row}">
-                <el-tag v-if="row['isEvaluate']" class="mx-1" effect="dark" type="success">是</el-tag>
+            <template #isEvaluate="{ row }">
+                <el-tag v-if="row.isEvaluate" class="mx-1" effect="dark" type="success">是</el-tag>
                 <el-tag v-else class="mx-1" effect="dark" type="info">否</el-tag>
             </template>
 
-            <template #reportNumber="{row}">
-                {{ row['reportNumber'] === '-1' || row['reportNumber'] === '0' ? '' : row['reportNumber'] }}
+            <template #reportNumber="{ row }">
+                {{ row.reportNumber === '-1' || row.reportNumber === '0' ? '' : row.reportNumber }}
             </template>
-            <template #isExperiment="{row}">
-                <el-tag v-if="row['isExperiment']" class="mx-1" effect="dark" type="success">是</el-tag>
+            <template #isExperiment="{ row }">
+                <el-tag v-if="row.isExperiment" class="mx-1" effect="dark" type="success">是</el-tag>
                 <el-tag v-else class="mx-1" effect="dark" type="info">否</el-tag>
             </template>
         </HcTable>
         <template #action>
-            <HcPages :pages="searchInternalForm" @change="pageInternalChange"/>
+            <HcPages :pages="searchInternalForm" @change="pageInternalChange" />
         </template>
     </HcCard>
 </template>
 
 <script setup>
-import {ref, nextTick, watch} from "vue";
-import internalApi from '~api/ledger/internal';
-import queryApi from '~api/data-fill/query';
-import {downloadBlob, isString, getArrValue, arrToId} from "js-fast-way"
+import { nextTick, ref, watch } from 'vue'
+import internalApi from '~api/ledger/internal'
+import queryApi from '~api/data-fill/query'
+import { arrToId, downloadBlob, getArrValue, isString } from 'js-fast-way'
 
 //参数
 const props = defineProps({
     projectId: {
         type: [String, Number],
-        default: ''
+        default: '',
     },
     contractId: {
         type: [String, Number],
-        default: ''
+        default: '',
     },
     treeData: {
         type: Object,
-        default: () => ({})
-    }
+        default: () => ({}),
+    },
 })
 
 //变量
-const projectId = ref(props.projectId);
-const contractId = ref(props.contractId);
-const nodeData = ref(props.treeData);
+const projectId = ref(props.projectId)
+const contractId = ref(props.contractId)
+const nodeData = ref(props.treeData)
 
 //监听
 watch(() => [
-    props.treeData
+    props.treeData,
 ], ([treeData]) => {
-    nodeData.value = treeData;
+    nodeData.value = treeData
     setQueryData(treeData)
 })
 
@@ -122,7 +134,7 @@ const setQueryData = (data) => {
     const cid = data?.contractIdRelation || ''
     const wbsId = data['contractIdRelation'] ? data['id'] : data['primaryKeyId']
     if (wbsId) {
-        searchInternalForm.value.contractId = cid ? cid : contractId.value;
+        searchInternalForm.value.contractId = cid ? cid : contractId.value
         searchInternalForm.value.contractIdRelation = data['contractIdRelation']
         searchInternalForm.value.wbsIds = [wbsId]
         searchInternalClick()
@@ -131,14 +143,14 @@ const setQueryData = (data) => {
 
 //审批状态
 const InternalApproval = ref([
-    {label: "未上报", value: "0"},
-    {label: "待审批", value: "1"},
-    {label: "已审批", value: "2"}
+    { label: '未上报', value: '0' },
+    { label: '待审批', value: '1' },
+    { label: '已审批', value: '2' },
 ])
 //是否评定
 const InternalAssess = ref([
-    {label: "是", value: true},
-    {label: "否", value: false}
+    { label: '是', value: true },
+    { label: '否', value: false },
 ])
 
 //上报批次
@@ -157,10 +169,10 @@ const queryBatchList = async () => {
         //     projectId: projectId.value,
         //     contractId: contractId.value || ''
         // })
-        const {error, code, data} = await queryApi.getReportNumber({
+        const { error, code, data } = await queryApi.getReportNumber({
             projectId: projectId.value,
             contractId: contractId.value || '',
-            type: 1
+            type: 1,
         })
         if (!error && code === 200) {
             InternalReportBatch.value = getArrValue(data)
@@ -173,19 +185,19 @@ const queryBatchList = async () => {
 }
 //是否关联试验
 const InternalAssociation = ref([
-    {label: "是", value: true},
-    {label: "否", value: false}
+    { label: '是', value: true },
+    { label: '否', value: false },
 ])
 
 //搜索表单
 const searchInternalForm = ref({
     taskStatus: null, isEvaluate: null, reportNumber: null, isExperiment: null,
-    current: 1, size: 20, total: 0
+    current: 1, size: 20, total: 0,
 })
 
 //回车
 const searchInternalKeyUp = (e) => {
-    if (e.key === "Enter") {
+    if (e.key === 'Enter') {
         searchInternalClick()
     }
 }
@@ -193,7 +205,7 @@ const searchInternalKeyUp = (e) => {
 //搜索
 const searchInternalClick = () => {
     if (searchInternalForm.value?.wbsIds) {
-        searchInternalForm.value.current = 1;
+        searchInternalForm.value.current = 1
         getTableInternalData()
 
     } else {
@@ -202,7 +214,7 @@ const searchInternalClick = () => {
 }
 
 //分页被点击
-const pageInternalChange = ({current, size}) => {
+const pageInternalChange = ({ current, size }) => {
     searchInternalForm.value.current = current
     searchInternalForm.value.size = size
     getTableInternalData()
@@ -211,16 +223,16 @@ const pageInternalChange = ({current, size}) => {
 //内业台账表头
 const tableInternalRef = ref(null)
 const tableInternalColumn = ref([
-    {key: 'unitProject', name: '单位工程'},
-    {key: 'partProject', name: '分部工程'},
-    {key: 'partChildProject', name: '子分部工程'},
-    {key: 'subentryProject', name: '分项工程'},
-    {key: 'subentryChildProject', name: '子分项工程'},
-    {key: 'process', name: '工序'},
-    {key: 'taskStatus', name: '审批状态', width: 120, align: 'center'},
-    {key: 'reportNumber', name: '上报批次', width: 100, align: 'center'},
-    {key: 'isEvaluate', name: '是否评定', width: 100, align: 'center'},
-    {key: 'isExperiment', name: '关联试验', width: 100, align: 'center'},
+    { key: 'unitProject', name: '单位工程' },
+    { key: 'partProject', name: '分部工程' },
+    { key: 'partChildProject', name: '子分部工程' },
+    { key: 'subentryProject', name: '分项工程' },
+    { key: 'subentryChildProject', name: '子分项工程' },
+    { key: 'process', name: '工序' },
+    { key: 'taskStatus', name: '审批状态', width: 120, align: 'center' },
+    { key: 'reportNumber', name: '上报批次', width: 100, align: 'center' },
+    { key: 'isEvaluate', name: '是否评定', width: 100, align: 'center' },
+    { key: 'isExperiment', name: '关联试验', width: 100, align: 'center' },
 ])
 const tableInternalData = ref([])
 
@@ -228,7 +240,7 @@ const tableInternalData = ref([])
 const tableInternalLoading = ref(false)
 const getTableInternalData = async () => {
     tableInternalLoading.value = true
-    const {error, code, data} = await internalApi.queryInternalPage({
+    const { error, code, data } = await internalApi.queryInternalPage({
         ...searchInternalForm.value,
         projectId: projectId.value,
     })
@@ -244,22 +256,22 @@ const getTableInternalData = async () => {
 }
 
 //多选
-const tableInternalKeys = ref([]);
+const tableInternalKeys = ref([])
 const tableInternalSelection = (rows) => {
     tableInternalKeys.value = rows.filter((item) => {
-        return (item ?? '') !== '';
+        return (item ?? '') !== ''
     })
 }
 
 //下载
 const downloadLoading = ref(false)
 const batchDownload = async () => {
-    const rows = tableInternalKeys.value;
-    console.log(rows, 'rows');
+    const rows = tableInternalKeys.value
+    console.log(rows, 'rows')
     const ids = arrToId(rows)
     //批量下载
     downloadLoading.value = true
-    const {error, disposition, res} = await queryApi.batchDownloadFileToZip({ids: ids})
+    const { error, disposition, res } = await queryApi.batchDownloadFileToZip({ ids: ids })
     //处理数据
     downloadLoading.value = false
     if (!error) {
@@ -274,11 +286,11 @@ const batchDownload = async () => {
 //打印
 const printLoading = ref(false)
 const batchPrint = async () => {
-    const rows = tableInternalKeys.value;
+    const rows = tableInternalKeys.value
     const ids = arrToId(rows)
     //批量下载
     printLoading.value = true
-    const {error, code, data} = await queryApi.batchPrint({ids: ids})
+    const { error, code, data } = await queryApi.batchPrint({ ids: ids })
     //处理数据
     printLoading.value = false
     const res = isString(data) ? data ?? '' : ''
@@ -286,5 +298,4 @@ const batchPrint = async () => {
         window.open(res, '_blank')
     }
 }
-
 </script>

src/views/ledger/components/table-form.vue

@@ -163,7 +163,7 @@
                 </div>
                 <div class="user-box">
                     <HcTable
-                        ref="copyTimeTableRef" :column="copyTimeTableColumn" :datas="copyTimeTableData"
+                        ref="copyTimeTableRef" :column="copyTimeTableColumn" :datas="copyTimeTableData" border
                         :loading="copyTimeTableLoading" is-check @selection-change="copyTimeTableSelection"
                     />
                 </div>

src/views/ledger/components/table-list.vue

@@ -57,7 +57,7 @@
             </template>
             <HcTable
                 ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading" is-check
-                @selection-change="tableSelectionChange"
+                border @selection-change="tableSelectionChange"
             >
                 <template #action="{ row }">
                     <HcTooltip keys="ledger_query_table_query">

src/views/ledger/components/weather.vue

@@ -2,7 +2,7 @@
     <HcCard>
         <template #header>
             <div class="w-64">
-                <HcDatePicker :dates="weatherTime" clearable size="large" @change="weatherTimeUpdate"/>
+                <HcDatePicker :dates="weatherTime" clearable size="large" @change="weatherTimeUpdate" />
             </div>
             <div class="ml-2">
                 <el-button size="large" type="primary" @click="searchWeatherClick">搜索</el-button>
@@ -11,85 +11,88 @@
         <template #extra>
             <HcTooltip keys="write_weather_print">
                 <el-button :loading="printLoading" hc-btn @click="batchPrint">
-                    <HcIcon name="printer"/>
+                    <HcIcon name="printer" />
                     <span>打印</span>
                 </el-button>
             </HcTooltip>
         </template>
-        <HcTable :column="tableWeatherColumn" :datas="tableWeatherData" :loading="tableWeatherLoading" isCheck
-                 @selection-change="tableWeatherSelection">
-            <template #tempLow="{row}">{{ row['tempLow'] }} ~ {{ row['tempHigh'] }}</template>
-            <template #action="{row}">
+        <HcTable
+            :column="tableWeatherColumn" :datas="tableWeatherData" :loading="tableWeatherLoading" is-check
+            border @selection-change="tableWeatherSelection"
+        >
+            <template #tempLow="{ row }">{{ row.tempLow }} ~ {{ row.tempHigh }}</template>
+            <template #action="{ row }">
                 <HcTooltip keys="write_weather_edit">
                     <el-button plain size="small" type="primary" @click="tableWeatherEdit(row)">
-                        <HcIcon name="edit"/>
+                        <HcIcon name="edit" />
                         <span>编辑</span>
                     </el-button>
                 </HcTooltip>
             </template>
         </HcTable>
         <template #action>
-            <HcPages :pages="searchWeatherForm" @change="pageWeatherChange"/>
+            <HcPages :pages="searchWeatherForm" @change="pageWeatherChange" />
         </template>
     </HcCard>
 
-    <!--编辑天气台账-->
+    <!-- 编辑天气台账 -->
     <el-dialog v-model="showWeatherEditModal" class="hc-modal-border" title="编辑天气台账" width="38rem">
-        <el-form ref="weatherFormRef" :model="weatherFormModel" :rules="weatherFormRules" label-width="auto"
-                 size="large">
+        <el-form
+            ref="weatherFormRef" :model="weatherFormModel" :rules="weatherFormRules" label-width="auto"
+            size="large"
+        >
             <el-form-item label="日期">
-                <el-input v-model="weatherFormModel.recordTime" disabled/>
+                <el-input v-model="weatherFormModel.recordTime" disabled />
             </el-form-item>
             <el-form-item label="天气" prop="weather">
-                <el-input v-model="weatherFormModel.weather" placeholder="天气"/>
+                <el-input v-model="weatherFormModel.weather" placeholder="天气" />
             </el-form-item>
             <el-form-item label="最低温度" prop="tempLow">
-                <el-input v-model="weatherFormModel.tempLow" placeholder="最低温度" type="number"/>
+                <el-input v-model="weatherFormModel.tempLow" placeholder="最低温度" type="number" />
             </el-form-item>
             <el-form-item label="最高温度" prop="tempHigh">
-                <el-input v-model="weatherFormModel.tempHigh" placeholder="最高温度" type="number"/>
+                <el-input v-model="weatherFormModel.tempHigh" placeholder="最高温度" type="number" />
             </el-form-item>
             <el-form-item label="风力" prop="windLevel">
-                <el-input v-model="weatherFormModel.windLevel" placeholder="风力"/>
+                <el-input v-model="weatherFormModel.windLevel" placeholder="风力" />
             </el-form-item>
         </el-form>
         <template #footer>
             <div class="dialog-footer">
                 <el-button size="large" @click="showWeatherEditModal = false">
-                    <HcIcon name="close"/>
+                    <HcIcon name="close" />
                     <span>取消</span>
                 </el-button>
                 <el-button :loading="saveWeatherLoading" hc-btn type="primary" @click="saveWeatherClick">
-                    <HcIcon name="save"/>
+                    <HcIcon name="save" />
                     <span>提交保存</span>
                 </el-button>
             </div>
         </template>
     </el-dialog>
-
 </template>
 
 <script setup>
-import {ref, nextTick} from "vue";
-import weatherApi from '~api/ledger/weather';
-import queryApi from '~api/data-fill/query';
-import {arrToId, deepClone, formValidate, getArrValue} from "js-fast-way"
+import { nextTick, ref } from 'vue'
+import weatherApi from '~api/ledger/weather'
+import queryApi from '~api/data-fill/query'
+import { arrToId, deepClone, formValidate, getArrValue } from 'js-fast-way'
 
 //参数
 const props = defineProps({
     projectId: {
         type: [String, Number],
-        default: ''
+        default: '',
     },
     contractId: {
         type: [String, Number],
-        default: ''
-    }
+        default: '',
+    },
 })
 
 //变量
-const projectId = ref(props.projectId);
-const contractId = ref(props.contractId);
+const projectId = ref(props.projectId)
+const contractId = ref(props.contractId)
 
 //渲染完成
 nextTick(() => {
@@ -97,23 +100,23 @@ nextTick(() => {
 })
 
 //搜索表单
-const searchWeatherForm = ref({recordTime: '', current: 1, size: 20, total: 0})
+const searchWeatherForm = ref({ recordTime: '', current: 1, size: 20, total: 0 })
 
 //日期时间被选择
 const weatherTime = ref(null)
-const weatherTimeUpdate = ({query, arr}) => {
+const weatherTimeUpdate = ({ query, arr }) => {
     weatherTime.value = arr
     searchWeatherForm.value.recordTime = query
 }
 
 //搜索
 const searchWeatherClick = () => {
-    searchWeatherForm.value.current = 1;
+    searchWeatherForm.value.current = 1
     getTableWeatherData()
 }
 
 //分页被点击
-const pageWeatherChange = ({current, size}) => {
+const pageWeatherChange = ({ current, size }) => {
     searchWeatherForm.value.current = current
     searchWeatherForm.value.size = size
     getTableWeatherData()
@@ -121,12 +124,12 @@ const pageWeatherChange = ({current, size}) => {
 
 //天气台账表头
 const tableWeatherColumn = ref([
-    {key: 'recordTime', name: '日期'},
-    {key: 'weather', name: '天气'},
-    {key: 'tempLow', name: '温度 ℃'},
-    {key: 'airTemp', name: '平均温度 ℃'},
-    {key: 'windLevel', name: '风力'},
-    {key: 'action', name: '操作', width: 100}
+    { key: 'recordTime', name: '日期' },
+    { key: 'weather', name: '天气' },
+    { key: 'tempLow', name: '温度 ℃' },
+    { key: 'airTemp', name: '平均温度 ℃' },
+    { key: 'windLevel', name: '风力' },
+    { key: 'action', name: '操作', width: 100 },
 ])
 const tableWeatherData = ref([])
 
@@ -134,10 +137,10 @@ const tableWeatherData = ref([])
 const tableWeatherLoading = ref(false)
 const getTableWeatherData = async () => {
     tableWeatherLoading.value = true
-    const {error, code, data} = await weatherApi.queryWeatherPage({
+    const { error, code, data } = await weatherApi.queryWeatherPage({
         ...searchWeatherForm.value,
         projectId: projectId.value,
-        contractId: contractId.value
+        contractId: contractId.value,
     })
     //判断状态
     tableWeatherLoading.value = false
@@ -160,19 +163,19 @@ const tableWeatherEdit = (row) => {
 
 //天气台账表单
 const weatherFormRef = ref(null)
-const weatherFormModel = ref({recordTime: '', weather: '', tempLow: null, tempHigh: null, windLevel: ''})
+const weatherFormModel = ref({ recordTime: '', weather: '', tempLow: null, tempHigh: null, windLevel: '' })
 const weatherFormRules = ref({
     weather: {
         required: true,
         trigger: 'blur',
-        message: "请输入天气"
+        message: '请输入天气',
     },
     tempLow: {
         required: true,
         validator: (rule, value, callback) => {
             const tempHigh = weatherFormModel.value?.tempHigh ?? ''
             const val = Number(value)
-            const high = Number(tempHigh);
+            const high = Number(tempHigh)
             if (!val) {
                 callback(new Error('请输入最低温度'))
             } else if (val > high) {
@@ -183,14 +186,14 @@ const weatherFormRules = ref({
                 callback()
             }
         },
-        trigger: "blur",
+        trigger: 'blur',
     },
     tempHigh: {
         required: true,
         validator: (rule, value, callback) => {
             const tempLow = weatherFormModel.value?.tempLow ?? ''
             const val = Number(value)
-            const low = Number(tempLow);
+            const low = Number(tempLow)
             if (!val) {
                 callback(new Error('请输入最高温度'))
             } else if (val < low) {
@@ -201,12 +204,12 @@ const weatherFormRules = ref({
                 callback()
             }
         },
-        trigger: "blur",
+        trigger: 'blur',
     },
     windLevel: {
         required: true,
         trigger: 'blur',
-        message: "请输入风力"
+        message: '请输入风力',
     },
 })
 
@@ -217,16 +220,16 @@ const saveWeatherClick = async () => {
     if (validate) {
         //发起请求
         saveWeatherLoading.value = true
-        const {error, code} = await weatherApi.updateWeatherById({
+        const { error, code } = await weatherApi.updateWeatherById({
             ...weatherFormModel.value,
             projectId: projectId.value,
-            contractId: contractId.value
+            contractId: contractId.value,
         }, false)
         //处理数据
         saveWeatherLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success('保存成功')
-            showWeatherEditModal.value = false;
+            showWeatherEditModal.value = false
             getTableWeatherData()
         } else {
             window?.$message?.error('保存失败')
@@ -234,21 +237,21 @@ const saveWeatherClick = async () => {
     }
 }
 //多选
-const tableweatherKeys = ref([]);
+const tableweatherKeys = ref([])
 const tableWeatherSelection = (rows) => {
     tableweatherKeys.value = rows.filter((item) => {
-        return (item ?? '') !== '';
+        return (item ?? '') !== ''
     })
 }
 
 //打印
 const printLoading = ref(false)
 const batchPrint = async () => {
-    const rows = tableweatherKeys.value;
+    const rows = tableweatherKeys.value
     const ids = arrToId(rows)
     //批量下载
     printLoading.value = true
-    const {error, code, data} = await queryApi.batchPrint({ids: ids})
+    const { error, code, data } = await queryApi.batchPrint({ ids: ids })
     //处理数据
     printLoading.value = false
     const res = isString(data) ? data ?? '' : ''

src/views/other-file/image-form.vue

@@ -120,7 +120,7 @@
                         </el-scrollbar>
                     </el-col>
                     <el-col :span="14">
-                        <HcTable v-if="dataType === 2" :column="tableColumn" :datas="tableData" />
+                        <HcTable v-if="dataType === 2" :column="tableColumn" :datas="tableData" border />
                     </el-col>
                 </el-row>
                 <template #action>
@@ -219,7 +219,7 @@ onActivated(() => {
         TreeAutoExpandKeys.value = getStoreValue('TreeExpandKeys')
     }
     formDataFormat({})
-   
+
     queryById()
     formValue.value.shootingUser = userInfo.value['real_name']
     if (wbsNodeIds.value) {
@@ -257,7 +257,7 @@ const getFileTitleNamedata = async (wbsNodeIds) => {
         } else {
             formValue.value.title = ''
         }
-     
+
     }
 
 
@@ -282,7 +282,7 @@ const nodeWbsElTreeClick = ({ data, keys }) => {
             filmCode: '',
             seeAlsoCode: '',
         }
-    
+
             uploadFileList.value = []
             previewFileList.value = []
         }
@@ -443,7 +443,7 @@ const saveLogClick = () => {
     formValue.value.shootingUser = userInfo.value['real_name']
     verifyFormData(true)
 
-  
+
 }
 
 //表单效验
@@ -463,7 +463,7 @@ const verifyFormData = async (log) => {
     //设置数据
     formData.imageUrl = imageUrl
     formData.pdfUrl = pdfUrl
-  
+
     shootingTimeStr.value = formData['shootingTimeStr'] || ''
     //验证数据
     if (!formData?.wbsId && dataType.value === 1) {
@@ -543,7 +543,7 @@ const toBackClick = () => {
             id: classifyId.value,
         },
     })
-  
+
 }
 
 //左右拖动，改变树形结构宽度

src/views/other-file/image-view.vue

@@ -72,7 +72,7 @@
                 </template>
                 <HcTable
                     ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading"
-                    is-check @selection-change="tableSelectionChange"
+                    is-check border @selection-change="tableSelectionChange"
                 >
                     <template #info="{ row }">
                         <div class="hc-table-col-item">
@@ -174,7 +174,7 @@ watch(() => [
 ], ([query]) => {
     console.log(query, 'query')
     dataId.value = query?.id || ''
-    dataType.value = parseInt(query?.type + '') 
+    dataType.value = parseInt(query?.type + '')
     fileType.value = parseInt(query?.fileType + '') || 2
     searchForm.value.classifyId = query?.id || ''
     initMounted()

src/views/other-file/project-scanning.vue

@@ -102,7 +102,7 @@
                 </template>
                 <HcTable
                     ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading"
-                    is-check @selection-change="tableSelectionChange"
+                    is-check border @selection-change="tableSelectionChange"
                 >
                     <template #fileName="{ row }">
                         <span class="text-link" @click="tablePreview(row)">{{ row?.fileName }}</span>
@@ -127,7 +127,7 @@
         <el-dialog v-model="showUploadModal" class="hc-modal-border hc-modal-table" title="上传工程文件" width="80vw">
             <HcTable
                 :column="tableUploadColumn" :datas="tableUploadData" :loading="uploadSaveLoading"
-                ui="hc-form-table"
+                ui="hc-form-table" border
             >
                 <template #fileNumber="{ row }">
                     <el-input
@@ -255,7 +255,7 @@
         >
             <div class="hc-card-body-flex">
                 <div class="flex-table">
-                    <HcTable :column="CertColumns" :datas="CertData" ui="hc-form-table" @row-click="CertRowClick">
+                    <HcTable :column="CertColumns" :datas="CertData" ui="hc-form-table" border @row-click="CertRowClick">
                         <template #action="{ row, index }">
                             <el-button plain size="small" type="primary" @click.stop="CertRowClick2(row)">
                                 预览

src/views/other/components/ListItem.vue

@@ -231,7 +231,7 @@
                 <div class="dialog-table">
                     <HcTable
                         :column="CTDdialogTableColumn" :datas="CTDdialogTableData1"
-                        :loading="CTDdialogTableLoading"
+                        :loading="CTDdialogTableLoading" border
                     >
                         <template #recordNo="{ row }">
                             <span class="text-link" @click="CTDtableRowName(row)">{{ row?.recordNo }}</span>
@@ -389,7 +389,7 @@
                     <HcTable
                         v-if="fileModalradio == 1" ref="dialogTableRef1" :column="filedialogTableColumn"
                         :datas="filedialogTableData" :loading="filedialogTableLoading" is-check
-                        @selection-change="filedialogTableSelection1"
+                        border @selection-change="filedialogTableSelection1"
                     >
                         <template #recordNo="{ row }">
                             <span :class="[row?.isSelectedStatus == 1 ? 'text-green' : '']">{{ row?.recordNo }}</span>
@@ -398,7 +398,7 @@
                     <HcTable
                         v-if="fileModalradio == 2" ref="dialogTableRef2" :column="filedialogTableColumn1"
                         :datas="filedialogTableData" :loading="filedialogTableLoading" is-check
-                        @selection-change="filedialogTableSelection"
+                        border @selection-change="filedialogTableSelection"
                     >
                         <template #reportNo="{ row }">
                             <span :class="[row?.isSelectedStatus === 1 ? 'text-green' : '']">{{ row?.reportNo }}</span>
@@ -407,7 +407,7 @@
                     <HcTable
                         v-if="fileModalradio == 3" ref="dialogTableRef" :column="filedialogTableColumn1"
                         :datas="filedialogTableData" :loading="filedialogTableLoading" is-check
-                        @selection-change="filedialogTableSelection"
+                        border @selection-change="filedialogTableSelection"
                     >
                         <template #reportNo="{ row }">
                             <span :class="[row?.isSelectedStatus === 1 ? 'text-green' : '']">{{ row?.reportNo }}</span>

src/views/other/first-item.vue

@@ -93,7 +93,7 @@
                 </template>
                 <HcTable
                     ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading"
-                    is-check @selection-change="tableSelectionChange"
+                    is-check border @selection-change="tableSelectionChange"
                 >
                     <template #name="{ row }">
                         <span class="text-link" @click="tableRowName(row)">{{ row?.name }}</span>
@@ -158,7 +158,7 @@
                     <el-divider border-style="dashed" />
                     <div class="title">文件附件</div>
                     <div class="hc-table-node-file-box">
-                        <HcTable :column="tableFileColumn" :datas="tableFileData" :is-index="false">
+                        <HcTable :column="tableFileColumn" :datas="tableFileData" :is-index="false" border>
                             <template #action="{ row, index }">
                                 <el-button plain size="small" type="danger" @click="tableDelButton(index)">
                                     删除

src/views/other/first-itemcopy.vue

@@ -93,7 +93,7 @@
                 </template>
                 <HcTable
                     ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading"
-                    is-check @selection-change="tableSelectionChange"
+                    is-check border @selection-change="tableSelectionChange"
                 >
                     <template #name="{ row }">
                         <span class="text-link" @click="tableRowName(row)">{{ row?.name }}</span>
@@ -172,7 +172,7 @@
                     <el-divider border-style="dashed" />
                     <div class="title">文件附件</div>
                     <div class="hc-table-node-file-box">
-                        <HcTable :column="tableFileColumn" :datas="tableFileData" :is-index="false">
+                        <HcTable :column="tableFileColumn" :datas="tableFileData" :is-index="false" border>
                             <template #action="{ row, index }">
                                 <el-button plain size="small" type="danger" @click="tableDelButton(index)">
                                     删除

src/views/tasks/components/TableCard.vue

@@ -59,7 +59,7 @@
         </template>
         <HcTable
             ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading" is-check
-            @selection-change="tableSelectionChange"
+            border @selection-change="tableSelectionChange"
         >
             <template #taskName="{ row }">
                 <span class="text-link" @click="rowTaskName(row)">{{ row?.taskName }}</span>
@@ -303,9 +303,9 @@ const queryPage = async () => {
     tableLoading.value = true
     const { error, code, data } = await tasksApi.getTaskPage({
         ...searchForm.value,
-  
+
         projectIdValue: projectId.value,
-    
+
         currentContractId:currentContractId.value,
 
     })

src/views/tasks/flow.vue

@@ -15,7 +15,7 @@
                     title="同一合同段内，只需要设置重复岗位的流程即可，其他任务岗位，系统将自动推送，无需创建更多任务流" type="error"
                 />
             </template>
-            <HcTable :column="tableListColumn" :datas="tableListData" :loading="tableLoading">
+            <HcTable :column="tableListColumn" :datas="tableListData" :loading="tableLoading" border>
                 <template #action="{ row }">
                     <HcTooltip keys="tasks_flow_edit">
                         <el-button plain size="small" type="primary" @click="handleTableEdit(row)">编辑</el-button>

src/views/tasks/hc-data.vue

@@ -55,10 +55,10 @@
                 </div>
                 <div :class="sbTableKey === 'key1' ? '' : 'vh'" class="flex-table">
                     <div v-if="taskReviewType === '1'" class="data-table taskReviewData">
-                        <HcTable :column="taskReviewColumns" :datas="taskReviewData" @row-click="rowTaskReviewClick" />
+                        <HcTable :column="taskReviewColumns" :datas="taskReviewData" border @row-click="rowTaskReviewClick" />
                     </div>
                     <div v-if="taskReviewType === '2'" class="data-table checkedRowsRef">
-                        <HcTable :column="checkedRowsColumns" :datas="checkedRowsRef" @row-click="rowTaskReviewClick" />
+                        <HcTable :column="checkedRowsColumns" :datas="checkedRowsRef" border @row-click="rowTaskReviewClick" />
                     </div>
                     <div v-if="sbTableKey === 'key1'" class="radio-group-box">
                         <span class="label">审批操作：</span>

src/views/tasks/message-data.vue

@@ -38,7 +38,7 @@
                 </template>
                 <HcTable
                     ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading"
-                    is-check @selection-change="tableSelectionChange"
+                    is-check border @selection-change="tableSelectionChange"
                 >
                     <template #content="{ row }">
                         <div class="text-link text-cut" @click="tableContent(row)">{{ row.content }}</div>

src/views/tasks/sign-admin.vue

@@ -16,7 +16,7 @@
                         <el-option v-for="item in contractList" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </div>
-           
+
                 <div class="w-64 ml-3">
                     <HcDatePicker :dates="betweenTime" clearable size="large" @change="betweenTimeUpdate" />
                 </div>
@@ -43,7 +43,7 @@
             </template>
             <HcTable
                 ref="tableListRef" :column="tableListColumn" :datas="tableData" :loading="tableLoading" is-check
-                @selection-change="tableSelectionChange"
+                border @selection-change="tableSelectionChange"
             >
                 <template #taskStatusName="{ row }">
                     <el-tag
@@ -88,8 +88,8 @@ onMounted(() => {
     const project = getObjValue(projectInfo.value)
     contractList.value = getArrValue(project['contractInfoList'])
     searchForm.value.contractId = contractId.value
-  
-    
+
+
     getTableData()
 })
 
@@ -192,8 +192,8 @@ const resignClick = async ()=>{
     if (!error && code === 200) {
        window.$message.success(msg)
        getTableData()
-    } 
-  
+    }
+
 }
 </script>
 

src/views/tentative/collect/test.vue

@@ -77,7 +77,7 @@
                 </template>
                 <HcTable
                     ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    @selection-change="tableSelection"
+                    border @selection-change="tableSelection"
                 />
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />

src/views/tentative/detect/components/ListItem.vue

@@ -210,7 +210,7 @@
             <div class="dialog-table-box">
                 <div class="dialog-table">
                     <HcTable
-                        ref="vesselTableRef" :column="vesselTableColumn" :datas="vesselTableData"
+                        ref="vesselTableRef" :column="vesselTableColumn" :datas="vesselTableData" border
                         :loading="vesselTableLoading" is-check @selection-change="vesselTableSelection"
                     />
                 </div>
@@ -239,7 +239,7 @@
             <div class="dialog-table-box">
                 <div class="dialog-table">
                     <HcTable
-                        ref="deviceTableRef" :column="deviceTableColumn" :datas="deviceTableData"
+                        ref="deviceTableRef" :column="deviceTableColumn" :datas="deviceTableData" border
                         :loading="deviceTableLoading" is-check @selection-change="deviceTableSelection"
                     />
                 </div>
@@ -382,7 +382,7 @@ watch(() => [
     alllistDataval.value = AlllistData
     NodeStatusval.value = NodeStatus
     setFormDataNum(datas)
-  
+
 })
 
 //监听
@@ -477,7 +477,7 @@ const CollapseChange = async (name) => {
         getOffsetTop(name)
         const index = names[1]
         let item = listDatas.value[index]
-        
+
         emit('upcheckTableId', item.pKeyId)
         emit('changeIscanclick', item.pKeyId)
         formKeyIds.value = getValString(item.pKeyId)
@@ -1459,7 +1459,7 @@ const renewData = (newaddId) => {
     emit('renew', newaddId, ActiveKey.value)
     ActiveKey.value = ''
 
-   
+
 }
 const changeisHide = (pKeyId, isBussShow) => {
     emit('changesdate', pKeyId, isBussShow)
@@ -1518,7 +1518,7 @@ const windowClick = (item, indexs)=>{
     const newTableForm = {
             ...setInitDragModalTableForm(item, indexs),
             ...formSize,
-         
+
         }
         console.log(newTableForm, 'newTableForm')
     item.isWindow = true
@@ -1532,14 +1532,14 @@ const windowClick = (item, indexs)=>{
         }
         DragModalTableForm.value = list
         ActiveKey.value = ''
-      
-    
+
+
             const { pKeyId } = item
     let KeyId = `item-${indexs}-${pKeyId}`
         CollapseChange(KeyId)
    }
- 
- 
+
+
 }
 //获取表单的大小
 const getTableFormSize = (pkeyId) => {
@@ -1563,7 +1563,7 @@ const setInitDragModalTableForm = (item, index) => {
     return {
         projectId: projectId.value,
         contractId: contractId.value,
-    
+
         pkeyId: item.pKeyId,
         height: '100%',
         width: '100%',
@@ -1575,10 +1575,10 @@ const setInitDragModalTableForm = (item, index) => {
 }
 //关闭窗口
 const windowCloseClick = (item, indexs)=>{
-    
+
     ActiveKey.value = ''
 
-  
+
 }
 const DragModalTableForm = ref([])
 const DragModalHeight = ref(600)
@@ -1596,10 +1596,10 @@ const TableFormClose = async ({ pkeyId, index }, indexs, type) => {
     listDatas.value[index].isWindow = false
   if (type) {
     ActiveKey.value = ''
-   
+
 
   }
- 
+
 }
 
 const dragNodeMoreMenu = [
@@ -1614,11 +1614,11 @@ const closeIconTap = async (event, item, indexs) => {
     const { index, pkeyId } = item
     let KeyId = `item-${index}-${pkeyId}`
     await TableFormClose(item, indexs, false)
-  
+
     console.log(item, 'KeyId')
     CollapseChange(KeyId)
     item.isWindow = false
-  
+
 }
 //菜单被点击
 const dragNodeMoreMenuTap = async ({ key }, items, indexs) => {
@@ -1699,9 +1699,9 @@ const HcUploadFileSuccess = async (res) => {
             obj[i] = resData[i]
         }
    }
-  
+
     dataHcUploadFileRef.value[0]?.setModalShow(false)
- 
+
 }
 
 // 暴露出去

src/views/tentative/detect/outside.vue

@@ -82,7 +82,7 @@
                 </template>
                 <HcTable
                     ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    @selection-change="tableSelection"
+                    border @selection-change="tableSelection"
                 >
                     <template #status="{ row }">
                         <span>{{ row.status === 1 ? '合格' : row.status === 0 ? '不合格' : '' }}</span>
@@ -306,7 +306,7 @@
                 </div>
                 <div class="hc-links-sample-table-box">
                     <HcTable
-                        :column="linksSampleTableColumn" :datas="linksSampleTableData"
+                        :column="linksSampleTableColumn" :datas="linksSampleTableData" border
                         :is-index="false" :loading="linksSampleTableLoading"
                     >
                         <template #action="{ row }">
@@ -505,7 +505,7 @@ const editFormModalClick = () => {
     const keys = tableCheckedKeys.value
     if (keys.length === 1) {
         addEditFormModel.value = keys[0]
-     
+
         formModalTitle.value = '编辑'
         addEditFormModal.value = true
     } else if (keys.length > 1) {
@@ -592,7 +592,7 @@ const submitFormApi = async () => {
         await getTableData()
         // window?.location?.reload() //刷新页面
     }
-  
+
 }
 
 //复制
@@ -623,7 +623,7 @@ const copyFormApi = async () => {
         addEditFormModal.value = false
         await getTableData()
     }
-   
+
 }
 
 //批量复制 提交保存
@@ -676,7 +676,7 @@ const tableRemoveData = async () => {
             setTimeout(() => {
                     isShowTree.value = true
             }, 100)
-       
+
         }
     }
 }

src/views/tentative/detect/test-form-bak.vue

@@ -200,7 +200,7 @@
                 <div class="hc-links-sample-table-box">
                     <HcTable
                         ref="tableRawRef" :column="linksRawTableColumn" :datas="linksRawTableData"
-                        :is-index="false" :loading="linksRawTableLoading" is-check
+                        :is-index="false" :loading="linksRawTableLoading" is-check border
                         @selection-change="linksRawTableSelection"
                     />
                 </div>
@@ -225,7 +225,7 @@
                 <div class="hc-links-sample-table-box">
                     <HcTable
                         ref="tableSampleRef" :column="linksSampleTableColumn" :datas="linksSampleTableData"
-                        :is-index="false" :loading="linksSampleTableLoading" is-check
+                        :is-index="false" :loading="linksSampleTableLoading" is-check border
                         @selection-change="linksSampleTableSelection"
                     />
                 </div>

src/views/tentative/detect/test-form.vue

@@ -197,7 +197,7 @@
                 <div class="hc-links-sample-table-box">
                     <HcTable
                         ref="tableRawRef" :column="linksRawTableColumn" :datas="linksRawTableData"
-                        :is-index="false" :loading="linksRawTableLoading" is-check
+                        :is-index="false" :loading="linksRawTableLoading" is-check border
                         @selection-change="linksRawTableSelection"
                     />
                 </div>
@@ -222,7 +222,7 @@
                 <div class="hc-links-sample-table-box">
                     <HcTable
                         ref="tableSampleRef" :column="linksSampleTableColumn" :datas="linksSampleTableData"
-                        :is-index="false" :loading="linksSampleTableLoading" is-check
+                        :is-index="false" :loading="linksSampleTableLoading" is-check border
                         @selection-change="linksSampleTableSelection"
                     />
                 </div>
@@ -1068,7 +1068,7 @@ const tableFormSaveClick = async () => {
             let recordNo = info?.recordNo || tabTypeKey.value == 1 ? listItemBaseData.value.id : ''
 
             let reportNo = info?.reportNo || tabTypeKey.value == 2 ? listItemBaseData.value.id : ''
-            
+
             //组装type
             if (recordNo === '' && reportNo !== '') {
                 listItemBaseData.value.tableType = '2'
@@ -1096,7 +1096,7 @@ const tableFormSaveClick = async () => {
                             nodeId: routerQuery?.nodeId,
                             isCollapseLoad: false,
                             isBussShow: item1.isBussShow,
-                            
+
                         }
                         // 过滤存在的key_的键值
                         let ishasKey = Object.keys(item1).filter(e => e.indexOf('key_') >= 0)
@@ -1175,7 +1175,7 @@ const tableFormSaveClick = async () => {
                         return item
                     }
                 })
-         
+
                 console.log(FormData, 'lastFormData1')
                 console.log(listItemBaseData.value.tableType, 'listItemBaseData.value.tableType')
                 console.log(nodeIdvalue.value?.length, 'newId.value?.length')
@@ -1222,21 +1222,21 @@ const tableFormSaveClick = async () => {
                         //   toBackClick()
 
                         listItemBaseData.value.id = data
-                       
+
                       await getSearchNodeTables()
                       await getSearchNodeTablesall(1)
                       await getSearchNodeTablesall(2)
                       await queryNodeStatus(data)
-               
+
                     } else {
                         listItemBaseData.value.id = data
-                     
+
                         // bussPdfsClick(nodeIdvalue.value)
                         await getSearchNodeTables()
                         await getSearchNodeTablesall(1)
                         await getSearchNodeTablesall(2)
                         await queryNodeStatus(data)
-                    
+
                         afterAdd.value = true
                         isaddType = false
                     }

src/views/tentative/detect/test.vue

@@ -239,7 +239,7 @@
         >
             <HcTable
                 :column="samplingTableColumn" :datas="samplingTableData" :is-index="false"
-                :loading="samplingTableLoading"
+                :loading="samplingTableLoading" border
             />
         </HcDialog>
         <!-- 批量上报审批 -->

src/views/tentative/detect/third.vue

@@ -82,7 +82,7 @@
                 </template>
                 <HcTable
                     ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    @selection-change="tableSelection"
+                    border @selection-change="tableSelection"
                 >
                     <template #status="{ row }">
                         <!-- <span>{{arrKeyValue(categoryData, 'dictKey', 'dictValue', row.detectionCategory)}}</span> -->
@@ -307,7 +307,7 @@
                 <div class="hc-links-sample-table-box">
                     <HcTable
                         :column="linksSampleTableColumn" :datas="linksSampleTableData"
-                        :is-index="false" :loading="linksSampleTableLoading"
+                        :is-index="false" :loading="linksSampleTableLoading" border
                     >
                         <template #action="{ row }">
                             <el-button v-if="addEditFormModel.sampleId === row.id" plain size="small" type="primary">
@@ -564,7 +564,7 @@ const addEditFormClick = async () => {
         } else {
             await submitFormApi()
         }
-    } 
+    }
 
 }
 
@@ -587,7 +587,7 @@ const submitFormApi = async () => {
             isShowTree.value = true
         }, 100)
         await getTableData()
-       
+
     }
 }
 

src/views/tentative/device/approach.vue

@@ -90,7 +90,7 @@
                 </template>
                 <HcTable
                     ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    @selection-change="tableSelection"
+                    border @selection-change="tableSelection"
                 >
                     <template #status="{ row }">
                         {{ row.status === 1 ? '启用中' : '已停用' }}
@@ -237,7 +237,7 @@
 
             <div class="hc-import-modal-table-box">
                 <HcTable
-                    ref="tableImportRef" :column="tableColumn" :datas="tableImportData"
+                    ref="tableImportRef" :column="tableColumn" :datas="tableImportData" border
                     :loading="tableImportLoading" is-check @selection-change="tableImportSelection"
                 >
                     <template #status="{ row }">

src/views/tentative/device/employ.vue

@@ -68,7 +68,7 @@
                 </template>
                 <HcTable
                     ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    @selection-change="tableSelection"
+                    border @selection-change="tableSelection"
                 />
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />

src/views/tentative/device/overhaul.vue

@@ -68,7 +68,7 @@
                 </template>
                 <HcTable
                     ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    @selection-change="tableSelection"
+                    border @selection-change="tableSelection"
                 />
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
@@ -156,7 +156,7 @@
             <HcDragUpload action="overhaul/read-excel" @finished="uploadFinished" @progress="uploadprogress" />
             <div class="hc-import-modal-table-box">
                 <HcTable
-                    ref="tableImportRef" :column="tableColumn" :datas="tableImportData"
+                    ref="tableImportRef" :column="tableColumn" :datas="tableImportData" border
                     :loading="tableImportLoading" is-check @selection-change="tableImportSelection"
                 />
             </div>

src/views/tentative/laboratory/print.vue

@@ -1,50 +1,53 @@
 <template>
     <div class="hc-page-layout-box">
-        <div :style="'width:' + leftWidth + 'px;'" class="hc-layout-left-box">
+        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box">
             <div class="hc-project-box">
                 <div class="hc-project-icon-box">
-                    <HcIcon name="stack"/>
+                    <HcIcon name="stack" />
                 </div>
                 <div class="ml-2 project-name-box">
-                    <span class="text-xl text-cut project-alias">{{ projectInfo['projectAlias'] }}</span>
-                    <div class="text-xs text-cut project-name">{{ projectInfo['name'] }}</div>
+                    <span class="text-xl text-cut project-alias">{{ projectInfo.projectAlias }}</span>
+                    <div class="text-xs text-cut project-name">{{ projectInfo.name }}</div>
                 </div>
             </div>
             <div class="hc-tree-box">
                 <el-scrollbar>
                     <!-- <WbsTree :autoExpandKeys="treeAutoExpandKeys" :projectId="projectId" :contractId="contractId" isColor @nodeTap="wbsElTreeClick"/> -->
                     <TestTree
-                        :autoExpandKeys="treeAutoExpandKeys"
-                        :projectId="projectId"
-                        :tenantId="userInfo?.tenant_id"
-                        :wbsTempId="projectInfo?.referenceWbsTemplateIdTrial"
-                        :wbsType="2"
-                        @nodeTap="wbsElTreeClick"/>
+                        :auto-expand-keys="treeAutoExpandKeys"
+                        :project-id="projectId"
+                        :tenant-id="userInfo?.tenant_id"
+                        :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial"
+                        :wbs-type="2"
+                        @nodeTap="wbsElTreeClick"
+                    />
                 </el-scrollbar>
             </div>
-            <!--左右拖动-->
-            <div class="horizontal-drag-line" @mousedown="onmousedown"/>
+            <!-- 左右拖动 -->
+            <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-page-content-box">
-            <HcCard :scrollbar="false" actionSize="lg">
+            <HcCard :scrollbar="false" action-size="lg">
                 <template #header>
                     <HcTooltip keys="tentative_laboratory_print_print">
                         <el-button :loading="printLoading" hc-btn @click="batchPrint()">
-                            <HcIcon name="printer"/>
+                            <HcIcon name="printer" />
                             <span>打印</span>
                         </el-button>
                     </HcTooltip>
                     <HcTooltip keys="tentative_laboratory_print_print_all">
                         <el-button :loading="allprintLoading" hc-btn @click="batchPrintall()">
-                            <HcIcon fill name="printer"/>
+                            <HcIcon fill name="printer" />
                             <span>全部打印</span>
                         </el-button>
                     </HcTooltip>
                 </template>
-                <HcTable ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" isCheck
-                         @selection-change="tableSelection"/>
+                <HcTable
+                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
+                    border @selection-change="tableSelection"
+                />
                 <template #action>
-                    <HcPages :pages="searchForm" @change="pageChange"/>
+                    <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
             </HcCard>
         </div>
@@ -52,23 +55,23 @@
 </template>
 
 <script setup>
-import {ref, watch, onMounted} from "vue";
-import {useAppStore} from "~src/store";
-import TestTree from "../material/components/TestTree.vue"
-import {getStoreValue, setStoreValue} from '~src/utils/storage'
-import dataApi from "~api/tentative/laboratory/print"
-import {arrToKey, getArrValue, isString} from "js-fast-way"
+import { onMounted, ref, watch } from 'vue'
+import { useAppStore } from '~src/store'
+import TestTree from '../material/components/TestTree.vue'
+import { getStoreValue, setStoreValue } from '~src/utils/storage'
+import dataApi from '~api/tentative/laboratory/print'
+import { arrToKey, getArrValue, isString } from 'js-fast-way'
 
 //变量
 const useAppState = useAppStore()
-const projectId = ref(useAppState.getProjectId);
-const contractId = ref(useAppState.getContractId);
-const projectInfo = ref(useAppState.getProjectInfo);
+const projectId = ref(useAppState.getProjectId)
+const contractId = ref(useAppState.getContractId)
+const projectInfo = ref(useAppState.getProjectInfo)
 const isCollapse = ref(useAppState.getCollapse)
 
 //监听
 watch(() => [
-    useAppState.getCollapse
+    useAppState.getCollapse,
 ], ([Collapse]) => {
     isCollapse.value = Collapse
 })
@@ -84,7 +87,7 @@ onMounted(() => {
 //搜索表单
 const searchForm = ref({
     contractId: null, type: null, approval: null, betweenTime: null,
-    current: 1, size: 20, total: 0
+    current: 1, size: 20, total: 0,
 })
 
 //树相关的变量
@@ -93,24 +96,24 @@ const nodeItemInfo = ref({})
 const nodeDataInfo = ref({})
 const clicID = ref('')
 //树被点击
-const wbsElTreeClick = ({node, data, keys}) => {
+const wbsElTreeClick = ({ node, data, keys }) => {
     nodeItemInfo.value = node
     nodeDataInfo.value = data
     primaryKeyId.value = data['primaryKeyId'] || ''
     clicID.value = data['id'] || ''
-    console.log(data, 'dtat');
+    console.log(data, 'dtat')
     //缓存自动展开
     treeAutoExpandKeys.value = keys
     setStoreValue('wbsTreeExpandKeys', keys)
     //改变搜索表单数据
     searchForm.value.wbsId = projectInfo?.value.referenceWbsTemplateIdTrial
     //searchForm.value.contractIdRelation = data['contractIdRelation'] projectInfo?.referenceWbsTemplateIdTrial
-    searchForm.value.current = 1;
+    searchForm.value.current = 1
     getTableData()
 }
 
 //分页被点击
-const pageChange = ({current, size}) => {
+const pageChange = ({ current, size }) => {
     searchForm.value.current = current
     searchForm.value.size = size
     getTableData()
@@ -119,7 +122,7 @@ const pageChange = ({current, size}) => {
 //表格数据
 const tableRef = ref(null)
 const tableColumn = ref([
-    {key: 'tableName', name: '表名'}
+    { key: 'tableName', name: '表名' },
 ])
 
 //获取数据
@@ -127,7 +130,7 @@ const tableLoading = ref(false)
 const tableData = ref([])
 const getTableData = async () => {
     tableLoading.value = true
-    const {error, code, data} = await dataApi.queryPage({
+    const { error, code, data } = await dataApi.queryPage({
         projectId: projectId.value,
         parentId: clicID.value,
         // contractId: contractId.value,
@@ -145,38 +148,38 @@ const getTableData = async () => {
 }
 
 //多选
-const tableCheckedKeys = ref([]);
+const tableCheckedKeys = ref([])
 const tableSelection = (rows) => {
     tableCheckedKeys.value = rows.filter((item) => {
-        return (item ?? '') !== '';
+        return (item ?? '') !== ''
     })
 }
 
 
 //左右拖动，改变树形结构宽度
-const leftWidth = ref(382);
+const leftWidth = ref(382)
 const onmousedown = () => {
     const leftNum = isCollapse.value ? 142 : 272
     document.onmousemove = (ve) => {
-        let diffVal = ve.clientX - leftNum;
+        let diffVal = ve.clientX - leftNum
         if (diffVal >= 310 && diffVal <= 900) {
-            leftWidth.value = diffVal;
+            leftWidth.value = diffVal
         }
     }
     document.onmouseup = () => {
-        document.onmousemove = null;
-        document.onmouseup = null;
+        document.onmousemove = null
+        document.onmouseup = null
     }
 }
 //打印
 const printLoading = ref(false)
 const allprintLoading = ref(false)
 const batchPrint = async () => {
-    const rows = tableCheckedKeys.value;
-    const ids = arrToKey(rows,'pkeyId', ',')
+    const rows = tableCheckedKeys.value
+    const ids = arrToKey(rows, 'pkeyId', ',')
     //批量下载
     printLoading.value = true
-    const {error, code, data} = await dataApi.batchPrint({pKeyIds: ids})
+    const { error, code, data } = await dataApi.batchPrint({ pKeyIds: ids })
     //处理数据
     printLoading.value = false
     const res = isString(data) ? data ?? '' : ''
@@ -185,11 +188,11 @@ const batchPrint = async () => {
     }
 }
 const batchPrintall = async () => {
-    const rows = tableData.value;
-    const ids = arrToKey(rows,'pkeyId', ',')
+    const rows = tableData.value
+    const ids = arrToKey(rows, 'pkeyId', ',')
     //批量下载
     allprintLoading.value = true
-    const {error, code, data} = await dataApi.batchPrint({pKeyIds: ids})
+    const { error, code, data } = await dataApi.batchPrint({ pKeyIds: ids })
     //处理数据
     allprintLoading.value = false
     const res = isString(data) ? data ?? '' : ''

src/views/tentative/laboratory/user.vue

@@ -37,7 +37,7 @@
             </template>
             <HcTable
                 ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                @selection-change="tableSelection"
+                border @selection-change="tableSelection"
             >
                 <template #sex="{ row }">
                     <span>{{ row.sex === 1 ? '男' : '女' }}</span>
@@ -437,7 +437,7 @@ const delModalClick = () => {
                 done()
             }
     })
-    
+
 }
 
 //批量删除

src/views/tentative/material/approach.vue

@@ -69,7 +69,7 @@
             </template>
             <HcTable
                 ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                @selection-change="tableSelection"
+                border @selection-change="tableSelection"
             >
                 <template #materialType="{ row }">{{ getRowTableMaterialType(row.materialType) }}</template>
                 <template #materialCount="{ row }">{{ row.materialCount === -1 ? "" : row.materialCount }}</template>
@@ -174,7 +174,7 @@
             :loading="copyTableLoading" :show="copyTableModal" is-table title="复制材料登记信息" widths="60rem"
             @close="copyTableModalClose" @save="copyTableClick"
         >
-            <HcTable :column="copyTableColumn" :datas="copyTableData">
+            <HcTable :column="copyTableColumn" :datas="copyTableData" border>
                 <template #materialNumber="{ row }">
                     <el-input
                         v-model="row.materialNumber" :class="row.isMaterialNumber ? 'is-error' : ''"
@@ -276,7 +276,7 @@
         >
             <HcTable
                 :column="samplingTableColumn" :datas="samplingTableData" :is-index="false"
-                :loading="samplingTableLoading"
+                :loading="samplingTableLoading" border
             >
                 <template #isOutsourcing="{ row }">
                     <span>{{ row.isOutsourcing === 1 ? '是' : '否' }}</span>
@@ -804,7 +804,7 @@ const getCaption = (obj) => {
 
         return index
     }
-   
+
 }
 
 //删除上传附件

src/views/tentative/material/sampling.vue

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

src/views/tentative/parameter/compactness.vue

@@ -23,7 +23,7 @@
             </template>
             <HcTable
                 ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                @selection-change="tableSelection"
+                border @selection-change="tableSelection"
             />
             <template #action>
                 <HcPages :pages="searchForm" @change="pageChange" />

src/views/tentative/parameter/container.vue

@@ -70,7 +70,7 @@
                 </template>
                 <HcTable
                     ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    @selection-change="tableSelection"
+                    border @selection-change="tableSelection"
                 />
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
@@ -448,7 +448,7 @@ const delNodeModalClick = (id) => {
                 done()
             }
     })
-    
+
 }
 
 //删除容器
@@ -661,12 +661,12 @@ const uploadprogress = (res) => {
 const importModalLoading = ref(false)
 const importModalYesClick = async () => {
      uploadRef.value?.submit()
-  
-   
-  
-    
 
-    
+
+
+
+
+
 }
 
 //关闭导入

src/views/tentative/parameter/density.vue

@@ -23,7 +23,7 @@
             </template>
             <HcTable
                 ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                @selection-change="tableSelection"
+                border @selection-change="tableSelection"
             />
             <template #action>
                 <HcPages :pages="searchForm" @change="pageChange" />

src/views/tentative/parameter/sieve.vue

@@ -55,7 +55,7 @@
                 </template>
                 <HcTable
                     ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    @selection-change="tableSelection"
+                    border @selection-change="tableSelection"
                 />
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />

src/views/user/index.vue

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