部分列表调整

src/views/basic_data/dealer/dealer_deposit.vue

@@ -15,35 +15,17 @@
     </el-card> -->
       <!-- 筛选条件 -->
       <div>
-        <el-form
-          ref="searchForm"
-          :model="searchForm"
-          label-width="100px"
-          size="small"
-          label-position="left"
-        >
+        <el-form ref="searchForm" :model="searchForm" label-width="100px" size="small" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商名称" prop="customerName">
-                <el-input
-                  v-model="searchForm.customerName"
-                  placeholder="请输入经销商名称"
-                ></el-input>
+                <el-input v-model="searchForm.customerName" placeholder="请输入经销商名称"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="状态" prop="currentStatus">
-                <el-select
-                  class="selectStyle"
-                  v-model="searchForm.currentStatus"
-                  placeholder="请选择"
-                >
-                  <el-option
-                    v-for="item in statusList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+                <el-select class="selectStyle" v-model="searchForm.currentStatus" placeholder="请选择">
+                  <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -52,9 +34,7 @@
             <el-col :xs="24" :sm="12" :lg="12">
               <el-form-item label="" class="fr">
                 <el-button size="small" @click="clearFn">清空</el-button>
-                <el-button size="small" type="primary" @click="searchFn"
-                  >搜索</el-button
-                >
+                <el-button size="small" type="primary" @click="searchFn">搜索</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -63,25 +43,11 @@
       <!-- 按钮 -->
       <div class="btn-group clearfix">
         <div class="fl">
-          <el-button
-            v-if="$checkBtnRole('add', $route.meta.roles)"
-            type="primary"
-            size="small"
-            @click="addFn"
-            >新增</el-button
-          >
+          <el-button v-if="$checkBtnRole('add', $route.meta.roles)" type="primary" size="small" @click="addFn">新增</el-button>
         </div>
         <div class="fr">
-          <el-button type="primary" size="small" @click="downLoadFn"
-            >模板</el-button
-          >
-          <el-upload
-            class="import-btn"
-            action=""
-            :http-request="handleImport"
-            :file-list="importFileList"
-            :show-file-list="false"
-          >
+          <el-button type="primary" size="small" @click="downLoadFn">模板</el-button>
+          <el-upload class="import-btn" action="" :http-request="handleImport" :file-list="importFileList" :show-file-list="false">
             <el-button type="primary" size="small">批量导入</el-button>
           </el-upload>
         </div>
@@ -90,142 +56,31 @@
       <div class="mymain-container">
         <!-- 列表 -->
         <div class="table">
-          <el-table
-            v-loading="listLoading"
-            :data="dataList"
-            element-loading-text="Loading"
-            border
-            fit
-            highlight-current-row
-            stripe
-          >
-            <el-table-column
-              align="center"
-              label="经销商编码"
-              prop="customerNumber"
-              min-width="160"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="center"
-              label="经销商名称"
-              prop="customerName"
-              min-width="160"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="center"
-              label="押金比例"
-              prop="rate"
-              min-width="160"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="center"
-              label="押金"
-              prop="amount"
-              min-width="160"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="center"
-              label="状态"
-              prop="currentStatus"
-              min-width="160"
-              show-overflow-tooltip
-            >
+          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+            <el-table-column align="center" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip />
+            <el-table-column align="center" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip />
+            <el-table-column align="center" label="押金比例" prop="rate" min-width="100" show-overflow-tooltip />
+            <el-table-column align="center" label="押金" prop="amount" min-width="100" show-overflow-tooltip />
+            <el-table-column align="center" label="状态" prop="currentStatus" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-tag type="info" v-if="scope.row.currentStatus == '未开始'"
-                  >未开始</el-tag
-                >
-                <el-tag
-                  type="success"
-                  v-if="scope.row.currentStatus == '生效中'"
-                  >生效中</el-tag
-                >
-                <el-tag type="danger" v-if="scope.row.currentStatus == '已结束'"
-                  >已结束</el-tag
-                >
+                <el-tag type="info" v-if="scope.row.currentStatus == '未开始'">未开始</el-tag>
+                <el-tag type="success" v-if="scope.row.currentStatus == '生效中'">生效中</el-tag>
+                <el-tag type="danger" v-if="scope.row.currentStatus == '已结束'">已结束</el-tag>
               </template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              label="开始时间"
-              prop="startTime"
-              min-width="160"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="center"
-              label="结束时间"
-              prop="endTime"
-              min-width="160"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="center"
-              label="备注"
-              prop="remark"
-              min-width="160"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="center"
-              label="创建人"
-              prop="createBy"
-              min-width="160"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="center"
-              label="创建时间"
-              prop="createTime"
-              min-width="160"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="center"
-              label="更新人"
-              prop="updateBy"
-              min-width="160"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="center"
-              label="更新时间"
-              prop="updateTime"
-              min-width="160"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="center"
-              label="操作"
-              min-width="200"
-              show-overflow-tooltip
-              fixed="right"
-            >
+            <el-table-column align="center" label="开始时间" prop="startTime" min-width="160" show-overflow-tooltip />
+            <el-table-column align="center" label="结束时间" prop="endTime" min-width="160" show-overflow-tooltip />
+            <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip />
+            <el-table-column align="center" label="创建人" prop="createBy" min-width="160" show-overflow-tooltip />
+            <el-table-column align="center" label="创建时间" prop="createTime" min-width="160" show-overflow-tooltip />
+            <el-table-column align="center" label="更新人" prop="updateBy" min-width="160" show-overflow-tooltip />
+            <el-table-column align="center" label="更新时间" prop="updateTime" min-width="160" show-overflow-tooltip />
+            <el-table-column align="center" label="操作" min-width="200" show-overflow-tooltip fixed="right">
               <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  class="textColor"
-                  v-if="$checkBtnRole('edit', $route.meta.roles)"
-                  @click="editFn(scope.row.id)"
-                  >编辑</el-button
-                >
-                <el-button
-                  type="text"
-                  class="textColor"
-                  @click="logFn(scope.row.id)"
-                  >记录</el-button
-                >
-                <el-popconfirm
-                  @onConfirm="deleFn(scope.row.id)"
-                  v-if="$checkBtnRole('del', $route.meta.roles)"
-                  title="这是一段内容确定删除吗？"
-                >
-                  <el-button type="text" class="textColor" slot="reference"
-                    >删除</el-button
-                  >
+                <el-button type="text" class="textColor" v-if="$checkBtnRole('edit', $route.meta.roles)" @click="editFn(scope.row.id)">编辑</el-button>
+                <el-button type="text" class="textColor" @click="logFn(scope.row.id)">记录</el-button>
+                <el-popconfirm @onConfirm="deleFn(scope.row.id)" v-if="$checkBtnRole('del', $route.meta.roles)" title="这是一段内容确定删除吗？">
+                  <el-button type="text" class="textColor" slot="reference">删除</el-button>
                 </el-popconfirm>
               </template>
             </el-table-column>
@@ -233,105 +88,44 @@
         </div>
         <!-- 分页 -->
         <div class="fr">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            :page-sizes="[10, 20, 30, 50]"
-            :page-size="10"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="listTotal"
-          >
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
           </el-pagination>
         </div>
       </div>
 
       <!-- 弹窗 -->
-      <el-dialog
-        :title="title"
-        :visible.sync="showDialog"
-        width="30%"
-        :show-close="false"
-        :close-on-click-modal="false"
-      >
-        <el-form
-          ref="dialogForm"
-          :model="dialogForm"
-          :rules="rules"
-          label-width="110px"
-          label-position="right"
-        >
+      <el-dialog :title="title" :visible.sync="showDialog" width="30%" :show-close="false" :close-on-click-modal="false">
+        <el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="110px" label-position="right">
           <el-form-item label="经销商名称" prop="customerId">
-            <el-select
-              class="inputStyle"
-              v-model="dialogForm.customerId"
-              placeholder="请选择"
-              filterable
-            >
-              <el-option
-                v-for="item in dealerList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              >
+            <el-select class="inputStyle" v-model="dialogForm.customerId" placeholder="请选择" filterable>
+              <el-option v-for="item in dealerList" :key="item.id" :label="item.name" :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
 
           <el-form-item label="押金比例" prop="rate">
-            <el-input
-              placeholder="请输入押金比例"
-              v-model.number="dialogForm.rate"
-              class="inputStyle"
-            >
+            <el-input placeholder="请输入押金比例" v-model.number="dialogForm.rate" class="inputStyle">
               <i class="el-input__icon" slot="suffix">% </i>
             </el-input>
           </el-form-item>
           <el-form-item label="" prop="">
-            <el-slider
-              class="inputStyle"
-              v-model="dialogForm.rate"
-              :marks="marks"
-            >
+            <el-slider class="inputStyle" v-model="dialogForm.rate" :marks="marks">
             </el-slider>
           </el-form-item>
 
           <el-form-item label="押金定额金额" prop="amount">
-            <el-input
-              placeholder="请输入押金定额"
-              v-model.number="dialogForm.amount"
-              class="inputStyle"
-            ></el-input>
+            <el-input placeholder="请输入押金定额" v-model.number="dialogForm.amount" class="inputStyle"></el-input>
           </el-form-item>
           <el-form-item label="开始时间" prop="startTime">
-            <el-date-picker
-              class="inputStyle"
-              v-model="dialogForm.startTime"
-              type="datetime"
-              placeholder="选择日期时间"
-              default-time="00:00:00"
-              value-format="yyyy-MM-dd HH:mm:ss"
-            >
+            <el-date-picker class="inputStyle" v-model="dialogForm.startTime" type="datetime" placeholder="选择日期时间" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="结束时间" prop="">
-            <el-date-picker
-              class="inputStyle"
-              v-model="dialogForm.endTime"
-              type="datetime"
-              placeholder="选择日期时间"
-              default-time="23:59:59"
-              value-format="yyyy-MM-dd HH:mm:ss"
-            >
+            <el-date-picker class="inputStyle" v-model="dialogForm.endTime" type="datetime" placeholder="选择日期时间" default-time="23:59:59" value-format="yyyy-MM-dd HH:mm:ss">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="备注" prop="remark">
-            <el-input
-              type="textarea"
-              v-model="dialogForm.remark"
-              placeholder="请输入备注信息"
-              class="inputStyle"
-            ></el-input>
+            <el-input type="textarea" v-model="dialogForm.remark" placeholder="请输入备注信息" class="inputStyle"></el-input>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">

src/views/basic_data/dealer/dealer_list.vue

@@ -3,29 +3,18 @@
     <div v-if="isShow">
       <!-- 筛选条件 -->
       <div>
-        <el-form
-          ref="searchForm"
-          :model="searchForm"
-          label-width="70px"
-          size="small"
-          label-position="left"
-        >
+        <el-form ref="searchForm" :model="searchForm" label-width="70px" size="small" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="名称" prop="keyword">
-                <el-input
-                  v-model="searchForm.keyword"
-                  placeholder="请输入名称"
-                ></el-input>
+                <el-input v-model="searchForm.keyword" placeholder="请输入名称"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="clearFn">清空</el-button>
-                <el-button size="small" type="primary" @click="searchFn"
-                  >搜索</el-button
-                >
+                <el-button size="small" type="primary" @click="searchFn">搜索</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -40,106 +29,31 @@
 
       <div class="mymain-container">
         <div class="table">
-          <el-table
-            v-loading="listLoading"
-            :data="dataList"
-            element-loading-text="Loading"
-            border
-            fit
-            highlight-current-row
-            stripe
-          >
-            <el-table-column
-              align="center"
-              label="客户编码"
-              prop="number"
-              min-width="160"
-              label-class-name="bianma"
-              class-name="fontstyle"
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="客户名称"
-              prop="name"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="简称"
-              prop="shortName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
+          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+            <el-table-column align="center" label="客户编码" prop="number" min-width="100"></el-table-column>
+            <el-table-column align="center" label="客户名称" prop="name" min-width="260" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="简称" prop="shortName" min-width="200" show-overflow-tooltip></el-table-column>
 
-            <el-table-column
-              prop="forbidStatus"
-              align="center"
-              label="禁用状态"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="forbidStatus" align="center" label="禁用状态" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-tag type="success" v-if="scope.row.forbidStatus === 'A'"
-                  >正常</el-tag
-                >
-                <el-tag type="danger" v-else-if="scope.row.flag === 'B'"
-                  >禁用</el-tag
-                >
+                <el-tag type="success" v-if="scope.row.forbidStatus === 'A'">正常</el-tag>
+                <el-tag type="danger" v-else-if="scope.row.flag === 'B'">禁用</el-tag>
               </template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              label="使用组织"
-              prop="useOrgName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="更新人"
-              prop="updateBy"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="更新时间"
-              prop="updateTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
+            <el-table-column align="center" label="使用组织" prop="useOrgName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="更新人" prop="updateBy" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="更新时间" prop="updateTime" min-width="160" show-overflow-tooltip></el-table-column>
 
-            <el-table-column
-              align="center"
-              label="操作"
-              prop="caozuo"
-              min-width="160"
-              show-overflow-tooltip
-              fixed="right"
-            >
+            <el-table-column align="center" label="操作" prop="caozuo" min-width="160" show-overflow-tooltip fixed="right">
               <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  class="textColor"
-                  @click="editFn(scope.row.id)"
-                  >详情</el-button
-                >
+                <el-button type="text" class="textColor" @click="editFn(scope.row.id)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
         </div>
         <!-- 分页 -->
         <div class="fr">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            :page-sizes="[10, 20, 30, 50]"
-            :page-size="10"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="listTotal"
-          >
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
           </el-pagination>
         </div>
       </div>

src/views/basic_data/dealer/dealer_stock.vue

@@ -2,29 +2,18 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <el-form
-        ref="searchForm"
-        :model="searchForm"
-        label-width="100px"
-        size="small"
-        label-position="left"
-      >
+      <el-form ref="searchForm" :model="searchForm" label-width="100px" size="small" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="经销商名称" prop="customerName">
-              <el-input
-                v-model="searchForm.customerName"
-                placeholder="请输入经销商名称"
-              ></el-input>
+              <el-input v-model="searchForm.customerName" placeholder="请输入经销商名称"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :xs="24" :sm="12" :lg="18">
             <el-form-item label="" class="fr">
               <el-button size="small" @click="clearFn">清空</el-button>
-              <el-button size="small" type="primary" @click="searchFn"
-                >搜索</el-button
-              >
+              <el-button size="small" type="primary" @click="searchFn">搜索</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -33,42 +22,14 @@
 
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button
-          v-if="$checkBtnRole('add', $route.meta.roles)"
-          type="primary"
-          size="small"
-          @click="addFn"
-          class="add-right"
-          icon="el-icon-plus"
-          >新增</el-button
-        >
-        <el-popconfirm
-          v-if="$checkBtnRole('del', $route.meta.roles)"
-          @onConfirm="deleFn"
-          title="这是一段内容确定删除吗？"
-        >
-          <el-button
-            :disabled="ids.length < 1"
-            type="danger"
-            size="small"
-            class="textColor"
-            icon="el-icon-minus"
-            slot="reference"
-            >批量删除</el-button
-          >
+        <el-button v-if="$checkBtnRole('add', $route.meta.roles)" type="primary" size="small" @click="addFn" class="add-right" icon="el-icon-plus">新增</el-button>
+        <el-popconfirm v-if="$checkBtnRole('del', $route.meta.roles)" @onConfirm="deleFn" title="这是一段内容确定删除吗？">
+          <el-button :disabled="ids.length < 1" type="danger" size="small" class="textColor" icon="el-icon-minus" slot="reference">批量删除</el-button>
         </el-popconfirm>
       </div>
       <div class="fr">
-        <el-button type="primary" size="small" @click="downLoadFn"
-          >下载模板</el-button
-        >
-        <el-upload
-          class="import-btn"
-          action=""
-          :http-request="handleImport"
-          :file-list="importFileList"
-          :show-file-list="false"
-        >
+        <el-button type="primary" size="small" @click="downLoadFn">下载模板</el-button>
+        <el-upload class="import-btn" action="" :http-request="handleImport" :file-list="importFileList" :show-file-list="false">
           <el-button type="primary" size="small">导入</el-button>
         </el-upload>
       </div>
@@ -77,151 +38,39 @@
     <div class="mymain-container">
       <!-- 列表 -->
       <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          @select="hanleSelect"
-          @select-all="hanleSelect"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column
-            type="selection"
-            align="center"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="经销商编码"
-            prop="customerNumber"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="经销商名称"
-            prop="customerName"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="钱包名称"
-            prop="customerWalletName"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="业务员"
-            prop="serviceName"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="创建人"
-            prop="createBy"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="创建时间"
-            prop="createTime"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="更新人"
-            prop="updateBy"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="更新时间"
-            prop="updateTime"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="操作"
-            prop="caozuo"
-            min-width="160"
-            show-overflow-tooltip
-            fixed="right"
-          >
+        <el-table v-loading="listLoading" :data="dataList" @select="hanleSelect" @select-all="hanleSelect" element-loading-text="Loading" border fit highlight-current-row stripe>
+          <el-table-column type="selection" align="center" min-width="100"></el-table-column>
+          <el-table-column align="center" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="钱包名称" prop="customerWalletName" min-width="200" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="业务员" prop="serviceName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="创建人" prop="createBy" min-width="180" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="创建时间" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="更新人" prop="updateBy" min-width="180" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="更新时间" prop="updateTime" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="操作" prop="caozuo" min-width="160" show-overflow-tooltip fixed="right">
             <template slot-scope="scope">
-              <el-button
-                type="text"
-                class="textColor"
-                v-if="$checkBtnRole('edit', $route.meta.roles)"
-                @click="editFn(scope.row.id)"
-                >编辑</el-button
-              >
-              <el-popconfirm
-                @onConfirm="deleFn(scope.row.id)"
-                v-if="$checkBtnRole('del', $route.meta.roles)"
-                title="这是一段内容确定删除吗？"
-              >
-                <el-button type="text" class="textColor" slot="reference"
-                  >删除</el-button
-                ></el-popconfirm
-              >
+              <el-button type="text" class="textColor" v-if="$checkBtnRole('edit', $route.meta.roles)" @click="editFn(scope.row.id)">编辑</el-button>
+              <el-popconfirm @onConfirm="deleFn(scope.row.id)" v-if="$checkBtnRole('del', $route.meta.roles)" title="这是一段内容确定删除吗？">
+                <el-button type="text" class="textColor" slot="reference">删除</el-button>
+              </el-popconfirm>
             </template>
           </el-table-column>
         </el-table>
       </div>
       <!-- 分页 -->
       <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
         </el-pagination>
       </div>
     </div>
 
     <!-- 弹窗 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="dialogForm"
-      width="30%"
-      :show-close="false"
-      :close-on-click-modal="false"
-    >
-      <el-form
-        ref="addForm"
-        :model="addForm"
-        :rules="rules"
-        label-width="100px"
-        label-position="right"
-      >
+    <el-dialog :title="title" :visible.sync="dialogForm" width="30%" :show-close="false" :close-on-click-modal="false">
+      <el-form ref="addForm" :model="addForm" :rules="rules" label-width="100px" label-position="right">
         <el-form-item label="经销商名称" prop="customerId">
-          <el-select
-            filterable
-            class="selectStyle"
-            v-model="addForm.customerId"
-            placeholder="请选择"
-            @change="changeFn"
-          >
-            <el-option
-              v-for="item in dealerList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            >
+          <el-select filterable class="selectStyle" v-model="addForm.customerId" placeholder="请选择" @change="changeFn">
+            <el-option v-for="item in dealerList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -232,30 +81,13 @@
           </template> -->
         </el-form-item>
         <el-form-item label="钱包" prop="customerWalletId">
-          <el-select
-            class="selectStyle"
-            v-model="addForm.customerWalletId"
-            placeholder="请选择"
-            filterable
-          >
-            <el-option
-              v-for="item in walletList"
-              :key="item.customerWalletId"
-              :label="item.customerWalletName"
-              :value="item.customerWalletId"
-            >
+          <el-select class="selectStyle" v-model="addForm.customerWalletId" placeholder="请选择" filterable>
+            <el-option v-for="item in walletList" :key="item.customerWalletId" :label="item.customerWalletName" :value="item.customerWalletId">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="区域" prop="region">
-          <el-cascader
-            ref="locationCascader"
-            v-model="addForm.region"
-            class="selectStyle"
-            :options="options"
-            :props="props"
-            clearable
-          ></el-cascader>
+          <el-cascader ref="locationCascader" v-model="addForm.region" class="selectStyle" :options="options" :props="props" clearable></el-cascader>
         </el-form-item>
         <!-- <el-form-item label="一级区域" prop="oneParentId">
           <el-select
@@ -309,18 +141,8 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="对应业务员" prop="serviceId">
-          <el-select
-            class="selectStyle"
-            v-model="addForm.serviceId"
-            placeholder="请选择"
-            filterable
-          >
-            <el-option
-              v-for="(item, i) in userList"
-              :key="i"
-              :label="item.nickName"
-              :value="item.adminUserId"
-            >
+          <el-select class="selectStyle" v-model="addForm.serviceId" placeholder="请选择" filterable>
+            <el-option v-for="(item, i) in userList" :key="i" :label="item.nickName" :value="item.adminUserId">
             </el-option>
           </el-select>
         </el-form-item>

src/views/basic_data/material/classify_list.vue

@@ -2,42 +2,20 @@
   <div class="app-container">
     <div class="main-content">
       <div class="main-left">
-        <el-button
-          icon="el-icon-plus"
-          type="primary"
-          plain
-          style="width: 100%"
-          v-if="$checkBtnRole('add', $route.meta.roles)"
-          @click="openAddGroupForm('add')"
-          >新建分组</el-button
-        >
+        <el-button icon="el-icon-plus" type="primary" plain style="width: 100%" v-if="$checkBtnRole('add', $route.meta.roles)" @click="openAddGroupForm('add')">新建分组</el-button>
         <div class="list">
           <div class="item">
             <strong class="title">所有分组</strong>
           </div>
-          <div
-            class="item"
-            :class="activeGroup === v.productCategoryId ? 'active' : ''"
-            v-for="v in categoryList"
-            :key="v.productCategoryId"
-            @click="changeGroup(v.productCategoryId, v)"
-          >
+          <div class="item" :class="activeGroup === v.productCategoryId ? 'active' : ''" v-for="v in categoryList" :key="v.productCategoryId" @click="changeGroup(v.productCategoryId, v)">
             <div class="title">{{ v.productCategoryName }}</div>
             <el-dropdown trigger="click" @command="handleCommand">
               <span class="el-dropdown-link">
                 <i class="el-icon-more icon-more"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
-                  :command="['edit', v]"
-                  v-if="$checkBtnRole('edit', $route.meta.roles)"
-                  >修改名称</el-dropdown-item
-                >
-                <el-dropdown-item
-                  :command="['del', v]"
-                  v-if="$checkBtnRole('del', $route.meta.roles)"
-                  >删除分组</el-dropdown-item
-                >
+                <el-dropdown-item :command="['edit', v]" v-if="$checkBtnRole('edit', $route.meta.roles)">修改名称</el-dropdown-item>
+                <el-dropdown-item :command="['del', v]" v-if="$checkBtnRole('del', $route.meta.roles)">删除分组</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
@@ -46,37 +24,23 @@
       <div class="main-right">
         <!-- 筛选条件 -->
         <div>
-          <el-form
-            ref="searchForm"
-            :model="searchForm"
-            label-width="70px"
-            size="small"
-            label-position="left"
-          >
+          <el-form ref="searchForm" :model="searchForm" label-width="70px" size="small" label-position="left">
             <el-row :gutter="20">
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="编码" prop="productCategoryNumber">
-                  <el-input
-                    v-model="searchForm.productCategoryNumber"
-                    placeholder="请输入"
-                  ></el-input>
+                  <el-input v-model="searchForm.productCategoryNumber" placeholder="请输入"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="名称" prop="productCategoryName">
-                  <el-input
-                    v-model="searchForm.productCategoryName"
-                    placeholder="请输入"
-                  ></el-input>
+                  <el-input v-model="searchForm.productCategoryName" placeholder="请输入"></el-input>
                 </el-form-item>
               </el-col>
 
               <el-col :xs="24" :sm="24" :lg="12" class="tr">
                 <el-form-item label="">
                   <el-button size="small" @click="clearFn">清空</el-button>
-                  <el-button size="small" type="primary" @click="searchFn"
-                    >搜索</el-button
-                  >
+                  <el-button size="small" type="primary" @click="searchFn">搜索</el-button>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -85,63 +49,19 @@
         <!-- 按钮 -->
         <div class="btn-group clearfix">
           <div class="fl">
-            <el-button
-              v-if="$checkBtnRole('add', $route.meta.roles)"
-              type="primary"
-              size="small"
-              @click="addCategoryFn"
-              >添加类别</el-button
-            >
+            <el-button v-if="$checkBtnRole('add', $route.meta.roles)" type="primary" size="small" @click="addCategoryFn">添加类别</el-button>
           </div>
         </div>
         <div class="mymain-container">
           <!-- 列表 -->
           <div class="table">
-            <el-table
-              v-loading="listLoading"
-              :data="dataList"
-              element-loading-text="Loading"
-              border
-              fit
-              highlight-current-row
-              stripe
-            >
-              <el-table-column
-                align="center"
-                label="编码"
-                prop="kingDeeCategoryNumber"
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="品类"
-                prop="kingDeeCategoryName"
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="操作"
-                min-width="160"
-                show-overflow-tooltip
-              >
+            <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+              <el-table-column align="center" label="编码" prop="kingDeeCategoryNumber" min-width="160" show-overflow-tooltip></el-table-column>
+              <el-table-column align="center" label="品类" prop="kingDeeCategoryName" min-width="160" show-overflow-tooltip></el-table-column>
+              <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <el-popconfirm
-                    confirm-button-text="好的"
-                    cancel-button-text="不用了"
-                    icon="el-icon-info"
-                    icon-color="red"
-                    title="内容确定删除吗？"
-                    @onConfirm="hanleDelete(scope.row.id)"
-                  >
-                    <el-button
-                      slot="reference"
-                      type="text"
-                      class="textColor el-popover-left"
-                      v-if="$checkBtnRole('del', $route.meta.roles)"
-                      >删除</el-button
-                    >
+                  <el-popconfirm confirm-button-text="好的" cancel-button-text="不用了" icon="el-icon-info" icon-color="red" title="内容确定删除吗？" @onConfirm="hanleDelete(scope.row.id)">
+                    <el-button slot="reference" type="text" class="textColor el-popover-left" v-if="$checkBtnRole('del', $route.meta.roles)">删除</el-button>
                   </el-popconfirm>
                 </template>
               </el-table-column>
@@ -162,40 +82,14 @@
       </div>
     </div>
     <!-- 新增编辑分组 -->
-    <el-dialog
-      :title="addGroupFormType == 'add' ? '新建分组' : '编辑分组'"
-      :visible.sync="addGroupFormVisible"
-      :show-close="false"
-      width="40%"
-      :close-on-click-modal="false"
-    >
-      <el-form
-        ref="addGroupForm"
-        :model="addGroupForm"
-        label-position="left"
-        label-width="80px"
-      >
+    <el-dialog :title="addGroupFormType == 'add' ? '新建分组' : '编辑分组'" :visible.sync="addGroupFormVisible" :show-close="false" width="40%" :close-on-click-modal="false">
+      <el-form ref="addGroupForm" :model="addGroupForm" label-position="left" label-width="80px">
         <el-form-item label="分组名称" prop="">
-          <el-input
-            autocomplete="off"
-            v-model="addGroupForm.productCategoryName"
-            placeholder="请输入分组名称"
-          ></el-input>
+          <el-input autocomplete="off" v-model="addGroupForm.productCategoryName" placeholder="请输入分组名称"></el-input>
         </el-form-item>
         <el-form-item label="编码" prop="">
-          <el-input
-            autocomplete="off"
-            v-model="addGroupForm.productCategoryNumber"
-            placeholder="请输入"
-            v-if="addGroupFormType == 'add'"
-          ></el-input>
-          <el-input
-            v-else
-            autocomplete="off"
-            v-model="addGroupForm.productCategoryNumber"
-            placeholder="请输入"
-            disabled="disabled"
-          ></el-input>
+          <el-input autocomplete="off" v-model="addGroupForm.productCategoryNumber" placeholder="请输入" v-if="addGroupFormType == 'add'"></el-input>
+          <el-input v-else autocomplete="off" v-model="addGroupForm.productCategoryNumber" placeholder="请输入" disabled="disabled"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -204,13 +98,7 @@
       </div>
     </el-dialog>
     <!-- 添加类别弹窗 -->
-    <ClassifyListSmall
-      :dataCategory="dataCategory"
-      :showAddSelect.sync="showAddSelect"
-      :data="dataList"
-      @updateList="updateListFn"
-      ref="updateDate"
-    />
+    <ClassifyListSmall :dataCategory="dataCategory" :showAddSelect.sync="showAddSelect" :data="dataList" @updateList="updateListFn" ref="updateDate" />
   </div>
 </template>
 

src/views/basic_data/supplier/supplier_list.vue

@@ -3,29 +3,18 @@
     <div v-if="isShow">
       <!-- 筛选条件 -->
       <div>
-        <el-form
-          ref="searchForm"
-          :model="searchForm"
-          label-width="70px"
-          size="small"
-          label-position="left"
-        >
+        <el-form ref="searchForm" :model="searchForm" label-width="70px" size="small" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="名称" prop="name">
-                <el-input
-                  v-model="searchForm.name"
-                  placeholder="请输入名称"
-                ></el-input>
+                <el-input v-model="searchForm.name" placeholder="请输入名称"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="clearFn">清空</el-button>
-                <el-button size="small" type="primary" @click="searchFn"
-                  >搜索</el-button
-                >
+                <el-button size="small" type="primary" @click="searchFn">搜索</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -35,77 +24,22 @@
       <!-- 表格 -->
       <div class="mymain-container">
         <div class="table">
-          <el-table
-            v-loading="listLoading"
-            :data="dataList"
-            element-loading-text="Loading"
-            border
-            fit
-            highlight-current-row
-            stripe
-          >
-            <el-table-column
-              align="center"
-              label="编码"
-              prop="number"
-              min-width="100"
-              label-class-name="bianma"
-              class-name="fontstyle"
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="使用组织"
-              prop="useOrgName"
-              min-width="100"
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="名称"
-              prop="name"
-              min-width="100"
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="简称"
-              prop="shortName"
-              min-width="100"
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="供应商分组"
-              prop="groupName"
-              min-width="100"
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="操作"
-              prop="caozuo"
-              min-width="160"
-              show-overflow-tooltip
-              fixed="right"
-            >
-              <template slot-scope="scope"
-                ><el-button
-                  type="text"
-                  class="textColor"
-                  @click="editFn(scope.row.id)"
-                  >详情</el-button
-                ></template
-              >
+          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+            <el-table-column align="center" label="编码" prop="number" min-width="60" label-class-name="bianma" class-name="fontstyle"></el-table-column>
+            <el-table-column align="center" label="使用组织" prop="useOrgName" min-width="160"></el-table-column>
+            <el-table-column align="center" label="名称" prop="name" min-width="200"></el-table-column>
+            <el-table-column align="center" label="简称" prop="shortName" min-width="160"></el-table-column>
+            <el-table-column align="center" label="供应商分组" prop="groupName" min-width="160"></el-table-column>
+            <el-table-column align="center" label="操作" prop="caozuo" min-width="160" show-overflow-tooltip fixed="right">
+              <template slot-scope="scope">
+                <el-button type="text" class="textColor" @click="editFn(scope.row.id)">详情</el-button>
+              </template>
             </el-table-column>
           </el-table>
         </div>
 
         <div class="fr">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            :page-sizes="[10, 20, 30, 50]"
-            :page-size="10"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="listTotal"
-          >
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
           </el-pagination>
         </div>
       </div>

src/views/basic_data/taker/taker_car.vue

@@ -2,37 +2,23 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <el-form
-        :model="searchForm"
-        ref="searchForm"
-        label-width="100px"
-        size="small"
-        label-position="left"
-      >
+      <el-form :model="searchForm" ref="searchForm" label-width="100px" size="small" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="经销商名称" prop="customerName">
-              <el-input
-                v-model="searchForm.customerName"
-                placeholder="请输入经销商名称"
-              ></el-input>
+              <el-input v-model="searchForm.customerName" placeholder="请输入经销商名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="车牌" prop="carBrand">
-              <el-input
-                v-model="searchForm.carBrand"
-                placeholder="请输入车牌"
-              ></el-input>
+              <el-input v-model="searchForm.carBrand" placeholder="请输入车牌"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :xs="24" :sm="12" :lg="12" class="tr">
             <el-form-item label="">
               <el-button size="small" @click="clearFn">清空</el-button>
-              <el-button size="small" type="primary" @click="searchFn"
-                >搜索</el-button
-              >
+              <el-button size="small" type="primary" @click="searchFn">搜索</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -41,30 +27,10 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button
-          v-if="$checkBtnRole('add', $route.meta.roles)"
-          type="primary"
-          icon="el-icon-plus"
-          size="small"
-          class="add-right"
-          @click="addDataList"
-          >新增</el-button
-        >
+        <el-button v-if="$checkBtnRole('add', $route.meta.roles)" type="primary" icon="el-icon-plus" size="small" class="add-right" @click="addDataList">新增</el-button>
 
-        <el-popconfirm
-          v-if="$checkBtnRole('del', $route.meta.roles)"
-          class="delClass"
-          @onConfirm="delFn"
-          title="这是一段内容确定删除吗？"
-        >
-          <el-button
-            :disabled="ids.length < 1"
-            slot="reference"
-            type="danger"
-            icon="el-icon-minus"
-            size="small"
-            >批量删除</el-button
-          >
+        <el-popconfirm v-if="$checkBtnRole('del', $route.meta.roles)" class="delClass" @onConfirm="delFn" title="这是一段内容确定删除吗？">
+          <el-button :disabled="ids.length < 1" slot="reference" type="danger" icon="el-icon-minus" size="small">批量删除</el-button>
         </el-popconfirm>
       </div>
       <div class="fr">
@@ -74,87 +40,19 @@
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          @select="hanleSelect"
-          @select-all="hanleSelect"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column
-            type="selection"
-            align="center"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="经销商名称"
-            prop="customerName"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="车辆车牌号"
-            prop="carBrand"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="创建者"
-            prop="createBy"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="创建时间"
-            prop="createTime"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="更新者"
-            prop="updateBy"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="更新时间"
-            prop="updateTime"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="操作"
-            min-width="160"
-            show-overflow-tooltip
-            fixed="right"
-          >
+        <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" @select="hanleSelect" @select-all="hanleSelect" border fit highlight-current-row stripe>
+          <el-table-column type="selection" align="center" min-width="100"></el-table-column>
+          <el-table-column align="center" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="车辆车牌号" prop="carBrand" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="创建者" prop="createBy" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="创建时间" prop="createTime" min-width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="更新者" prop="updateBy" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="更新时间" prop="updateTime" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip fixed="right">
             <template slot-scope="scope">
-              <el-button
-                type="text"
-                class="textColor"
-                v-if="$checkBtnRole('edit', $route.meta.roles)"
-                @click="editFn(scope.row)"
-                >编辑</el-button
-              >
-              <el-popconfirm
-                @onConfirm="delFn(scope.row.id)"
-                v-if="$checkBtnRole('del', $route.meta.roles)"
-                title="这是一段内容确定删除吗？"
-              >
-                <el-button type="text" class="textColor" slot="reference"
-                  >删除</el-button
-                >
+              <el-button type="text" class="textColor" v-if="$checkBtnRole('edit', $route.meta.roles)" @click="editFn(scope.row)">编辑</el-button>
+              <el-popconfirm @onConfirm="delFn(scope.row.id)" v-if="$checkBtnRole('del', $route.meta.roles)" title="这是一段内容确定删除吗？">
+                <el-button type="text" class="textColor" slot="reference">删除</el-button>
               </el-popconfirm>
             </template>
           </el-table-column>
@@ -162,70 +60,45 @@
       </div>
       <!-- 分页 -->
       <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
         </el-pagination>
       </div>
     </div>
 
     <!-- 弹窗 -->
-    <el-dialog
-      title="提货车辆档案"
-      :visible.sync="dialogForm"
-      width="40%"
-      :show-close="false"
-      :close-on-click-modal="false"
-    >
-      <el-form
-        ref="addForm"
-        :rules="rules"
-        :model="addForm"
-        label-width="120px"
-        class="demo-ruleForm"
-      >
+    <el-dialog title="提货车辆档案" :visible.sync="dialogForm" width="40%" :show-close="false" :close-on-click-modal="false">
+      <el-form ref="addForm" :rules="rules" :model="addForm" label-width="120px" class="demo-ruleForm">
         <el-form-item label="经销商名称" prop="customerId">
-          <el-select
-            v-model="addForm.customerId"
-            placeholder="请选择经销商名称"
-          >
-            <el-option
-              v-for="item in dealerList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            >
+          <el-select v-model="addForm.customerId" placeholder="请选择经销商名称">
+            <el-option v-for="item in dealerList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-row>
           <el-col :span="12">
             <el-form-item label="车牌号" prop="carBrand">
-              <el-input v-model="addForm.carBrand"></el-input> </el-form-item
-          ></el-col>
+              <el-input v-model="addForm.carBrand"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="联系电话" prop="mobile">
-              <el-input v-model="addForm.mobile"></el-input> </el-form-item
-          ></el-col>
+              <el-input v-model="addForm.mobile"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="车型" prop="carType">
-              <el-input v-model="addForm.carType"></el-input> </el-form-item
-          ></el-col>
+              <el-input v-model="addForm.carType"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="体积" prop="volume">
               <el-input v-model="addForm.volume">
                 <i class="el-input__icon" slot="suffix">m³ </i>
               </el-input>
-            </el-form-item></el-col
-          >
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/basic_data/taker/taker_list.vue

@@ -2,45 +2,28 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <el-form
-        ref="searchForm"
-        :model="searchForm"
-        label-width="100px"
-        size="small"
-        label-position="left"
-      >
+      <el-form ref="searchForm" :model="searchForm" label-width="100px" size="small" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="经销商名称" prop="customerName">
-              <el-input
-                v-model="searchForm.customerName"
-                placeholder="请输入经销商名称"
-              ></el-input>
+              <el-input v-model="searchForm.customerName" placeholder="请输入经销商名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="提货人姓名" prop="takerName">
-              <el-input
-                v-model="searchForm.takerName"
-                placeholder="请输入提货人姓名"
-              ></el-input>
+              <el-input v-model="searchForm.takerName" placeholder="请输入提货人姓名"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="电话" prop="phoneKeyword">
-              <el-input
-                v-model="searchForm.phoneKeyword"
-                placeholder="请输入电话"
-              ></el-input>
+              <el-input v-model="searchForm.phoneKeyword" placeholder="请输入电话"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :xs="24" :sm="12" :lg="6" class="tr">
             <el-form-item label="">
               <el-button size="small" @click="clearFn">清空</el-button>
-              <el-button size="small" type="primary" @click="searchFn"
-                >搜索</el-button
-              >
+              <el-button size="small" type="primary" @click="searchFn">搜索</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -49,13 +32,7 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button
-          v-if="$checkBtnRole('add', $route.meta.roles)"
-          type="primary"
-          size="small"
-          @click="addFn"
-          >新增</el-button
-        >
+        <el-button v-if="$checkBtnRole('add', $route.meta.roles)" type="primary" size="small" @click="addFn">新增</el-button>
       </div>
       <div class="fr">
         <ExportButton :exUrl="'/taker-record/export'" :exParams="exParams" />
@@ -64,156 +41,43 @@
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column
-            align="center"
-            label="经销商名称"
-            prop="customerName"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="提货人姓名"
-            prop="takerName"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="身份证"
-            prop="identity"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="联系电话"
-            prop="phone"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="备用电话"
-            prop="sparePhone"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="有效期"
-            prop="expireTime"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="创建人"
-            prop="createBy"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="创建时间"
-            prop="createTime"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="状态"
-            prop="flag"
-            min-width="160"
-            show-overflow-tooltip
-          >
+        <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+          <el-table-column align="center" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="提货人姓名" prop="takerName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="身份证" prop="identity" min-width="170" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="联系电话" prop="phone" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="备用电话" prop="sparePhone" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="有效期" prop="expireTime" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="创建人" prop="createBy" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="创建时间" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="状态" prop="flag" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-tag type="success" v-if="scope.row.flag === 1">有效</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.flag === 2"
-                >失效</el-tag
-              >
+              <el-tag type="danger" v-else-if="scope.row.flag === 2">失效</el-tag>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="操作"
-            prop="caozuo"
-            min-width="160"
-            show-overflow-tooltip
-            fixed="right"
-          >
-            <template slot-scope="scope"
-              ><el-button
-                type="text"
-                class="textColor"
-                @click="seeFn(scope.row)"
-                >查看</el-button
-              >
-              <el-popconfirm
-                @onConfirm="deleFn(scope.row.id)"
-                v-if="$checkBtnRole('del', $route.meta.roles)"
-                title="这是一段内容确定删除吗？"
-              >
-                <el-button type="text" class="textColor" slot="reference"
-                  >删除</el-button
-                >
+          <el-table-column align="center" label="操作" prop="caozuo" min-width="160" show-overflow-tooltip fixed="right">
+            <template slot-scope="scope">
+              <el-button type="text" class="textColor" @click="seeFn(scope.row)">查看</el-button>
+              <el-popconfirm @onConfirm="deleFn(scope.row.id)" v-if="$checkBtnRole('del', $route.meta.roles)" title="这是一段内容确定删除吗？">
+                <el-button type="text" class="textColor" slot="reference">删除</el-button>
               </el-popconfirm>
-              <el-button
-                type="text"
-                class="textColor"
-                @click="stopFn(scope.row.id)"
-                v-if="scope.row.flag === 1"
-                >停用</el-button
-              >
-              <el-button
-                type="text"
-                class="textColor"
-                @click="rebuild(scope.row)"
-                v-else-if="scope.row.flag === 2"
-                >重建</el-button
-              >
+              <el-button type="text" class="textColor" @click="stopFn(scope.row.id)" v-if="scope.row.flag === 1">停用</el-button>
+              <el-button type="text" class="textColor" @click="rebuild(scope.row)" v-else-if="scope.row.flag === 2">重建</el-button>
             </template>
           </el-table-column>
         </el-table>
       </div>
       <!-- 分页 -->
       <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
         </el-pagination>
       </div>
     </div>
 
     <!-- 弹窗 -->
-    <el-dialog
-      title="提货人档案"
-      :visible.sync="dialogForm"
-      width="40%"
-      :show-close="false"
-      :close-on-click-modal="false"
-    >
-      <el-form
-        ref="addForm"
-        :rules="rules"
-        :model="addForm"
-        label-width="120px"
-      >
+    <el-dialog title="提货人档案" :visible.sync="dialogForm" width="40%" :show-close="false" :close-on-click-modal="false">
+      <el-form ref="addForm" :rules="rules" :model="addForm" label-width="120px">
         <el-form-item label="经销商名称" prop="customerId">
           <!-- <el-select v-model="addForm.customerId" placeholder="名称">
             <el-option
@@ -229,18 +93,21 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="提货人姓名" prop="takerName">
-              <el-input v-model="addForm.takerName"></el-input> </el-form-item
-          ></el-col>
+              <el-input v-model="addForm.takerName"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="身份证号码" prop="identity">
-              <el-input v-model="addForm.identity"></el-input> </el-form-item
-          ></el-col>
+              <el-input v-model="addForm.identity"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="联系电话" prop="phone">
-              <el-input v-model="addForm.phone"></el-input> </el-form-item
-          ></el-col>
+              <el-input v-model="addForm.phone"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-row :gutter="0">
               <el-col :span="14">
@@ -249,18 +116,11 @@
                 </el-form-item>
               </el-col>
               <el-col :span="9">
-                <el-button v-show="show" type="info" @click="getCodeFn"
-                  >获取验证码</el-button
-                >
-                <el-button
-                  v-show="!show"
-                  :style="{
+                <el-button v-show="show" type="info" @click="getCodeFn">获取验证码</el-button>
+                <el-button v-show="!show" :style="{
                     backgroundColor: '#409eff',
                     border: '0',
-                  }"
-                  type="info"
-                  >{{ count }}s后重新获取</el-button
-                >
+                  }" type="info">{{ count }}s后重新获取</el-button>
               </el-col>
             </el-row>
           </el-col>
@@ -268,19 +128,15 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="有效期" prop="expireTime">
-              <el-date-picker
-                v-model="addForm.expireTime"
-                type="date"
-                placeholder="选择日期"
-                format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd"
-              >
-              </el-date-picker> </el-form-item
-          ></el-col>
+              <el-date-picker v-model="addForm.expireTime" type="date" placeholder="选择日期" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="备用电话" prop="sparePhone">
-              <el-input v-model="addForm.sparePhone"></el-input> </el-form-item
-          ></el-col>
+              <el-input v-model="addForm.sparePhone"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-form-item label="上传提货人附件" prop="fileUrl">
           <fileUpload :fileList="fileList" />
@@ -288,9 +144,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancelFn">取 消</el-button>
-        <el-button v-if="showOK" type="primary" @click="addDataFn"
-          >确 定</el-button
-        >
+        <el-button v-if="showOK" type="primary" @click="addDataFn">确 定</el-button>
       </div>
     </el-dialog>
   </div>

src/views/finance/rebate_list.vue

@@ -1,11 +1,7 @@
 <template>
   <div class="app-container">
     <div v-if="showPage == 1">
-      <el-radio-group
-        @change="changeRadioFn"
-        v-model="searchForm.examineStatus"
-        size=""
-      >
+      <el-radio-group @change="changeRadioFn" v-model="searchForm.examineStatus" size="">
         <el-radio-button label="">全部</el-radio-button>
         <el-radio-button label="SAVE">保存</el-radio-button>
         <el-radio-button label="WAIT">待审核</el-radio-button>
@@ -18,59 +14,32 @@
       <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form
-          ref="searchForm"
-          :model="searchForm"
-          label-width="100px"
-          size="small"
-          label-position="left"
-        >
+        <el-form ref="searchForm" :model="searchForm" label-width="100px" size="small" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商名称" prop="customerName">
-                <el-input
-                  v-model="searchForm.customerName"
-                  placeholder="请输入经销商名称"
-                ></el-input>
+                <el-input v-model="searchForm.customerName" placeholder="请输入经销商名称"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="返利类型" prop="walletName">
-                <el-input
-                  v-model="searchForm.walletName"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="searchForm.walletName" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商编码" prop="customerNumber">
-                <el-input
-                  v-model="searchForm.customerNumber"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="searchForm.customerNumber" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="开始时间" prop="startTime">
-                <el-date-picker
-                  class="selectStyle"
-                  v-model="searchForm.startTime"
-                  placeholder="选择日期"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
+                <el-date-picker class="selectStyle" v-model="searchForm.startTime" placeholder="选择日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss">
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结束时间" prop="endTime">
-                <el-date-picker
-                  class="selectStyle"
-                  v-model="searchForm.endTime"
-                  placeholder="选择日期"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
+                <el-date-picker class="selectStyle" v-model="searchForm.endTime" placeholder="选择日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -78,9 +47,7 @@
             <el-col :xs="24" :sm="12" :lg="18">
               <el-form-item label="" class="fr">
                 <el-button size="small" @click="cancelFn">清空</el-button>
-                <el-button size="small" type="primary" @click="searchFn"
-                  >搜索</el-button
-                >
+                <el-button size="small" type="primary" @click="searchFn">搜索</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -95,487 +62,150 @@
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
-          <el-table
-            v-loading="listLoading"
-            :data="dataList"
-            element-loading-text="Loading"
-            border
-            fit
-            highlight-current-row
-            stripe
-            show-summary
-            :summary-method="$getSummaries"
-          >
-            <el-table-column
-              align="center"
-              label="状态"
-              prop="examineStatus"
-              min-width="160"
-              show-overflow-tooltip
-              v-if="!isCustomer"
-            >
+          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
+            <el-table-column align="center" label="状态" prop="examineStatus" min-width="160" show-overflow-tooltip v-if="!isCustomer">
               <template slot-scope="scope">
                 <el-tag v-show="scope.row.examineStatus == 'SAVE'">保存</el-tag>
-                <el-tag v-show="scope.row.examineStatus == 'WAIT'"
-                  >待审核</el-tag
-                >
-                <el-tag v-show="scope.row.examineStatus == 'OK_ONE'"
-                  >初审通过</el-tag
-                >
-                <el-tag v-show="scope.row.examineStatus == 'FAIL_ONE'"
-                  >初审不通过</el-tag
-                >
-                <el-tag v-show="scope.row.examineStatus == 'OK'"
-                  >复核通过</el-tag
-                >
-                <el-tag v-show="scope.row.examineStatus == 'FAIL'"
-                  >不通过</el-tag
-                >
-                <el-tag v-show="scope.row.examineStatus == 'CLOSE'"
-                  >已关闭</el-tag
-                >
+                <el-tag v-show="scope.row.examineStatus == 'WAIT'">待审核</el-tag>
+                <el-tag v-show="scope.row.examineStatus == 'OK_ONE'">初审通过</el-tag>
+                <el-tag v-show="scope.row.examineStatus == 'FAIL_ONE'">初审不通过</el-tag>
+                <el-tag v-show="scope.row.examineStatus == 'OK'">复核通过</el-tag>
+                <el-tag v-show="scope.row.examineStatus == 'FAIL'">不通过</el-tag>
+                <el-tag v-show="scope.row.examineStatus == 'CLOSE'">已关闭</el-tag>
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="isCustomer"
-              align="center"
-              label="是否确认"
-              prop="customerIsConfirm"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column v-if="isCustomer" align="center" label="是否确认" prop="customerIsConfirm" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-tag v-show="scope.row.customerIsConfirm == true"
-                  >已确认</el-tag
-                >
-                <el-tag v-show="scope.row.customerIsConfirm == false"
-                  >未确认</el-tag
-                >
+                <el-tag v-show="scope.row.customerIsConfirm == true">已确认</el-tag>
+                <el-tag v-show="scope.row.customerIsConfirm == false">未确认</el-tag>
               </template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              label="返利单号"
-              prop="rebateOrderId"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="返利日期"
-              prop="theTime"
-              min-width="180"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="isCustomer"
-              align="center"
-              label="标题备注"
-              prop="policyDocNo"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="经销商编码"
-              prop="customerNumber"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="经销商名称"
-              prop="customerName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="返利类型"
-              prop="walletName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="right"
-              label="总返利金额"
-              prop="amount"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="center" label="返利单号" prop="rebateOrderId" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="返利日期" prop="theTime" min-width="180" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="isCustomer" align="center" label="标题备注" prop="policyDocNo" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="返利类型" prop="walletName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="总返利金额" prop="amount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.amount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="返利金额"
-              prop="rebateAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="返利金额" prop="rebateAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.rebateAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="暂扣返利"
-              prop="withholdAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="暂扣返利" prop="withholdAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.withholdAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="折让金额"
-              prop="allowanceAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="折让金额" prop="allowanceAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.allowanceAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="折让编号"
-              prop="allowanceCode"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="折让账号"
-              prop="allowanceAccount"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="right"
-              label="已办理折让金额"
-              prop="handledAllowanceAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column v-if="!isCustomer" align="center" label="折让编号" prop="allowanceCode" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="折让账号" prop="allowanceAccount" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="right" label="已办理折让金额" prop="handledAllowanceAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.handledAllowanceAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="折让对应收款单号"
-              prop="allowanceOrderNo"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="政策文件流水号"
-              prop="policyFileNo"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="政策文号"
-              prop="policyDocNo"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="政策年份"
-              prop="policyYear"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="政策月份"
-              prop="policyMonth"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="政策归属部门"
-              prop="policyOrg"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              v-if="!isCustomer"
-              label="客户区域"
-              prop="customerArea"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="客户属性"
-              prop="customerAttr"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              v-if="!isCustomer"
-              label="奖励实际归属客户"
-              prop="rewardActualCustomers"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="备注1"
-              prop="remark1"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="备注2"
-              prop="remark2"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="制单人"
-              prop="createBy"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="制单时间"
-              prop="createTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="审核人"
-              prop="examineBy"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="审核时间"
-              prop="examineTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="确认人"
-              prop="customerName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="确认时间"
-              prop="customerConfirmTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="复核人"
-              prop="secondExamineBy"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="!isCustomer"
-              align="center"
-              label="复核时间"
-              prop="secondExamineTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              v-if="isCustomer"
-              align="center"
-              label="确认时间"
-              prop="customerConfirmTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="操作"
-              min-width="240"
-              show-overflow-tooltip
-              fixed="right"
-            >
+            <el-table-column v-if="!isCustomer" align="center" label="折让对应收款单号" prop="allowanceOrderNo" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="政策文件流水号" prop="policyFileNo" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="政策文号" prop="policyDocNo" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="政策年份" prop="policyYear" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="政策月份" prop="policyMonth" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="政策归属部门" prop="policyOrg" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" v-if="!isCustomer" label="客户区域" prop="customerArea" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="客户属性" prop="customerAttr" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" v-if="!isCustomer" label="奖励实际归属客户" prop="rewardActualCustomers" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="备注1" prop="remark1" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="备注2" prop="remark2" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="制单人" prop="createBy" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="制单时间" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="审核人" prop="examineBy" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="审核时间" prop="examineTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="确认人" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="确认时间" prop="customerConfirmTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="复核人" prop="secondExamineBy" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="!isCustomer" align="center" label="复核时间" prop="secondExamineTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="isCustomer" align="center" label="确认时间" prop="customerConfirmTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="操作" min-width="240" show-overflow-tooltip fixed="right">
               <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  class="textColor"
-                  v-if="
+                <el-button type="text" class="textColor" v-if="
                     !isCustomer &&
                     $checkBtnRole('edit', $route.meta.roles) &&
                     scope.row.examineStatus != 'FAIL_ONE'
-                  "
-                  @click="editFn(scope.row.rebateOrderId)"
-                  >编辑</el-button
-                >
-                <el-button
-                  type="text"
-                  class="textColor"
-                  v-show="
+                  " @click="editFn(scope.row.rebateOrderId)">编辑</el-button>
+                <el-button type="text" class="textColor" v-show="
                     scope.row.examineStatus == 'SAVE' &&
                     !isCustomer &&
                     $checkBtnRole('apply', $route.meta.roles)
-                  "
-                  @click="applyFn(scope.row.rebateOrderId)"
-                  >申请</el-button
-                >
-                <el-button
-                  type="text"
-                  class="textColor"
-                  v-show="
+                  " @click="applyFn(scope.row.rebateOrderId)">申请</el-button>
+                <el-button type="text" class="textColor" v-show="
                     scope.row.examineStatus == 'WAIT' &&
                     !isCustomer &&
                     $checkBtnRole('examine', $route.meta.roles)
-                  "
-                  @click="examineFn(scope.row.rebateOrderId)"
-                  >审核</el-button
-                >
-                <el-button
-                  type="text"
-                  class="textColor"
-                  v-show="
+                  " @click="examineFn(scope.row.rebateOrderId)">审核</el-button>
+                <el-button type="text" class="textColor" v-show="
                     (scope.row.examineStatus == 'OK_ONE' ||
                       scope.row.examineStatus == 'OK' ||
                       scope.row.examineStatus == 'FAIL') &&
                     !isCustomer &&
                     $checkBtnRole('examine', $route.meta.roles)
-                  "
-                  @click="reviewFn(scope.row.rebateOrderId)"
-                  >{{
+                  " @click="reviewFn(scope.row.rebateOrderId)">{{
                     scope.row.examineStatus == "OK" ? "取消复核" : "复核"
-                  }}</el-button
-                >
-                <el-button
-                  type="text"
-                  class="textColor"
-                  v-show="
+                  }}</el-button>
+                <el-button type="text" class="textColor" v-show="
                     (scope.row.examineStatus == 'WAIT' ||
                       scope.row.examineStatus == 'SAVE') &&
                     !isCustomer
-                  "
-                  @click="infoFn(scope.row.rebateOrderId)"
-                  >详情</el-button
-                >
-                <el-button
-                  type="text"
-                  class="textColor"
-                  v-show="
+                  " @click="infoFn(scope.row.rebateOrderId)">详情</el-button>
+                <el-button type="text" class="textColor" v-show="
                     (scope.row.examineStatus == 'OK_ONE' ||
                       scope.row.examineStatus == 'FAIL_ONE' ||
                       scope.row.examineStatus == 'FAIL' ||
                       scope.row.examineStatus == 'OK') &&
                     !isCustomer
-                  "
-                  @click="detail2(scope.row.rebateOrderId)"
-                  >详情</el-button
-                >
-                <el-button
-                  type="text"
-                  class="textColor"
-                  v-if="
+                  " @click="detail2(scope.row.rebateOrderId)">详情</el-button>
+                <el-button type="text" class="textColor" v-if="
                     isCustomer &&
                     scope.row.withholdAmount == 0 &&
                     (scope.row.examineStatus == 'OK_ONE' ||
                       scope.row.examineStatus == 'OK' ||
                       scope.row.examineStatus == 'FAIL')
-                  "
-                  @click="
+                  " @click="
                     confirmFn(
                       scope.row.rebateOrderId,
                       scope.row.customerIsConfirm
                     )
-                  "
-                  >{{
+                  ">{{
                     scope.row.customerIsConfirm == true ? "详情" : "确认"
-                  }}</el-button
-                >
+                  }}</el-button>
               </template>
             </el-table-column>
           </el-table>
         </div>
         <!-- 分页 -->
         <div class="fr">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            :page-sizes="[10, 20, 30, 50]"
-            :page-size="pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="listTotal"
-          >
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
           </el-pagination>
         </div>
       </div>
     </div>
 
     <RebateListApply :detailId="detailId" v-else-if="showPage == 2" />
-    <RebateListExamine
-      @updateList="updateList"
-      :detailId="detailId"
-      v-else-if="showPage == 3"
-    />
-    <RebateListReview
-      @updateList="updateList"
-      :detailId="detailId"
-      v-else-if="showPage == 4"
-    />
+    <RebateListExamine @updateList="updateList" :detailId="detailId" v-else-if="showPage == 3" />
+    <RebateListReview @updateList="updateList" :detailId="detailId" v-else-if="showPage == 4" />
     <!-- 详情 -->
     <RebateListDetail :detailId="detailId" v-else-if="showPage == 5" />
     <!-- 确定 -->
-    <RebateListConfirm
-      @updateList="updateList"
-      :detailId="detailId"
-      :isShow="isShow"
-      v-else-if="showPage == 6"
-    />
+    <RebateListConfirm @updateList="updateList" :detailId="detailId" :isShow="isShow" v-else-if="showPage == 6" />
     <!-- 编辑 -->
-    <RebateListEdit
-      @updateList="updateList"
-      :detailId="detailId"
-      v-else-if="showPage == 7"
-    />
+    <RebateListEdit @updateList="updateList" :detailId="detailId" v-else-if="showPage == 7" />
     <!-- <EditDateTimeDialog
       :isShow.sync="isShowEditDateDialog"
       :dateForm.sync="dateForm"

src/views/finance/receipt_list.vue

@@ -3,52 +3,31 @@
     <div v-if="showDetail">
       <!-- 筛选条件 -->
       <div>
-        <el-form
-          ref="searchForm"
-          :model="searchForm"
-          label-width="100px"
-          size="small"
-          label-position="left"
-        >
+        <el-form ref="searchForm" :model="searchForm" label-width="100px" size="small" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="单据类型" prop="billType">
-                <el-input
-                  v-model="searchForm.billType"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="searchForm.billType" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="单据编号" prop="billNo">
-                <el-input
-                  v-model="searchForm.billNo"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="searchForm.billNo" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="往来单位" prop="wlCompanyType">
-                <el-input
-                  v-model="searchForm.wlCompanyType"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="searchForm.wlCompanyType" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="付款单位" prop="customerName">
-                <el-input
-                  v-model="searchForm.customerName"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="searchForm.customerName" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结算方式" prop="settleType">
-                <el-input
-                  v-model="searchForm.settleType"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="searchForm.settleType" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -58,27 +37,13 @@
             </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="开始时间" prop="startTime">
-                <el-date-picker
-                  class="selectStyle"
-                  v-model="searchForm.startTime"
-                  type="datetime"
-                  placeholder="选择日期时间"
-                  default-time="00:00:00"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
+                <el-date-picker class="selectStyle" v-model="searchForm.startTime" type="datetime" placeholder="选择日期时间" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结束时间" prop="endTime">
-                <el-date-picker
-                  class="selectStyle"
-                  v-model="searchForm.endTime"
-                  type="datetime"
-                  placeholder="选择日期时间"
-                  default-time="00:00:00"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
+                <el-date-picker class="selectStyle" v-model="searchForm.endTime" type="datetime" placeholder="选择日期时间" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -86,9 +51,7 @@
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="" class="fr">
                 <el-button size="small" @click="cancelFn">清空</el-button>
-                <el-button size="small" type="primary" @click="searchFn"
-                  >搜索</el-button
-                >
+                <el-button size="small" type="primary" @click="searchFn">搜索</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -97,58 +60,26 @@
       <!-- 按钮 -->
       <div class="btn-group clearfix">
         <div class="fr">
-          <ExportButton
-            :exUrl="'/k3/receipt/export'"
-            :exParams="exParams"
-            class="exportClass"
-          />
+          <ExportButton :exUrl="'/k3/receipt/export'" :exParams="exParams" class="exportClass" />
         </div>
       </div>
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
-          <el-table
-            v-loading="listLoading"
-            :data="dataList"
-            element-loading-text="Loading"
-            border
-            fit
-            highlight-current-row
-            stripe
-            show-summary
-            :summary-method="$getSummaries"
-          >
-            <el-table-column
-              align="center"
-              label="单据类型"
-              prop="billType"
-              min-width="160"
-              show-overflow-tooltip
-            >
+          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
+            <el-table-column align="center" label="单据类型" prop="billType" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.billType == 1
                     ? "收款单"
                     : scope.row.billType == 2
                     ? "退款单"
-                    : ""
+                    : scope.row.billType == 3?'付款单':''
                 }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              label="单据编码"
-              prop="billNo"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="业务日期"
-              prop="theTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
+            <el-table-column align="center" label="单据编码" prop="billNo" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="业务日期" prop="theTime" min-width="160" show-overflow-tooltip></el-table-column>
             <!-- <el-table-column
               align="center"
               label="币别"
@@ -157,45 +88,15 @@
               show-overflow-tooltip
             ></el-table-column> -->
 
-            <el-table-column
-              align="center"
-              label="钱包"
-              prop="walletName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="表头·应收金额"
-              prop=""
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="往来单位"
-              prop="wlCompanyName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="right"
-              label="表头·实收金额"
-              prop="amount"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="center" label="钱包" prop="walletName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="表头·应收金额" prop="" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="往来单位" prop="wlCompanyName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="表头·实收金额" prop="amount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.amount | numToFixed }}
+                {{ scope.row.billType == 3? -scope.row.amount:scope.row.amount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              label="收款金额"
-              prop=""
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
+            <el-table-column align="center" label="收款金额" prop="" min-width="160" show-overflow-tooltip></el-table-column>
             <!-- <el-table-column
               align="center"
               label="结算方式"
@@ -210,93 +111,36 @@
               min-width="160"
               show-overflow-tooltip
             ></el-table-column> -->
-            <el-table-column
-              align="center"
-              label="付款单位"
-              prop="customerName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="表体·实收金额"
-              prop="amount"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="勾对"
-              prop=""
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="单据状态"
-              prop="status"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="center" label="付款单位" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="表体·实收金额" prop="amount" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.billType == 3? -scope.row.amount:scope.row.amount | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="勾对" prop="" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="单据状态" prop="status" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-tag v-show="scope.row.status == 'A'">保存</el-tag>
-                <el-tag v-show="scope.row.status == 'B'" type="info"
-                  >审核中</el-tag
-                >
-                <el-tag v-show="scope.row.status == 'C'" type="success"
-                  >已审核</el-tag
-                >
-                <el-tag v-show="scope.row.status == 'D'" type="warning"
-                  >重新审核</el-tag
-                >
+                <el-tag v-show="scope.row.status == 'B'" type="info">审核中</el-tag>
+                <el-tag v-show="scope.row.status == 'C'" type="success">已审核</el-tag>
+                <el-tag v-show="scope.row.status == 'D'" type="warning">重新审核</el-tag>
               </template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              label="备注"
-              prop="remark"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="操作"
-              min-width="160"
-              show-overflow-tooltip
-              fixed="right"
-            >
+            <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip fixed="right">
               <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  class="textColor"
-                  v-if="
+                <el-button type="text" class="textColor" v-if="
                     $checkBtnRole('examine', $route.meta.roles) &&
                     scope.row.status == 'C'
-                  "
-                  @click="NoExamineFn(scope.row.id)"
-                  >弃审</el-button
-                >
-                <el-button
-                  type="text"
-                  class="textColor"
-                  @click="seeFn(scope.row.id)"
-                  >查看</el-button
-                >
+                  " @click="NoExamineFn(scope.row.id)">弃审</el-button>
+                <el-button type="text" class="textColor" @click="seeFn(scope.row.id)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
         </div>
         <!-- 分页 -->
         <div class="fr">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            :page-sizes="[10, 20, 30, 50]"
-            :page-size="10"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="listTotal"
-          >
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
           </el-pagination>
         </div>
       </div>

src/views/finance/standbook_list.vue

@@ -100,9 +100,9 @@
           <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="getSummaries">
             <el-table-column label="序号" align="center" width="100" type="index" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="单据日期" prop="theTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="单据类型" prop="billType" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="单据号" prop="billNo" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="钱包" prop="walletName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="单据类型" prop="billType" min-width="280" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="单据号" prop="billNo" min-width="220" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="钱包" prop="walletName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作时间" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="摘要" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="预付货款" prop="flag" min-width="160" show-overflow-tooltip>
@@ -220,7 +220,7 @@
           <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="getSummaries2">
             <el-table-column label="序号" align="center" width="100" type="index" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="客户编码" prop="customerCode" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="客户名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="客户名称" prop="customerName" min-width="260" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="单据日期" prop="theTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="审核日期" prop="examineTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="单据类型" prop="billType" min-width="160" show-overflow-tooltip>