新需求

src/components/byTable/index.vue

@@ -119,8 +119,8 @@
 
       <el-row v-if="!hidePagination" class="table-pagination" justify="end" type="flex">
         <el-pagination background layout="total, sizes, prev, pager, next, jumper" :current-page="getPagination.pageNum"
-                       :page-size="getPagination.pageSize" :page-sizes="[10,50,100,500,1000]" :total="getPagination.total"
-                       @size-change="handleSizeChange" @current-change="handlePageChange" />
+                       :page-size="getPagination.pageSize" :page-sizes="[10,50,100,500]" :total="getPagination.total" @size-change="handleSizeChange"
+                       @current-change="handlePageChange" />
       </el-row>
     </component>
   </div>

src/views/process/processApproval/index.vue

@@ -71,7 +71,7 @@
     </div>
     <div class="right-card">
       <el-tabs v-model="activeName" class="demo-tabs">
-        <el-tab-pane label="处理意见" name="first">
+        <el-tab-pane label="处理意见" name="first" v-if="route.query.processType != 20">
           <div style="overflow: auto; height: calc(100vh - 240px)">
             <el-form :model="flowForm" :rules="flowRules" ref="flowFormDom">
               <el-form-item prop="remark" label-width="0px" label="">
@@ -693,6 +693,9 @@ const getRecords = (_id) => {
 };
 //d
 onMounted(async () => {
+  if (route.query && route.query.processType == 20) {
+    activeName.value = "second";
+  }
   //processType 10 为修改 20为查看 30回退发起
   if (
     route.query.processType == 10 ||

src/views/purchaseSales/outAndInWarehouse/record/index.vue

@@ -3,11 +3,12 @@
     <div class="content">
       <byTable :source="sourceList.data" :pagination="sourceList.pagination" :config="config" :loading="loading" :selectConfig="selectConfig"
                highlight-current-row :action-list="[
-          {
+         
+        ]" @get-list="getList">
+        <!-- {
             text: '导出Excel',
             action: () => deriveExcel(),
-          },
-        ]" @get-list="getList">
+          }, -->
         <template #warehouseName="{ item }">
           <div>
             <!-- <span v-if="item.opType == 1">{{ item.toWarehouseName }}</span>

src/views/salesMange/salesMange/profitSettlement/index.vue

@@ -620,12 +620,12 @@ const formBudgetData = reactive({
   data: {},
 });
 const formBudgetRules = ref({
-  trailerFee: [{ required: true, message: "请输入拖车费", trigger: "blur" }],
-  inspectionRedPackFee: [
-    { required: true, message: "请输入验收红包", trigger: "blur" },
-  ],
-  commissionFee: [{ required: true, message: "请输入佣金", trigger: "blur" }],
-  otherFee: [{ required: true, message: "请输入其他费用", trigger: "blur" }],
+  // trailerFee: [{ required: true, message: "请输入拖车费", trigger: "blur" }],
+  // inspectionRedPackFee: [
+  //   { required: true, message: "请输入验收红包", trigger: "blur" },
+  // ],
+  // commissionFee: [{ required: true, message: "请输入佣金", trigger: "blur" }],
+  // otherFee: [{ required: true, message: "请输入其他费用", trigger: "blur" }],
 });
 const formBudgetConfig = computed(() => {
   return [