Merge branch 'feature/Feature-basic_data' into develop

src/views/basic_data/dealer/dealer_apply.vue

@@ -1,128 +1,158 @@
 <template>
-  <div class="base">
+  <div class="app-container">
     <div v-if="isShow">
-      <div class="top">
-        <div class="left">
-          <el-input
-            v-model="enterprise.name"
-            placeholder="企业名称"
-            width="20%"
-          />
-          <el-input
-            v-model="enterprise.friend"
-            placeholder="联系人"
-            width="20%"
-          />
-          <el-input
-            v-model="enterprise.telephone"
-            placeholder="联系电话"
-            width="20%"
-          />
-          <el-input
-            v-model="enterprise.address"
-            placeholder="联系地址"
-            width="20%"
-          />
-          <el-input v-model="enterprise.email" placeholder="邮箱" width="20%" />
+      <!-- 筛选条件 -->
+      <div>
+        <el-form 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="account">
+                <el-input placeholder="请输入企业名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="联系人" prop="nickname">
+                <el-input placeholder="请输入联系人"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="联系电话" prop="phone">
+                <el-input placeholder="请输入联系电话"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="联系电话" prop="email">
+                <el-input placeholder="请输入联系电话"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="电子邮箱" prop="email">
+                <el-input 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="resetScreenForm"
+                  >清空</el-button
+                >
+                <el-button size="small" type="primary" @click="submitScreenForm"
+                  >搜索</el-button
+                >
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <!-- 按钮 -->
+      <div class="btn-group clearfix">
+        <div class="fl">
+          <el-button type="primary">删除</el-button>
         </div>
-        <div class="right">
-          <el-button type="info">查询</el-button>
-          <el-button type="info">重置</el-button>
+        <div class="fr">
+          <el-button type="primary">导出</el-button>
         </div>
       </div>
-      <div class="main">
-        <el-row>
-          <el-button type="info">删除</el-button>
-          <el-button type="info">导出</el-button>
-        </el-row>
-      </div>
-      <div class="main">
+      <div class="mymain-container">
         <!-- 列表 -->
-        <el-table
-          :data="dataList"
-          element-loading-text="Loading"
-          :header-cell-style="{
-            'background-color': '#e8e8e8',
-            color: 'black',
-          }"
-          border=""
-        >
-          <el-table-column type="selection" min-width="100"></el-table-column>
-          <el-table-column
-            align="center"
-            label="企业名称"
-            prop="enterprise"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="联系人"
-            prop="friend"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="联系电话"
-            prop="telephone"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="邮箱"
-            prop="email"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="联系地址"
-            prop="address"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="申请时间"
-            prop="reqDate"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="跟进人"
-            prop="person"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="跟进时间"
-            prop="personDate"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="跟进状态"
-            prop="state"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="操作"
-            min-width="160"
-            show-overflow-tooltip
+        <div class="table">
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
           >
-            <el-button type="text" class="textColor" @click="editFn"
-              >跟进</el-button
+            <el-table-column type="selection" min-width="100"></el-table-column>
+            <el-table-column
+              align="center"
+              label="企业名称"
+              prop="enterprise"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="联系人"
+              prop="friend"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="联系电话"
+              prop="telephone"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="邮箱"
+              prop="email"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="联系地址"
+              prop="address"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="申请时间"
+              prop="reqDate"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="跟进人"
+              prop="person"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="跟进时间"
+              prop="personDate"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="跟进状态"
+              prop="state"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="操作"
+              min-width="160"
+              show-overflow-tooltip
             >
-            <el-button type="text" class="textColor">删除</el-button>
-          </el-table-column>
-        </el-table>
+              <el-button type="text" class="textColor" @click="editFn"
+                >跟进</el-button
+              >
+              <el-button type="text" class="textColor">删除</el-button>
+            </el-table-column>
+          </el-table>
+        </div>
+        <!-- 分页 -->
+        <div class="fr">
+          <el-pagination
+            :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>
     </div>
 
@@ -135,6 +165,9 @@ import DealerApplyDetail from "./components/dealer-apply-detail.vue";
 export default {
   data() {
     return {
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
       isShow: true,
       showDialog: false,
       dataList: [
@@ -192,25 +225,4 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.base {
-  padding: 20px 20px 0 20px;
-}
-.textColor {
-  color: black;
-}
-.main {
-  margin: 1px 20px 8px;
-}
-.top {
-  padding: 20px;
-  display: flex;
-  justify-content: space-between;
-  .left {
-    display: flex;
-    justify-content: start;
-    .el-input {
-      margin-right: 18px;
-    }
-  }
-}
 </style>

src/views/basic_data/dealer/dealer_deposit.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="main">
-    <el-card class="box-card">
+  <div class="app-container">
+    <!-- <el-card class="box-card">
       <el-row>
         <h4>通用经销商工程机押金比例配置</h4>
         <h4>
@@ -11,112 +11,139 @@
           />%通用工程押金比例配置适用于,没有单独配置工程机押金比例的经销商.
         </h4>
       </el-row>
-    </el-card>
-    <div class="search">
-      <el-input placeholder="输入筛选条件"></el-input>
-      <el-button type="info">过滤</el-button>
+    </el-card> -->
+    <!-- 筛选条件 -->
+    <div>
+      <el-form 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="account">
+              <el-input 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">清空</el-button>
+              <el-button size="small" type="primary">搜索</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </div>
-    <div class="table">
-      <el-row>
-        <el-button type="info">新增</el-button>
-        <el-button type="info">编辑</el-button>
-        <el-button type="info">删除</el-button>
-        <el-button type="info">导入</el-button>
-        <el-button type="info">导出</el-button>
-        <el-button type="info">打印</el-button>
-      </el-row>
+    <!-- 按钮 -->
+    <div class="btn-group clearfix">
+      <div class="fl">
+        <el-button type="primary">新增</el-button>
+        <el-button type="primary">编辑</el-button>
+        <el-button type="primary">删除</el-button>
+      </div>
+      <div class="fr">
+        <el-button type="primary">导入</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </div>
     </div>
 
-    <!-- 列表 -->
-    <div class="table">
-      <el-table
-        :data="dataList"
-        :header-cell-style="{
-          'background-color': '#e8e8e8',
-          color: 'black',
-        }"
-        border=""
-      >
-        <el-table-column
-          align="center"
-          label="序号"
-          prop="num"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="经销商编码"
-          prop="bianma"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="经销商名称"
-          prop="dealerName"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="押金比例"
-          prop="yaJin"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="备注"
-          prop="beiZhu"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="创建人"
-          prop="createMan"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="创建时间"
-          prop="createDate"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="更新人"
-          prop="updateMan"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="更新时间"
-          prop="updateDate"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="操作"
-          min-width="160"
-          show-overflow-tooltip
+    <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-button type="text" class="textColor" @click="editFn"
-            >编辑</el-button
+          <el-table-column
+            align="center"
+            label="序号"
+            prop="num"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="经销商编码"
+            prop="bianma"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="经销商名称"
+            prop="dealerName"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="押金比例"
+            prop="yaJin"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="备注"
+            prop="beiZhu"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="创建人"
+            prop="createMan"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="创建时间"
+            prop="createDate"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="更新人"
+            prop="updateMan"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="更新时间"
+            prop="updateDate"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="操作"
+            min-width="160"
+            show-overflow-tooltip
           >
-          <el-button type="text" class="textColor">删除</el-button>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!-- 分页 -->
-    <div>
-      <el-pagination class="right" layout="prev, pager, next" :total="1000">
-      </el-pagination>
+            <el-button type="text" class="textColor" @click="editFn"
+              >编辑</el-button
+            >
+            <el-button type="text" class="textColor">删除</el-button>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 分页 -->
+      <div class="fr">
+        <el-pagination
+          :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>
 
     <!-- 弹窗 -->
@@ -165,6 +192,9 @@
 export default {
   data() {
     return {
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表
       dialogForm: {
         bianma: "",
         name: "",
@@ -233,23 +263,12 @@ export default {
 .inp {
   margin: 0 12px;
 }
-::v-deep .el-pagination {
-  .active {
-    border: 1px solid #64adfd;
-    margin-left: 6px;
-    color: #64adfd;
-    height: 32px;
-    width: 32px;
-    border-radius: 2px;
-  }
-}
+
 .right {
   margin-top: 12px;
   float: right;
 }
-.textColor {
-  color: black;
-}
+
 .table {
   margin-top: 12px;
 }
@@ -261,8 +280,8 @@ export default {
     margin-right: 12px;
   }
 }
-.main {
-  padding: 12px;
-}
+// .main {
+//   padding: 12px;
+// }
 </style>>
 

src/views/basic_data/dealer/dealer_list.vue

@@ -2,27 +2,16 @@
   <div class="app-container">
     <div v-if="isShow">
       <!-- 筛选条件 -->
-      <div class="screen-container">
-        <div class="top clearfix">
-          <div class="title fl">条件筛选</div>
-        </div>
-        <el-form
-          ref="screenForm"
-          :model="screenForm"
-          label-width="70px"
-          size="small"
-          label-position="left"
-        >
+      <div>
+        <el-form 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="screenForm.name"
-                  placeholder="请输入关键字"
-                ></el-input>
+              <el-form-item label="关键字" prop="account">
+                <el-input placeholder="请输入关键字"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
+
+            <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
                 <el-button size="small">清空</el-button>
                 <el-button size="small" type="primary">搜索</el-button>
@@ -31,90 +20,89 @@
           </el-row>
         </el-form>
       </div>
-
-      <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          :header-cell-style="{
-            'background-color': '#eef2f8',
-            'border-right': '1px solid #bec2c8',
-          }"
-        >
-          <el-table-column type="selection" min-width="100"></el-table-column>
-          <el-table-column
-            align="center"
-            label="客户编码"
-            prop="bianMa"
-            min-width="100"
-            label-class-name="bianma"
-            class-name="fontstyle"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="客户名称"
-            prop="username"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="简称"
-            prop="jianCheng"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="单据状态"
-            prop="danJuZhuangTai"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="禁用状态"
-            prop="jinYong"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="使用组织"
-            prop="use"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="审核人"
-            prop="shenHeRen"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="审核日期"
-            prop="shenHeDate"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="客户分组"
-            prop="keHu"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="操作"
-            prop="caozuo"
-            min-width="160"
-            show-overflow-tooltip
+      <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-button type="text" class="textColor" @click="editFn"
-              >编辑</el-button
+            <el-table-column type="selection" min-width="160"></el-table-column>
+            <el-table-column
+              align="center"
+              label="客户编码"
+              prop="bianMa"
+              min-width="160"
+              label-class-name="bianma"
+              class-name="fontstyle"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="客户名称"
+              prop="username"
+              min-width="160"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="简称"
+              prop="jianCheng"
+              min-width="160"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="单据状态"
+              prop="danJuZhuangTai"
+              min-width="160"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="禁用状态"
+              prop="jinYong"
+              min-width="160"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="使用组织"
+              prop="use"
+              min-width="160"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="审核人"
+              prop="shenHeRen"
+              min-width="160"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="审核日期"
+              prop="shenHeDate"
+              min-width="160"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="客户分组"
+              prop="keHu"
+              min-width="160"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="操作"
+              prop="caozuo"
+              min-width="160"
+              show-overflow-tooltip
             >
-            <el-button type="text" class="textColor">删除</el-button>
-          </el-table-column>
-        </el-table>
-      </div>
-
-      <div class="pagination clearfix">
+              <el-button type="text" class="textColor" @click="editFn"
+                >编辑</el-button
+              >
+              <el-button type="text" class="textColor">删除</el-button>
+            </el-table-column>
+          </el-table>
+        </div>
+        <!-- 分页 -->
         <div class="fr">
           <el-pagination
             :current-page="currentPage"
@@ -203,67 +191,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .fontstyle {
-  color: #0909ff;
-}
-::v-deep .bianma {
-  color: #409eff;
-}
-.tree-container {
-  width: 18%;
-  height: calc(100vh - 110px);
-  flex-shrink: 0;
-  background: #f5f5f5;
-  margin-right: 2%;
-  display: flex;
-  flex-direction: column;
-  overflow-y: hidden;
-  .el-tree {
-    height: 100%;
-    background: none;
-    width: 100%;
-    overflow: scroll;
-    // ::v-deep .el-tree-node:focus > .el-tree-node__content {
-    //   color: #ffffff;
-    //   background-color: #409EFF;
-    // }
-    ::v-deep > .el-tree-node {
-      display: inline-block;
-      min-width: 100%;
-    }
-    ::v-deep .el-tree-node > .el-tree-node__content {
-      padding-right: 10px;
-      align-self: baseline;
-    }
-    ::v-deep .el-tree-node.is-current > .el-tree-node__content {
-      background-color: #409eff;
-      .custom-tree-node {
-        i {
-          color: #fff;
-        }
-        span {
-          color: #fff;
-        }
-      }
-    }
-    ::v-deep .el-tree-node > .el-tree-node__children {
-      overflow: unset;
-    }
-    .custom-tree-node {
-      i {
-        font-size: 14px;
-        color: #999;
-      }
-      span {
-        font-size: 14px;
-        margin-left: 6px;
-        color: #666;
-      }
-    }
-  }
-}
-.mymain-container {
-  width: 80%;
-  margin-top: 0;
-}
 </style>

src/views/basic_data/dealer/dealer_stock.vue

@@ -1,59 +1,59 @@
 <template>
   <div class="app-container">
     <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-row :gutter="30">
-        <el-col :span="4">
-          <el-input
-            v-model="dealerForm.name"
-            placeholder="经销商名称"
-            width="20%"
-          />
-        </el-col>
-        <el-col :span="4">
-          <el-input
-            v-model="dealerForm.coding"
-            placeholder="存货分类编码"
-            width="20%"
-          />
-        </el-col>
-        <el-col :span="4">
-          <el-input
-            v-model="dealerForm.select"
-            placeholder="存货分类"
-            width="20%"
-          />
-        </el-col>
-        <el-col :span="8">
-          <div class="right">
-            <el-button type="info" @click="queryFn">查询</el-button>
-            <el-button type="info" @click="resetFn">重置</el-button>
-          </div>
-        </el-col>
-      </el-row>
+    <div class="base">
+      <el-form 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="account">
+              <el-input placeholder="请输入经销商名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="存货分类编码" prop="account">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="存货分类" prop="account">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="" class="fr">
+              <el-button size="small">清空</el-button>
+              <el-button size="small" type="primary">搜索</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </div>
 
-    <div class="mymain-container">
-      <el-row>
-        <el-button type="info">新增</el-button>
-        <el-button type="info">编辑</el-button>
-        <el-button type="info">删除</el-button>
-        <el-button type="info">导入</el-button>
-        <el-button type="info">导出</el-button>
-        <el-button type="info">打印</el-button>
-      </el-row>
+    <div class="btn-group clearfix">
+      <div class="fl">
+        <el-button type="primary">新增</el-button>
+        <el-button type="primary">编辑</el-button>
+        <el-button type="primary">删除</el-button>
+      </div>
+      <div class="fr">
+        <el-button type="primary">导入</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </div>
+    </div>
 
+    <div class="mymain-container">
       <!-- 列表 -->
       <div class="table">
         <el-table
           v-loading="listLoading"
           :data="dataList"
           element-loading-text="Loading"
-          :header-cell-style="{
-            'background-color': '#e8e8e8',
-            color: 'black',
-          }"
-          border=""
+          border
+          fit
+          highlight-current-row
+          stripe
         >
           <el-table-column type="selection" min-width="100"></el-table-column>
           <el-table-column
@@ -119,12 +119,17 @@
           </el-table-column>
         </el-table>
       </div>
-    </div>
-
-    <!-- 分页 -->
-    <div>
-      <el-pagination class="right" layout="prev, pager, next" :total="1000">
-      </el-pagination>
+      <!-- 分页 -->
+      <div class="fr">
+        <el-pagination
+          :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>
 
     <!-- 弹窗 -->
@@ -158,37 +163,8 @@
 </template>
 
 <script>
-import { COMMON_SELECT } from "@/utils/select_data";
-import { getList } from "@/api/basic_data/dealer";
-import { downloadFiles } from "@/utils/util";
-import { getToken } from "@/utils/auth";
-import { getDetail, resetPassword, editAccount } from "@/api/merchant";
-
 export default {
   data() {
-    var validatePass = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("请输入登录密码"));
-      } else if (value.length < 12) {
-        callback(new Error("密码长度至少12位"));
-      } else if (/[A-Za-z].*[0-9]|[0-9].*[A-Za-z]/.test(value) == false) {
-        callback(new Error("密码必须包含数字和字母"));
-      } else {
-        if (this.resetForm.confirmPassword !== "") {
-          this.$refs.resetForm.validateField("confirmPassword");
-        }
-        callback();
-      }
-    };
-    var validatePass2 = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("请再次输入密码"));
-      } else if (value !== this.resetForm.newPassword) {
-        callback(new Error("两次输入密码不一致"));
-      } else {
-        callback();
-      }
-    };
     return {
       dialogForm: false,
       form: {
@@ -278,6 +254,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.aaa {
+  padding: 10px 0;
+}
 ::v-deep .el-input--suffix {
   width: 300px;
 }
@@ -288,16 +267,7 @@ export default {
   display: flex;
   justify-content: center;
 }
-::v-deep .el-pagination {
-  .active {
-    border: 1px solid #64adfd;
-    margin-left: 6px;
-    color: #415058;
-    height: 32px;
-    width: 32px;
-    border-radius: 2px;
-  }
-}
+
 .formWidth {
   width: 70%;
   margin-right: 20px;
@@ -305,7 +275,4 @@ export default {
 .right {
   float: right;
 }
-.textColor {
-  color: black;
-}
 </style>

src/views/basic_data/logistics/logistics_list.vue

@@ -1,145 +1,144 @@
 <template>
-  <div>
+  <div class="app-container">
     <!-- 筛选条件 -->
-    <div class="base">
-      <el-row :gutter="30">
-        <el-col :span="4">
-          <el-input
-            v-model="searchForm.name"
-            placeholder="物流公司名称"
-            width="20%"
-          />
-        </el-col>
-        <el-col :span="4">
-          <el-input
-            v-model="searchForm.telephone"
-            placeholder="客服电话"
-            width="20%"
-          />
-        </el-col>
+    <div>
+      <el-form 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="account">
+              <el-input placeholder="请输入物流公司名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="客服电话" prop="nickname">
+              <el-input placeholder="请输入客服电话"></el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="14">
-          <div class="right">
-            <el-button type="info">查询</el-button>
-            <el-button type="info">重置</el-button>
-          </div>
-        </el-col>
-      </el-row>
+          <el-col :xs="24" :sm="12" :lg="12" class="tr">
+            <el-form-item label="">
+              <el-button size="small" @click="resetScreenForm">清空</el-button>
+              <el-button size="small" type="primary" @click="submitScreenForm"
+                >搜索</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </div>
     <!-- 按钮 -->
-    <div class="table base">
-      <el-row>
-        <el-button type="info">新增</el-button>
-        <el-button type="info">编辑</el-button>
-        <el-button type="info">删除</el-button>
-        <el-button type="info">导入</el-button>
-        <el-button type="info">导出</el-button>
-        <el-button type="info">打印</el-button>
-      </el-row>
+    <div class="btn-group clearfix">
+      <div class="fl">
+        <el-button type="primary">新增</el-button>
+        <el-button type="primary">编辑</el-button>
+        <el-button type="primary">删除</el-button>
+      </div>
+      <div class="fr">
+        <el-button type="primary">导入</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </div>
     </div>
     <!-- 列表 -->
-    <div class="table base">
-      <el-table
-        :data="dataList"
-        element-loading-text="Loading"
-        :header-cell-style="{
-          'background-color': '#e8e8e8',
-          color: 'black',
-        }"
-        border=""
-      >
-        <el-table-column
-          align="center"
-          label=""
-          prop="num"
-          min-width="60"
-          show-overflow-tooltip
-        ></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="code"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="提货人"
-          prop="consignee"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="提货人电话"
-          prop="consigneePhone"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="客服电话"
-          prop="customerService"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="创建人"
-          prop="createUser"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="创建时间"
-          prop="createDate"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="更新人"
-          prop="updateUser"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="更新时间"
-          prop="updateDate"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="操作"
-          min-width="160"
-          show-overflow-tooltip
+    <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-button type="text" class="textColor" @click="editFn"
-            >编辑</el-button
+          <el-table-column type="selection"></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="code"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="提货人"
+            prop="consignee"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="提货人电话"
+            prop="consigneePhone"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="客服电话"
+            prop="customerService"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="创建人"
+            prop="createUser"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="创建时间"
+            prop="createDate"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="更新人"
+            prop="updateUser"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="更新时间"
+            prop="updateDate"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="操作"
+            min-width="160"
+            show-overflow-tooltip
           >
-          <el-button type="text" class="textColor">删除</el-button>
-        </el-table-column>
-      </el-table>
-    </div>
-
-    <!-- 分页 -->
-    <div>
-      <el-pagination
-        class="right base"
-        layout="prev, pager, next"
-        :total="1000"
-      >
-      </el-pagination>
+            <el-button type="text" class="textColor" @click="editFn"
+              >编辑</el-button
+            >
+            <el-button type="text" class="textColor">删除</el-button>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 分页 -->
+      <div class="fr">
+        <el-pagination
+          :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>
 
     <!-- 弹窗 -->
@@ -181,6 +180,9 @@
 export default {
   data() {
     return {
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
       diaLogForm: {
         name: "",
         code: "",
@@ -255,16 +257,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-pagination {
-  .active {
-    border: 1px solid #64adfd;
-    margin-left: 6px;
-    color: #64adfd;
-    height: 32px;
-    width: 32px;
-    border-radius: 2px;
-  }
-}
 .textColor {
   color: black;
 }

src/views/basic_data/material/material_list.vue

@@ -2,127 +2,122 @@
   <div class="app-container">
     <div v-if="isShow">
       <!-- 筛选条件 -->
-      <div class="screen-container">
-        <div class="top clearfix">
-          <div class="title fl">条件筛选</div>
-        </div>
-        <el-form
-          ref="screenForm"
-          :model="screenForm"
-          label-width="70px"
-          size="small"
-          label-position="left"
-        >
+      <div>
+        <el-form 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="screenForm.name"
-                  placeholder="请输入关键字"
-                ></el-input>
+              <el-form-item label="关键字" prop="account">
+                <el-input placeholder="请输入关键字"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
+
+            <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
-                <el-button size="small">清空</el-button>
-                <el-button size="small" type="primary">搜索</el-button>
+                <el-button size="small" @click="resetScreenForm"
+                  >清空</el-button
+                >
+                <el-button size="small" type="primary" @click="submitScreenForm"
+                  >搜索</el-button
+                >
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
       </div>
-
-      <div class="table">
-        <el-table
-          :data="dataList"
-          element-loading-text="Loading"
-          :header-cell-style="{
-            'background-color': '#eef2f8',
-            'border-right': '1px solid #bec2c8',
-          }"
-        >
-          <el-table-column type="selection" min-width="100"></el-table-column>
-          <el-table-column
-            align="center"
-            label="使用组织"
-            prop="usename"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="编码"
-            prop="bianMa"
-            min-width="100"
-            label-class-name="bianma"
-            class-name="fontstyle"
-          ></el-table-column>
-
-          <el-table-column
-            align="center"
-            label="名称"
-            prop="name"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="规格型号"
-            prop="model"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="数据状态"
-            prop="dataState"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="是否维护商城资料"
-            prop="maintainData"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="是否维护内外机档案"
-            prop="maintainFiles"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="基本单位"
-            prop="baseCompany"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="已使用"
-            prop="used"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="操作"
-            prop="caozuo"
-            min-width="160"
-            show-overflow-tooltip
+      <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-button type="text" class="textColor" @click="editFn"
-              >编辑</el-button
-            >
-            <el-button type="text" class="textColor">删除</el-button>
-          </el-table-column>
-        </el-table>
-      </div>
+            <el-table-column type="selection" min-width="100"></el-table-column>
+            <el-table-column
+              align="center"
+              label="使用组织"
+              prop="usename"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="编码"
+              prop="bianMa"
+              min-width="100"
+              label-class-name="bianma"
+              class-name="fontstyle"
+            ></el-table-column>
 
-      <div class="fr base">
-        <el-pagination
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
-        </el-pagination>
+            <el-table-column
+              align="center"
+              label="名称"
+              prop="name"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="规格型号"
+              prop="model"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="数据状态"
+              prop="dataState"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="是否维护商城资料"
+              prop="maintainData"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="是否维护内外机档案"
+              prop="maintainFiles"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="基本单位"
+              prop="baseCompany"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="已使用"
+              prop="used"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="操作"
+              prop="caozuo"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <el-button type="text" class="textColor" @click="editFn"
+                >编辑</el-button
+              >
+              <el-button type="text" class="textColor">删除</el-button>
+            </el-table-column>
+          </el-table>
+        </div>
+        <!-- 分页 -->
+        <div class="fr">
+          <el-pagination
+            :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>
     </div>
     <MaterialListDetail v-else />
@@ -190,13 +185,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.base {
-  margin-top: 20px;
-}
-::v-deep .fontstyle {
-  color: #0909ff;
-}
-::v-deep .bianma {
-  color: #409eff;
-}
+// ::v-deep .fontstyle {
+//   color: #0909ff;
+// }
+// ::v-deep .bianma {
+//   color: #409eff;
+// }
 </style>

src/views/basic_data/supplier/supplier_list.vue

@@ -1,25 +1,17 @@
 <template>
-  <div class="base">
+  <div class="app-container">
     <div v-if="isShow">
-      <!-- 搜索框 -->
-      <div class="base">
-        <el-form
-          ref="screenForm"
-          :model="searchForm"
-          label-width="70px"
-          size="small"
-          label-position="left"
-        >
+      <!-- 筛选条件 -->
+      <div>
+        <el-form 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-form-item label="关键字" prop="account">
+                <el-input placeholder="请输入关键字"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
+
+            <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
                 <el-button size="small">清空</el-button>
                 <el-button size="small" type="primary">搜索</el-button>
@@ -30,14 +22,16 @@
       </div>
 
       <!-- 表格 -->
-      <div class="base">
+      <div class="mymain-container">
         <div class="table">
           <el-table
+            v-loading="listLoading"
             :data="dataList"
-            :header-cell-style="{
-              'background-color': '#eef2f8',
-              'border-right': '1px solid #bec2c8',
-            }"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
           >
             <el-table-column type="selection" min-width="100"></el-table-column>
             <el-table-column
@@ -87,17 +81,15 @@
           </el-table>
         </div>
 
-        <div class="pagination clearfix">
-          <div class="fr">
-            <el-pagination
-              :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 class="fr">
+          <el-pagination
+            :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>
     </div>
@@ -110,6 +102,9 @@ import SupplierListDetail from "./components/supplier_list-detail.vue";
 export default {
   data() {
     return {
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
       isShow: true,
       searchForm: {
         name: "",

src/views/basic_data/taker/taker_car.vue

@@ -1,118 +1,122 @@
 <template>
-  <div>
+  <div class="app-container">
     <!-- 筛选条件 -->
-    <div class="base">
-      <el-row :gutter="30">
-        <el-col :span="4">
-          <el-input
-            v-model="searchForm.name"
-            placeholder="经销商名称"
-            width="20%"
-          />
-        </el-col>
-        <el-col :span="4">
-          <el-input
-            v-model="searchForm.username"
-            placeholder="提货人姓名"
-            width="20%"
-          />
-        </el-col>
+    <div>
+      <el-form 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="account">
+              <el-input placeholder="请输入经销商名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="提货人" prop="nickname">
+              <el-input placeholder="请输入提货人"></el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="14">
-          <div class="right">
-            <el-button type="info">查询</el-button>
-            <el-button type="info">重置</el-button>
-          </div>
-        </el-col>
-      </el-row>
+          <el-col :xs="24" :sm="12" :lg="12" class="tr">
+            <el-form-item label="">
+              <el-button size="small" @click="resetScreenForm">清空</el-button>
+              <el-button size="small" type="primary" @click="submitScreenForm"
+                >搜索</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </div>
     <!-- 按钮 -->
-    <div class="table base">
-      <el-row>
-        <el-button type="info">新增</el-button>
-        <el-button type="info">编辑</el-button>
-        <el-button type="info">删除</el-button>
-        <el-button type="info">导入</el-button>
-        <el-button type="info">导出</el-button>
-        <el-button type="info">打印</el-button>
-      </el-row>
+    <div class="btn-group clearfix">
+      <div class="fl">
+        <el-button type="primary">新增</el-button>
+        <el-button type="primary">编辑</el-button>
+        <el-button type="primary">删除</el-button>
+      </div>
+      <div class="fr">
+        <el-button type="primary">导入</el-button>
+        <el-button type="primary">导出</el-button>
+      </div>
     </div>
     <!-- 列表 -->
-    <div class="table base">
-      <el-table
-        :data="dataList"
-        element-loading-text="Loading"
-        :header-cell-style="{
-          'background-color': '#e8e8e8',
-          color: 'black',
-        }"
-        border=""
-      >
-        <el-table-column type="selection" min-width="100"></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="carNumber"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="创建者"
-          prop="createUser"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="创建时间"
-          prop="createDate"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="更新者"
-          prop="updateUser"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="更新时间"
-          prop="updateDate"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="操作"
-          min-width="160"
-          show-overflow-tooltip
+    <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-button type="text" class="textColor" @click="editFn"
-            >编辑</el-button
+          <el-table-column type="selection" min-width="100"></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="carNumber"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="创建者"
+            prop="createUser"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="创建时间"
+            prop="createDate"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="更新者"
+            prop="updateUser"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="更新时间"
+            prop="updateDate"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="操作"
+            min-width="160"
+            show-overflow-tooltip
           >
-          <el-button type="text" class="textColor">删除</el-button>
-        </el-table-column>
-      </el-table>
-    </div>
-
-    <!-- 分页 -->
-    <div>
-      <el-pagination
-        class="right base"
-        layout="prev, pager, next"
-        :total="1000"
-      >
-      </el-pagination>
+            <el-button type="text" class="textColor" @click="editFn"
+              >编辑</el-button
+            >
+            <el-button type="text" class="textColor">删除</el-button>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 分页 -->
+      <div class="fr">
+        <el-pagination
+          :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>
 
     <!-- 弹窗 -->
@@ -162,6 +166,9 @@
 export default {
   data() {
     return {
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
       addForm: {
         name: "",
         username: "",
@@ -214,19 +221,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-pagination {
-  .active {
-    border: 1px solid #64adfd;
-    margin-left: 6px;
-    color: #64adfd;
-    height: 32px;
-    width: 32px;
-    border-radius: 2px;
-  }
-}
-.textColor {
-  color: black;
-}
 ::v-deep .el-date-editor {
   width: 100%;
 }
@@ -239,13 +233,4 @@ export default {
 ::v-deep .el-dialog__header {
   background-color: #dddddd;
 }
-.base {
-  padding: 20px 20px 0;
-}
-.table {
-  margin-top: 12px;
-}
-.right {
-  float: right;
-}
 </style>

src/views/basic_data/taker/taker_list.vue

@@ -1,139 +1,141 @@
 <template>
-  <div>
+  <div class="app-container">
     <!-- 筛选条件 -->
-    <div class="base">
-      <el-row :gutter="30">
-        <el-col :span="4">
-          <el-input
-            v-model="searchForm.name"
-            placeholder="经销商名称"
-            width="20%"
-          />
-        </el-col>
-        <el-col :span="4">
-          <el-input
-            v-model="searchForm.username"
-            placeholder="存货分类编码"
-            width="20%"
-          />
-        </el-col>
-        <el-col :span="4">
-          <el-input
-            v-model="searchForm.telephone"
-            placeholder="存货分类"
-            width="20%"
-          />
-        </el-col>
-        <el-col :span="8">
-          <div class="right">
-            <el-button type="info">查询</el-button>
-            <el-button type="info">重置</el-button>
-          </div>
-        </el-col>
-      </el-row>
+    <div>
+      <el-form 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="account">
+              <el-input placeholder="请输入经销商名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="提货人姓名" prop="nickname">
+              <el-input placeholder="请输入提货人姓名"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="电话" prop="phone">
+              <el-input 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">清空</el-button>
+              <el-button size="small" type="primary">搜索</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </div>
     <!-- 按钮 -->
-    <div class="table base">
-      <el-row>
-        <el-button type="info" @click="addFn">新增</el-button>
-        <el-button type="info">导入</el-button>
-        <el-button type="info">导出</el-button>
-        <el-button type="info">打印</el-button>
-      </el-row>
+    <div class="btn-group clearfix">
+      <div class="fl">
+        <el-button type="primary" @click="addFn">新增</el-button>
+      </div>
+      <div class="fr">
+        <el-button type="primary">导入</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </div>
     </div>
     <!-- 列表 -->
-    <div class="table base">
-      <el-table
-        :data="dataList"
-        element-loading-text="Loading"
-        :header-cell-style="{
-          'background-color': '#e8e8e8',
-          color: 'black',
-        }"
-        border=""
-      >
-        <el-table-column type="selection" min-width="100"></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="username"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="身份证"
-          prop="userID"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="联系电话"
-          prop="telephone"
-          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="enclosure"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="有效期"
-          prop="valid"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="创建人"
-          prop="createUser"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="创建时间"
-          prop="createDate"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="状态"
-          prop="state"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-      </el-table>
-    </div>
-
-    <!-- 分页 -->
-    <div>
-      <el-pagination
-        class="right base"
-        layout="prev, pager, next"
-        :total="1000"
-      >
-      </el-pagination>
+    <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 type="selection" min-width="100"></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="username"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="身份证"
+            prop="userID"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="联系电话"
+            prop="telephone"
+            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="enclosure"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="有效期"
+            prop="valid"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="创建人"
+            prop="createUser"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="创建时间"
+            prop="createDate"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="状态"
+            prop="state"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+      </div>
+      <!-- 分页 -->
+      <div class="fr">
+        <el-pagination
+          :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>
 
     <!-- 弹窗 -->
@@ -211,6 +213,9 @@
 export default {
   data() {
     return {
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
       addForm: {
         name: "",
         username: "",
@@ -275,16 +280,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-pagination {
-  .active {
-    border: 1px solid #64adfd;
-    margin-left: 6px;
-    color: #64adfd;
-    height: 32px;
-    width: 32px;
-    border-radius: 2px;
-  }
-}
 ::v-deep .el-date-editor {
   width: 100%;
 }

src/views/basic_data/warehouse/warehouse_book.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="base">
+  <div class="app-container">
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span>仓库每天预约提货设置</span>
@@ -7,12 +7,13 @@
       <!-- 列表 -->
       <div class="">
         <el-table
+          v-loading="listLoading"
           :data="dataList"
-          :header-cell-style="{
-            'background-color': '#e8e8e8',
-            color: 'black',
-          }"
-          border=""
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
         >
           <el-table-column
             align="center"
@@ -115,7 +116,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.base {
-  padding: 20px;
-}
 </style>

src/views/basic_data/warehouse/warehouse_cost.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="main">
-    <el-card class="box-card">
+  <div class="app-container">
+    <!-- <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span>仓库费规则设施</span>
       </div>
@@ -29,107 +29,137 @@
       <h4 class="zhu">
         注:改规则适用所有经销商,个性化液之后,则不再按该规则执行
       </h4>
-    </el-card>
-    <div class="search">
-      <el-input placeholder="输入筛选条件"></el-input>
-      <el-button type="info">过滤</el-button>
+    </el-card> -->
+
+    <!-- 筛选条件 -->
+    <div>
+      <el-form 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="account">
+              <el-input 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="resetScreenForm">清空</el-button>
+              <el-button size="small" type="primary" @click="submitScreenForm"
+                >搜索</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </div>
-    <div class="table">
-      <el-row>
-        <el-button type="info">新增</el-button>
-        <el-button type="info">编辑</el-button>
-        <el-button type="info">删除</el-button>
-        <el-button type="info">导入</el-button>
-        <el-button type="info">导出</el-button>
-        <el-button type="info">打印</el-button>
-      </el-row>
+    <!-- 按钮 -->
+    <div class="btn-group clearfix">
+      <div class="fl">
+        <el-button type="primary">新增</el-button>
+        <el-button type="primary">编辑</el-button>
+        <el-button type="primary">删除</el-button>
+      </div>
+      <div class="fr">
+        <el-button type="primary">导入</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </div>
     </div>
 
-    <!-- 列表 -->
-    <div class="table">
-      <el-table
-        :data="dataList"
-        :header-cell-style="{
-          'background-color': '#e8e8e8',
-          color: 'black',
-        }"
-        border=""
-      >
-        <el-table-column type="selection" min-width="100" />
-
-        <el-table-column
-          align="center"
-          label="经销商编码"
-          prop="bianma"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="经销商名称"
-          prop="dealerName"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="存放免费天数"
-          prop="freeDay"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="收费规则(每立方米)"
-          prop="rule"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="创建人"
-          prop="createMan"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="创建时间"
-          prop="createDate"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="更新人"
-          prop="updateMan"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="更新时间"
-          prop="updateDate"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="操作"
-          min-width="160"
-          show-overflow-tooltip
+    <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-button type="text" class="textColor" @click="editFn"
-            >编辑</el-button
+          <el-table-column type="selection" min-width="100" />
+
+          <el-table-column
+            align="center"
+            label="经销商编码"
+            prop="bianma"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="经销商名称"
+            prop="dealerName"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="存放免费天数"
+            prop="freeDay"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="收费规则(每立方米)"
+            prop="rule"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="创建人"
+            prop="createMan"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="创建时间"
+            prop="createDate"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="更新人"
+            prop="updateMan"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="更新时间"
+            prop="updateDate"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="操作"
+            min-width="160"
+            show-overflow-tooltip
           >
-          <el-button type="text" class="textColor">删除</el-button>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!-- 分页 -->
-    <div>
-      <el-pagination class="right" layout="prev, pager, next" :total="1000">
-      </el-pagination>
+            <el-button type="text" class="textColor" @click="editFn"
+              >编辑</el-button
+            >
+            <el-button type="text" class="textColor">删除</el-button>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 分页 -->
+      <div class="fr">
+        <el-pagination
+          :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>
 
     <!-- 弹窗 -->
@@ -179,6 +209,9 @@
 export default {
   data() {
     return {
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
       dialogForm: {
         bianma: "",
         name: "",
@@ -264,23 +297,12 @@ export default {
 .inp {
   margin: 0 12px;
 }
-::v-deep .el-pagination {
-  .active {
-    border: 1px solid #64adfd;
-    margin-left: 6px;
-    color: #64adfd;
-    height: 32px;
-    width: 32px;
-    border-radius: 2px;
-  }
-}
+
 .right {
   margin-top: 12px;
   float: right;
 }
-.textColor {
-  color: black;
-}
+
 .table {
   margin-top: 12px;
 }

src/views/basic_data/warehouse/warehouse_list.vue

@@ -2,138 +2,133 @@
   <div class="app-container">
     <div v-if="isShow">
       <!-- 筛选条件 -->
-      <div class="screen-container">
-        <div class="top clearfix">
-          <div class="title fl">条件筛选</div>
-        </div>
-        <el-form
-          ref="screenForm"
-          :model="screenForm"
-          label-width="70px"
-          size="small"
-          label-position="left"
-        >
+      <div>
+        <el-form 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="screenForm.name"
-                  placeholder="请输入关键字"
-                ></el-input>
+              <el-form-item label="关键字" prop="account">
+                <el-input placeholder="请输入关键字"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
+
+            <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
-                <el-button size="small">清空</el-button>
-                <el-button size="small" type="primary">搜索</el-button>
+                <el-button size="small" @click="resetScreenForm"
+                  >清空</el-button
+                >
+                <el-button size="small" type="primary" @click="submitScreenForm"
+                  >搜索</el-button
+                >
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
       </div>
-
-      <div class="table">
-        <el-table
-          :data="dataList"
-          element-loading-text="Loading"
-          :header-cell-style="{
-            'background-color': '#eef2f8',
-            'border-right': '1px solid #bec2c8',
-          }"
-        >
-          <el-table-column type="selection" min-width="100"></el-table-column>
-          <el-table-column
-            align="center"
-            label="编码"
-            prop="bianMa"
-            min-width="100"
-            label-class-name="bianma"
-            class-name="fontstyle"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="名称"
-            prop="name"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="仓库地址"
-            prop="address"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="仓库负责人"
-            prop="storeUser"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="仓库属性"
-            prop="storeAttribute"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="第三方仓储类型"
-            prop="storeType"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="数据状态"
-            prop="dataState"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="允许即时库存负库存"
-            prop="allow"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="启用仓位管理"
-            prop="openStore"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="不参与可发量统计"
-            prop="noStatistics"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="参与预警"
-            prop="warning"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="操作"
-            prop="caozuo"
-            min-width="160"
-            show-overflow-tooltip
+      <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-button type="text" class="textColor" @click="editFn"
-              >编辑</el-button
+            <el-table-column type="selection" min-width="100"></el-table-column>
+            <el-table-column
+              align="center"
+              label="编码"
+              prop="bianMa"
+              min-width="100"
+              label-class-name="bianma"
+              class-name="fontstyle"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="名称"
+              prop="name"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="仓库地址"
+              prop="address"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="仓库负责人"
+              prop="storeUser"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="仓库属性"
+              prop="storeAttribute"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="第三方仓储类型"
+              prop="storeType"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="数据状态"
+              prop="dataState"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="允许即时库存负库存"
+              prop="allow"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="启用仓位管理"
+              prop="openStore"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="不参与可发量统计"
+              prop="noStatistics"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="参与预警"
+              prop="warning"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="操作"
+              prop="caozuo"
+              min-width="160"
+              show-overflow-tooltip
             >
-            <el-button type="text" class="textColor">删除</el-button>
-          </el-table-column>
-        </el-table>
-      </div>
-
-      <div class="fr base">
-        <el-pagination
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
-        </el-pagination>
+              <el-button type="text" class="textColor" @click="editFn"
+                >编辑</el-button
+              >
+              <el-button type="text" class="textColor">删除</el-button>
+            </el-table-column>
+          </el-table>
+        </div>
+        <!-- 分页 -->
+        <div class="fr">
+          <el-pagination
+            :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>
     </div>
     <WarehouseListDetail v-else />
@@ -209,13 +204,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.base {
-  margin-top: 20px;
-}
-::v-deep .fontstyle {
-  color: #0909ff;
-}
-::v-deep .bianma {
-  color: #409eff;
-}
+// ::v-deep .fontstyle {
+//   color: #0909ff;
+// }
+// ::v-deep .bianma {
+//   color: #409eff;
+// }
 </style>

src/views/basic_data/warehouse/warehouse_site.vue

@@ -1,136 +1,139 @@
 <template>
-  <div>
+  <div class="app-container">
     <!-- 筛选条件 -->
-    <div class="base">
-      <el-row :gutter="30">
-        <el-col :span="4">
-          <el-input
-            v-model="searchForm.storeName"
-            placeholder="仓库名称"
-            width="20%"
-          />
-        </el-col>
-        <el-col :span="4">
-          <el-input
-            v-model="searchForm.positionName"
-            placeholder="仓位名称"
-            width="20%"
-          />
-        </el-col>
+    <div>
+      <el-form 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="account">
+              <el-input placeholder="请输入仓库名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="仓位名称" prop="nickname">
+              <el-input placeholder="请输入仓位名称"></el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="14">
-          <div class="right">
-            <el-button type="info">查询</el-button>
-            <el-button type="info">重置</el-button>
-          </div>
-        </el-col>
-      </el-row>
+          <el-col :xs="24" :sm="12" :lg="12" class="tr">
+            <el-form-item label="">
+              <el-button size="small" @click="resetScreenForm">清空</el-button>
+              <el-button size="small" type="primary" @click="submitScreenForm"
+                >搜索</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </div>
     <!-- 按钮 -->
-    <div class="table base">
-      <el-row>
-        <el-button type="info" @click="addFn">新增</el-button>
-        <el-button type="info">编辑</el-button>
-        <el-button type="info">删除</el-button>
-      </el-row>
+    <div class="btn-group clearfix">
+      <div class="fl">
+        <el-button type="primary">新增</el-button>
+        <el-button type="primary">编辑</el-button>
+        <el-button type="primary">删除</el-button>
+      </div>
     </div>
-    <!-- 列表 -->
-    <div class="table base">
-      <el-table
-        :data="dataList"
-        element-loading-text="Loading"
-        :header-cell-style="{
-          'background-color': '#e8e8e8',
-          color: 'black',
-        }"
-        border=""
-      >
-        <el-table-column
-          align="center"
-          label="序号"
-          prop="num"
-          min-width="60"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="仓库名称"
-          prop="storeName"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="仓位名称"
-          prop="positionName"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="库存警戒线"
-          prop="alert"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="库存充足"
-          prop="adequate"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="创建人"
-          prop="createUser"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="创建时间"
-          prop="createDate"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="更新人"
-          prop="updateUser"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          label="更新时间"
-          prop="updateDate"
-          min-width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-
-        <el-table-column
-          align="center"
-          label="操作"
-          min-width="160"
-          show-overflow-tooltip
+    <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-button type="text" class="textColor" @click="editFn"
-            >编辑</el-button
-          >
-          <el-button type="text" class="textColor">删除</el-button>
-        </el-table-column>
-      </el-table>
-    </div>
+          <el-table-column
+            align="center"
+            label="序号"
+            prop="num"
+            min-width="60"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="仓库名称"
+            prop="storeName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="仓位名称"
+            prop="positionName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="库存警戒线"
+            prop="alert"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="库存充足"
+            prop="adequate"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="创建人"
+            prop="createUser"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="创建时间"
+            prop="createDate"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="更新人"
+            prop="updateUser"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="更新时间"
+            prop="updateDate"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
 
-    <!-- 分页 -->
-    <div>
-      <el-pagination
-        class="right base"
-        layout="prev, pager, next"
-        :total="1000"
-      >
-      </el-pagination>
+          <el-table-column
+            align="center"
+            label="操作"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <el-button type="text" class="textColor" @click="editFn"
+              >编辑</el-button
+            >
+            <el-button type="text" class="textColor">删除</el-button>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 分页 -->
+      <div class="fr">
+        <el-pagination
+          :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>
 
     <!-- 弹窗 -->
@@ -182,6 +185,9 @@
 export default {
   data() {
     return {
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
       options: [
         {
           value: "选项1",
@@ -261,19 +267,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-pagination {
-  .active {
-    border: 1px solid #64adfd;
-    margin-left: 6px;
-    color: #64adfd;
-    height: 32px;
-    width: 32px;
-    border-radius: 2px;
-  }
-}
-.textColor {
-  color: black;
-}
 ::v-deep .el-date-editor {
   width: 100%;
 }

src/views/merchant/merchant_list.vue

@@ -5,41 +5,66 @@
       <div class="top clearfix">
         <div class="title fl">条件筛选</div>
       </div>
-      <el-form ref="screenForm" :model="screenForm" label-width="70px" size="small" label-position="left">
+      <el-form
+        ref="screenForm"
+        :model="screenForm"
+        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="account">
-              <el-input v-model="screenForm.account" placeholder="请输入商户账号"></el-input>
+              <el-input
+                v-model="screenForm.account"
+                placeholder="请输入商户账号"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="商户昵称" prop="nickname">
-              <el-input v-model="screenForm.nickname" placeholder="请输入商户昵称"></el-input>
+              <el-input
+                v-model="screenForm.nickname"
+                placeholder="请输入商户昵称"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="联系电话" prop="phone">
-              <el-input v-model="screenForm.phone" placeholder="请输入联系电话"></el-input>
+              <el-input
+                v-model="screenForm.phone"
+                placeholder="请输入联系电话"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="电子邮箱" prop="email">
-              <el-input v-model="screenForm.email" placeholder="请输入电子邮箱"></el-input>
+              <el-input
+                v-model="screenForm.email"
+                placeholder="请输入电子邮箱"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="状态" prop="state">
               <el-select v-model="screenForm.status" placeholder="全部">
                 <el-option label="全部" value=""></el-option>
-                <el-option :label="item.label" :value="item.value" v-for="(item, index) in select_status" :key="index"></el-option>
+                <el-option
+                  :label="item.label"
+                  :value="item.value"
+                  v-for="(item, index) in select_status"
+                  :key="index"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          
+
           <el-col :xs="24" :sm="12" :lg="18" class="tr">
             <el-form-item label="">
               <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+              <el-button size="small" type="primary" @click="submitScreenForm"
+                >搜索</el-button
+              >
             </el-form-item>
           </el-col>
         </el-row>
@@ -49,43 +74,134 @@
     <div class="mymain-container">
       <div class="btn-group clearfix">
         <div class="fl">
-          <el-button size="small" type="primary" @click="toCreate()">开通账号</el-button>
+          <el-button size="small" type="primary" @click="toCreate()"
+            >开通账号</el-button
+          >
         </div>
         <div class="fr">
-          <el-button size="small" type="primary" icon="el-icon-download" @click="handleExport">导出数据</el-button>
+          <el-button
+            size="small"
+            type="primary"
+            icon="el-icon-download"
+            @click="handleExport"
+            >导出数据</el-button
+          >
         </div>
       </div>
       <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="操作" width="120" fixed="right">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            align="center"
+            label="操作"
+            width="120"
+            fixed="right"
+          >
             <template slot-scope="scope">
-              <el-button type="text" @click="toDetail(scope.row.adminUserId)">详情</el-button>
+              <el-button type="text" @click="toDetail(scope.row.adminUserId)"
+                >详情</el-button
+              >
               <template v-if="checkBtnRole('status')">
-                <el-popconfirm v-if="scope.row.status" style="margin-left: 10px;" title="确定冻结吗？" @onConfirm="changeStatus(scope.row.adminUserId, 0)" >
+                <el-popconfirm
+                  v-if="scope.row.status"
+                  style="margin-left: 10px"
+                  title="确定冻结吗？"
+                  @onConfirm="changeStatus(scope.row.adminUserId, 0)"
+                >
                   <el-button slot="reference" type="text">冻结</el-button>
                 </el-popconfirm>
-                <el-popconfirm v-else style="margin-left: 10px;" title="确定恢复吗？" @onConfirm="changeStatus(scope.row.adminUserId, 1)" >
+                <el-popconfirm
+                  v-else
+                  style="margin-left: 10px"
+                  title="确定恢复吗？"
+                  @onConfirm="changeStatus(scope.row.adminUserId, 1)"
+                >
                   <el-button slot="reference" type="text">恢复</el-button>
                 </el-popconfirm>
               </template>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="商户账号" prop="userName" min-width="100" show-overflow-tooltip>
+          <el-table-column
+            align="center"
+            label="商户账号"
+            prop="userName"
+            min-width="100"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-              <el-button type="text" @click="toAccountList(scope.row)">查看</el-button>
+              <el-button type="text" @click="toAccountList(scope.row)"
+                >查看</el-button
+              >
             </template>
           </el-table-column>
-          <el-table-column align="center" label="商户昵称" prop="adminCompanyName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="负责人" prop="linkName" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="角色" prop="roleName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="联系电话" prop="linkPhone" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="金蝶主体账号" prop="useOrgNumber" 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="email" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="地址" prop="address" min-width="200" show-overflow-tooltip></el-table-column>
+          <el-table-column
+            align="center"
+            label="商户昵称"
+            prop="adminCompanyName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="负责人"
+            prop="linkName"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="角色"
+            prop="roleName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="联系电话"
+            prop="linkPhone"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="金蝶主体账号"
+            prop="useOrgNumber"
+            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="email"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="地址"
+            prop="address"
+            min-width="200"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column align="center" label="状态" class-name="status-col">
             <template slot-scope="scope">
-              <el-tag :type="scope.row.status ? 'success':'danger'">{{ scope.row.status ? '正常':'冻结' }}</el-tag>
+              <el-tag :type="scope.row.status ? 'success' : 'danger'">{{
+                scope.row.status ? "正常" : "冻结"
+              }}</el-tag>
             </template>
           </el-table-column>
         </el-table>
@@ -100,11 +216,12 @@
           :page-sizes="[10, 20, 30, 50]"
           :page-size="10"
           layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal">
+          :total="listTotal"
+        >
         </el-pagination>
       </div>
     </div>
-    
+
     <!-- 详情弹窗 -->
     <el-dialog
       title="详情"
@@ -112,181 +229,264 @@
       width="600px"
       :show-close="false"
       :close-on-click-modal="false"
-      >
-     <div>
-      <el-form class="my-form" ref="mainForm" :model="mainForm" label-width="100px" label-position="right">
-        <el-form-item label="商户账号" prop="account">
-          <el-input v-model="mainForm.account" disabled  class="formWidth"></el-input>
-        </el-form-item>
-        <el-form-item label="账户昵称" prop="nickName">
-          <el-input v-model="mainForm.nickName" disabled class="formWidth" ></el-input>
-        </el-form-item>
-        <el-form-item label="负责人" prop="chargePerson">
-          <el-input v-model="mainForm.chargePerson" disabled class="formWidth"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话" prop="phone">
-          <el-input v-model="mainForm.phone" disabled class="formWidth"></el-input>
-        </el-form-item>
-        <el-form-item label="金蝶主体账号" prop="kingdeeId">
-          <el-input v-model="mainForm.kingdeeId" disabled class="formWidth"></el-input>
-        </el-form-item>
-        <el-form-item label="金蝶主体名称" prop="kingdeeName">
-          <el-input v-model="mainForm.kingdeeName" disabled class="formWidth"></el-input>
-        </el-form-item>
-        <el-form-item label="电子邮箱" prop="email">
-          <el-input v-model="mainForm.email" disabled class="formWidth"></el-input>
-        </el-form-item>
-        <el-form-item label="地址" prop="address">
-          <el-input v-model="mainForm.address" disabled class="formWidth"></el-input>
-        </el-form-item>
-        <el-form-item label="登录密码" prop="password">
-          <el-input v-model="mainForm.password" type="password" disabled class="formWidth"></el-input>
-          <el-button class="reset" @click="handleReset()">重置密码</el-button>
-        </el-form-item>
-        <!-- <el-form-item class="tr">
+    >
+      <div>
+        <el-form
+          class="my-form"
+          ref="mainForm"
+          :model="mainForm"
+          label-width="100px"
+          label-position="right"
+        >
+          <el-form-item label="商户账号" prop="account">
+            <el-input
+              v-model="mainForm.account"
+              disabled
+              class="formWidth"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="账户昵称" prop="nickName">
+            <el-input
+              v-model="mainForm.nickName"
+              disabled
+              class="formWidth"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="负责人" prop="chargePerson">
+            <el-input
+              v-model="mainForm.chargePerson"
+              disabled
+              class="formWidth"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="联系电话" prop="phone">
+            <el-input
+              v-model="mainForm.phone"
+              disabled
+              class="formWidth"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="金蝶主体账号" prop="kingdeeId">
+            <el-input
+              v-model="mainForm.kingdeeId"
+              disabled
+              class="formWidth"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="金蝶主体名称" prop="kingdeeName">
+            <el-input
+              v-model="mainForm.kingdeeName"
+              disabled
+              class="formWidth"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="电子邮箱" prop="email">
+            <el-input
+              v-model="mainForm.email"
+              disabled
+              class="formWidth"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="地址" prop="address">
+            <el-input
+              v-model="mainForm.address"
+              disabled
+              class="formWidth"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="登录密码" prop="password">
+            <el-input
+              v-model="mainForm.password"
+              type="password"
+              disabled
+              class="formWidth"
+            ></el-input>
+            <el-button class="reset" @click="handleReset()">重置密码</el-button>
+          </el-form-item>
+          <!-- <el-form-item class="tr">
           <el-button type="primary" @click="submitmainForm">保存</el-button>
         </el-form-item> -->
-      </el-form>
-      
-    
-    <!-- 重置密码 -->
-    <el-dialog append-to-body title="重置密码" :visible.sync="resetFormVisible" :show-close="false" width="500px" :close-on-click-modal="false">
-      <el-form ref="resetForm" :model="resetForm" :rules="resetFormRules" label-position="left" label-width="100px">
-        <el-form-item label="输入新密码" prop="newPassword">
-          <el-input v-model="resetForm.newPassword" ref="password1" autocomplete="off" class="formWidth" placeholder="请输入新密码" :type="passwordType1"></el-input>
-          <span class="show-pwd" @click="showPwd(1)">
-            <svg-icon :icon-class="passwordType1 === 'password' ? 'eye' : 'eye-open'" />
-          </span>
-        </el-form-item>
-        <el-form-item label="确认密码" prop="confirmPassword">
-          <el-input v-model="resetForm.confirmPassword" ref="password2" autocomplete="off" class="formWidth" placeholder="请再次输入新密码" :type="passwordType2"></el-input>
-          <span class="show-pwd" @click="showPwd(2)">
-            <svg-icon :icon-class="passwordType2 === 'password' ? 'eye' : 'eye-open'" />
-          </span>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="cancelResetForm">取 消</el-button>
-        <el-button type="primary" @click="submitResetForm">确 定</el-button>
+        </el-form>
+
+        <!-- 重置密码 -->
+        <el-dialog
+          append-to-body
+          title="重置密码"
+          :visible.sync="resetFormVisible"
+          :show-close="false"
+          width="500px"
+          :close-on-click-modal="false"
+        >
+          <el-form
+            ref="resetForm"
+            :model="resetForm"
+            :rules="resetFormRules"
+            label-position="left"
+            label-width="100px"
+          >
+            <el-form-item label="输入新密码" prop="newPassword">
+              <el-input
+                v-model="resetForm.newPassword"
+                ref="password1"
+                autocomplete="off"
+                class="formWidth"
+                placeholder="请输入新密码"
+                :type="passwordType1"
+              ></el-input>
+              <span class="show-pwd" @click="showPwd(1)">
+                <svg-icon
+                  :icon-class="
+                    passwordType1 === 'password' ? 'eye' : 'eye-open'
+                  "
+                />
+              </span>
+            </el-form-item>
+            <el-form-item label="确认密码" prop="confirmPassword">
+              <el-input
+                v-model="resetForm.confirmPassword"
+                ref="password2"
+                autocomplete="off"
+                class="formWidth"
+                placeholder="请再次输入新密码"
+                :type="passwordType2"
+              ></el-input>
+              <span class="show-pwd" @click="showPwd(2)">
+                <svg-icon
+                  :icon-class="
+                    passwordType2 === 'password' ? 'eye' : 'eye-open'
+                  "
+                />
+              </span>
+            </el-form-item>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="cancelResetForm">取 消</el-button>
+            <el-button type="primary" @click="submitResetForm">确 定</el-button>
+          </div>
+        </el-dialog>
       </div>
-    </el-dialog>
-    </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="detailDiaLog = false" >关 闭</el-button>
+        <el-button @click="detailDiaLog = false">关 闭</el-button>
       </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { COMMON_SELECT } from '@/utils/select_data'
-import { getList, changeAccountStatus, getDetail, resetPassword, editAccount } from "@/api/merchant";
-import {downloadFiles} from '@/utils/util'
-import { getToken } from '@/utils/auth'
+import { COMMON_SELECT } from "@/utils/select_data";
+import {
+  getList,
+  changeAccountStatus,
+  getDetail,
+  resetPassword,
+  editAccount,
+} from "@/api/merchant";
+import { downloadFiles } from "@/utils/util";
+import { getToken } from "@/utils/auth";
 
 export default {
   // components:{MERCHANT_DETAIL},
-  
+
   data() {
     var validatePass = (rule, value, callback) => {
-      if (value === '') {
-        callback(new Error('请输入登录密码'));
+      if (value === "") {
+        callback(new Error("请输入登录密码"));
       } else if (value.length < 12) {
-        callback(new Error('密码长度至少12位'));
+        callback(new Error("密码长度至少12位"));
       } else if (/[A-Za-z].*[0-9]|[0-9].*[A-Za-z]/.test(value) == false) {
-        callback(new Error('密码必须包含数字和字母'));
+        callback(new Error("密码必须包含数字和字母"));
       } else {
-        if (this.resetForm.confirmPassword !== '') {
-          this.$refs.resetForm.validateField('confirmPassword');
+        if (this.resetForm.confirmPassword !== "") {
+          this.$refs.resetForm.validateField("confirmPassword");
         }
         callback();
       }
     };
     var validatePass2 = (rule, value, callback) => {
-      if (value === '') {
-        callback(new Error('请再次输入密码'));
+      if (value === "") {
+        callback(new Error("请再次输入密码"));
       } else if (value !== this.resetForm.newPassword) {
-        callback(new Error('两次输入密码不一致'));
+        callback(new Error("两次输入密码不一致"));
       } else {
         callback();
       }
     };
     return {
       baseURL: process.env.VUE_APP_BASE_API,
-      myHeaders: {'x-token': getToken()},
+      myHeaders: { "x-token": getToken() },
       id: null,
       companyWechatId: null,
-      step: 'first',
+      step: "first",
       mainForm: {
-        account: '', // 账号
-        nickName: '', // 用户名
-        chargePerson: '', // 负责人
-        phone: '', // 联系电话
-        kingdeeId: '',
-        kingdeeName: '',          
-        email: '', // 电子邮箱
-        address: '', // 地址
-        newPassword: '', // 新密码
-        confirmPassword: '', // 确认密码
+        account: "", // 账号
+        nickName: "", // 用户名
+        chargePerson: "", // 负责人
+        phone: "", // 联系电话
+        kingdeeId: "",
+        kingdeeName: "",
+        email: "", // 电子邮箱
+        address: "", // 地址
+        newPassword: "", // 新密码
+        confirmPassword: "", // 确认密码
       },
 
-      passwordType1: 'password',
-      passwordType2: 'password',
+      passwordType1: "password",
+      passwordType2: "password",
 
-      
       resetFormVisible: false,
       resetForm: {
-        newPassword: '', // 新密码
-        confirmPassword: '', // 确认密码
+        newPassword: "", // 新密码
+        confirmPassword: "", // 确认密码
       },
       resetFormRules: {
         newPassword: [
-          { required: true, validator: validatePass, trigger: 'blur' }
+          { required: true, validator: validatePass, trigger: "blur" },
         ],
         confirmPassword: [
-          { required: true, validator: validatePass2, trigger: 'blur' }
+          { required: true, validator: validatePass2, trigger: "blur" },
         ],
       },
 
       formLoading: false,
-    
 
-      detailDiaLog:false,//详情弹窗
+      detailDiaLog: false, //详情弹窗
       isOpen: false, // 是否展开条件筛选
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
       dataList: null, // 列表数据
       listLoading: false, // 列表加载loading
-      screenForm: { // 筛选表单数据
-        account: '',
-        nickname: '',
-        phone: '',
-        email: '',
-        status: '',
+      screenForm: {
+        // 筛选表单数据
+        account: "",
+        nickname: "",
+        phone: "",
+        email: "",
+        status: "",
       },
-      select_status: [ // 筛选字段 - 状态
-        { label: '正常', value: true },
-        { label: '冻结', value: false }
+      select_status: [
+        // 筛选字段 - 状态
+        { label: "正常", value: true },
+        { label: "冻结", value: false },
       ],
-    }
+    };
   },
   created() {
     this.getList();
   },
-   computed: {
+  computed: {
     sidebar() {
-      return this.$store.state.app.sidebar
+      return this.$store.state.app.sidebar;
     },
     classObj() {
       return {
         hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened
-      }
+        openSidebar: this.sidebar.opened,
+      };
     },
   },
   methods: {
-   goBack() {
+    goBack() {
       this.$router.go(-1);
     },
 
@@ -297,10 +497,10 @@ export default {
     },
 
     // 取消重置密码
-    cancelResetForm(){
+    cancelResetForm() {
       this.resetFormVisible = false;
-      this.passwordType1 = 'password';
-      this.passwordType2 = 'password';
+      this.passwordType1 = "password";
+      this.passwordType2 = "password";
       this.$refs.resetForm.resetFields();
     },
 
@@ -310,38 +510,38 @@ export default {
         if (valid) {
           let params = {
             password: this.resetForm.newPassword,
-            adminUserId: this.id
-          }
-          resetPassword(params).then(res => {
+            adminUserId: this.id,
+          };
+          resetPassword(params).then((res) => {
             this.cancelResetForm();
             this.getDetail();
             this.$successMsg();
-          })
+          });
         }
-      })
+      });
     },
 
     // 显示隐藏密码
     showPwd(num) {
-      if(num == 1) {
-        if (this.passwordType1 === 'password') {
-          this.passwordType1 = ''
+      if (num == 1) {
+        if (this.passwordType1 === "password") {
+          this.passwordType1 = "";
         } else {
-          this.passwordType1 = 'password'
+          this.passwordType1 = "password";
         }
         this.$nextTick(() => {
-          this.$refs.password1.focus()
-        })
+          this.$refs.password1.focus();
+        });
       }
-      if(num == 2) {
-        if (this.passwordType2 === 'password') {
-          this.passwordType2 = ''
+      if (num == 2) {
+        if (this.passwordType2 === "password") {
+          this.passwordType2 = "";
         } else {
-          this.passwordType2 = 'password'
+          this.passwordType2 = "password";
         }
         this.$nextTick(() => {
-          this.$refs.password2.focus()
-        })
+          this.$refs.password2.focus();
+        });
       }
     },
 
@@ -364,18 +564,20 @@ export default {
             subSecret: this.mainForm.childKey,
             subMchId: this.mainForm.childMerchantId,
             template: this.mainForm.templateId,
-            companyWechatId: this.companyWechatId
-          }
-          editAccount(params).then(res => {
-            this.$successMsg('保存成功');
-            setTimeout(() => {
-              this.goBack();
-            }, 1500)
-          }).finally(res => {
-            this.formLoading = false;
-          })
+            companyWechatId: this.companyWechatId,
+          };
+          editAccount(params)
+            .then((res) => {
+              this.$successMsg("保存成功");
+              setTimeout(() => {
+                this.goBack();
+              }, 1500);
+            })
+            .finally((res) => {
+              this.formLoading = false;
+            });
         }
-      })
+      });
     },
     // 查询按钮权限
     checkBtnRole(value) {
@@ -383,7 +585,7 @@ export default {
       // if(!btnRole) {return true}
       // let index = btnRole.indexOf(value);
       // return index >= 0;
-      return true
+      return true;
     },
 
     // 查询列表
@@ -403,7 +605,7 @@ export default {
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;
-      })
+      });
     },
     // 提交筛选表单
     submitScreenForm() {
@@ -431,22 +633,22 @@ export default {
     // 去开通账号
     toCreate() {
       this.$router.push({
-        path: '/merchant/create_account',
-        query: {}
-      })
+        path: "/merchant/create_account",
+        query: {},
+      });
     },
 
     toAccountList() {
       this.$router.push({
-        path: '/setting/account',
+        path: "/setting/account",
         query: {
-          type: 1
-        }
-      })
+          type: 1,
+        },
+      });
     },
 
     async toDetail(id) {
-      getDetail({adminUserId: id}).then(res => {
+      getDetail({ adminUserId: id }).then((res) => {
         this.mainForm.account = res.data.userName;
         this.mainForm.nickName = res.data.nickName;
         this.mainForm.chargePerson = res.data.linkName;
@@ -455,18 +657,18 @@ export default {
         this.mainForm.kingdeeName = res.data.useOrgName;
         this.mainForm.email = res.data.email;
         this.mainForm.address = res.data.address;
-        this.mainForm.password = '************';
-        this.detailDiaLog = true
-      })
+        this.mainForm.password = "************";
+        this.detailDiaLog = true;
+      });
     },
 
     // 操作 - 更改状态(type: 禁用0，启用1)
     changeStatus(id, type) {
-      type = type ? true : false
-      changeAccountStatus({adminUserId: id, status: type}).then(res => {
+      type = type ? true : false;
+      changeAccountStatus({ adminUserId: id, status: type }).then((res) => {
         this.getList();
         this.$successMsg();
-      })
+      });
     },
 
     // 导出
@@ -478,15 +680,14 @@ export default {
         email: this.screenForm.email,
         status: this.screenForm.status,
       };
-      downloadFiles('admin/user/mch/export', screenData);
+      downloadFiles("admin/user/mch/export", screenData);
     },
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-
- .formWidth {
+.formWidth {
   width: 70%;
   margin-right: 20px;
 }