From 137c25d75cd216521cf820d89c11dcff37cb3279 Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Mon, 15 Jul 2024 09:30:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8D=95=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ActionBar/index.vue     |   1 +
 src/components/CostEntry/actionBar.vue | 206 ++++++++++----------
 src/components/CostEntry/feeTable.vue  |   6 +-
 src/design/public.less                 | 259 ++++++++++++++++++++++++-
 src/styles/common.scss                 | 251 ------------------------
 src/styles/index.scss                  |   1 -
 6 files changed, 365 insertions(+), 359 deletions(-)
 delete mode 100644 src/styles/common.scss

diff --git a/src/components/ActionBar/index.vue b/src/components/ActionBar/index.vue
index a9945674..835ccaa0 100644
--- a/src/components/ActionBar/index.vue
+++ b/src/components/ActionBar/index.vue
@@ -165,6 +165,7 @@
   .ds-action-bar {
     position: fixed;
     right: 30px;
+    top: 65vh;
     height: auto;
     z-index: 999;
     cursor: pointer;
diff --git a/src/components/CostEntry/actionBar.vue b/src/components/CostEntry/actionBar.vue
index fe360cbd..3a8e06c3 100644
--- a/src/components/CostEntry/actionBar.vue
+++ b/src/components/CostEntry/actionBar.vue
@@ -5,113 +5,115 @@
 -->
 <template>
   <div class="cost-action-bar">
-    <a-button type="link" size="mini" @click="addRow">
-      <span class="iconfont icon-tianjia" :style="{ fontSize: '12px' }"></span>
-      添加
-    </a-button>
-    <a-button type="link" @click="copyRow">
-      <span class="iconfont icon-fuzhi" :style="{ fontSize: '12px' }"></span>
-      复制
-    </a-button>
-    <a-button type="link" @click="save">
-      <span class="iconfont icon-icon_baocun" :style="{ fontSize: '12px' }"></span>
-      保存
-    </a-button>
-    <a-popconfirm
-      :visible="deleteFlag"
-      title="确定要删除勾选的数据?"
-      ok-text="确定"
-      cancel-text="取消"
-      @confirm="deleteRow"
-      @cancel="cancelDelete"
-      @click="checkDelete"
-    >
-      <a-button danger type="link" >
-        <span class="iconfont icon-shanchu1" :style="{ fontSize: '12px' }"></span>
-        删除
+    <div>
+      <a-popconfirm
+        :visible="deleteFlag"
+        title="确定要删除勾选的数据?"
+        ok-text="确定"
+        cancel-text="取消"
+        @confirm="deleteRow"
+        @cancel="cancelDelete"
+        @click="checkDelete"
+      >
+        <a-button danger type="link" >
+          <span class="iconfont icon-shanchu1" :style="{ fontSize: '12px' }"></span>
+          删除
+        </a-button>
+      </a-popconfirm>
+      <a-popconfirm
+        title="是否取消数据录入?"
+        ok-text="确定"
+        cancel-text="取消"
+        @confirm="cancelEdit"
+      >
+        <a-button danger type="link">
+          <span class="iconfont icon-shanchu" :style="{ fontSize: '12px' }"></span>
+          取消
+        </a-button>
+      </a-popconfirm>
+      <a-button type="link" @click="refresh">
+        <span class="iconfont icon-shuaxin" :style="{ fontSize: '12px' }"></span>
+        刷新
       </a-button>
-    </a-popconfirm>
-    <a-popconfirm
-      title="是否取消数据录入?"
-      ok-text="确定"
-      cancel-text="取消"
-      @confirm="cancelEdit"
-    >
-      <a-button danger type="link">
-        <span class="iconfont icon-shanchu" :style="{ fontSize: '12px' }"></span>
-        取消
+      <a-dropdown>
+        <template #overlay>
+          <a-menu>
+            <a-sub-menu :title="tbType == 'receive' ? '打印应付账单' : '打印应收账单'">
+              <a-menu-item @click="printFee(1)">{{ tbType == 'receive' ? '所选应付打印' : '所选应收打印' }}</a-menu-item>
+              <a-menu-item @click="printFee(2)">{{ tbType == 'receive' ? '应付客户打印' : '应收客户打印' }}</a-menu-item>
+              <a-menu-item @click="printFee(3)">{{ tbType == 'receive' ? '所有应付打印' : '所有应收打印' }}</a-menu-item>
+            </a-sub-menu>
+            <a-menu-item @click="feeTem">利润核算单打印</a-menu-item>
+            <a-menu-item @click="saveToTem">打印账单</a-menu-item>
+          </a-menu>
+        </template>
+        <a-button type="link">
+          <span class="iconfont icon-printing" :style="{ fontSize: '12px' }"></span>
+          打印
+        </a-button>
+      </a-dropdown>
+      <a-dropdown>
+        <template #overlay>
+          <a-menu>
+            <a-menu-item @click="submit">提交审核</a-menu-item>
+            <a-menu-item @click="submitAll">{{ tbType == 'receive' ? '应收提交' : '应付提交' }}</a-menu-item>
+            <a-menu-item>整票提交</a-menu-item>
+            <a-menu-item @click="revokeSubmit">撤销提交</a-menu-item>
+            <a-menu-item>撤销整票提交</a-menu-item>
+            <a-menu-item>申请开票</a-menu-item>
+            <a-menu-item>收费申请</a-menu-item>
+            <a-menu-item>费用拆分</a-menu-item>
+            <a-menu-item @click="openFlowChart">查看工作流</a-menu-item>
+            <a-menu-item>批量更改费用对象</a-menu-item>
+            <a-menu-item>批量修改核算单位</a-menu-item>
+            <a-menu-item>禁开发票</a-menu-item>
+            <a-menu-item>费用信息排序</a-menu-item>
+          </a-menu>
+        </template>
+        <a-button type="link">
+          提交审核
+          <span class="iconfont icon-xia" :style="{ fontSize: '12px' }"></span>
+        </a-button>
+      </a-dropdown>
+      <a-button @click="openApplyModify" type="link">
+        申请修改
+      </a-button>
+      <a-button type="link" @click="deleteApply">
+        申请删除
+      </a-button>
+      <a-button type="link" @click="cancelApply">
+        取消申请
       </a-button>
-    </a-popconfirm>
-    <a-button type="link" @click="refresh">
-      <span class="iconfont icon-shuaxin" :style="{ fontSize: '12px' }"></span>
-      刷新
-    </a-button>
-    <a-dropdown>
-      <template #overlay>
-        <a-menu>
-          <a-sub-menu :title="tbType == 'receive' ? '打印应付账单' : '打印应收账单'">
-            <a-menu-item @click="printFee(1)">{{ tbType == 'receive' ? '所选应付打印' : '所选应收打印' }}</a-menu-item>
-            <a-menu-item @click="printFee(2)">{{ tbType == 'receive' ? '应付客户打印' : '应收客户打印' }}</a-menu-item>
-            <a-menu-item @click="printFee(3)">{{ tbType == 'receive' ? '所有应付打印' : '所有应收打印' }}</a-menu-item>
-          </a-sub-menu>
-          <a-menu-item @click="feeTem">利润核算单打印</a-menu-item>
-          <a-menu-item @click="saveToTem">打印账单</a-menu-item>
-        </a-menu>
-      </template>
-      <a-button type="link">
-        <span class="iconfont icon-printing" :style="{ fontSize: '12px' }"></span>
-        打印
+      <a-dropdown>
+        <template #overlay>
+          <a-menu>
+            <a-menu-item @click="history">历史引入</a-menu-item>
+            <a-menu-item @click="feeTem">引入费用模版</a-menu-item>
+            <a-menu-item @click="saveToTem">保存为费用模版</a-menu-item>
+            <a-sub-menu :title="tbType == 'receive' ? '生成应付' : '生成应收'">
+              <a-menu-item @click="selectInsert(1)">{{ tbType == 'receive' ? '所选生成应付' : '所选生成应收' }}</a-menu-item>
+              <a-menu-item @click="selectInsert(2)">{{ tbType == 'receive' ? '所有生成应付' : '所有生成应收' }}</a-menu-item>
+            </a-sub-menu>
+          </a-menu>
+        </template>
+        <a-button type="link">
+          引入费用
+          <span class="iconfont icon-xia" :style="{ fontSize: '12px' }"></span>
+        </a-button>
+      </a-dropdown>
+      <a-button type="link" size="mini" @click="addRow">
+        <span class="iconfont icon-tianjia" :style="{ fontSize: '12px' }"></span>
+        添加
       </a-button>
-    </a-dropdown>
-    <a-dropdown>
-      <template #overlay>
-        <a-menu>
-          <a-menu-item @click="submit">提交审核</a-menu-item>
-          <a-menu-item @click="submitAll">{{ tbType == 'receive' ? '应收提交' : '应付提交' }}</a-menu-item>
-          <a-menu-item>整票提交</a-menu-item>
-          <a-menu-item @click="revokeSubmit">撤销提交</a-menu-item>
-          <a-menu-item>撤销整票提交</a-menu-item>
-          <a-menu-item>申请开票</a-menu-item>
-          <a-menu-item>收费申请</a-menu-item>
-          <a-menu-item>费用拆分</a-menu-item>
-          <a-menu-item @click="openFlowChart">查看工作流</a-menu-item>
-          <a-menu-item>批量更改费用对象</a-menu-item>
-          <a-menu-item>批量修改核算单位</a-menu-item>
-          <a-menu-item>禁开发票</a-menu-item>
-          <a-menu-item>费用信息排序</a-menu-item>
-        </a-menu>
-      </template>
-      <a-button type="link">
-        提交审核
-        <span class="iconfont icon-xia" :style="{ fontSize: '12px' }"></span>
+      <a-button type="link" @click="copyRow">
+        <span class="iconfont icon-fuzhi" :style="{ fontSize: '12px' }"></span>
+        复制
       </a-button>
-    </a-dropdown>
-    <a-button @click="openApplyModify" type="link">
-      申请修改
-    </a-button>
-    <a-button type="link" @click="deleteApply">
-      申请删除
-    </a-button>
-    <a-button type="link" @click="cancelApply">
-      取消申请
-    </a-button>
-    <a-dropdown>
-      <template #overlay>
-        <a-menu>
-          <a-menu-item @click="history">历史引入</a-menu-item>
-          <a-menu-item @click="feeTem">引入费用模版</a-menu-item>
-          <a-menu-item @click="saveToTem">保存为费用模版</a-menu-item>
-          <a-sub-menu :title="tbType == 'receive' ? '生成应付' : '生成应收'">
-            <a-menu-item @click="selectInsert(1)">{{ tbType == 'receive' ? '所选生成应付' : '所选生成应收' }}</a-menu-item>
-            <a-menu-item @click="selectInsert(2)">{{ tbType == 'receive' ? '所有生成应付' : '所有生成应收' }}</a-menu-item>
-          </a-sub-menu>
-        </a-menu>
-      </template>
-      <a-button type="link">
-        引入费用
-        <span class="iconfont icon-xia" :style="{ fontSize: '12px' }"></span>
+      <a-button type="link" @click="save">
+        <span class="iconfont icon-icon_baocun" :style="{ fontSize: '12px' }"></span>
+        保存
       </a-button>
-    </a-dropdown>
+    </div>
     <!-- 引入历史数据弹窗 -->
     <HistoryDrawer ref="historyDrawer" @submit="submitHistory"></HistoryDrawer>
     <!-- 费用模版弹窗 -->
diff --git a/src/components/CostEntry/feeTable.vue b/src/components/CostEntry/feeTable.vue
index 154a16d5..c65a4143 100644
--- a/src/components/CostEntry/feeTable.vue
+++ b/src/components/CostEntry/feeTable.vue
@@ -7,7 +7,7 @@
   <a-spin :spinning="loading">
     <div class="cost-entry-receive">
       <div class="flex">
-        <h4>{{ tbType == 'receive' ? '应收' : '应付' }}</h4>
+        <h4>{{ tbType == 'receive' ? '应收费用' : '应付费用' }}</h4>
         <ActionBar
           :data="list"
           :row="row"
@@ -898,9 +898,7 @@
   .cost-entry-receive {
     .flex {
       h4 {
-        margin: 0 10px;
-        line-height: 30px;
-        font-size: 14px;
+        margin: 10px 0;
       }
     }
     .line {
diff --git a/src/design/public.less b/src/design/public.less
index 7feba680..26975289 100644
--- a/src/design/public.less
+++ b/src/design/public.less
@@ -265,4 +265,261 @@ input, button, textarea {
 }
 .vben-basic-table-header__toolbar > * {
   margin-right: 0!important;
-}
\ No newline at end of file
+}
+
+h1,
+h2,
+h3,
+h4,
+h5 {
+  font-weight: 600;
+  color: #262626;
+  padding: 0;
+  margin: 0;
+}
+// 各级标题 适配UI
+h1 {
+  font-size: 18px;
+}
+
+h2 {
+  font-size: 14px;
+  font-weight: 600!important;
+}
+h3 {
+  font-size: 14px;
+  font-weight: bold !important;
+  height: 40px;
+  line-height: 40px;
+  padding-left: 15px;
+  border-bottom: 0.7px solid #d9d9d9;
+}
+h4 {
+  font-size: 12px;
+  font-weight: 600!important;
+}
+h5 {
+  font-size: 12px;
+  color: #33383D;
+  font-weight: 400;
+}
+
+.ml10 {
+  margin-left: 10px;
+}
+// 表单详情样式
+.ds-form-detail {
+  .ant-form-item {
+    margin-bottom: 10px;
+  }
+  .ant-form-item-control-input-content {
+    white-space: nowrap;
+    width: 100%;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    font-size: 12px;
+  }
+  .ant-form-item-control-input {
+    min-height: 28px;
+  }
+  .ant-form-item-label {
+    padding: 0 !important;
+    label {
+      font-family: PingFang SC-Semibold, PingFang SC;
+      font-size: 12px;
+      color: #7A8798;
+    }
+  }
+}
+
+// handsontable 全选checkbox
+.handsontable {
+  input[type="checkbox"] {
+    border-color: #E8EBED;
+  }
+  .htCore {
+    thead {
+      tr {
+        height: 24px;
+        background: #fafafa;
+        th {
+          line-height: 22px;
+          background: #F5F9FC;
+          font-size: 12px;
+          border-color: #E8EBED;
+        }
+      }
+    }
+    tbody {
+      tr {
+        td {
+          height: 24px !important;
+          line-height: 22px;
+          font-size: 12px;
+          color: #262626;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          border-color: #E8EBED;
+        }
+      }
+    }
+  }
+  // 清除禁用状态下的下拉图标
+  .htDimmed {
+    cursor: no-drop;
+    .htAutocompleteArrow {
+      display: none;
+    }
+  }
+  .handsontableInput {
+    height: 24px !important;
+    line-height: 24px !important;
+  }
+  .hot-green {
+    color: #9acd32 !important;
+    font-weight: 600;
+  }
+  .hot-yellow {
+    background: #ffe37e !important;
+  }
+  .hot-red {
+    background-color: #ff4500;
+  }
+}
+.ds-tb-check {
+  position: absolute;
+  z-index: 199;
+  left: 15px;
+  margin-top: 9px;
+  width: 12px;
+}
+
+.ds-detail-box {
+  margin: 0 0 0 20px;
+}
+
+.flex {
+  display: flex;
+  .auto {
+    flex: 1;
+  }
+}
+
+.mt2 {
+  margin-top: 2px !important;
+}
+
+.mt5 {
+  margin-top: 5px !important;
+}
+
+.mt10 {
+  margin-top: 10px !important;
+}
+
+.mr10 {
+  margin-right: 10px !important;
+}
+
+.mb10 {
+  margin-bottom: 10px !important;
+}
+
+.ml10 {
+  margin-left: 10px !important;
+}
+
+.ds-card {
+  padding: 10px 20px;
+  background-color: #ffffff;
+  border: 0.7px solid #E8EBED;
+}
+
+.mr15 {
+  margin-right: 15px !important;
+}
+.mt15 {
+  margin-top: 15px;
+}
+.mb15 {
+  margin-bottom: 15px;
+}
+.ml15 {
+  margin-left: 15px;
+}
+
+// 表格状态使用
+.ds-green-tag,
+.ds-blue-tag,
+.ds-orange-tag,
+.ds-red-tag,
+.ds-purple-tag {
+  padding: 4px 13px;
+  border-radius: 30px;
+  font-size: 10px;
+  font-weight: 700 !important;
+  color: #ffffff;
+  display: inline-block;
+  vertical-align: bottom;
+}
+
+.ds-green-tag {
+  background-color: rgba(223, 247, 247, 1);
+  color: rgba(43, 176, 194, 1);
+}
+
+.ds-blue-tag {
+  background-color: rgba(222, 242, 255, 1);
+  color: rgba(70, 145, 255, 1);
+}
+
+.ds-orange-tag {
+  background-color: rgba(255, 232, 204, 1);
+  color: rgba(219, 146, 72, 1);
+}
+
+.ds-red-tag {
+  background-color: rgba(255, 232, 232, 1);
+  color: rgba(255, 128, 145, 1);
+}
+
+.ds-purple-tag {
+  background-color: rgba(232, 232, 255, 1);
+  color: rgba(137, 124, 222, 1);
+}
+
+// 表格状态使用（定义2）
+.ds-green-status,
+.ds-blue-status,
+.ds-orange-status,
+.ds-red-status,
+.ds-purple-status,
+.ds-grey-status {
+  font-family: Arial, Helvetica, sans-serif;
+  font-weight: 600;
+}
+
+.ds-green-status {
+  color: #419638;
+}
+
+.ds-blue-status {
+  color: #096dd9;
+}
+
+.ds-orange-status {
+  color: #e1a200;
+}
+
+.ds-red-status {
+  color: #f5222d;
+}
+
+.ds-purple-status {
+  color: #531dab;
+}
+
+.ds-grey-status {
+  color: #8c8c8c;
+}
diff --git a/src/styles/common.scss b/src/styles/common.scss
deleted file mode 100644
index 24a0ef6c..00000000
--- a/src/styles/common.scss
+++ /dev/null
@@ -1,251 +0,0 @@
-h1,
-h2,
-h3,
-h4,
-h5 {
-  font-weight: 600;
-  color: #262626;
-  padding: 0;
-  margin: 0;
-}
-// 各级标题 适配UI
-h1 {
-  font-size: 18px;
-}
-
-h2 {
-  font-size: 14px;
-  font-weight: 600!important;
-}
-h3 {
-  font-size: 14px;
-  font-weight: bold !important;
-  height: 40px;
-  line-height: 40px;
-  padding-left: 15px;
-  border-bottom: 0.7px solid #d9d9d9;
-}
-h4 {
-  font-size: 12px;
-  font-weight: 600!important;
-}
-h5 {
-  font-size: 12px;
-  color: #33383D;
-  font-weight: 400;
-}
-
-.ml10 {
-  margin-left: 10px;
-}
-// 表单详情样式
-.ds-form-detail {
-  .ant-form-item {
-    margin-bottom: 10px;
-  }
-  .ant-form-item-control-input-content {
-    white-space: nowrap;
-    width: 100%;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    font-size: 12px;
-  }
-  .ant-form-item-control-input {
-    min-height: 28px;
-  }
-  .ant-form-item-label {
-    padding: 0 !important;
-    label {
-      font-family: PingFang SC-Semibold, PingFang SC;
-      font-size: 12px;
-      color: #7A8798;
-    }
-  }
-}
-
-// handsontable 全选checkbox
-.handsontable {
-  .htCore {
-    thead {
-      tr {
-        height: 24px;
-        background: #fafafa;
-        th {
-          line-height: 22px;
-          background: #fafafa;
-          font-size: 12px;
-        }
-      }
-    }
-    tbody {
-      tr {
-        td {
-          height: 24px !important;
-          line-height: 22px;
-          font-size: 12px;
-          color: #262626;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
-      }
-    }
-  }
-  // 清除禁用状态下的下拉图标
-  .htDimmed {
-    cursor: no-drop;
-    .htAutocompleteArrow {
-      display: none;
-    }
-  }
-  .handsontableInput {
-    height: 24px !important;
-    line-height: 24px !important;
-  }
-  .hot-green {
-    color: #9acd32 !important;
-    font-weight: 600;
-  }
-  .hot-yellow {
-    background: #ffe37e !important;
-  }
-  .hot-red {
-    background-color: #ff4500;
-  }
-}
-.ds-tb-check {
-  position: absolute;
-  z-index: 199;
-  left: 15px;
-  margin-top: 9px;
-  width: 12px;
-}
-
-.ds-detail-box {
-  margin: 0 0 0 20px;
-}
-
-.flex {
-  display: flex;
-  .auto {
-    flex: 1;
-  }
-}
-
-.mt2 {
-  margin-top: 2px !important;
-}
-
-.mt5 {
-  margin-top: 5px !important;
-}
-
-.mt10 {
-  margin-top: 10px !important;
-}
-
-.mr10 {
-  margin-right: 10px !important;
-}
-
-.mb10 {
-  margin-bottom: 10px !important;
-}
-
-.ml10 {
-  margin-left: 10px !important;
-}
-
-.ds-card {
-  padding: 10px 20px;
-  background-color: #ffffff;
-  border: 0.7px solid #E8EBED;
-}
-
-.mr15 {
-  margin-right: 15px !important;
-}
-.mt15 {
-  margin-top: 15px;
-}
-.mb15 {
-  margin-bottom: 15px;
-}
-.ml15 {
-  margin-left: 15px;
-}
-
-// 表格状态使用
-.ds-green-tag,
-.ds-blue-tag,
-.ds-orange-tag,
-.ds-red-tag,
-.ds-purple-tag {
-  padding: 4px 13px;
-  border-radius: 30px;
-  font-size: 10px;
-  font-weight: 700 !important;
-  color: #ffffff;
-  display: inline-block;
-  vertical-align: bottom;
-}
-
-.ds-green-tag {
-  background-color: rgba(223, 247, 247, 1);
-  color: rgba(43, 176, 194, 1);
-}
-
-.ds-blue-tag {
-  background-color: rgba(222, 242, 255, 1);
-  color: rgba(70, 145, 255, 1);
-}
-
-.ds-orange-tag {
-  background-color: rgba(255, 232, 204, 1);
-  color: rgba(219, 146, 72, 1);
-}
-
-.ds-red-tag {
-  background-color: rgba(255, 232, 232, 1);
-  color: rgba(255, 128, 145, 1);
-}
-
-.ds-purple-tag {
-  background-color: rgba(232, 232, 255, 1);
-  color: rgba(137, 124, 222, 1);
-}
-
-// 表格状态使用（定义2）
-.ds-green-status,
-.ds-blue-status,
-.ds-orange-status,
-.ds-red-status,
-.ds-purple-status,
-.ds-grey-status {
-  font-family: Arial, Helvetica, sans-serif;
-  font-weight: 600;
-}
-
-.ds-green-status {
-  color: #419638;
-}
-
-.ds-blue-status {
-  color: #096dd9;
-}
-
-.ds-orange-status {
-  color: #e1a200;
-}
-
-.ds-red-status {
-  color: #f5222d;
-}
-
-.ds-purple-status {
-  color: #531dab;
-}
-
-.ds-grey-status {
-  color: #8c8c8c;
-}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index de4ff23f..5e587711 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -1,6 +1,5 @@
 // import dark theme
 @use "element-plus/theme-chalk/src/dark/css-vars.scss" as *;
-@import './common.scss';
 :root {
   .el-segmented {
     --el-segmented-radius: var(--el-border-radius-base);