Merge branch 'master' of D:\wuweihua\BMS with conflicts.

Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
2026-10-28 15:32:21 +08:00 · 2026-10-28 15:30:47 +08:00 · 2026-10-28 09:28:14 +08:00 · 2026-10-27 18:25:18 +08:00 · 2026-10-27 17:51:40 +08:00 · 2026-10-27 16:25:11 +08:00
1 changed files with 5 additions and 5 deletions
@@ -124,7 +124,7 @@
            @click="openBatchFee"
          >批量增加费用</el-button>
        </el-col>
-        <el-col :span="1.5">
+        <!-- <el-col :span="1.5">
          <el-button
            type="primary"
            plain
@@ -132,7 +132,7 @@
            v-hasPermi="['price:billing:chargeWeightEdit']"
            @click="openChargeWeightImport"
          >批量修改计费重</el-button>
-        </el-col>
+        </el-col> -->
        <el-col :span="1.5">
          <el-button
            type="info"
@@ -163,14 +163,14 @@
      </template>
      <template #col-action="{ row }">
        <el-button link type="primary" icon="View" @click="handleView(row)">查看</el-button>
-        <el-button
+        <!-- <el-button
          link
          type="primary"
          icon="Edit"
          :disabled="row.refundStatus === 'REFUNDED'"
          v-hasPermi="['price:billing:chargeWeightEdit']"
          @click="openEditChargeWeight(row)"
-        >改计费重</el-button>
+        >改计费重</el-button> -->
        <el-button
          link
          type="danger"
@@ -460,7 +460,7 @@ const columns = [
  { label: '销售员', prop: 'belongSaler', minWidth: 100, showOverflowTooltip: true },
  { label: '结算员', prop: 'settlementMan', minWidth: 100, showOverflowTooltip: true },
  { label: '客服员', prop: 'serviceMan', minWidth: 100, showOverflowTooltip: true },
-  { label: '操作', prop: 'action', align: 'center', width: 240, fixed: 'right', slot: 'action', showInToolbar: false, showOverflowTooltip: false }
+  { label: '操作', prop: 'action', align: 'center', width: 150, fixed: 'right', slot: 'action', showInToolbar: false, showOverflowTooltip: false }
 ]
 const arrearsStatusOptions = [
Author	SHA1	Message	Date
wuweihua	9a393fe7dc	Merge branch 'master' of D:\wuweihua\BMS with conflicts.	2026-10-28 15:32:21 +08:00
wuweihua	a2468099c2	Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.	2026-10-28 15:30:47 +08:00
caojia	cbed4dc2a3	Merge branch 'test'	2026-10-28 09:28:14 +08:00
caojia	d66b96b2ff	Merge branch 'test'	2026-10-27 18:25:18 +08:00
wuweihua	cdfc90556d	隐藏修改计费重	2026-10-27 17:51:40 +08:00
wuweihua	dfa90d6e33	Merge branch 'master' of D:\wuweihua\BMS with conflicts.	2026-10-27 16:25:11 +08:00
wuweihua	4a34075022	Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.	2026-10-27 16:24:36 +08:00
wuweihua	6a03300f2f	Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.	2026-10-27 10:31:58 +08:00
liuminghui	7496f8cbc6	Merge branch 'test'	2026-10-27 10:21:57 +08:00
wuweihua	2f2305825a	Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.	2026-10-27 01:10:31 +08:00
wuweihua	b79cd6f995	Merge branch 'master' of D:\wuweihua\BMS with conflicts.	2026-10-27 00:17:37 +08:00
wuweihua	70a3c34c20	Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.	2026-10-27 00:16:40 +08:00
caojia	2b5633190e	Merge branch 'test'	2026-10-26 18:01:23 +08:00
wuweihua	77dfb4291b	Merge remote-tracking branch 'origin/test'	2026-10-26 17:13:44 +08:00
caojia	d71b7f04fe	Merge branch 'test'	2026-10-26 17:09:01 +08:00
caojia	f8ae347846	Merge branch 'test'	2026-10-26 16:39:11 +08:00
wuweihua	94991a1ed3	Merge pull request '修改操作文档' (#1 ) from test into master Reviewed-on: #1	2026-10-26 15:23:59 +08:00