ZaiZai 1 year ago
parent
commit
54c5a85bc8
43 changed files with 168 additions and 136 deletions
  1. 2 2
      src/components/choice-user/choice-user.vue
  2. 2 2
      src/components/hc-report/hc-report.vue
  3. 1 1
      src/views/alter/ledgers/ledger.vue
  4. 2 2
      src/views/debit-pay/admin/apply.vue
  5. 2 2
      src/views/debit-pay/material/periods.vue
  6. 5 5
      src/views/periods/admin/certificate.vue
  7. 7 3
      src/views/periods/admin/components/addBillBaseModal.vue
  8. 4 4
      src/views/periods/admin/components/detailsModal.vue
  9. 1 1
      src/views/periods/admin/components/middle/addModal.vue
  10. 7 3
      src/views/periods/admin/components/middle/linkAlterModal.vue
  11. 14 6
      src/views/periods/admin/components/middle/linkWarranty.vue
  12. 6 6
      src/views/periods/admin/measure.vue
  13. 3 3
      src/views/periods/admin/middle.vue
  14. 3 3
      src/views/periods/contract-admin/apply.vue
  15. 5 5
      src/views/periods/contract-admin/certificate.vue
  16. 4 4
      src/views/periods/contract-admin/components/detailsModal.vue
  17. 6 6
      src/views/periods/contract-admin/phase.vue
  18. 2 2
      src/views/periods/contract-book/components/pay/exportModal.vue
  19. 7 3
      src/views/periods/contract-book/components/pay/periodModal.vue
  20. 2 2
      src/views/periods/contract-book/ledgers.vue
  21. 2 2
      src/views/periods/ledgers/components/pay/exportModal.vue
  22. 7 3
      src/views/periods/ledgers/components/pay/periodModal.vue
  23. 2 2
      src/views/periods/ledgers/details.vue
  24. 2 2
      src/views/periods/ledgers/pay.vue
  25. 2 2
      src/views/periods/ledgers/payment.vue
  26. 2 2
      src/views/periods/ledgers/section.vue
  27. 2 2
      src/views/periods/ledgers/standards.vue
  28. 2 2
      src/views/periods/ledgers/summary.vue
  29. 5 5
      src/views/periods/material/book.vue
  30. 2 2
      src/views/periods/material/components/order/dataModal.vue
  31. 5 5
      src/views/periods/material/contract.vue
  32. 7 3
      src/views/periods/material/order.vue
  33. 6 6
      src/views/periods/material/phase.vue
  34. 3 3
      src/views/periods/project/certificate.vue
  35. 2 2
      src/views/periods/project/components/certificate/addModal.vue
  36. 3 3
      src/views/periods/project/components/certificate/editModal.vue
  37. 4 4
      src/views/periods/project/components/pay/detailsModal.vue
  38. 3 3
      src/views/periods/project/pay.vue
  39. 5 5
      src/views/periods/start-work/book.vue
  40. 2 2
      src/views/periods/start-work/components/order/dataModal.vue
  41. 7 3
      src/views/periods/start-work/order.vue
  42. 6 6
      src/views/periods/start-work/phase.vue
  43. 2 2
      src/views/user/index.vue

+ 2 - 2
src/components/choice-user/choice-user.vue

@@ -10,7 +10,7 @@
             </div>
         </div>
         <!-- 选择用户的弹窗 -->
-        <hc-dialog ui="hc-choice-user-dialog" bg-color="#fff" is-to-body is-table is-footer-center widths="62rem" :show="userModalShow" title="选择用户" @save="userModalSave" @close="userModalClose">
+        <hc-new-dialog ui="hc-choice-user-dialog" is-table widths="62rem" :show="userModalShow" title="选择用户" @save="userModalSave" @close="userModalClose">
             <div class="relative h-full flex">
                 <div class="relative h-full flex-1 p-2" hc-border-r="1px solid #eee">
                     <el-scrollbar>
@@ -48,7 +48,7 @@
                     </div>
                 </div>
             </div>
-        </hc-dialog>
+        </hc-new-dialog>
     </div>
 </template>
 

+ 2 - 2
src/components/hc-report/hc-report.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-dialog is-to-body is-footer-center widths="600px" bg-color="#fff" :show="isShow" title="流程上报" @save="modalSave" @close="modalClose">
+    <hc-new-dialog widths="600px" bg-color="#fff" :show="isShow" title="流程上报" @save="modalSave" @close="modalClose">
         <el-form ref="formRef" class="p-2" label-position="top" :model="formModel" :rules="formRules" size="large">
             <el-form-item label="任务名称:" prop="key1">
                 <el-input v-model="formModel.key1" :autosize="{ minRows: 2, maxRows: 6 }" placeholder="请输入名称" type="textarea" />
@@ -36,7 +36,7 @@
                 <el-input v-model="formModel.key4" :autosize="{ minRows: 3, maxRows: 6 }" placeholder="请输入上报说明" type="textarea" />
             </el-form-item>
         </el-form>
-    </hc-dialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

+ 1 - 1
src/views/alter/ledgers/ledger.vue

@@ -28,7 +28,7 @@
                 <el-table-column type="expand" label="-">
                     <template #default="props">
                         <!-- props.row.key1 -->
-                        <hc-table :is-index="false" :column="tableColumn" :datas="tableData1" />
+                        <hc-table :is-index="false" :column="tableColumn" :datas="tableData1" is-new />
                     </template>
                 </el-table-column>
                 <el-table-column type="index" label="序号" width="80" />

+ 2 - 2
src/views/debit-pay/admin/apply.vue

@@ -58,13 +58,13 @@
         <HcAddModal v-model="addModalShow" />
 
         <!-- 收方单任务下达 -->
-        <hc-dialog is-to-body is-footer-center widths="500px" :show="giveTaskModalShow" title="收方单任务下达" @save="giveTaskModalSave" @close="giveTaskModalClose">
+        <hc-new-dialog widths="500px" :show="giveTaskModalShow" title="收方单任务下达" @save="giveTaskModalSave" @close="giveTaskModalClose">
             <el-form ref="giveTaskFormRef" class="p-2" label-position="top" :model="giveTaskForm" :rules="giveTaskFormRules">
                 <el-form-item label="执行人:">
                     <hc-choice-user v-model="giveTaskForm.key1" />
                 </el-form-item>
             </el-form>
-        </hc-dialog>
+        </hc-new-dialog>
 
         <!-- 清单明细 -->
         <HcDetailsModal v-model="detailsModalShow" />

+ 2 - 2
src/views/debit-pay/material/periods.vue

@@ -43,10 +43,10 @@
                 </template>
                 <hc-table :column="tableEditColumn" :datas="tableEditData" is-new :index-style="{ width: 60 }">
                     <template #key1="{ row }">
-                        <hc-table-input v-model="row.key1" disabled />
+                        <hc-table-input v-model="row.key1" disabled is-new :index-style="{ width: 60 }" />
                     </template>
                     <template #key2="{ row }">
-                        <hc-table-input v-model="row.key2" disabled />
+                        <hc-table-input v-model="row.key2" disabled is-new :index-style="{ width: 60 }" />
                     </template>
                     <template #key3="{ row }">
                         <el-select v-model="row.key3" placeholder="选择年份" filterable disabled block>

+ 5 - 5
src/views/periods/admin/certificate.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-card>
+    <hc-new-card>
         <template #header>
             <div class="w-40">
                 <el-select v-model="searchForm.key1" filterable block placeholder="选择单项工程">
@@ -14,7 +14,7 @@
                 <span>新增</span>
             </el-button>
         </template>
-        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading">
+        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }">
             <template #action="{ row }">
                 <el-link type="primary">查看报表</el-link>
                 <el-link type="success">修改</el-link>
@@ -27,7 +27,7 @@
             <hc-pages :pages="searchForm" @change="pageChange" />
         </template>
         <!-- 新增中期支付证书 -->
-        <hc-dialog is-to-body is-footer-center widths="30rem" :show="addModalShow" title="新增中期支付证书" @save="addModalSave" @close="addModalClose">
+        <hc-new-dialog widths="30rem" :show="addModalShow" title="新增中期支付证书" @save="addModalSave" @close="addModalClose">
             <el-form ref="formRef" class="p-2" label-position="top" :model="formModel" :rules="formRules" size="large">
                 <el-form-item label="计量期:" prop="key1">
                     <el-select v-model="formModel.key1" block>
@@ -41,8 +41,8 @@
                     <div class="form-item-div" />
                 </el-form-item>
             </el-form>
-        </hc-dialog>
-    </hc-card>
+        </hc-new-dialog>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 7 - 3
src/views/periods/admin/components/addBillBaseModal.vue

@@ -1,7 +1,11 @@
 <template>
-    <hc-dialog is-to-body is-table is-footer-center widths="1200px" :show="isShow" title="添加分解清单" @save="modalSave" @close="modalClose">
-        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check @selection-change="tableCheckChange" />
-    </hc-dialog>
+    <hc-new-dialog is-table widths="1200px" :show="isShow" title="添加分解清单" @save="modalSave" @close="modalClose">
+        <hc-table
+            :column="tableColumn" :datas="tableData" :loading="tableLoading"
+            is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+            @selection-change="tableCheckChange"
+        />
+    </hc-new-dialog>
 </template>
 
 <script setup>

+ 4 - 4
src/views/periods/admin/components/detailsModal.vue

@@ -1,9 +1,9 @@
 <template>
-    <hc-dialog ui="is-no-footer" is-to-body is-table :footer="false" widths="1200px" :show="isShow" title="收方清单明细" @close="modalClose">
+    <hc-new-dialog is-table :footer="false" widths="1200px" :show="isShow" title="收方清单明细" @close="modalClose">
         <div class="relative h-full">
             <div id="hc_details_table">
                 <hc-card-item>
-                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" />
+                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }" />
                     <template #action>
                         <hc-pages :pages="searchForm" @change="pageChange" />
                     </template>
@@ -11,11 +11,11 @@
             </div>
             <div id="hc_details_list">
                 <hc-card-item>
-                    <hc-table :column="tableColumn1" :datas="tableData1" />
+                    <hc-table :column="tableColumn1" :datas="tableData1" is-new :index-style="{ width: 60 }" />
                 </hc-card-item>
             </div>
         </div>
-    </hc-dialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

+ 1 - 1
src/views/periods/admin/components/middle/addModal.vue

@@ -82,7 +82,7 @@
                         <span>添加</span>
                     </el-button>
                 </template>
-                <hc-table :column="addTableColumn" :datas="addTableData">
+                <hc-table :column="addTableColumn" :datas="addTableData" is-new :index-style="{ width: 60 }">
                     <template #key3="{ row }">
                         <hc-table-input v-model="row.key3" disabled />
                     </template>

+ 7 - 3
src/views/periods/admin/components/middle/linkAlterModal.vue

@@ -1,7 +1,11 @@
 <template>
-    <hc-dialog is-to-body is-table is-footer-center widths="1200px" :show="isShow" title="关联变更令" @save="modalSave" @close="modalClose">
-        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check @selection-change="tableCheckChange" />
-    </hc-dialog>
+    <hc-new-dialog is-table widths="1200px" :show="isShow" title="关联变更令" @save="modalSave" @close="modalClose">
+        <hc-table
+            :column="tableColumn" :datas="tableData" :loading="tableLoading"
+            is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+            @selection-change="tableCheckChange"
+        />
+    </hc-new-dialog>
 </template>
 
 <script setup>

+ 14 - 6
src/views/periods/admin/components/middle/linkWarranty.vue

@@ -1,6 +1,6 @@
 <template>
-    <hc-dialog is-to-body is-table is-footer-center widths="1200px" :show="isShow" title="选择需要关联的检查的部位" @save="modalSave" @close="modalClose">
-        <hc-card>
+    <hc-new-dialog is-table widths="1200px" :show="isShow" title="选择需要关联的检查的部位" @save="modalSave" @close="modalClose">
+        <hc-new-card>
             <template #header>
                 <div class="w-60">
                     <el-input v-model="searchForm.queryValue" clearable placeholder="请输入部位名称检索" @keyup="keyUpEvent" />
@@ -27,7 +27,11 @@
                 </div>
                 <div id="hc_table_warranty" class="flex-1">
                     <hc-card-item>
-                        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check @selection-change="tableCheckChange" />
+                        <hc-table
+                            :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                            is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                            @selection-change="tableCheckChange"
+                        />
                         <template #action>
                             <hc-pages :pages="searchForm" @change="pageChange" />
                         </template>
@@ -36,14 +40,18 @@
             </div>
             <div v-if="typeKey === '2'" class="relative h-full">
                 <hc-card-item>
-                    <hc-table :column="tableColumn1" :datas="tableData" :loading="tableLoading" is-check @selection-change="tableCheckChange" />
+                    <hc-table
+                        :column="tableColumn1" :datas="tableData" :loading="tableLoading"
+                        is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                        @selection-change="tableCheckChange"
+                    />
                     <template #action>
                         <hc-pages :pages="searchForm" @change="pageChange" />
                     </template>
                 </hc-card-item>
             </div>
-        </hc-card>
-    </hc-dialog>
+        </hc-new-card>
+    </hc-new-dialog>
 </template>
 
 <script setup>

+ 6 - 6
src/views/periods/admin/measure.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-card>
+    <hc-new-card>
         <template #header>
             <div class="w-40">
                 <el-select v-model="searchForm.key1" filterable block placeholder="选择工区" @change="searchClick">
@@ -14,7 +14,7 @@
                 <span>编辑</span>
             </el-button>
         </template>
-        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading">
+        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }">
             <template #action="{ row }">
                 <el-link type="danger">锁定</el-link>
             </template>
@@ -23,7 +23,7 @@
             <hc-pages :pages="searchForm" @change="pageChange" />
         </template>
         <!-- 编辑修改 -->
-        <hc-dialog is-to-body is-table is-footer-center widths="1200px" :show="editModalShow" title="计量期编辑" @save="editModalSave" @close="editModalClose">
+        <hc-new-dialog is-table widths="1200px" :show="editModalShow" title="计量期编辑" @save="editModalSave" @close="editModalClose">
             <hc-card-item>
                 <template #header>
                     <el-tooltip :visible="editVisible" effect="light" placement="bottom-start">
@@ -53,7 +53,7 @@
                         <span>插入下一行</span>
                     </el-button>
                 </template>
-                <hc-table :column="tableEditColumn" :datas="tableEditData">
+                <hc-table :column="tableEditColumn" :datas="tableEditData" is-new :index-style="{ width: 60 }">
                     <template #key1="{ row }">
                         <hc-table-input v-model="row.key1" disabled />
                     </template>
@@ -78,8 +78,8 @@
                     </template>
                 </hc-table>
             </hc-card-item>
-        </hc-dialog>
-    </hc-card>
+        </hc-new-dialog>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 3 - 3
src/views/periods/admin/middle.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-card>
+    <hc-new-card>
         <template #header>
             <div class="w-40">
                 <el-select v-model="searchForm.key1" filterable block placeholder="选择工区">
@@ -53,7 +53,7 @@
                             <span>按录入时间排序</span>
                         </el-button>
                     </template>
-                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" />
+                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }" />
                     <template #action>
                         <hc-pages :pages="searchForm" @change="pageChange" />
                     </template>
@@ -68,7 +68,7 @@
 
         <!-- 上报弹窗 -->
         <hc-report-dialog v-model="isReport" />
-    </hc-card>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 3 - 3
src/views/periods/contract-admin/apply.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-card>
+    <hc-new-card>
         <template #header>
             <div class="w-40">
                 <el-select v-model="searchForm.key2" filterable block placeholder="选择计量期">
@@ -47,7 +47,7 @@
                             <span>按录入时间排序</span>
                         </el-button>
                     </template>
-                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" />
+                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }" />
                     <template #action>
                         <hc-pages :pages="searchForm" @change="pageChange" />
                     </template>
@@ -60,7 +60,7 @@
 
         <!-- 上报弹窗 -->
         <hc-report-dialog v-model="isReport" />
-    </hc-card>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 5 - 5
src/views/periods/contract-admin/certificate.vue

@@ -1,12 +1,12 @@
 <template>
-    <hc-card title="合同中期支付证书">
+    <hc-new-card title="合同中期支付证书">
         <template #extra>
             <el-button hc-btn type="primary" @click="addModalClick">
                 <HcIcon name="add" />
                 <span>新增</span>
             </el-button>
         </template>
-        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading">
+        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }">
             <template #action="{ row }">
                 <el-link type="primary">查看报表</el-link>
                 <el-link type="success">修改</el-link>
@@ -19,7 +19,7 @@
             <hc-pages :pages="searchForm" @change="pageChange" />
         </template>
         <!-- 新增中期支付证书 -->
-        <hc-dialog is-to-body is-footer-center widths="30rem" :show="addModalShow" title="新增中期支付证书" @save="addModalSave" @close="addModalClose">
+        <hc-new-dialog widths="30rem" :show="addModalShow" title="新增中期支付证书" @save="addModalSave" @close="addModalClose">
             <el-form ref="formRef" class="p-2" label-position="top" :model="formModel" :rules="formRules" size="large">
                 <el-form-item label="计量期:" prop="key1">
                     <el-select v-model="formModel.key1" block>
@@ -45,8 +45,8 @@
                     <div class="form-item-div" />
                 </el-form-item>
             </el-form>
-        </hc-dialog>
-    </hc-card>
+        </hc-new-dialog>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 4 - 4
src/views/periods/contract-admin/components/detailsModal.vue

@@ -1,9 +1,9 @@
 <template>
-    <hc-dialog ui="is-no-footer" is-to-body is-table :footer="false" widths="1200px" :show="isShow" title="收方清单明细" @close="modalClose">
+    <hc-new-dialog is-table :footer="false" widths="1200px" :show="isShow" title="收方清单明细" @close="modalClose">
         <div class="relative h-full">
             <div id="hc_details_table">
                 <hc-card-item>
-                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" />
+                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }" />
                     <template #action>
                         <hc-pages :pages="searchForm" @change="pageChange" />
                     </template>
@@ -11,11 +11,11 @@
             </div>
             <div id="hc_details_list">
                 <hc-card-item>
-                    <hc-table :column="tableColumn1" :datas="tableData1" />
+                    <hc-table :column="tableColumn1" :datas="tableData1" is-new :index-style="{ width: 60 }" />
                 </hc-card-item>
             </div>
         </div>
-    </hc-dialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

+ 6 - 6
src/views/periods/contract-admin/phase.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-card title="合同计量期">
+    <hc-new-card title="合同计量期">
         <template #extra>
             <el-button hc-btn type="primary" @click="editModalClick">
                 <HcIcon name="edit" />
@@ -9,7 +9,7 @@
         <div class="relative h-full flex">
             <div class="flex-1">
                 <hc-card-item>
-                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading">
+                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }">
                         <template #action="{ row }">
                             <el-link type="danger">锁定</el-link>
                         </template>
@@ -49,7 +49,7 @@
             </div>
         </div>
         <!-- 编辑修改 -->
-        <hc-dialog is-to-body is-table is-footer-center widths="1200px" :show="editModalShow" title="计量期编辑" @save="editModalSave" @close="editModalClose">
+        <hc-new-dialog is-table widths="1200px" :show="editModalShow" title="计量期编辑" @save="editModalSave" @close="editModalClose">
             <hc-card-item>
                 <template #header>
                     <el-tooltip :visible="editVisible" effect="light" placement="bottom-start">
@@ -79,7 +79,7 @@
                         <span>插入下一行</span>
                     </el-button>
                 </template>
-                <hc-table :column="tableEditColumn" :datas="tableEditData">
+                <hc-table :column="tableEditColumn" :datas="tableEditData" is-new :index-style="{ width: 60 }">
                     <template #key1="{ row }">
                         <hc-table-input v-model="row.key1" disabled />
                     </template>
@@ -104,8 +104,8 @@
                     </template>
                 </hc-table>
             </hc-card-item>
-        </hc-dialog>
-    </hc-card>
+        </hc-new-dialog>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 2 - 2
src/views/periods/contract-book/components/pay/exportModal.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-dialog is-to-body is-table is-footer-center widths="800px" :show="isShow" title="合同工程清单选择" @save="modalSave" @close="modalClose">
+    <hc-new-dialog is-table widths="800px" :show="isShow" title="合同工程清单选择" @save="modalSave" @close="modalClose">
         <el-scrollbar>
             <el-radio-group v-model="radioValue">
                 <hc-lazy-tree :h-props="treeProps" @load="treeLoadNode">
@@ -9,7 +9,7 @@
                 </hc-lazy-tree>
             </el-radio-group>
         </el-scrollbar>
-    </hc-dialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

+ 7 - 3
src/views/periods/contract-book/components/pay/periodModal.vue

@@ -1,7 +1,11 @@
 <template>
-    <hc-dialog is-to-body is-table is-footer-center widths="800px" :show="isShow" title="计量期选择" @save="modalSave" @close="modalClose">
-        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check @selection-change="tableCheckChange" />
-    </hc-dialog>
+    <hc-new-dialog is-table widths="800px" :show="isShow" title="计量期选择" @save="modalSave" @close="modalClose">
+        <hc-table
+            :column="tableColumn" :datas="tableData" :loading="tableLoading"
+            is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+            @selection-change="tableCheckChange"
+        />
+    </hc-new-dialog>
 </template>
 
 <script setup>

+ 2 - 2
src/views/periods/contract-book/ledgers.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-card>
+    <hc-new-card>
         <template #header>
             <hc-new-switch :datas="tabTab" :keys="tabKey" size="small" :round="false" @change="tabChange" />
             <div class="hc-flex ml-6">
@@ -71,7 +71,7 @@
         <HcPeriodModal v-model="periodModalShow" />
         <!-- 选择计量周期 -->
         <HcExportModal v-model="exportModalShow" />
-    </hc-card>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 2 - 2
src/views/periods/ledgers/components/pay/exportModal.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-dialog is-to-body is-table is-footer-center widths="800px" :show="isShow" title="合同工程清单选择" @save="modalSave" @close="modalClose">
+    <hc-new-dialog is-table widths="800px" :show="isShow" title="合同工程清单选择" @save="modalSave" @close="modalClose">
         <el-scrollbar>
             <el-radio-group v-model="radioValue">
                 <hc-lazy-tree :h-props="treeProps" @load="treeLoadNode">
@@ -9,7 +9,7 @@
                 </hc-lazy-tree>
             </el-radio-group>
         </el-scrollbar>
-    </hc-dialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

+ 7 - 3
src/views/periods/ledgers/components/pay/periodModal.vue

@@ -1,7 +1,11 @@
 <template>
-    <hc-dialog is-to-body is-table is-footer-center widths="800px" :show="isShow" title="计量期选择" @save="modalSave" @close="modalClose">
-        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check @selection-change="tableCheckChange" />
-    </hc-dialog>
+    <hc-new-dialog is-table widths="800px" :show="isShow" title="计量期选择" @save="modalSave" @close="modalClose">
+        <hc-table
+            :column="tableColumn" :datas="tableData" :loading="tableLoading"
+            is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+            @selection-change="tableCheckChange"
+        />
+    </hc-new-dialog>
 </template>
 
 <script setup>

+ 2 - 2
src/views/periods/ledgers/details.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-card>
+    <hc-new-card>
         <template #header>
             <el-date-picker v-model="searchForm.key2" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD" placeholder="截止日期" />
         </template>
@@ -29,7 +29,7 @@
         <template #action>
             <hc-pages :pages="searchForm" @change="pageChange" />
         </template>
-    </hc-card>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 2 - 2
src/views/periods/ledgers/pay.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-card>
+    <hc-new-card>
         <template #header>
             <div class="w-40">
                 <el-select v-model="searchForm.key1" filterable block placeholder="选择工区">
@@ -78,7 +78,7 @@
         <HcPeriodModal v-model="periodModalShow" />
         <!-- 选择计量周期 -->
         <HcExportModal v-model="exportModalShow" />
-    </hc-card>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 2 - 2
src/views/periods/ledgers/payment.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-card>
+    <hc-new-card>
         <template #header>
             <el-date-picker v-model="searchForm.key2" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD" placeholder="截止日期" />
         </template>
@@ -29,7 +29,7 @@
         <template #action>
             <hc-pages :pages="searchForm" @change="pageChange" />
         </template>
-    </hc-card>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 2 - 2
src/views/periods/ledgers/section.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-card title="章节完成投资柱状图">
+    <hc-new-card title="章节完成投资柱状图">
         <template #extra>
             <div class="w-40">
                 <el-select v-model="searchForm.key1" filterable block placeholder="选择工区">
@@ -9,7 +9,7 @@
             </div>
         </template>
         <hc-charts :option="chartsOption" />
-    </hc-card>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 2 - 2
src/views/periods/ledgers/standards.vue

@@ -1,7 +1,7 @@
 <template>
-    <hc-card title="各标完成投资柱状图">
+    <hc-new-card title="各标完成投资柱状图">
         <hc-charts :option="chartsOption" />
-    </hc-card>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 2 - 2
src/views/periods/ledgers/summary.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-card>
+    <hc-new-card>
         <template #header>
             <el-date-picker v-model="searchForm.key1" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD" placeholder="截止日期" />
         </template>
@@ -24,7 +24,7 @@
         <template #action>
             <hc-pages :pages="searchForm" @change="pageChange" />
         </template>
-    </hc-card>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 5 - 5
src/views/periods/material/book.vue

@@ -1,12 +1,12 @@
 <template>
-    <hc-card title="材料预付款报表手册">
+    <hc-new-card title="材料预付款报表手册">
         <template #extra>
             <el-button hc-btn type="primary" @click="addModalClick">
                 <HcIcon name="add" />
                 <span>新增</span>
             </el-button>
         </template>
-        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading">
+        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }">
             <template #action="{ row }">
                 <el-link type="primary">查看报表</el-link>
                 <el-link type="success">修改</el-link>
@@ -18,7 +18,7 @@
             <hc-pages :pages="searchForm" @change="pageChange" />
         </template>
         <!-- 新增/修改 -->
-        <hc-dialog v-model="formModalShow" is-to-body widths="30rem" title="材料计量单新增" @save="formModalSave" @close="formModalClose">
+        <hc-new-dialog v-model="formModalShow" widths="30rem" title="材料计量单新增" @save="formModalSave" @close="formModalClose">
             <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="top">
                 <el-form-item label="计量期:">
                     <el-select v-model="formModel.key1" disabled block>
@@ -39,8 +39,8 @@
                     <el-input v-model="formModel.key5" :autosize="{ minRows: 3, maxRows: 6 }" type="textarea" />
                 </el-form-item>
             </el-form>
-        </hc-dialog>
-    </hc-card>
+        </hc-new-dialog>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 2 - 2
src/views/periods/material/components/order/dataModal.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-dialog is-to-body is-table widths="1200px" :show="isShow" title="材料计量单新增" @save="modalSave" @close="modalClose">
+    <hc-new-dialog is-table widths="1200px" :show="isShow" title="材料计量单新增" @save="modalSave" @close="modalClose">
         <div class="relative h-full flex">
             <div id="hc_modal_tree">
                 <hc-card-item scrollbar>
@@ -101,7 +101,7 @@
                 </hc-card-item>
             </div>
         </div>
-    </hc-dialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

+ 5 - 5
src/views/periods/material/contract.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-card title="合同材料">
+    <hc-new-card title="合同材料">
         <template #extra>
             <el-button hc-btn type="primary" @click="rowAddClick">
                 <HcIcon name="add" />
@@ -9,7 +9,7 @@
         <div class="relative h-full flex">
             <div class="flex-1">
                 <hc-card-item>
-                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading">
+                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }">
                         <template #action="{ row }">
                             <el-link type="success" @click="rowEditClick(row)">修改</el-link>
                             <el-link type="danger">删除</el-link>
@@ -46,7 +46,7 @@
             </div>
         </div>
         <!-- 新增/修改 -->
-        <hc-dialog is-to-body is-footer-center widths="30rem" :show="isFormModal" title="合同材料新增" @save="modalSave" @close="modalClose">
+        <hc-new-dialog widths="30rem" :show="isFormModal" title="合同材料新增" @save="modalSave" @close="modalClose">
             <el-form ref="formRef" class="p-2" label-position="top" :model="formModel" :rules="formRules" size="large">
                 <el-form-item label="材料编号:">
                     <el-input v-model="formModel.key1" />
@@ -67,8 +67,8 @@
                     <el-input v-model="formModel.key6" />
                 </el-form-item>
             </el-form>
-        </hc-dialog>
-    </hc-card>
+        </hc-new-dialog>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 7 - 3
src/views/periods/material/order.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-card>
+    <hc-new-card>
         <template #header>
             <div class="w-40">
                 <el-select v-model="searchForm.key1" filterable block placeholder="选择计量期" @change="searchKey1Click">
@@ -20,7 +20,11 @@
         <div class="relative h-full flex">
             <div class="flex-1">
                 <hc-card-item>
-                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check @selection-change="tableCheckChange">
+                    <hc-table
+                        :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                        is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                        @selection-change="tableCheckChange"
+                    >
                         <template #action="{ row }">
                             <el-link type="success" @click="rowEditClick(row)">修改</el-link>
                             <el-link type="danger">删除</el-link>
@@ -94,7 +98,7 @@
 
         <!-- 上报弹窗 -->
         <hc-report-dialog v-model="isReport" />
-    </hc-card>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 6 - 6
src/views/periods/material/phase.vue

@@ -1,12 +1,12 @@
 <template>
-    <hc-card title="材料预付款计量期">
+    <hc-new-card title="材料预付款计量期">
         <template #extra>
             <el-button hc-btn type="primary" @click="editModalClick">
                 <HcIcon name="edit" />
                 <span>编辑</span>
             </el-button>
         </template>
-        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading">
+        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }">
             <template #action="{ row }">
                 <el-link type="danger">锁定</el-link>
             </template>
@@ -15,7 +15,7 @@
             <hc-pages :pages="searchForm" @change="pageChange" />
         </template>
         <!-- 编辑修改 -->
-        <hc-dialog is-to-body is-table is-footer-center widths="1200px" :show="editModalShow" title="材料预付款计量期编辑" @save="editModalSave" @close="editModalClose">
+        <hc-new-dialog is-table widths="1200px" :show="editModalShow" title="材料预付款计量期编辑" @save="editModalSave" @close="editModalClose">
             <hc-card-item>
                 <template #header>
                     <el-tooltip :visible="editVisible" effect="light" placement="bottom-start">
@@ -41,7 +41,7 @@
                         <span>插入下一行</span>
                     </el-button>
                 </template>
-                <hc-table :column="tableEditColumn" :datas="tableEditData">
+                <hc-table :column="tableEditColumn" :datas="tableEditData" is-new :index-style="{ width: 60 }">
                     <template #key1="{ row }">
                         <hc-table-input v-model="row.key1" disabled />
                     </template>
@@ -66,8 +66,8 @@
                     </template>
                 </hc-table>
             </hc-card-item>
-        </hc-dialog>
-    </hc-card>
+        </hc-new-dialog>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 3 - 3
src/views/periods/project/certificate.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-card>
+    <hc-new-card>
         <template #header>
             <div class="w-40">
                 <el-select v-model="searchForm.key1" filterable block placeholder="选择工区">
@@ -14,7 +14,7 @@
                 <span>新增</span>
             </el-button>
         </template>
-        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading">
+        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }">
             <template #action="{ row }">
                 <el-link type="primary">查看报表</el-link>
                 <el-link type="success" @click="rowEditClick(row)">修改</el-link>
@@ -32,7 +32,7 @@
 
         <!-- 中间计量新增 -->
         <HcEditModal v-model="editModalShow" />
-    </hc-card>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 2 - 2
src/views/periods/project/components/certificate/addModal.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-dialog is-to-body is-footer-center widths="30rem" :show="isShow" title="新增结算支付证书" @save="addModalSave" @close="addModalClose">
+    <hc-new-dialog widths="30rem" :show="isShow" title="新增结算支付证书" @save="addModalSave" @close="addModalClose">
         <el-form ref="formRef" class="p-2" label-position="top" :model="formModel" :rules="formRules" size="large">
             <el-form-item label="证书编号:" prop="key2">
                 <el-input v-model="formModel.key2" />
@@ -8,7 +8,7 @@
                 <div class="form-item-div" />
             </el-form-item>
         </el-form>
-    </hc-dialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

+ 3 - 3
src/views/periods/project/components/certificate/editModal.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-dialog is-to-body is-table is-footer-center widths="1200px" :show="isShow" title="修改结算支付证书" @save="addModalSave" @close="addModalClose">
+    <hc-new-dialog is-table widths="1200px" :show="isShow" title="修改结算支付证书" @save="addModalSave" @close="addModalClose">
         <el-scrollbar>
             <!-- 基础表单 -->
             <hc-card-item>
@@ -21,14 +21,14 @@
 
             <!-- 表格数据 -->
             <hc-card-item class="mt-3">
-                <hc-table :is-index="false" :column="tableColumn" :datas="tableData">
+                <hc-table :is-index="false" :column="tableColumn" :datas="tableData" is-new>
                     <template #key8="{ row }">
                         <hc-table-input v-model="row.key8" disabled />
                     </template>
                 </hc-table>
             </hc-card-item>
         </el-scrollbar>
-    </hc-dialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

+ 4 - 4
src/views/periods/project/components/pay/detailsModal.vue

@@ -1,9 +1,9 @@
 <template>
-    <hc-dialog ui="is-no-footer" is-to-body is-table :footer="false" widths="1200px" :show="isShow" title="计量清单明细" @close="modalClose">
+    <hc-new-dialog is-table :footer="false" widths="1200px" :show="isShow" title="计量清单明细" @close="modalClose">
         <div class="relative h-full">
             <div id="hc_details_table">
                 <hc-card-item>
-                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" />
+                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }" />
                     <template #action>
                         <hc-pages :pages="searchForm" @change="pageChange" />
                     </template>
@@ -11,11 +11,11 @@
             </div>
             <div id="hc_details_list">
                 <hc-card-item>
-                    <hc-table :column="tableColumn1" :datas="tableData1" />
+                    <hc-table :column="tableColumn1" :datas="tableData1" is-new :index-style="{ width: 60 }" />
                 </hc-card-item>
             </div>
         </div>
-    </hc-dialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

+ 3 - 3
src/views/periods/project/pay.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-card>
+    <hc-new-card>
         <template #header>
             <div class="w-40">
                 <el-select v-model="searchForm.key1" filterable block placeholder="选择工区">
@@ -51,7 +51,7 @@
                             <span>查看报表</span>
                         </el-button>
                     </template>
-                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading">
+                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }">
                         <template #action="{ row }">
                             <el-link type="success">修改</el-link>
                             <el-link type="danger">删除</el-link>
@@ -67,7 +67,7 @@
         <hc-report-dialog v-model="isReport" />
         <!-- 清单明细 -->
         <HcDetailsModal v-model="detailsModalShow" />
-    </hc-card>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 5 - 5
src/views/periods/start-work/book.vue

@@ -1,12 +1,12 @@
 <template>
-    <hc-card title="开工预付款报表手册">
+    <hc-new-card title="开工预付款报表手册">
         <template #extra>
             <el-button hc-btn type="primary" @click="addModalClick">
                 <HcIcon name="add" />
                 <span>新增</span>
             </el-button>
         </template>
-        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading">
+        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }">
             <template #action="{ row }">
                 <el-link type="primary">查看报表</el-link>
                 <el-link type="success">修改</el-link>
@@ -18,7 +18,7 @@
             <hc-pages :pages="searchForm" @change="pageChange" />
         </template>
         <!-- 新增/修改 -->
-        <hc-dialog v-model="formModalShow" is-to-body widths="30rem" title="开工预付款计量单新增" @save="formModalSave" @close="formModalClose">
+        <hc-new-dialog v-model="formModalShow" widths="30rem" title="开工预付款计量单新增" @save="formModalSave" @close="formModalClose">
             <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="top">
                 <el-form-item label="计量期:">
                     <el-select v-model="formModel.key1" disabled block>
@@ -36,8 +36,8 @@
                     <el-date-picker v-model="formModel.key4" class="block" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD" disabled />
                 </el-form-item>
             </el-form>
-        </hc-dialog>
-    </hc-card>
+        </hc-new-dialog>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 2 - 2
src/views/periods/start-work/components/order/dataModal.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-dialog is-to-body widths="500px" :show="isShow" title="开工预付款计量单新增" @save="modalSave" @close="modalClose">
+    <hc-new-dialog widths="500px" :show="isShow" title="开工预付款计量单新增" @save="modalSave" @close="modalClose">
         <el-scrollbar>
             <hc-card-item>
                 <el-form ref="baseFormRef" :model="baseForm" :rules="baseFormRules" label-position="top" label-width="auto">
@@ -32,7 +32,7 @@
                 </el-form>
             </hc-card-item>
         </el-scrollbar>
-    </hc-dialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

+ 7 - 3
src/views/periods/start-work/order.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-card>
+    <hc-new-card>
         <template #header>
             <div class="w-40">
                 <el-select v-model="searchForm.key1" filterable block placeholder="选择计量期" @change="searchKey1Click">
@@ -20,7 +20,11 @@
         <div class="relative h-full flex">
             <div class="flex-1">
                 <hc-card-item>
-                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check @selection-change="tableCheckChange">
+                    <hc-table
+                        :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                        is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                        @selection-change="tableCheckChange"
+                    >
                         <template #action="{ row }">
                             <el-link type="success" @click="rowEditClick(row)">修改</el-link>
                             <el-link type="danger">删除</el-link>
@@ -66,7 +70,7 @@
 
         <!-- 上报弹窗 -->
         <hc-report-dialog v-model="isReport" />
-    </hc-card>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 6 - 6
src/views/periods/start-work/phase.vue

@@ -1,12 +1,12 @@
 <template>
-    <hc-card title="开工预付款计量期">
+    <hc-new-card title="开工预付款计量期">
         <template #extra>
             <el-button hc-btn type="primary" @click="editModalClick">
                 <HcIcon name="edit" />
                 <span>编辑</span>
             </el-button>
         </template>
-        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading">
+        <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }">
             <template #action="{ row }">
                 <el-link type="danger">锁定</el-link>
             </template>
@@ -16,7 +16,7 @@
         </template>
 
         <!-- 编辑修改 -->
-        <hc-dialog is-to-body is-table is-footer-center widths="1200px" :show="editModalShow" title="新增预付款计量期" @save="editModalSave" @close="editModalClose">
+        <hc-new-dialog is-table widths="1200px" :show="editModalShow" title="新增预付款计量期" @save="editModalSave" @close="editModalClose">
             <hc-card-item>
                 <template #header>
                     <el-tooltip :visible="editVisible" effect="light" placement="bottom-start">
@@ -42,7 +42,7 @@
                         <span>插入下一行</span>
                     </el-button>
                 </template>
-                <hc-table :column="tableEditColumn" :datas="tableEditData">
+                <hc-table :column="tableEditColumn" :datas="tableEditData" is-new :index-style="{ width: 60 }">
                     <template #key1="{ row }">
                         <hc-table-input v-model="row.key1" disabled />
                     </template>
@@ -67,8 +67,8 @@
                     </template>
                 </hc-table>
             </hc-card-item>
-        </hc-dialog>
-    </hc-card>
+        </hc-new-dialog>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 2 - 2
src/views/user/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-card>
+    <hc-new-card>
         <div class="relative h-full flex">
             <div class="mr-4 h-full w-[260px]">
                 <hc-card-item>
@@ -94,7 +94,7 @@
         </div>
         <!-- 文件上传 -->
         <hc-upload-file ref="HcUploadFileRef" :options="uploadFileOptions" @success="uploadFileSuccess" />
-    </hc-card>
+    </hc-new-card>
 </template>
 
 <script setup>