222

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

@@ -1,6 +1,6 @@
 <template>
     <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 ref="formRef" class="p-4" 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" />
             </el-form-item>

src/views/debit-pay/admin/components/middlepay/linkWarranty.vue

@@ -17,7 +17,7 @@
                     <HcIcon name="delete-bin" />
                     <span>批量删除</span>
                 </el-button>
-                <hc-new-switch :datas="typeData" :keys="typeKey" :round="false" @change="typeChange" />
+                <hc-new-switch :datas="typeData" :keys="typeKey" :round="false" size="default" @change="typeChange" />
             </template>
             <div v-if="typeKey === '1'" class="relative h-full flex">
                 <div id="hc_tree_warranty">

src/views/debit-pay/admin/middlepay.vue

@@ -1,68 +1,61 @@
 <template>
-    <hc-new-card>
-        <template #header>
-            <div class="w-40">
-                <el-select v-model="searchForm.key1" filterable block placeholder="选择计量期" @change="searchKey1Click">
-                    <el-option v-for="item in key1Data" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-            </div>
-        </template>
-        <template #extra>
-            <el-button hc-btn type="primary" @click="addModalClick">
-                <HcIcon name="add" />
-                <span>新增</span>
-            </el-button>
-            <el-button hc-btn type="warning" @click="reportClick">
-                <HcIcon name="send-plane-2" />
-                <span>按期上报</span>
-            </el-button>
-            <el-button hc-btn type="success" @click="detailsModalClick">
-                <HcIcon name="file-list" />
-                <span>清单明细</span>
-            </el-button>
-            <el-button hc-btn type="success">
-                <HcIcon name="bar-chart-box" />
-                <span>查看报表</span>
-            </el-button>
-        </template>
-        <div class="relative h-full flex">
-            <div :id="`hc_tree_card_${uuid}`">
-                <hc-card-item scrollbar>
-                    <hc-lazy-tree :h-props="treeProps" @load="treeLoadNode" />
-                </hc-card-item>
-            </div>
-            <div :id="`hc_table_card_${uuid}`" class="flex-1">
-                <hc-card-item>
-                    <template #header>
-                        <div class="font-400 text-orange">收方总金额：0元</div>
-                    </template>
-                    <template #extra>
-                        <el-button hc-btn color="#626aef">
-                            <HcIcon name="sort-desc" :line="false" />
-                            <span>按部位排序</span>
-                        </el-button>
-                        <el-button hc-btn color="#626aef">
-                            <HcIcon name="sort-desc" :line="false" />
-                            <span>按录入时间排序</span>
-                        </el-button>
-                    </template>
-                    <hc-table
-                        :column="tableColumn" :datas="tableData" :loading="tableLoading"
-                        is-new is-check :check-style="{ width: 29 }" :index-style="{ width: 60 }"
-                        @selection-change="tableCheckChange"
-                    >
-                        <template #action="{ row }">
-                            <el-link type="success">修改</el-link>
-                            <el-link type="danger">删除</el-link>
-                        </template>
-                    </hc-table>
-                    <template #action>
-                        <hc-pages :pages="searchForm" @change="pageChange" />
+    <div class="relative h-full flex">
+        <div :id="`hc_tree_card_${uuid}`">
+            <hc-new-card scrollbar>
+                <template #header>
+                    <el-select v-model="searchForm.key1" filterable block placeholder="选择计量期" @change="searchKey1Click">
+                        <el-option v-for="item in key1Data" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                </template>
+                <hc-lazy-tree :h-props="treeProps" @load="treeLoadNode" />
+            </hc-new-card>
+        </div>
+        <div :id="`hc_table_card_${uuid}`" class="flex-1">
+            <hc-new-card>
+                <template #header>
+                    <div class="font-400 text-orange">收方总金额：0元</div>
+                </template>
+                <template #extra>
+                    <el-button hc-btn type="primary" @click="addModalClick">
+                        <HcIcon name="add" />
+                        <span>新增</span>
+                    </el-button>
+                    <el-button hc-btn type="warning" @click="reportClick">
+                        <HcIcon name="send-plane-2" />
+                        <span>按期上报</span>
+                    </el-button>
+                    <el-button hc-btn type="success" @click="detailsModalClick">
+                        <HcIcon name="file-list" />
+                        <span>清单明细</span>
+                    </el-button>
+                    <el-button hc-btn type="success">
+                        <HcIcon name="bar-chart-box" />
+                        <span>查看报表</span>
+                    </el-button>
+                    <el-button hc-btn color="#626aef">
+                        <HcIcon name="sort-desc" :line="false" />
+                        <span>按部位排序</span>
+                    </el-button>
+                    <el-button hc-btn color="#626aef">
+                        <HcIcon name="sort-desc" :line="false" />
+                        <span>按录入时间排序</span>
+                    </el-button>
+                </template>
+                <hc-table
+                    :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                    is-new is-check :check-style="{ width: 29 }" :index-style="{ width: 60 }"
+                    @selection-change="tableCheckChange"
+                >
+                    <template #action="{ row }">
+                        <el-link type="success">修改</el-link>
+                        <el-link type="danger">删除</el-link>
                     </template>
-                </hc-card-item>
-            </div>
+                </hc-table>
+                <template #action>
+                    <hc-pages :pages="searchForm" @change="pageChange" />
+                </template>
+            </hc-new-card>
         </div>
-
         <!-- 中间计量新增 -->
         <HcAddModal v-model="addModalShow" />
 
@@ -71,7 +64,7 @@
 
         <!-- 上报弹窗 -->
         <hc-report-dialog v-model="isReport" />
-    </hc-new-card>
+    </div>
 </template>
 
 <script setup>

src/views/debit-pay/ledgers/debit.vue

@@ -1,7 +1,7 @@
 <template>
     <hc-new-card>
         <template #header>
-            <hc-new-switch :datas="tabTab" :keys="tabKey" :round="false" @change="tabChange" />
+            <hc-new-switch :datas="tabTab" :keys="tabKey" :round="false" size="default" @change="tabChange" />
             <div class="hc-flex ml-6">
                 <span class="text-gray-5">超计台账：</span>
                 <el-switch v-model="searchForm.key1" inline-prompt active-text="是" inactive-text="否" size="large" />

src/views/debit-pay/material/book.vue

@@ -19,7 +19,7 @@
         </template>
         <!-- 新增/修改 -->
         <hc-new-dialog v-model="formModalShow" is-to-body widths="30rem" title="材料计量单新增" @save="formModalSave" @close="formModalClose">
-            <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="top">
+            <el-form ref="formRef" class="p-4" :model="formModel" :rules="formRules" label-position="top">
                 <el-form-item label="计量期：">
                     <el-select v-model="formModel.key1" disabled block>
                         <el-option label="第1期" value="1" />

src/views/debit-pay/project/pay.vue

@@ -1,63 +1,61 @@
 <template>
-    <hc-new-card>
-        <div class="relative h-full flex">
-            <div :id="`hc_tree_card_${uuid}`">
-                <hc-card-item scrollbar>
-                    <hc-lazy-tree :h-props="treeProps" @load="treeLoadNode" />
-                </hc-card-item>
-            </div>
-            <div :id="`hc_table_card_${uuid}`" class="flex-1">
-                <hc-card-item>
-                    <template #header>
-                        <div class="font-400 text-orange">本期计量总金额：0元</div>
-                    </template>
-                    <template #extra>
-                        <el-button hc-btn type="primary">
-                            <HcIcon name="24-hours" />
-                            <span>自动生成结算单</span>
-                        </el-button>
-                        <el-button hc-btn type="warning" @click="reportClick">
-                            <HcIcon name="send-plane-2" />
-                            <span>按期上报</span>
-                        </el-button>
-                        <el-button hc-btn type="danger">
-                            <HcIcon name="delete-bin" />
-                            <span>按部位删除</span>
-                        </el-button>
-                        <el-button hc-btn color="#626aef">
-                            <HcIcon name="sort-desc" :line="false" />
-                            <span>按部位排序</span>
-                        </el-button>
-                        <el-button hc-btn color="#626aef">
-                            <HcIcon name="sort-desc" :line="false" />
-                            <span>按录入时间排序</span>
-                        </el-button>
-                        <el-button hc-btn type="success" @click="detailsModalClick">
-                            <HcIcon name="file-list" />
-                            <span>清单明细</span>
-                        </el-button>
-                        <el-button hc-btn type="success">
-                            <HcIcon name="file-chart" />
-                            <span>查看报表</span>
-                        </el-button>
-                    </template>
-                    <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>
-                        </template>
-                    </hc-table>
-                    <template #action>
-                        <hc-pages :pages="searchForm" @change="pageChange" />
+    <div class="relative h-full flex">
+        <div :id="`hc_tree_card_${uuid}`">
+            <hc-new-card scrollbar>
+                <hc-lazy-tree :h-props="treeProps" @load="treeLoadNode" />
+            </hc-new-card>
+        </div>
+        <div :id="`hc_table_card_${uuid}`" class="flex-1">
+            <hc-new-card>
+                <template #header>
+                    <div class="font-400 text-orange">本期计量总金额：0元</div>
+                </template>
+                <template #extra>
+                    <el-button hc-btn type="primary">
+                        <HcIcon name="24-hours" />
+                        <span>自动生成结算单</span>
+                    </el-button>
+                    <el-button hc-btn type="warning" @click="reportClick">
+                        <HcIcon name="send-plane-2" />
+                        <span>按期上报</span>
+                    </el-button>
+                    <el-button hc-btn type="danger">
+                        <HcIcon name="delete-bin" />
+                        <span>按部位删除</span>
+                    </el-button>
+                    <el-button hc-btn color="#626aef">
+                        <HcIcon name="sort-desc" :line="false" />
+                        <span>按部位排序</span>
+                    </el-button>
+                    <el-button hc-btn color="#626aef">
+                        <HcIcon name="sort-desc" :line="false" />
+                        <span>按录入时间排序</span>
+                    </el-button>
+                    <el-button hc-btn type="success" @click="detailsModalClick">
+                        <HcIcon name="file-list" />
+                        <span>清单明细</span>
+                    </el-button>
+                    <el-button hc-btn type="success">
+                        <HcIcon name="file-chart" />
+                        <span>查看报表</span>
+                    </el-button>
+                </template>
+                <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>
                     </template>
-                </hc-card-item>
-            </div>
+                </hc-table>
+                <template #action>
+                    <hc-pages :pages="searchForm" @change="pageChange" />
+                </template>
+            </hc-new-card>
         </div>
         <!-- 上报弹窗 -->
         <hc-report-dialog v-model="isReport" />
         <!-- 清单明细 -->
         <HcDetailsModal v-model="detailsModalShow" />
-    </hc-new-card>
+    </div>
 </template>
 
 <script setup>

src/views/debit-pay/start-work/book.vue

@@ -19,7 +19,7 @@
         </template>
         <!-- 新增/修改 -->
         <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 ref="formRef" class="p-4" :model="formModel" :rules="formRules" label-position="top">
                 <el-form-item label="计量期：">
                     <el-select v-model="formModel.key1" disabled block>
                         <el-option label="第1期" value="1" />

src/views/debit-pay/start-work/components/order/dataModal.vue

@@ -36,7 +36,7 @@
 </template>
 
 <script setup>
-import { nextTick, ref, watch } from 'vue'
+import { ref, watch } from 'vue'
 
 const props = defineProps({
     ids: {
@@ -64,43 +64,10 @@ watch(() => [
 //监听
 watch(isShow, (val) => {
     if (val) {
-        detailsModalShow()
+        console.log('isShow', val)
     }
 })
 
-const detailsModalShow = () => {
-    nextTick(() => {
-        window.$split(['#hc_modal_tree', '#hc_modal_form'], {
-            sizes: [30, 70],
-            snapOffset: 0,
-            minSize: [170, 500],
-        })
-    })
-}
-
-//数据格式
-const treeProps = {
-    label: 'name',
-    children: 'children',
-    isLeaf: 'leaf',
-}
-
-//懒加载的数据
-const treeLoadNode = ({ level }, resolve) => {
-    if (level === 0) {
-        return resolve([{ name: 'region' }])
-    }
-    if (level > 3) {
-        return resolve([])
-    }
-    setTimeout(() => {
-        resolve([
-            { name: 'leaf', leaf: true },
-            { name: 'zone' },
-        ])
-    }, 500)
-}
-
 //基础表单
 const baseFormRef = ref(null)
 const baseForm = ref({})

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

@@ -1,66 +1,59 @@
 <template>
-    <hc-new-card>
-        <template #header>
-            <div class="w-40">
-                <el-select v-model="searchForm.key2" filterable block placeholder="选择计量期">
-                    <el-option label="第一期" value="1" />
-                    <el-option label="第二期" value="2" />
-                </el-select>
-            </div>
-        </template>
-        <template #extra>
-            <el-button hc-btn type="primary">
-                <HcIcon name="add" />
-                <span>归集工区计量单</span>
-            </el-button>
-            <el-button hc-btn type="warning" @click="reportClick">
-                <HcIcon name="send-plane-2" />
-                <span>按期上报</span>
-            </el-button>
-            <el-button hc-btn type="success" @click="detailsModalClick">
-                <HcIcon name="file-list" />
-                <span>清单明细</span>
-            </el-button>
-            <el-button hc-btn type="success">
-                <HcIcon name="bar-chart-box" />
-                <span>查看报表</span>
-            </el-button>
-        </template>
-        <div class="relative h-full flex">
-            <div :id="`hc_tree_card_${uuid}`">
-                <hc-card-item scrollbar>
-                    <hc-lazy-tree :h-props="treeProps" @load="treeLoadNode" />
-                </hc-card-item>
-            </div>
-            <div :id="`hc_table_card_${uuid}`" class="flex-1">
-                <hc-card-item>
-                    <template #header>
-                        <div class="font-400 text-orange">本期计量总金额：0元</div>
-                    </template>
-                    <template #extra>
-                        <el-button hc-btn color="#626aef">
-                            <HcIcon name="sort-desc" :line="false" />
-                            <span>按部位排序</span>
-                        </el-button>
-                        <el-button hc-btn color="#626aef">
-                            <HcIcon name="sort-desc" :line="false" />
-                            <span>按录入时间排序</span>
-                        </el-button>
-                    </template>
-                    <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }" />
-                    <template #action>
-                        <hc-pages :pages="searchForm" @change="pageChange" />
-                    </template>
-                </hc-card-item>
-            </div>
+    <div class="relative h-full flex">
+        <div :id="`hc_tree_card_${uuid}`">
+            <hc-new-card scrollbar>
+                <template #header>
+                    <el-select v-model="searchForm.key2" filterable block placeholder="选择计量期">
+                        <el-option label="第一期" value="1" />
+                        <el-option label="第二期" value="2" />
+                    </el-select>
+                </template>
+                <hc-lazy-tree :h-props="treeProps" @load="treeLoadNode" />
+            </hc-new-card>
+        </div>
+        <div :id="`hc_table_card_${uuid}`" class="flex-1">
+            <hc-new-card>
+                <template #header>
+                    <div class="font-400 text-orange">本期计量总金额：0元</div>
+                </template>
+                <template #extra>
+                    <el-button hc-btn type="primary">
+                        <HcIcon name="add" />
+                        <span>归集工区计量单</span>
+                    </el-button>
+                    <el-button hc-btn type="warning" @click="reportClick">
+                        <HcIcon name="send-plane-2" />
+                        <span>按期上报</span>
+                    </el-button>
+                    <el-button hc-btn type="success" @click="detailsModalClick">
+                        <HcIcon name="file-list" />
+                        <span>清单明细</span>
+                    </el-button>
+                    <el-button hc-btn type="success">
+                        <HcIcon name="bar-chart-box" />
+                        <span>查看报表</span>
+                    </el-button>
+                    <el-button hc-btn color="#626aef">
+                        <HcIcon name="sort-desc" :line="false" />
+                        <span>按部位排序</span>
+                    </el-button>
+                    <el-button hc-btn color="#626aef">
+                        <HcIcon name="sort-desc" :line="false" />
+                        <span>按录入时间排序</span>
+                    </el-button>
+                </template>
+                <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }" />
+                <template #action>
+                    <hc-pages :pages="searchForm" @change="pageChange" />
+                </template>
+            </hc-new-card>
         </div>
-
         <!-- 清单明细 -->
         <HcDetailsModal v-model="detailsModalShow" />
 
         <!-- 上报弹窗 -->
         <hc-report-dialog v-model="isReport" />
-    </hc-new-card>
+    </div>
 </template>
 
 <script setup>

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

@@ -1,7 +1,7 @@
 <template>
     <hc-new-card>
         <template #header>
-            <hc-new-switch :datas="tabTab" :keys="tabKey" size="small" :round="false" @change="tabChange" />
+            <hc-new-switch :datas="tabTab" :keys="tabKey" size="default" :round="false" @change="tabChange" />
             <div class="hc-flex ml-6">
                 <span class="text-gray-5">超计台账：</span>
                 <el-switch v-model="searchForm.key1" inline-prompt active-text="是" inactive-text="否" size="large" />

src/views/periods/ledgers/pay.vue

@@ -7,7 +7,7 @@
                     <el-option label="二工区" value="2" />
                 </el-select>
             </div>
-            <hc-new-switch class="ml-3" :datas="tabTab" :keys="tabKey" size="small" :round="false" @change="tabChange" />
+            <hc-new-switch class="ml-3" :datas="tabTab" :keys="tabKey" size="default" :round="false" @change="tabChange" />
             <div class="hc-flex ml-6">
                 <span class="text-gray-5">超计台账：</span>
                 <el-switch v-model="searchForm.key1" inline-prompt active-text="是" inactive-text="否" size="large" />

src/views/periods/project/pay.vue

@@ -1,73 +1,67 @@
 <template>
-    <hc-new-card>
-        <template #header>
-            <div class="w-40">
-                <el-select v-model="searchForm.key1" filterable block placeholder="选择工区">
-                    <el-option label="一工区" value="1" />
-                    <el-option label="二工区" value="2" />
-                </el-select>
-            </div>
-        </template>
-        <template #extra>
-            <el-button hc-btn type="primary">
-                <HcIcon name="24-hours" />
-                <span>自动生成结算单</span>
-            </el-button>
-            <el-button hc-btn type="warning" @click="reportClick">
-                <HcIcon name="send-plane-2" />
-                <span>按期上报</span>
-            </el-button>
-            <el-button hc-btn type="danger">
-                <HcIcon name="delete-bin" />
-                <span>按部位删除</span>
-            </el-button>
-        </template>
-        <div class="relative h-full flex">
-            <div :id="`hc_tree_card_${uuid}`">
-                <hc-card-item scrollbar>
-                    <hc-lazy-tree :h-props="treeProps" @load="treeLoadNode" />
-                </hc-card-item>
-            </div>
-            <div :id="`hc_table_card_${uuid}`" class="flex-1">
-                <hc-card-item>
-                    <template #header>
-                        <div class="font-400 text-orange">本期计量总金额：0元</div>
-                    </template>
-                    <template #extra>
-                        <el-button hc-btn color="#626aef">
-                            <HcIcon name="sort-desc" :line="false" />
-                            <span>按部位排序</span>
-                        </el-button>
-                        <el-button hc-btn color="#626aef">
-                            <HcIcon name="sort-desc" :line="false" />
-                            <span>按录入时间排序</span>
-                        </el-button>
-                        <el-button hc-btn type="success" @click="detailsModalClick">
-                            <HcIcon name="file-list" />
-                            <span>清单明细</span>
-                        </el-button>
-                        <el-button hc-btn type="success">
-                            <HcIcon name="file-chart" />
-                            <span>查看报表</span>
-                        </el-button>
-                    </template>
-                    <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>
-                        </template>
-                    </hc-table>
-                    <template #action>
-                        <hc-pages :pages="searchForm" @change="pageChange" />
+    <div class="relative h-full flex">
+        <div :id="`hc_tree_card_${uuid}`">
+            <hc-new-card scrollbar>
+                <template #header>
+                    <el-select v-model="searchForm.key1" filterable block placeholder="选择工区">
+                        <el-option label="一工区" value="1" />
+                        <el-option label="二工区" value="2" />
+                    </el-select>
+                </template>
+                <hc-lazy-tree :h-props="treeProps" @load="treeLoadNode" />
+            </hc-new-card>
+        </div>
+        <div :id="`hc_table_card_${uuid}`" class="flex-1">
+            <hc-new-card>
+                <template #header>
+                    <div class="font-400 text-orange">本期计量总金额：0元</div>
+                </template>
+                <template #extra>
+                    <el-button hc-btn type="primary">
+                        <HcIcon name="24-hours" />
+                        <span>自动生成结算单</span>
+                    </el-button>
+                    <el-button hc-btn type="warning" @click="reportClick">
+                        <HcIcon name="send-plane-2" />
+                        <span>按期上报</span>
+                    </el-button>
+                    <el-button hc-btn type="danger">
+                        <HcIcon name="delete-bin" />
+                        <span>按部位删除</span>
+                    </el-button>
+                    <el-button hc-btn color="#626aef">
+                        <HcIcon name="sort-desc" :line="false" />
+                        <span>按部位排序</span>
+                    </el-button>
+                    <el-button hc-btn color="#626aef">
+                        <HcIcon name="sort-desc" :line="false" />
+                        <span>按录入时间排序</span>
+                    </el-button>
+                    <el-button hc-btn type="success" @click="detailsModalClick">
+                        <HcIcon name="file-list" />
+                        <span>清单明细</span>
+                    </el-button>
+                    <el-button hc-btn type="success">
+                        <HcIcon name="file-chart" />
+                        <span>查看报表</span>
+                    </el-button>
+                </template>
+                <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>
                     </template>
-                </hc-card-item>
-            </div>
+                </hc-table>
+                <template #action>
+                    <hc-pages :pages="searchForm" @change="pageChange" />
+                </template>
+            </hc-new-card>
         </div>
         <!-- 上报弹窗 -->
         <hc-report-dialog v-model="isReport" />
         <!-- 清单明细 -->
         <HcDetailsModal v-model="detailsModalShow" />
-    </hc-new-card>
+    </div>
 </template>
 
 <script setup>