ZaiZai 6 months ago
parent
commit
dea81bb69c

+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240814135432"
+  "value": "20240815104714"
 }

+ 5 - 5
src/views/archives/appraisal.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-body :loading="treeLoading" :project-nmae="projectInfo.name" split>
+    <hc-body :loading="treeLoading" :project-nmae="projectInfo?.name" split>
         <template #tree>
             <HcTree
                 :auto-expand-keys="treeAutoExpandKeys" :contract-id="contractId" :project-id="projectId"
@@ -18,22 +18,22 @@
                         <el-option v-for="item in retentionPeriod" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                 </div>
-                <div class="w-40 ml-2">
+                <div class="ml-2 w-40">
                     <el-select v-model="searchForm.fileSizeValue" clearable placeholder="文件大小">
                         <el-option v-for="item in fileSize" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                 </div>
-                <div class="w-40 ml-2">
+                <div class="ml-2 w-40">
                     <el-select v-model="searchForm.isOutOfDate" clearable placeholder="是否到期">
                         <el-option v-for="item in isExpired" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                 </div>
-                <div class="w-40 ml-2">
+                <div class="ml-2 w-40">
                     <el-select v-model="searchForm.filingUnit" clearable placeholder="立卷单位">
                         <el-option v-for="item in filingUnit" :key="item" :label="item" :value="item" />
                     </el-select>
                 </div>
-                <div v-if="searchForm.isDeleted == 1" class="w-40 ml-2">
+                <div v-if="searchForm.isDeleted == 1" class="ml-2 w-40">
                     <el-select v-model="searchForm.destroyUser" clearable placeholder="销毁操作账户">
                         <el-option v-for="item in operatingAccount" :key="item.id" :label="item.realName" :value="item.id" />
                     </el-select>

+ 1 - 1
src/views/archives/bookmark.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-body :loading="treeLoading" :project-nmae="projectInfo.name" class="hc-archives-bookmark-page" split>
+    <hc-body :loading="treeLoading" :project-nmae="projectInfo?.name" class="hc-archives-bookmark-page" split>
         <template #tree>
             <HcTree
                 :auto-expand-keys="treeAutoExpandKeys" :contract-id="contractId" :project-id="projectId"

+ 1 - 1
src/views/archives/meta-data.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-body :loading="treeLoading" :project-nmae="projectInfo.name" split>
+    <hc-body :loading="treeLoading" :project-nmae="projectInfo?.name" split>
         <template #tree>
             <HcTree
                 :auto-expand-keys="treeAutoExpandKeys" :contract-id="contractId" :project-id="projectId"

+ 5 - 5
src/views/archives/tuning.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-body :loading="treeLoading" :project-nmae="projectInfo.name" split>
+    <hc-body :loading="treeLoading" :project-nmae="projectInfo?.name" split>
         <template #tree>
             <HcTree
                 :auto-expand-keys="treeAutoExpandKeys" :contract-id="contractId" :project-id="projectId"
@@ -45,7 +45,7 @@
                     <HcTable
                         ref="tableRef" :check-style="{ width: 29 }" :column="tableColumn" :datas="tableData"
                         :index-style="{ width: 70 }" :is-arr-index="false" :loading="tableLoading" :ui="hoverHand ? 'hover-hand' : ''"
-                        is-check is-current-row is-new
+                        is-check is-new is-current-row
                         @selection-change="tableSelection" @row-click="tableRowClick"
                     >
                         <template #table-column-header-num>
@@ -101,7 +101,7 @@
                 <div class="hc-moves-transfer-panel">
                     <div class="panel-header">
                         <div class="panel-header-label">
-                            <el-checkbox v-model="movesCheckAll" :indeterminate="isIndeterminate" class="size-xl space" @change="handleCheckAllChange">
+                            <el-checkbox v-model="movesCheckAll" :indeterminate="isIndeterminate" class="space size-xl" @change="handleCheckAllChange">
                                 选择需要迁移的文件
                             </el-checkbox>
                         </div>
@@ -111,7 +111,7 @@
                         <el-scrollbar>
                             <el-checkbox-group v-model="checkedMoves" @change="handleCheckedMovesChange">
                                 <div v-for="item in tableCheckedKeys" :key="item.id" class="hc-file-checkbox">
-                                    <el-checkbox :value="item.id" class="size-xl space">{{ item.name }}</el-checkbox>
+                                    <el-checkbox :value="item.id" class="space size-xl">{{ item.name }}</el-checkbox>
                                 </div>
                             </el-checkbox-group>
                         </el-scrollbar>
@@ -148,7 +148,7 @@
                         <span class="text-link text-xl" @click="upSortClick(index)">
                             <HcIcon fill name="arrow-up" />
                         </span>
-                        <span class="text-link text-xl ml-2" @click="downSortClick(index)">
+                        <span class="text-link ml-2 text-xl" @click="downSortClick(index)">
                             <HcIcon fill name="arrow-down" />
                         </span>
                     </template>

+ 1 - 1
src/views/file/collection.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-body :loading="treeLoading" :project-nmae="projectInfo.name" class="hc-file-collection-page" split>
+    <hc-body :loading="treeLoading" :project-nmae="projectInfo?.name" class="hc-file-collection-page" split>
         <template #tree>
             <HcTree
                 ref="treeRef" :auto-expand-keys="treeAutoExpandKeys" :contract-id="contractId" :menus="ElTreeMenu"

+ 1 - 1
src/views/file/records.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-body class="hc-file-records-page" split :loading="treeLoading" :project-nmae="projectInfo.name">
+    <hc-body class="hc-file-records-page" split :loading="treeLoading" :project-nmae="projectInfo?.name">
         <template #tree>
             <HcTree :project-id="projectId" :contract-id="contractId" :auto-expand-keys="treeAutoExpandKeys" @node-tap="projectTreeClick" @node-loading="treeNodeLoading" @menu-tap="ElTreeMenuClick" />
         </template>

+ 18 - 13
src/views/tasks/components/TableCard.vue

@@ -2,30 +2,30 @@
     <hc-new-card>
         <template #header>
             <div class="w-32">
-                <el-select v-model="searchForm.typeValue" block clearable placeholder="任务类型" size="large">
+                <el-select v-model="searchForm.typeValue" clearable block placeholder="任务类型" size="large">
                     <el-option v-for="item in tasksType" :label="item.dictValue" :value="item.dictKey" />
                 </el-select>
             </div>
-            <div class="w-32 ml-3">
-                <el-select v-model="searchForm.statusValue" block clearable placeholder="任务状态" size="large">
+            <div class="ml-3 w-32">
+                <el-select v-model="searchForm.statusValue" clearable block placeholder="任务状态" size="large">
                     <el-option v-for="item in tasksStatus" :label="item.dictValue" :value="item.dictKey" />
                 </el-select>
             </div>
-            <div class="w-32 ml-3">
-                <el-select v-model="searchForm.contractIdValue" block clearable placeholder="合同段" size="large" @change="ContractIdChange">
+            <div class="ml-3 w-32">
+                <el-select v-model="searchForm.contractIdValue" clearable block placeholder="合同段" size="large" @change="ContractIdChange">
                     <el-option v-for="item in contractList" :label="item.contractName" :value="item.id" />
                 </el-select>
             </div>
-            <div class="w-32 ml-3">
-                <el-select v-model="searchForm.batchValue" block clearable placeholder="上报批次" size="large">
+            <div class="ml-3 w-32">
+                <el-select v-model="searchForm.batchValue" clearable block placeholder="上报批次" size="large">
                     <el-option v-for="item in reportBatch" :label="item.batch" :value="item.batch" />
                 </el-select>
             </div>
-            <div class="w-64 ml-3">
+            <div class="ml-3 w-64">
                 <HcDatePicker :dates="betweenTime" clearable size="large" @change="betweenTimeUpdate" />
             </div>
-            <div class="w-56 ml-3">
-                <el-input v-model="searchForm.queryValue" block clearable placeholder="请输入名称关键词检索" size="large" @keyup="keyUpEvent" />
+            <div class="ml-3 w-56">
+                <el-input v-model="searchForm.queryValue" clearable block placeholder="请输入名称关键词检索" size="large" @keyup="keyUpEvent" />
             </div>
             <div class="ml-2">
                 <el-button size="large" type="primary" @click="searchClick">
@@ -80,7 +80,7 @@
         <template #action>
             <div class="lr-dialog-footer">
                 <div class="left">
-                    <span class="text-success">审批人员中:</span>
+                    <span class="text-approval-personnel">审批人员中:</span>
                     <el-tag class="mx-1" effect="dark" type="info">未签字</el-tag>
                     <el-tag class="mx-1" effect="dark" type="success">已签字</el-tag>
                     <el-tag class="mx-1" effect="dark" type="warning">已废除</el-tag>
@@ -326,6 +326,11 @@ const batchApprovalTaskClick = () => {
 }
 </script>
 
-<style lang="scss" scoped>
-
+<style lang="scss">
+.text-approval-personnel {
+    color: green;
+}
+html.dark .text-approval-personnel {
+    color: white;
+}
 </style>

+ 1 - 1
src/views/transfer/inspects.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-body ids="carry-spot-checks-layout-target1" split :loading="treeLoading" :project-nmae="projectInfo.name">
+    <hc-body ids="carry-spot-checks-layout-target1" split :loading="treeLoading" :project-nmae="projectInfo?.name">
         <template #tree>
             <HcTree :project-id="projectId" :contract-id="contractId" :auto-expand-keys="treeAutoExpandKeys" @node-tap="projectTreeClick" @node-loading="treeNodeLoading" @menu-tap="ElTreeMenuClick" />
         </template>