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

# 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.

bms-front/src/views/price/billing/bill.vue

@@ -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 = [