Przeglądaj źródła

仓库,物流,提货人.经销商,供应商管理页面完成

chen 3 lat temu
rodzic
commit
b34490bcaf

+ 157 - 0
src/views/basic_data/dealer/components/dealer-apply-detail.vue

@@ -0,0 +1,157 @@
+<template>
+  <div>
+    <div>
+      <el-page-header @back="goBack" content="详情页面"> </el-page-header>
+    </div>
+    <div class="message">
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>申请信息</span>
+        </div>
+        <el-row>
+          <el-col :span="4">企业名称</el-col>
+          <el-col :span="4"><input type="text" /></el-col>
+          <el-col :span="4">联系人</el-col>
+          <el-col :span="4"><input type="text" /></el-col>
+          <el-col :span="4">联系电话</el-col>
+          <el-col :span="4"><input type="text" /></el-col>
+          <el-col :span="4">企业名称</el-col>
+          <el-col :span="4"><input type="text" /></el-col>
+          <el-col :span="4">联系人</el-col>
+          <el-col :span="4"><input type="text" /></el-col>
+          <el-col :span="4">联系电话</el-col>
+          <el-col :span="4"><input type="text" /></el-col>
+        </el-row>
+      </el-card>
+      <div>
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>跟进记录</span>
+          </div>
+          <!-- 列表 -->
+
+          <el-table
+            :data="dataList"
+            :header-cell-style="{
+              'background-color': '#e8e8e8',
+              color: 'black',
+            }"
+            border=""
+          >
+            <el-table-column
+              align="center"
+              label="跟进人"
+              prop="person"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="center"
+              label="跟进时间"
+              prop="personDate"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="center"
+              label="跟进状态"
+              prop="state"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="center"
+              label="处理意见"
+              prop="suggest"
+              min-width="160"
+              show-overflow-tooltip
+            />
+          </el-table>
+        </el-card>
+      </div>
+
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>跟进登录</span>
+        </div>
+        <el-row>
+          <el-col :span="4">跟进人</el-col>
+          <el-col :span="4"><input type="text" /></el-col>
+          <el-col :span="4">跟进时间</el-col>
+          <el-col :span="4"><input type="text" /></el-col>
+          <el-col :span="4">跟进状态</el-col>
+          <el-col :span="4"
+            ><select value="1">
+              <option value="1">跟进中</option>
+              <option value="2">vertical</option>
+            </select></el-col
+          >
+          <el-col :span="4">处理意见</el-col>
+          <el-col :span="4"
+            ><input type="text" placeholder="记录处理意见"
+          /></el-col>
+        </el-row>
+      </el-card>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      dataList: [
+        {
+          person: "李四",
+          personDate: "2020-09-10 12:12",
+          state: "跟进中",
+          suggest: "业务沟通中",
+        },
+        {
+          person: "李四",
+          personDate: "2020-09-10 12:12",
+          state: "跟进中",
+          suggest: "业务沟通中",
+        },
+        {
+          person: "李四",
+          personDate: "2020-09-10 12:12",
+          state: "跟进中",
+          suggest: "业务沟通中",
+        },
+      ],
+    };
+  },
+  methods: {
+    goBack() {
+      console.log(this.$parent);
+      this.$parent.isShow = true;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.el-card__body {
+  .el-col:nth-child(2n + 1) {
+    background-color: #e8e8e8;
+  }
+  .el-col {
+    border: 1px solid black;
+    height: 48px;
+    text-align: center;
+    line-height: 48px;
+    overflow: hidden;
+    margin: 0px 0px -1px -1px;
+    input {
+      outline: none;
+      border: 0px;
+      height: 48px;
+    }
+  }
+}
+
+.message {
+  margin-top: 10px;
+}
+</style>

+ 287 - 0
src/views/basic_data/dealer/components/dealer_list-detail.vue

@@ -0,0 +1,287 @@
+<template>
+  <div>
+    <div class="sty">
+      <el-page-header @back="goBack" content="详情页面"> </el-page-header>
+    </div>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>客户</span>
+      </div>
+      <el-row>
+        <el-col :span="8"
+          ><span class="color">创建组织</span><input type="text"
+        /></el-col>
+        <el-col :span="8"><span>客户编码</span><input type="text" /></el-col>
+        <el-col :span="8"
+          ><span class="color">使用组织</span><input type="text"
+        /></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8"><span>简称</span><input type="text" /></el-col>
+      </el-row>
+    </el-card>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>基本信息</span>
+      </div>
+      <div class="baseInfo">
+        <div>
+          <div class="base-header">
+            <span>地址</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">国家</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">地区</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">省份</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">城市</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">通讯地址</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">邮政编码</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">公司网址</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">商城订单对应组织</span
+              ><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">联系邮箱</span><input type="text"
+            /></el-col>
+          </el-row>
+        </div>
+        <div>
+          <div class="base-header">
+            <span>管理</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">联系电话</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">传真</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">公司类别</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">公司性质</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">公司规模</span><input type="text"
+            /></el-col>
+          </el-row>
+          <div class="base-header">
+            <span>开票信息</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">发票抬头</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">纳税登记号</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">开户银行</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">银行账号</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">开票联系电话</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">开票通讯地址</span><input type="text"
+            /></el-col>
+          </el-row>
+        </div>
+        <div>
+          <div class="base-header">
+            <span>相关</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">对应供应商</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">对应集团客户</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">集团客户</span><input type="checkbox"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">默认付款方</span><input type="checkbox"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">不校验可发量</span><input type="checkbox"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">客户类别</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">客户分组</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">对应组织</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">备注</span><input type="text"
+            /></el-col>
+          </el-row>
+          <div class="base-header">
+            <span>智慧订货</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">允许对智慧订货</span><input type="checkbox"
+            /></el-col>
+          </el-row>
+        </div>
+      </div>
+    </el-card>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>信用额度</span>
+      </div>
+      <el-row>
+        <el-col :span="8"
+          ><span class="color">信用额度</span><input type="text"
+        /></el-col>
+        <el-col :span="8"><span>有效期</span><input type="text" /></el-col>
+        <el-col :span="8"></el-col>
+      </el-row>
+    </el-card>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>业务信息</span>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    goBack() {
+      console.log(this.$parent);
+      this.$parent.isShow = true;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.color {
+  color: #1f93ec;
+}
+.el-col-24 {
+  margin: 6px 0;
+}
+
+.marg-r {
+  padding-right: 15px;
+  font-size: 12px;
+  display: inline-block;
+  width: 120px;
+}
+.base-header {
+  height: 20px;
+  width: 60%;
+  border-bottom: 2px solid gray;
+  span {
+    width: 100px;
+    height: 100%;
+    display: block;
+    text-align: center;
+    color: #fff;
+
+    background-color: gray;
+  }
+}
+.box-card {
+  margin-bottom: 20px;
+}
+.el-col-8 {
+  span {
+    padding-right: 10px;
+    display: inline-block;
+    width: 100px;
+  }
+}
+.baseInfo {
+  display: flex;
+  justify-content: space-between;
+  > div {
+    width: 33%;
+  }
+}
+.sty {
+  margin-bottom: 20px;
+}
+.el-row {
+  margin-bottom: 20px;
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+</style>

+ 216 - 0
src/views/basic_data/dealer/dealer_apply.vue

@@ -0,0 +1,216 @@
+<template>
+  <div class="base">
+    <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>
+        <div class="right">
+          <el-button type="info">查询</el-button>
+          <el-button type="info">重置</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">
+        <!-- 列表 -->
+        <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
+          >
+            <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>
+
+    <DealerApplyDetail v-else />
+  </div>
+</template>
+
+<script>
+import DealerApplyDetail from "./components/dealer-apply-detail.vue";
+export default {
+  data() {
+    return {
+      isShow: true,
+      showDialog: false,
+      dataList: [
+        {
+          enterprise: "佛山市禅城区梁云冷气经营部",
+          friend: "张三",
+          telephone: "17839906442",
+          email: "@163.com",
+          address: "广东深圳市",
+          reqDate: "2022-5-34  12:08",
+          person: "张三",
+          personDate: "2022-5-24   12:09",
+          state: "跟进中",
+        },
+        {
+          enterprise: "佛山市禅城区梁云冷气经营部",
+          friend: "张三",
+          telephone: "17839906442",
+          email: "@163.com",
+          address: "广东深圳市",
+          reqDate: "2022-5-34  12:08",
+          person: "张三",
+          personDate: "2022-5-24   12:09",
+          state: "跟进中",
+        },
+        {
+          enterprise: "佛山市禅城区梁云冷气经营部",
+          friend: "张三",
+          telephone: "17839906442",
+          email: "@163.com",
+          address: "广东深圳市",
+          reqDate: "2022-5-34  12:08",
+          person: "张三",
+          personDate: "2022-5-24   12:09",
+          state: "跟进中",
+        },
+      ],
+      enterprise: {
+        name: "",
+        friend: "",
+        telephone: "",
+        address: "",
+        email: "",
+      },
+    };
+  },
+  components: {
+    DealerApplyDetail,
+  },
+  methods: {
+    editFn() {
+      this.isShow = false;
+    },
+  },
+};
+</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>

+ 268 - 0
src/views/basic_data/dealer/dealer_deposit.vue

@@ -0,0 +1,268 @@
+<template>
+  <div class="main">
+    <el-card class="box-card">
+      <el-row>
+        <h4>通用经销商工程机押金比例配置</h4>
+        <h4>
+          工程机押金比例配置
+          <input
+            type="text"
+            class="inp"
+          />%通用工程押金比例配置适用于,没有单独配置工程机押金比例的经销商.
+        </h4>
+      </el-row>
+    </el-card>
+    <div class="search">
+      <el-input placeholder="输入筛选条件"></el-input>
+      <el-button type="info">过滤</el-button>
+    </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>
+
+    <!-- 列表 -->
+    <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
+        >
+          <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>
+      <el-pagination class="right" layout="prev, pager, next" :total="1000">
+      </el-pagination>
+    </div>
+
+    <!-- 弹窗 -->
+    <el-dialog
+      title="经销商工程机押金比例设置"
+      :visible.sync="showDialog"
+      width="30%"
+      :show-close="false"
+      :close-on-click-modal="false"
+    >
+      <el-form :model="dialogForm" label-width="100px" label-position="right">
+        <el-form-item label="经销商编码">
+          <el-select
+            v-model="dialogForm.bianma"
+            placeholder="请选择活动区域"
+            class="inputStyle"
+          >
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="经销商名称">
+          <el-input v-model="dialogForm.name" class="inputStyle"></el-input>
+        </el-form-item>
+        <el-form-item label="押金比例">
+          <el-input v-model="dialogForm.yaJin" class="inputStyle"></el-input>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input
+            type="textarea"
+            v-model="dialogForm.beiZhu"
+            placeholder="请输入备注信息"
+            class="inputStyle"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="showDialog = false">取 消</el-button>
+        <el-button type="primary" @click="showDialog = false">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      dialogForm: {
+        bianma: "",
+        name: "",
+        yaJin: "",
+        beiZhu: "",
+      },
+      showDialog: false,
+      dataList: [
+        {
+          num: "1",
+          bianma: "1002",
+          dealerName: "佛山市禅城区梁云冷气经营部",
+          yaJin: "0.1",
+          beiZhu: "???",
+          createMan: "??",
+          createDate: "2000/01/01",
+          updateMan: "??",
+          updateDate: "2020/01/01",
+        },
+        {
+          num: "1",
+          bianma: "1002",
+          dealerName: "佛山市禅城区梁云冷气经营部",
+          yaJin: "0.1",
+          beiZhu: "???",
+          createMan: "??",
+          createDate: "2000/01/01",
+          updateMan: "??",
+          updateDate: "2020/01/01",
+        },
+        {
+          num: "1",
+          bianma: "1002",
+          dealerName: "佛山市禅城区梁云冷气经营部",
+          yaJin: "0.1",
+          beiZhu: "???",
+          createMan: "??",
+          createDate: "2000/01/01",
+          updateMan: "??",
+          updateDate: "2020/01/01",
+        },
+      ],
+    };
+  },
+  methods: {
+    editFn() {
+      this.showDialog = true;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-form {
+  .inputStyle {
+    width: 80%;
+  }
+}
+::v-deep .dialog-footer {
+  display: flex;
+  justify-content: center;
+}
+::v-deep .el-dialog__header {
+  background-color: #dddddd;
+}
+.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;
+}
+.search {
+  display: flex;
+  margin-top: 12px;
+  ::v-deep .el-input {
+    width: 50%;
+    margin-right: 12px;
+  }
+}
+.main {
+  padding: 12px;
+}
+</style>>
+

+ 230 - 459
src/views/basic_data/dealer/dealer_list.vue

@@ -1,498 +1,269 @@
 <template>
   <div class="app-container">
-    <!-- 筛选条件 -->
-    <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">
-        <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>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6" 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 style="display: flex">
-      <div class="tree-container">
-        <div style="padding: 10px; display: flex;">
-          <el-button icon="el-icon-refresh-right" size="small" @click="refreshDepartment()" style="padding: 9px 10px; margin-right: 6px"></el-button>
-          <el-input
-            placeholder="输入关键字进行过滤"
-            size="small"
-            clearable
-            v-model="filterText">
-          </el-input>
+    <div v-if="isShow">
+      <!-- 筛选条件 -->
+      <div class="screen-container">
+        <div class="top clearfix">
+          <div class="title fl">条件筛选</div>
         </div>
-        <el-tree
-          :data="departmentList"
-          :props="defaultProps"
-          default-expand-all
-          highlight-current
-          :expand-on-click-node="false"
-          :filter-node-method="filterNode"
-          @node-click="handleNodeClick"
-          node-key="id"
-          ref="listTree">
-          <div class="custom-tree-node" slot-scope="{ node, data }">
-            <i :class="data.children && data.children.length > 0 ? 'el-icon-folder-opened':'el-icon-document-remove'"></i><span>{{ node.label }}</span>
-          </div>
-        </el-tree>
+        <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="name">
+                <el-input
+                  v-model="screenForm.name"
+                  placeholder="请输入关键字"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <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="mymain-container">
-        
-        <div class="btn-group clearfix" style="margin-top: 20px">
-          <div class="fl">
-            <el-button size="small" type="primary" @click="openDepartmentForm('add')">添加部门</el-button>
-          </div>
-          <div class="fr">
-            <!-- <el-upload
-              class="import-btn"
-              style="height: 0; width: 0; overflow: hidden;"
-              :action="baseURL + 'student/import'"
-              :http-request="handleImport"
-              :file-list="importFileList"
-              v-if="checkBtnRole('import')"
-            >
-              <el-button size="small" type="primary" :loading="importLoading">{{ importLoading ? '导入中...' : '导入' }}</el-button>
-            </el-upload>
-
-            <el-button size="small" type="primary" @click="handleExport">导出</el-button>
 
-            <el-button size="small" type="primary" :loading="importLoading" @click="clickImport">{{ importLoading ? '导入中...' : '导入' }}</el-button>
-            
-            <el-button size="small" @click="handleDownload" v-if="checkBtnRole('download')">下载导入模板</el-button> -->
-          </div>
-        </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
+          >
+            <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="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
-            <!-- <el-table-column align="center" type="selection" width="55" fixed></el-table-column> -->
-            <el-table-column align="center" label="账号" prop="userName" min-width="120"></el-table-column>
-            <el-table-column align="center" label="用户名" prop="nickName" min-width="120"></el-table-column>
-            <el-table-column align="center" label="角色" prop="roleName" min-width="100"></el-table-column>
-            <el-table-column align="center" label="创建时间" prop="createTime" min-width="160"></el-table-column>
-            <el-table-column align="center" label="最后登录时间" prop="lastLoginTime" min-width="160"></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>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        
-        <div class="pagination clearfix">
-          <div class="fr">
-            <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page="currentPage"
-              :page-sizes="[10, 20, 30, 50]"
-              :page-size="10"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="listTotal">
-            </el-pagination>
-          </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>
     </div>
+    <DealerListDetail v-else />
   </div>
 </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";
-
+import DealerListDetail from "./components/dealer_list-detail.vue";
 export default {
-  
   data() {
     return {
-      baseURL: process.env.VUE_APP_BASE_API,
-      dataList: null, // 列表数据
-      moduleList: null, // 模块列表
-      listLoading: true, // 列表加载loading
-      screenForm: { // 筛选表单数据
-        name: '', // 名称
+      isShow: true,
+      dataList: [
+        {
+          bianMa: "001",
+          username: "张蕙兰",
+          jianCheng: "zhl",
+          danJuZhuangTai: "已审核",
+          jinYong: "否",
+          use: "广州格匠机电工程科技有限公司",
+          shenHeRen: "郑桂茹",
+          shenHeDate: "2020/11/11",
+          keHu: "花都线",
+        },
+        {
+          bianMa: "001",
+          username: "张蕙兰",
+          jianCheng: "zhl",
+          danJuZhuangTai: "已审核",
+          jinYong: "否",
+          use: "广州格匠机电工程科技有限公司",
+          shenHeRen: "郑桂茹",
+          shenHeDate: "2020/11/11",
+          keHu: "花都线",
+        },
+        {
+          bianMa: "001",
+          username: "张蕙兰",
+          jianCheng: "zhl",
+          danJuZhuangTai: "已审核",
+          jinYong: "否",
+          use: "广州格匠机电工程科技有限公司",
+          shenHeRen: "郑桂茹",
+          shenHeDate: "2020/11/11",
+          keHu: "花都线",
+          zip: 200333,
+        },
+      ], // 列表数据
+
+      listLoading: false, // 列表加载loading
+      screenForm: {
+        // 筛选表单数据
+        name: "", // 名称
       },
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
-
-      departmentFormType: 'add',
-      departmentFormVisible: false,
-      departmentForm: {
-        name: '',
-      },
-      departmentFormRules: {
-        name: [
-          { required: true, message: '请填写部门名称', trigger: 'blur' },
-        ],
-      },
-      selectDepartment: null, // 选中的部门
-
-     
-      filterText: '',
-      departmentList: [],
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      props: {
-        multiple: true,
-        value: 'adminWebsitId',
-        label: 'name',
-        children: 'children',
-      },
-
-      tableSelection: [],
-
-      importLoading: false, // 导入加载loading
-      importFileList: [], // 导入列表
-
-      
-      accountType: '',
-      roleList: [], // 角色列表
-      merchantList: [],
-
-      passwordType1: 'password',
-      passwordType2: 'password',
-    }
+    };
   },
-  created() {
-    this.getList();
-    const { id } = this.$route.query;
-    this.id = id;
-    // this.getDetail();
-  },
-   computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened
-      }
-    },
+  components: {
+    DealerListDetail,
   },
+  created() {},
+  computed: {},
   methods: {
-   goBack() {
-      this.$router.go(-1);
-    },
-
-    // 获取详情
-    // getDetail() {
-      // console.log(id);
-      // getDetail({adminUserId: this.id}).then(res => {
-      //   this.mainForm.account = res.data.userName;
-      //   this.mainForm.nickName = res.data.nickName;
-      //   this.mainForm.chargePerson = res.data.linkName;
-      //   this.mainForm.phone = res.data.linkPhone;
-      //   this.mainForm.kingdeeId = res.data.useOrgNumber;
-      //   this.mainForm.kingdeeName = res.data.useOrgName;
-      //   this.mainForm.email = res.data.email;
-      //   this.mainForm.address = res.data.address;
-      //   this.mainForm.password = '************';
-      // })
-    // },
-
-    // 重置密码
-    handleReset(id) {
-      this.resetId = id;
-      this.resetFormVisible = true;
-    },
-
-    // 取消重置密码
-    cancelResetForm(){
-      this.resetFormVisible = false;
-      this.passwordType1 = 'password';
-      this.passwordType2 = 'password';
-      this.$refs.resetForm.resetFields();
-    },
-
-    // 提交重置密码
-    submitResetForm() {
-      this.$refs.resetForm.validate((valid) => {
-        if (valid) {
-          let params = {
-            password: this.resetForm.newPassword,
-            adminUserId: this.id
-          }
-          resetPassword(params).then(res => {
-            this.cancelResetForm();
-            this.getDetail();
-            this.$successMsg();
-          })
-        }
-      })
-    },
-
-    // 显示隐藏密码
-    showPwd(num) {
-      if(num == 1) {
-        if (this.passwordType1 === 'password') {
-          this.passwordType1 = ''
-        } else {
-          this.passwordType1 = 'password'
-        }
-        this.$nextTick(() => {
-          this.$refs.password1.focus()
-        })
-      }
-      if(num == 2) {
-        if (this.passwordType2 === 'password') {
-          this.passwordType2 = ''
-        } else {
-          this.passwordType2 = 'password'
-        }
-        this.$nextTick(() => {
-          this.$refs.password2.focus()
-        })
-      }
-    },
-
-    submitMainForm() {
-      this.$refs.mainForm.validate((valid) => {
-        if (valid) {
-          this.formLoading = true;
-
-          let params = {
-            adminUserId: this.id,
-            corpId: this.mainForm.enterpriseId,
-            secret2: this.mainForm.listSecret,
-            secret3: this.mainForm.listSyncSecret,
-            agentId1: this.mainForm.appAgentId,
-            secret1: this.mainForm.appSecret,
-            appId: this.mainForm.appId,
-            mchId: this.mainForm.merchantId,
-            mchKey: this.mainForm.merchantKey,
-            subAppId: this.mainForm.childAppId,
-            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;
-          })
-        }
-      })
-    },
-    // 查询按钮权限
-    checkBtnRole(value) {
-      // let btnRole = this.$route.meta.roles;
-      // if(!btnRole) {return true}
-      // let index = btnRole.indexOf(value);
-      // return index >= 0;
-      return true
-    },
-
-    // 查询列表
-    getList() {
-      this.listLoading = true;
-
-      let params = {
-        pageNum: this.currentPage,
-        pageSize: this.pageSize,
-        userName: this.screenForm.account,
-        nickName: this.screenForm.nickName,
-        linkPhone: this.screenForm.phone,
-        email: this.screenForm.email,
-        status: this.screenForm.status,
-      };
-      getList(params).then((res) => {
-        this.dataList = res.data.records;
-        this.listTotal = res.data.total;
-        this.listLoading = false;
-      })
-    },
-    // 提交筛选表单
-    submitScreenForm() {
-      this.currentPage = 1;
-      this.getList();
-    },
-    // 重置筛选表单
-    resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList();
-    },
-    // 更改每页数量
-    handleSizeChange(val) {
-      this.pageSize = val;
-      this.currentPage = 1;
-      this.getList();
-    },
-    // 更改当前页
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getList();
-    },
-
-    // 去开通账号
-    toCreate() {
-      this.$router.push({
-        path: '/merchant/create_account',
-        query: {}
-      })
-    },
-
-    toAccountList() {
-      this.$router.push({
-        path: '/setting/account',
-        query: {
-          type: 1
-        }
-      })
-    },
-
-    async toDetail(id) {
-      // this.$router.push({
-      //   path: '/merchant/merchant_detail',
-      //   query: {
-      //     id
-      //   }
-      // })
-      console.log(id);
-      this.detailDiaLog=true
-      getDetail({adminUserId: id}).then(res => {
-        this.mainForm.account = res.data.userName;
-        this.mainForm.nickName = res.data.nickName;
-        this.mainForm.chargePerson = res.data.linkName;
-        this.mainForm.phone = res.data.linkPhone;
-        this.mainForm.kingdeeId = res.data.useOrgNumber;
-        this.mainForm.kingdeeName = res.data.useOrgName;
-        this.mainForm.email = res.data.email;
-        this.mainForm.address = res.data.address;
-        this.mainForm.password = '************';
-      })
-   
-
-    },
-
-    // 操作 - 更改状态(type: 禁用0,启用1)
-    changeStatus(id, type) {
-      type = type ? true : false
-      changeAccountStatus({adminUserId: id, status: type}).then(res => {
-        this.getList();
-        this.$successMsg();
-      })
-    },
-
-    // 导出
-    handleExport() {
-      let screenData = {
-        userName: this.screenForm.account,
-        nickName: this.screenForm.nickName,
-        linkPhone: this.screenForm.phone,
-        email: this.screenForm.email,
-        status: this.screenForm.status,
-      };
-      downloadFiles('admin/user/mch/export', screenData);
-    },
-
-    // 筛选部门
-    filterNode(value, data) {
-      if (!value) return true;
-      return data.name.indexOf(value) !== -1;
-    },
-
-    // 选择部门
+    handleSizeChange() {},
+    handleCurrentChange() {},
     handleNodeClick(data) {
       console.log(data);
-      if(this.selectDepartment && data.adminWebsitId === this.selectDepartment.adminWebsitId) {
-        this.$refs.listTree.setCurrentKey(null);
-        this.selectDepartment = null;
-      }else {
-        this.selectDepartment = data;
-      }
-      this.getList();
     },
-
-    // 刷新部门
-    refreshDepartment() {
-      this.$refs.listTree.setCurrentKey(null);
-      this.selectDepartment = null;
-      this.getTree();
-      this.getList();
+    editFn() {
+      this.isShow = false;
     },
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  .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;
-      }
+::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 {
-          font-size: 14px;
-          color: #999;
+          color: #fff;
         }
         span {
-          font-size: 14px;
-          margin-left: 6px;
-          color: #666;
+          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;
-  }
+}
+.mymain-container {
+  width: 80%;
+  margin-top: 0;
+}
 </style>

+ 246 - 458
src/views/basic_data/dealer/dealer_stock.vue

@@ -2,522 +2,310 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <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">
-        <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-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-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-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-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-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-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <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>
 
     <div class="mymain-container">
-      <div class="btn-group clearfix">
-        <div class="fl">
-          <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>
-        </div>
-      </div>
+      <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="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">
-            <template slot-scope="scope">
-              <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-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-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>
-            <template slot-scope="scope">
-              <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="状态" class-name="status-col">
-            <template slot-scope="scope">
-              <el-tag :type="scope.row.status ? 'success':'danger'">{{ scope.row.status ? '正常':'冻结' }}</el-tag>
-            </template>
+        <el-table
+          v-loading="listLoading"
+          :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="nname"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="存货分类编码"
+            prop="bianma"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="存货分类名称"
+            prop="selectname"
+            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="createdata"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="更新人"
+            prop="updateperson"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="更新时间"
+            prop="update"
+            min-width="160"
+            show-overflow-tooltip
+          ></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>
-    <div class="pagination clearfix">
-      <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal">
-        </el-pagination>
-      </div>
+
+    <!-- 分页 -->
+    <div>
+      <el-pagination class="right" layout="prev, pager, next" :total="1000">
+      </el-pagination>
     </div>
-    
-    <!-- 详情弹窗 -->
+
+    <!-- 弹窗 -->
     <el-dialog
-      title="详情"
-      :visible.sync="detailDiaLog"
+      title="编辑"
+      :visible.sync="dialogForm"
       width="30%"
       :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 :model="form" label-width="100px" label-position="right">
+        <el-form-item label="经销商名称">
+          <el-select v-model="form.name" placeholder="请选择活动区域">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
         </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="30%" :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 label="活动分类">
+          <el-select v-model="form.select" placeholder="请选择活动区域">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
         </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-button @click="dialogForm = false">取 消</el-button>
+        <el-button type="primary" @click="dialogForm = false">确 定</el-button>
       </div>
     </el-dialog>
-    </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="detailDiaLog = false" >取 消</el-button>
-        <el-button type="primary" @click="detailDiaLog = false">确 定</el-button>
-      </span>
-    </el-dialog>
   </div>
 </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 { 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 {
-  // 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()},
-      id: null,
-      companyWechatId: null,
-      step: 'first',
-      mainForm: {
-        account: '', // 账号
-        nickName: '', // 用户名
-        chargePerson: '', // 负责人
-        phone: '', // 联系电话
-        kingdeeId: '',
-        kingdeeName: '',          
-        email: '', // 电子邮箱
-        address: '', // 地址
-        newPassword: '', // 新密码
-        confirmPassword: '', // 确认密码
-      },
-
-      passwordType1: 'password',
-      passwordType2: 'password',
-
-      
-      resetFormVisible: false,
-      resetForm: {
-        newPassword: '', // 新密码
-        confirmPassword: '', // 确认密码
-      },
-      resetFormRules: {
-        newPassword: [
-          { required: true, validator: validatePass, trigger: 'blur' }
-        ],
-        confirmPassword: [
-          { required: true, validator: validatePass2, trigger: 'blur' }
-        ],
+      dialogForm: false,
+      form: {
+        name: "",
+        select: "",
       },
-
-      formLoading: false,
-    
-
-      detailDiaLog:false,//详情弹窗
-      isOpen: false, // 是否展开条件筛选
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
-      dataList: null, // 列表数据
-      listLoading: false, // 列表加载loading
-      screenForm: { // 筛选表单数据
-        account: '',
-        nickname: '',
-        phone: '',
-        email: '',
-        status: '',
+      dealerForm: {
+        name: "",
+        coding: "",
+        select: "",
       },
-      select_status: [ // 筛选字段 - 状态
-        { label: '正常', value: true },
-        { label: '冻结', value: false }
-      ],
-    }
-  },
-  created() {
-    this.getList();
-    const { id } = this.$route.query;
-    this.id = id;
-    // this.getDetail();
-  },
-   computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened
-      }
-    },
+      dataList: [
+        {
+          nname: "佛山市禅城区梁云冷气经营部",
+          bianma: "01",
+          selectname: "家用空调",
+          person: "LID",
+          createdata: "2022-05-18 12:00",
+          updateperson: "LID",
+          update: "2022-05-24  12:00",
+        },
+        {
+          nname: "佛山市禅城区梁云冷气经营部",
+          bianma: "01",
+          selectname: "家用空调",
+          person: "LID",
+          createdata: "2022-05-18 12:00",
+          updateperson: "LID",
+          update: "2022-05-24  12:00",
+        },
+        {
+          nname: "佛山市禅城区梁云冷气经营部",
+          bianma: "01",
+          selectname: "家用空调",
+          person: "LID",
+          createdata: "2022-05-18 12:00",
+          updateperson: "LID",
+          update: "2022-05-24  12:00",
+        },
+        {
+          nname: "佛山市禅城区梁云冷气技术部",
+          bianma: "02",
+          selectname: "家用电视",
+          person: "CCC",
+          createdata: "2022-05-18 12:00",
+          updateperson: "CCC",
+          update: "2022-05-24  12:00",
+        },
+      ], // 列表数据
+      listLoading: false, // 列表加载loading
+    };
   },
+  created() {},
+  computed: {},
   methods: {
-   goBack() {
-      this.$router.go(-1);
-    },
-
-    // 获取详情
-    // getDetail() {
-      // console.log(id);
-      // getDetail({adminUserId: this.id}).then(res => {
-      //   this.mainForm.account = res.data.userName;
-      //   this.mainForm.nickName = res.data.nickName;
-      //   this.mainForm.chargePerson = res.data.linkName;
-      //   this.mainForm.phone = res.data.linkPhone;
-      //   this.mainForm.kingdeeId = res.data.useOrgNumber;
-      //   this.mainForm.kingdeeName = res.data.useOrgName;
-      //   this.mainForm.email = res.data.email;
-      //   this.mainForm.address = res.data.address;
-      //   this.mainForm.password = '************';
-      // })
-    // },
-
-    // 重置密码
-    handleReset(id) {
-      this.resetId = id;
-      this.resetFormVisible = true;
-    },
-
-    // 取消重置密码
-    cancelResetForm(){
-      this.resetFormVisible = false;
-      this.passwordType1 = 'password';
-      this.passwordType2 = 'password';
-      this.$refs.resetForm.resetFields();
+    editFn() {
+      this.dialogForm = true;
     },
-
-    // 提交重置密码
-    submitResetForm() {
-      this.$refs.resetForm.validate((valid) => {
-        if (valid) {
-          let params = {
-            password: this.resetForm.newPassword,
-            adminUserId: this.id
-          }
-          resetPassword(params).then(res => {
-            this.cancelResetForm();
-            this.getDetail();
-            this.$successMsg();
-          })
-        }
-      })
-    },
-
-    // 显示隐藏密码
-    showPwd(num) {
-      if(num == 1) {
-        if (this.passwordType1 === 'password') {
-          this.passwordType1 = ''
-        } else {
-          this.passwordType1 = 'password'
-        }
-        this.$nextTick(() => {
-          this.$refs.password1.focus()
-        })
+    queryFn() {
+      if (
+        this.dealerForm.name === "" &&
+        this.dealerForm.coding === "" &&
+        this.dealerForm.select === ""
+      ) {
+        return;
       }
-      if(num == 2) {
-        if (this.passwordType2 === 'password') {
-          this.passwordType2 = ''
-        } else {
-          this.passwordType2 = 'password'
-        }
-        this.$nextTick(() => {
-          this.$refs.password2.focus()
-        })
-      }
-    },
-
-    submitMainForm() {
-      this.$refs.mainForm.validate((valid) => {
-        if (valid) {
-          this.formLoading = true;
-
-          let params = {
-            adminUserId: this.id,
-            corpId: this.mainForm.enterpriseId,
-            secret2: this.mainForm.listSecret,
-            secret3: this.mainForm.listSyncSecret,
-            agentId1: this.mainForm.appAgentId,
-            secret1: this.mainForm.appSecret,
-            appId: this.mainForm.appId,
-            mchId: this.mainForm.merchantId,
-            mchKey: this.mainForm.merchantKey,
-            subAppId: this.mainForm.childAppId,
-            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;
-          })
-        }
-      })
-    },
-    // 查询按钮权限
-    checkBtnRole(value) {
-      // let btnRole = this.$route.meta.roles;
-      // if(!btnRole) {return true}
-      // let index = btnRole.indexOf(value);
-      // return index >= 0;
-      return true
-    },
-
-    // 查询列表
-    getList() {
-      this.listLoading = true;
-
-      let params = {
-        pageNum: this.currentPage,
-        pageSize: this.pageSize,
-        userName: this.screenForm.account,
-        nickName: this.screenForm.nickName,
-        linkPhone: this.screenForm.phone,
-        email: this.screenForm.email,
-        status: this.screenForm.status,
-      };
-      getList(params).then((res) => {
-        this.dataList = res.data.records;
-        this.listTotal = res.data.total;
-        this.listLoading = false;
-      })
-    },
-    // 提交筛选表单
-    submitScreenForm() {
-      this.currentPage = 1;
-      this.getList();
-    },
-    // 重置筛选表单
-    resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList();
-    },
-    // 更改每页数量
-    handleSizeChange(val) {
-      this.pageSize = val;
-      this.currentPage = 1;
-      this.getList();
-    },
-    // 更改当前页
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getList();
-    },
 
-    // 去开通账号
-    toCreate() {
-      this.$router.push({
-        path: '/merchant/create_account',
-        query: {}
-      })
+      let res = this.dataList.filter(
+        (v) =>
+          v.nname === this.dealerForm.name &&
+          v.coding === this.dealerForm.bianma &&
+          v.select === this.dealerForm.selectname
+      );
+      this.dataList = res;
     },
-
-    toAccountList() {
-      this.$router.push({
-        path: '/setting/account',
-        query: {
-          type: 1
-        }
-      })
-    },
-
-    async toDetail(id) {
-      // this.$router.push({
-      //   path: '/merchant/merchant_detail',
-      //   query: {
-      //     id
-      //   }
-      // })
-      console.log(id);
-      this.detailDiaLog=true
-      getDetail({adminUserId: id}).then(res => {
-        this.mainForm.account = res.data.userName;
-        this.mainForm.nickName = res.data.nickName;
-        this.mainForm.chargePerson = res.data.linkName;
-        this.mainForm.phone = res.data.linkPhone;
-        this.mainForm.kingdeeId = res.data.useOrgNumber;
-        this.mainForm.kingdeeName = res.data.useOrgName;
-        this.mainForm.email = res.data.email;
-        this.mainForm.address = res.data.address;
-        this.mainForm.password = '************';
-      })
-   
-
+    resetFn() {
+      this.dealerForm.name = "";
+      this.dealerForm.coding = "";
+      this.dealerForm.select = "";
+      console.log(this.dealerForm);
     },
-
-    // 操作 - 更改状态(type: 禁用0,启用1)
-    changeStatus(id, type) {
-      type = type ? true : false
-      changeAccountStatus({adminUserId: id, status: type}).then(res => {
-        this.getList();
-        this.$successMsg();
-      })
-    },
-
-    // 导出
-    handleExport() {
-      let screenData = {
-        userName: this.screenForm.account,
-        nickName: this.screenForm.nickName,
-        linkPhone: this.screenForm.phone,
-        email: this.screenForm.email,
-        status: this.screenForm.status,
-      };
-      downloadFiles('admin/user/mch/export', screenData);
-    },
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-
- .formWidth {
+::v-deep .el-input--suffix {
+  width: 300px;
+}
+::v-deep .el-dialog__header {
+  background-color: #dddddd;
+}
+::v-deep .dialog-footer {
+  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;
 }
+.right {
+  float: right;
+}
+.textColor {
+  color: black;
+}
 </style>

+ 5 - 0
src/views/basic_data/logistics.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>

+ 292 - 0
src/views/basic_data/logistics/logistics_list.vue

@@ -0,0 +1,292 @@
+<template>
+  <div>
+    <!-- 筛选条件 -->
+    <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>
+
+        <el-col :span="14">
+          <div class="right">
+            <el-button type="info">查询</el-button>
+            <el-button type="info">重置</el-button>
+          </div>
+        </el-col>
+      </el-row>
+    </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>
+    <!-- 列表 -->
+    <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
+        >
+          <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>
+      <el-pagination
+        class="right base"
+        layout="prev, pager, next"
+        :total="1000"
+      >
+      </el-pagination>
+    </div>
+
+    <!-- 弹窗 -->
+    <el-dialog
+      title="提货车辆档案"
+      :visible.sync="showDialogForm"
+      width="30%"
+      :show-close="false"
+      :close-on-click-modal="false"
+    >
+      <el-form ref="form" :model="diaLogForm" label-width="100px">
+        <el-form-item label="物流公司名称">
+          <el-input v-model="diaLogForm.name"></el-input>
+        </el-form-item>
+        <el-form-item label="物流公司代码">
+          <el-input v-model="diaLogForm.code"></el-input>
+        </el-form-item>
+        <el-form-item label="提货人">
+          <el-input v-model="diaLogForm.consignee"></el-input>
+        </el-form-item>
+        <el-form-item label="提货人电话">
+          <el-input v-model="diaLogForm.consigneePhone"></el-input>
+        </el-form-item>
+        <el-form-item label="客服电话">
+          <el-input v-model="diaLogForm.sparePhone"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="showDialogForm = false">取 消</el-button>
+        <el-button type="primary" @click="showDialogForm = false"
+          >确 定</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      diaLogForm: {
+        name: "",
+        code: "",
+        consignee: "",
+        consigneePhone: "",
+        customerService: "",
+      },
+      showDialogForm: false,
+      dataList: [
+        {
+          num: "1",
+          name: "嘉贤",
+          code: "1212",
+          consignee: "",
+          consigneePhone: "",
+          customerService: "12345678901",
+          createUser: "",
+          createDate: "",
+          updateUser: "",
+          updateDate: "",
+        },
+        {
+          num: "1",
+          name: "嘉贤",
+          code: "1212",
+          consignee: "",
+          consigneePhone: "",
+          customerService: "12345678901",
+          createUser: "",
+          createDate: "",
+          updateUser: "",
+          updateDate: "",
+        },
+        {
+          num: "1",
+          name: "嘉贤",
+          code: "1212",
+          consignee: "",
+          consigneePhone: "",
+          customerService: "12345678901",
+          createUser: "",
+          createDate: "",
+          updateUser: "",
+          updateDate: "",
+        },
+        {
+          num: "1",
+          name: "嘉贤",
+          code: "1212",
+          consignee: "",
+          consigneePhone: "",
+          customerService: "12345678901",
+          createUser: "",
+          createDate: "",
+          updateUser: "",
+          updateDate: "",
+        },
+      ],
+      searchForm: {
+        name: "",
+        username: "",
+        telephone: "",
+      },
+    };
+  },
+  methods: {
+    editFn() {
+      this.showDialogForm = true;
+    },
+  },
+};
+</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%;
+}
+::v-deep .el-select {
+  width: 100%;
+}
+::v-deep .el-col-9 .el-button {
+  padding: 5px;
+}
+::v-deep .el-dialog__header {
+  background-color: #dddddd;
+}
+.base {
+  padding: 20px 20px 0;
+}
+.table {
+  margin-top: 12px;
+}
+.right {
+  float: right;
+}
+</style>

+ 5 - 0
src/views/basic_data/material.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>

+ 648 - 0
src/views/basic_data/material/components/material_list-detail.vue

@@ -0,0 +1,648 @@
+<template>
+  <div>
+    <div class="sty">
+      <el-page-header @back="goBack" content="详情页面"> </el-page-header>
+    </div>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>信息</span>
+      </div>
+      <el-row>
+        <el-col :span="8"><span>创建组织</span><input type="text" /></el-col>
+        <el-col :span="8"><span>使用组织</span><input type="text" /></el-col>
+        <el-col :span="8"><span>编码</span><input type="text" /></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8"><span>名称</span><input type="text" /></el-col>
+        <el-col :span="8"></el-col>
+        <el-col :span="8"></el-col>
+      </el-row>
+    </el-card>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>基本</span>
+      </div>
+      <div class="baseInfo">
+        <div>
+          <div class="base-header">
+            <span>基本信息</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">规格型号</span
+              ><select name="" id="" class="selectStyle2">
+                <option value="">普通仓库</option>
+              </select></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">助记码</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">旧物料编码</span><input type="text" />
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">条码</span><input type="text" />
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">描述</span
+              ><textarea
+                class="textareaStyle"
+                name=""
+                id=""
+                cols="30"
+                rows="10"
+              ></textarea>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">物料分组</span><input type="text" />
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">物料属性</span
+              ><select name="" id="" class="selectStyle2">
+                <option value="">普通仓库</option>
+              </select>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">配置生产</span
+              ><select name="" id="" class="selectStyle2">
+                <option value="">普通仓库</option>
+              </select></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">特征件子项</span
+              ><select name="" id="" class="selectStyle2">
+                <option value="">普通仓库</option>
+              </select></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">套件</span
+              ><select name="" id="" class="selectStyle2">
+                <option value="">普通仓库</option>
+              </select></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">基本单位</span
+              ><select name="" id="" class="selectStyle2">
+                <option value="">正常</option>
+              </select></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">禁用原因</span><input type="text"
+            /></el-col>
+          </el-row>
+        </div>
+        <div>
+          <div class="base-header">
+            <span>控制</span>
+          </div>
+          <el-row>
+            <el-row></el-row>
+            <el-row>
+              <el-col :span="8"
+                ><span class="marg-r">允许采购</span><input type="checkbox"
+              /></el-col>
+              <el-col :span="8"
+                ><span class="marg-r">允许销售</span><input type="checkbox"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8"
+                ><span class="marg-r">允许库存</span><input type="checkbox"
+              /></el-col>
+              <el-col :span="8"
+                ><span class="marg-r">允许生产</span><input type="checkbox"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8"
+                ><span class="marg-r">允许委外</span><input type="checkbox"
+              /></el-col>
+              <el-col :span="8"
+                ><span class="marg-r">允许资产</span><input type="checkbox"
+              /></el-col>
+            </el-row>
+          </el-row>
+
+          <div class="base-header">
+            <span>财务信息</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">默认税率</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">存货类别</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">税分类</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">结算成本价加减价比例(%)</span
+              ><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">商城公开价</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">套机码</span><input type="text"
+            /></el-col>
+          </el-row>
+        </div>
+        <div>
+          <div class="base-header">
+            <span>重量信息</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">毛重</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">净重</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">重量单位</span><input type="text"
+            /></el-col>
+          </el-row>
+
+          <div class="base-header">
+            <span>尺寸信息</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">长</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">宽</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">高</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">体积</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">尺寸单位</span><input type="text"
+            /></el-col>
+          </el-row>
+
+          <div class="base-header">
+            <span>状态</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">数据状态</span
+              ><select name="" id="" class="selectStyle2">
+                <option value="">普通仓库</option>
+              </select></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">禁用状态</span
+              ><select name="" id="" class="selectStyle2">
+                <option value="">普通仓库</option>
+              </select></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">已使用</span
+              ><select name="" id="" class="selectStyle2">
+                <option value="">普通仓库</option>
+              </select></el-col
+            >
+          </el-row>
+        </div>
+      </div>
+    </el-card>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>库存</span>
+      </div>
+      <div class="baseInfo">
+        <div>
+          <div class="base-header">
+            <span>存储</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">库存单位</span
+              ><select name="" id="" class="selectStyle2">
+                <option value="">普通仓库</option>
+              </select></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">换算方向</span
+              ><select name="" id="" class="selectStyle2">
+                <option value="">普通仓库</option>
+              </select></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">仓库</span><input type="text" />
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">仓位</span><input type="text" />
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">单箱标准数量</span><input type="text"
+            /></el-col>
+          </el-row>
+          <div class="base-header">
+            <span>库存控制</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">可锁库</span><input type="checkbox"
+            /></el-col>
+          </el-row>
+        </div>
+        <div>
+          <div class="base-header">
+            <span>管理</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">启用批号管理</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">批号编码规则</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">启用保质期管理</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">批号附属信息</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">保质期单位</span
+              ><select name="" id="" class="selectStyle2">
+                <option value="">普通仓库</option>
+              </select></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">在架寿命期</span><input type="text"
+            /></el-col>
+          </el-row>
+          <div class="base-header">
+            <span>库存成本</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">参考成本</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">成本单位</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">币别</span><input type="text"
+            /></el-col>
+          </el-row>
+        </div>
+        <div>
+          <div class="base-header">
+            <span>库存计划</span>
+          </div>
+          <el-row>
+            <el-col :span="24">
+              <span class="marg-r startUse">启用</span>
+              <div class="start">
+                <div><input type="checkbox" /><span>最小库存预警</span></div>
+                <div><input type="checkbox" /><span>安全库存预警</span></div>
+                <div><input type="checkbox" /><span>最大库存预警</span></div>
+                <div><input type="checkbox" /><span>在订货点预警</span></div>
+              </div>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">最小库存</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">再定货点</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">经济订货批量</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">最大库存</span><input type="text"
+            /></el-col>
+          </el-row>
+        </div>
+      </div>
+      <div>
+        <div class="base-header">
+          <span>客机信息</span>
+        </div>
+        <!-- 列表 -->
+        <br />
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          :header-cell-style="{
+            'background-color': '#e8e8e8',
+            color: 'black',
+          }"
+          border=""
+        >
+          <el-table-column
+            align="center"
+            label="序号"
+            prop="nname"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="内机编码"
+            prop="bianma"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="内机名称"
+            prop="selectname"
+            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="createdata"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="外机编码"
+            prop="updateperson"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="外机名称"
+            prop="update"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="型号"
+            prop="update"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="外机体积"
+            prop="update"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+        <br />
+        <el-row>
+          <el-col :span="6">
+            <strong class="marg-r">商城分类</strong>
+            <select name="" id="" class="selectStyle2">
+              <option value="">挂式空调</option>
+            </select>
+          </el-col>
+        </el-row>
+        <div>
+          <div class="img">
+            <strong>产品图片</strong>
+          </div>
+          <br />
+          <el-upload list-type="picture-card">
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <br />
+          <span>(上传图片大小规格: , 最多上传5张)</span>
+          <div class="img"></div>
+        </div>
+        <br />
+        <div>
+          <div class="img">
+            <strong>详情图</strong>
+          </div>
+          <br />
+          <el-upload list-type="picture-card">
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <br />
+          <span>(上传图片宽度不超过: ,)</span>
+          <div class="img"></div>
+        </div>
+        <br />
+        <el-row>
+          <el-col :span="6">
+            <strong class="marg-r">是否允许订货</strong>
+            <select name="" id="" class="selectStyle2">
+              <option value="">是</option>
+              <option value="">否</option>
+            </select>
+          </el-col>
+        </el-row>
+        <br />
+        <br />
+        <el-button type="info">保存</el-button>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    goBack() {
+      console.log(this.$parent);
+      this.$parent.isShow = true;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-upload {
+  width: 100px;
+  height: 100px;
+  line-height: 100px;
+  border: 1px solid grey;
+}
+.img {
+  width: 30%;
+  height: 25px;
+  //   background-color: aqua;
+  border-bottom: 1px solid gray;
+}
+.startUse {
+  vertical-align: top;
+}
+.start {
+  display: inline-block;
+  width: 35%;
+
+  div {
+    float: left;
+    width: 50%;
+    span {
+      font-size: 12px;
+      vertical-align: text-bottom;
+      padding: 0px 3px;
+    }
+  }
+}
+.baseWidth {
+  width: 46%;
+}
+.inputDate {
+  width: 46%;
+}
+.selectStyle2 {
+  width: 35%;
+}
+.selectStyle {
+  width: 35%;
+}
+.textareaStyle {
+  vertical-align: text-top;
+  resize: none;
+  width: 35%;
+  height: 100px;
+}
+.color {
+  color: #1f93ec;
+}
+.el-col-24 {
+  margin: 6px 0;
+}
+
+.marg-r {
+  padding-right: 15px;
+  font-size: 12px;
+  display: inline-block;
+  width: 120px;
+}
+.base-header {
+  height: 20px;
+  width: 60%;
+  border-bottom: 2px solid gray;
+  span {
+    width: 100px;
+    height: 100%;
+    display: block;
+    text-align: center;
+    color: #fff;
+
+    background-color: gray;
+  }
+}
+.box-card {
+  margin-bottom: 20px;
+}
+.el-col-8 {
+  span {
+    padding-right: 10px;
+    display: inline-block;
+    width: 100px;
+  }
+}
+.baseInfo {
+  display: flex;
+  justify-content: space-between;
+  > div {
+    width: 33%;
+  }
+}
+.sty {
+  margin-bottom: 20px;
+}
+.el-row {
+  margin-bottom: 20px;
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+</style>

+ 202 - 0
src/views/basic_data/material/material_list.vue

@@ -0,0 +1,202 @@
+<template>
+  <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"
+        >
+          <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>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <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">
+        <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
+          >
+            <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 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>
+      </div>
+    </div>
+    <MaterialListDetail v-else />
+  </div>
+</template>
+
+<script>
+import MaterialListDetail from "./components/material_list-detail.vue";
+export default {
+  data() {
+    return {
+      isShow: true,
+      dataList: [
+        {
+          usename: "广州格匠机电工程有限公司",
+          bianMa: "0021",
+          name: "电器",
+          model: "KFR-50LW/(50530)FNh",
+          dataState: "已审核",
+          maintainData: "是",
+          maintainFiles: "是",
+          baseCompany: "Pcs",
+          used: "否",
+        },
+        {
+          usename: "广州格匠机电工程有限公司",
+          bianMa: "0021",
+          name: "电器",
+          model: "KFR-50LW/(50530)FNh",
+          dataState: "已审核",
+          maintainData: "是",
+          maintainFiles: "是",
+          baseCompany: "Pcs",
+          used: "否",
+        },
+        {
+          usename: "广州格匠机电工程有限公司",
+          bianMa: "0021",
+          name: "电器",
+          model: "KFR-50LW/(50530)FNh",
+          dataState: "已审核",
+          maintainData: "是",
+          maintainFiles: "是",
+          baseCompany: "Pcs",
+          used: "否",
+        },
+      ], // 列表数据
+
+      screenForm: {
+        // 筛选表单数据
+        name: "", // 名称
+      },
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
+    };
+  },
+  components: { MaterialListDetail },
+  methods: {
+    editFn() {
+      this.isShow = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.base {
+  margin-top: 20px;
+}
+::v-deep .fontstyle {
+  color: #0909ff;
+}
+::v-deep .bianma {
+  color: #409eff;
+}
+</style>

+ 398 - 0
src/views/basic_data/supplier/components/supplier_list-detail.vue

@@ -0,0 +1,398 @@
+<template>
+  <div>
+    <div class="sty">
+      <el-page-header @back="goBack" content="详情页面"> </el-page-header>
+    </div>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>供应商编码</span>
+      </div>
+      <el-row>
+        <el-col :span="6"
+          ><span class="color">创建组织</span><input type="text"
+        /></el-col>
+        <el-col :span="6"><span>使用组织</span><input type="text" /></el-col>
+        <el-col :span="6"
+          ><span class="color">注册编码</span><input type="text"
+        /></el-col>
+        <el-col :span="6"
+          ><span class="color">编码</span><input type="text"
+        /></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6"><span>名称</span><input type="text" /></el-col>
+        <el-col :span="6"><span>简称</span><input type="text" /></el-col>
+      </el-row>
+    </el-card>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>基本信息</span>
+      </div>
+      <div class="baseInfo">
+        <div>
+          <div class="base-header">
+            <span>地址</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">国家</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">地区</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">通讯地址</span
+              ><textarea
+                name=""
+                id=""
+                cols="30"
+                rows="10"
+                class="textareaStyle"
+              ></textarea>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">邮政编码</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">语言</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">公司地址</span
+              ><textarea
+                class="textareaStyle"
+                name=""
+                id=""
+                cols="30"
+                rows="10"
+              ></textarea>
+            </el-col>
+          </el-row>
+        </div>
+        <div>
+          <div class="base-header">
+            <span>注册</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">行业</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">创立日期</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">法人代表</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">注册资金(万元)</span
+              ><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">公司规模工商登记号</span
+              ><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">生产经许可证</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">统一社会信用代码</span
+              ><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">注册地址</span
+              ><textarea
+                name=""
+                id=""
+                cols="30"
+                rows="10"
+                class="textareaStyle"
+              ></textarea>
+            </el-col>
+          </el-row>
+        </div>
+        <div>
+          <div class="base-header">
+            <span>管理</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">负责部门</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">负责人</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">供应商分类</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">供应类别</span
+              ><select name="" id="" class="selectStyle">
+                <option value="">采购</option>
+              </select></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">供应商等级</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">供应商分组</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">公司类别</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">公司性质</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">公司规模</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">对应组织</span><input type="text"
+            /></el-col>
+          </el-row>
+        </div>
+      </div>
+    </el-card>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>商务信息</span>
+      </div>
+      <el-row>
+        <el-col :span="6"
+          ><span class="color">采购组</span><input type="text"
+        /></el-col>
+        <el-col :span="6"><span>默认价目表</span><input type="text" /></el-col>
+        <el-col :span="6"
+          ><span>业务状态</span
+          ><select name="" id="" class="selectStyle2">
+            <option value="">正常</option>
+          </select></el-col
+        >
+        <el-col :span="6"><span>默认折扣表</span><input type="text" /></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6"
+          ><span>冻结范围</span
+          ><select name="" id="" class="selectStyle2">
+            <option value=""></option></select
+        ></el-col>
+        <el-col :span="6"
+          ><span class="color">供货方</span><input type="text"
+        /></el-col>
+        <el-col :span="6"><span>冻结人</span><input type="text" /></el-col>
+        <el-col :span="6"
+          ><span class="color">VMI仓库</span><input type="text"
+        /></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6"
+          ><span>冻结日期</span><input type="date" class="inputDate"
+        /></el-col>
+        <el-col :span="6"><span>VMI业务</span><input type="checkbox" /></el-col>
+        <el-col :span="6"
+          ><span class="color">汇总公司</span><input type="text"
+        /></el-col>
+        <el-col :span="6"
+          ><span>启用供应商协同</span><input type="checkbox"
+        /></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6"><span>保证金比例</span><input type="text" /></el-col>
+        <el-col :span="6"
+          ><span class="color">默认联系人</span><input type="text"
+        /></el-col>
+        <el-col :span="6"></el-col>
+        <el-col :span="6"></el-col>
+      </el-row>
+    </el-card>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>财务信息</span>
+      </div>
+      <el-row>
+        <el-col :span="6"
+          ><span class="color">对应客户</span><input type="text"
+        /></el-col>
+        <el-col :span="6"
+          ><span>单次预付额度</span><input type="text"
+        /></el-col>
+        <el-col :span="6"
+          ><span class="color">发票类型</span
+          ><select name="" id="" class="selectStyle2">
+            <option value="">正常</option>
+          </select></el-col
+        >
+        <el-col :span="6"
+          ><span class="color">结算币别</span><input type="text"
+        /></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6"
+          ><span class="color">税分类</span><input type="text"
+        /></el-col>
+        <el-col :span="6"
+          ><span class="color">默认税率</span><input type="text"
+        /></el-col>
+        <el-col :span="6"
+          ><span class="color">结算方式</span><input type="text"
+        /></el-col>
+        <el-col :span="6"><span>税务登记号</span><input type="text" /></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6"
+          ><span>描述</span
+          ><textarea
+            class="textareaStyle"
+            name=""
+            id=""
+            cols="30"
+            rows="10"
+            style="width: 46%"
+          ></textarea>
+        </el-col>
+        <el-col :span="6"
+          ><span class="color">付款条件</span><input type="text"
+        /></el-col>
+        <el-col :span="6"
+          ><span class="color">经营类型</span><input type="text"
+        /></el-col>
+        <el-col :span="6"
+          ><span class="color">结算方</span><input type="text"
+        /></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6"
+          ><span class="color">收款方</span><input type="text"
+        /></el-col>
+        <el-col :span="6"></el-col>
+        <el-col :span="6"></el-col>
+        <el-col :span="6"></el-col>
+      </el-row>
+    </el-card>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    goBack() {
+      console.log(this.$parent);
+      this.$parent.isShow = true;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.baseWidth {
+  width: 46%;
+}
+.inputDate {
+  width: 46%;
+}
+.selectStyle2 {
+  width: 46%;
+}
+.selectStyle {
+  width: 35%;
+}
+.textareaStyle {
+  vertical-align: text-top;
+  resize: none;
+  width: 35%;
+  height: 100px;
+}
+.color {
+  color: #1f93ec;
+}
+.el-col-24 {
+  margin: 6px 0;
+}
+
+.marg-r {
+  padding-right: 15px;
+  font-size: 12px;
+  display: inline-block;
+  width: 120px;
+}
+.base-header {
+  height: 20px;
+  width: 60%;
+  border-bottom: 2px solid gray;
+  span {
+    width: 100px;
+    height: 100%;
+    display: block;
+    text-align: center;
+    color: #fff;
+
+    background-color: gray;
+  }
+}
+.box-card {
+  margin-bottom: 20px;
+}
+.el-col-6 {
+  span {
+    padding-right: 10px;
+    display: inline-block;
+    width: 100px;
+  }
+}
+.baseInfo {
+  display: flex;
+  justify-content: space-between;
+  > div {
+    width: 33%;
+  }
+}
+.sty {
+  margin-bottom: 20px;
+}
+.el-row {
+  margin-bottom: 20px;
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+</style>

+ 167 - 0
src/views/basic_data/supplier/supplier_list.vue

@@ -0,0 +1,167 @@
+<template>
+  <div class="base">
+    <div v-if="isShow">
+      <!-- 搜索框 -->
+      <div class="base">
+        <el-form
+          ref="screenForm"
+          :model="searchForm"
+          label-width="70px"
+          size="small"
+          label-position="left"
+        >
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="关键字" prop="name">
+                <el-input
+                  v-model="searchForm.name"
+                  placeholder="请输入关键字"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <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="base">
+        <div class="table">
+          <el-table
+            :data="dataList"
+            :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="useZh"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="名称"
+              prop="name"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="简称"
+              prop="jc"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="供应商分组"
+              prop="gongYing"
+              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="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>
+      </div>
+    </div>
+    <SupplierListDetail v-else />
+  </div>
+</template>
+
+<script>
+import SupplierListDetail from "./components/supplier_list-detail.vue";
+export default {
+  data() {
+    return {
+      isShow: true,
+      searchForm: {
+        name: "",
+      },
+      dataList: [
+        {
+          bianMa: "DG0001",
+          useZh: "广州格匠机电工程有限公司",
+          name: "东莞市美信机电工程有限公司",
+          jc: "",
+          gongYing: "东莞",
+        },
+        {
+          bianMa: "DG0001",
+          useZh: "广州格匠机电工程有限公司",
+          name: "东莞市美信机电工程有限公司",
+          jc: "",
+          gongYing: "东莞",
+        },
+        {
+          bianMa: "DG0001",
+          useZh: "广州格匠机电工程有限公司",
+          name: "东莞市美信机电工程有限公司",
+          jc: "",
+          gongYing: "东莞",
+        },
+        {
+          bianMa: "DG0001",
+          useZh: "广州格匠机电工程有限公司",
+          name: "东莞市美信机电工程有限公司",
+          jc: "",
+          gongYing: "东莞",
+        },
+      ],
+    };
+  },
+  components: {
+    SupplierListDetail,
+  },
+  methods: {
+    editFn() {
+      this.isShow = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.base {
+  padding: 20px;
+}
+.fr {
+  margin-top: 20px;
+}
+</style>

+ 5 - 0
src/views/basic_data/taker.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>

+ 251 - 0
src/views/basic_data/taker/taker_car.vue

@@ -0,0 +1,251 @@
+<template>
+  <div>
+    <!-- 筛选条件 -->
+    <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="14">
+          <div class="right">
+            <el-button type="info">查询</el-button>
+            <el-button type="info">重置</el-button>
+          </div>
+        </el-col>
+      </el-row>
+    </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>
+    <!-- 列表 -->
+    <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
+        >
+          <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>
+      <el-pagination
+        class="right base"
+        layout="prev, pager, next"
+        :total="1000"
+      >
+      </el-pagination>
+    </div>
+
+    <!-- 弹窗 -->
+    <el-dialog
+      title="提货车辆档案"
+      :visible.sync="dialogForm"
+      width="40%"
+      :show-close="false"
+      :close-on-click-modal="false"
+    >
+      <el-form ref="form" :model="addForm" label-width="120px">
+        <el-form-item label="经销商名称">
+          <el-select v-model="addForm.name" placeholder="选择名称">
+            <el-option> dsdsds</el-option>
+          </el-select>
+        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="车牌号">
+              <el-input v-model="addForm.username"></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话">
+              <el-input v-model="addForm.userID"></el-input> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="车型">
+              <el-input v-model="addForm.telephone"></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="体积">
+              <el-input v-model="addForm.sparePhone"></el-input> </el-form-item
+          ></el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogForm = false">取 消</el-button>
+        <el-button type="primary" @click="dialogForm = false">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      addForm: {
+        name: "",
+        username: "",
+        userID: "",
+        telephone: "",
+        sparePhone: "",
+        valid: "",
+        Verification: "",
+      },
+      dialogForm: false,
+      dataList: [
+        {
+          name: "佛山市禅城区梁云冷气经营部",
+          carNumber: "粤Axxxxx",
+          createUser: "张三",
+          createDate: "2022-01-02 12:12",
+          updateUser: "张三",
+          updateDate: "2022-01-02 12:21",
+        },
+        {
+          name: "佛山市禅城区梁云冷气经营部",
+          carNumber: "粤Axxxxx",
+          createUser: "张三",
+          createDate: "2022-01-02 12:12",
+          updateUser: "张三",
+          updateDate: "2022-01-02 12:21",
+        },
+        {
+          name: "佛山市禅城区梁云冷气经营部",
+          carNumber: "粤Axxxxx",
+          createUser: "张三",
+          createDate: "2022-01-02 12:12",
+          updateUser: "张三",
+          updateDate: "2022-01-02 12:21",
+        },
+      ],
+      searchForm: {
+        name: "",
+        username: "",
+        telephone: "",
+      },
+    };
+  },
+  methods: {
+    editFn() {
+      this.dialogForm = true;
+    },
+  },
+};
+</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%;
+}
+::v-deep .el-select {
+  width: 100%;
+}
+::v-deep .el-col-9 .el-button {
+  padding: 5px;
+}
+::v-deep .el-dialog__header {
+  background-color: #dddddd;
+}
+.base {
+  padding: 20px 20px 0;
+}
+.table {
+  margin-top: 12px;
+}
+.right {
+  float: right;
+}
+</style>

+ 309 - 0
src/views/basic_data/taker/taker_list.vue

@@ -0,0 +1,309 @@
+<template>
+  <div>
+    <!-- 筛选条件 -->
+    <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>
+    <!-- 按钮 -->
+    <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>
+    <!-- 列表 -->
+    <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>
+
+    <!-- 弹窗 -->
+    <el-dialog
+      title="提货人档案"
+      :visible.sync="dialogForm"
+      width="40%"
+      :show-close="false"
+      :close-on-click-modal="false"
+    >
+      <el-form ref="form" :model="addForm" label-width="120px">
+        <el-form-item label="经销商名称">
+          <el-select v-model="addForm.name" placeholder="名称">
+            <el-option> dsdsds</el-option>
+          </el-select>
+        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="提货人姓名">
+              <el-input v-model="addForm.username"></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="身份证号码">
+              <el-input v-model="addForm.userID"></el-input> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="联系电话">
+              <el-input v-model="addForm.telephone"></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="备用电话">
+              <el-input v-model="addForm.sparePhone"></el-input> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="有效期">
+              <el-date-picker
+                v-model="addForm.valid"
+                type="date"
+                placeholder="选择日期"
+              >
+              </el-date-picker> </el-form-item
+          ></el-col>
+          <el-col :span="12">
+            <el-form-item label="验证码">
+              <el-row :gutter="6">
+                <el-col :span="14">
+                  <el-input v-model="addForm.Verification" />
+                </el-col>
+                <el-col :span="9">
+                  <el-button type="info">获取验证码</el-button>
+                </el-col>
+              </el-row>
+            </el-form-item></el-col
+          >
+        </el-row>
+        <el-form-item label="上传提货人附件">
+          <el-upload class="upload-demo">
+            <el-button size="small" type="info">点击上传</el-button>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogForm = false">取 消</el-button>
+        <el-button type="primary" @click="dialogForm = false">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      addForm: {
+        name: "",
+        username: "",
+        userID: "",
+        telephone: "",
+        sparePhone: "",
+        valid: "",
+        Verification: "",
+      },
+      dialogForm: false,
+      dataList: [
+        {
+          name: "佛山市禅城区梁云冷气经营部",
+          username: "张三",
+          userID: "01234567891234567689",
+          telephone: "01234567891",
+          sparePhone: "1234567890",
+          enclosure: "",
+          valid: "2022-04-30",
+          createUser: "张三",
+          createDate: "2022-01-02 12:21",
+          state: "失效",
+        },
+        {
+          name: "佛山市禅城区梁云冷气经营部",
+          username: "张三",
+          userID: "01234567891234567689",
+          telephone: "01234567891",
+          sparePhone: "1234567890",
+          enclosure: "",
+          valid: "2022-04-30",
+          createUser: "张三",
+          createDate: "2022-01-02 12:21",
+          state: "失效",
+        },
+        {
+          name: "佛山市禅城区梁云冷气经营部",
+          username: "张三",
+          userID: "01234567891234567689",
+          telephone: "01234567891",
+          sparePhone: "1234567890",
+          enclosure: "",
+          valid: "2022-04-30",
+          createUser: "张三",
+          createDate: "2022-01-02 12:21",
+          state: "失效",
+        },
+      ],
+      searchForm: {
+        name: "",
+        username: "",
+        telephone: "",
+      },
+    };
+  },
+  methods: {
+    addFn() {
+      this.dialogForm = true;
+    },
+  },
+};
+</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%;
+}
+::v-deep .el-select {
+  width: 100%;
+}
+::v-deep .el-col-9 .el-button {
+  padding: 5px;
+}
+::v-deep .el-dialog__header {
+  background-color: #dddddd;
+}
+.base {
+  padding: 20px 20px 0;
+}
+.table {
+  margin-top: 12px;
+}
+.right {
+  float: right;
+}
+</style>

+ 5 - 0
src/views/basic_data/warehouse.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>

+ 288 - 0
src/views/basic_data/warehouse/components/warehouse_list-detail.vue

@@ -0,0 +1,288 @@
+<template>
+  <div>
+    <div class="sty">
+      <el-page-header @back="goBack" content="详情页面"> </el-page-header>
+    </div>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>组织信息</span>
+      </div>
+      <el-row>
+        <el-col :span="8"><span>创建组织</span><input type="text" /></el-col>
+        <el-col :span="8"><span>编码</span><input type="text" /></el-col>
+        <el-col :span="8"><span>名称</span><input type="text" /></el-col>
+      </el-row>
+    </el-card>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>基本信息</span>
+      </div>
+      <div class="baseInfo">
+        <div>
+          <div class="base-header">
+            <span>基本信息</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">仓库属性</span
+              ><select name="" id="" class="selectStyle2">
+                <option value="">普通仓库</option>
+              </select></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">供应商</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">客户</span
+              ><textarea
+                name=""
+                id=""
+                cols="30"
+                rows="10"
+                class="textareaStyle"
+              ></textarea>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">仓库地址</span
+              ><textarea
+                class="textareaStyle"
+                name=""
+                id=""
+                cols="30"
+                rows="10"
+              ></textarea>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">仓库负责人</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">联系电话</span><input type="text" />
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">描述</span
+              ><textarea
+                class="textareaStyle"
+                name=""
+                id=""
+                cols="30"
+                rows="10"
+              ></textarea>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">分组</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">管易仓</span><input type="checkbox"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">管易仓编码</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">第三方仓储类型</span
+              ><select name="" id="" class="selectStyle2">
+                <option value="">正常</option>
+              </select></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">第三方仓库编码</span><input type="text"
+            /></el-col>
+          </el-row>
+        </div>
+        <div>
+          <div class="base-header">
+            <span>库存状态</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">库存状态类型</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">默认库存状态</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">默认收料状态</span><input type="text"
+            /></el-col>
+          </el-row>
+          <div class="base-header">
+            <span>控制</span>
+          </div>
+          <el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">允许客户查询</span><input type="checkbox"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8"
+                ><span class="marg-r">允许即时库存负库存</span
+                ><input type="checkbox"
+              /></el-col>
+              <el-col :span="8"
+                ><span class="marg-r">允许MRP计划</span><input type="checkbox"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8"
+                ><span class="marg-r">允许锁库</span><input type="checkbox"
+              /></el-col>
+              <el-col :span="8"
+                ><span class="marg-r">参与预警</span><input type="checkbox"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8"
+                ><span class="marg-r">启用仓位管理</span><input type="checkbox"
+              /></el-col>
+              <el-col :span="8"
+                ><span class="marg-r">参与拣货</span><input type="checkbox"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8"
+                ><span class="marg-r">不参与可发量统计</span
+                ><input type="checkbox"
+              /></el-col>
+              <el-col :span="8"> </el-col>
+            </el-row>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">拣货优先级(1~9999)</span><input type="text"
+            /></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r color">仓位维度数据列表显示格式</span
+              ><select name="" id="" class="selectStyle2">
+                <option value="">正常</option>
+              </select></el-col
+            >
+          </el-row>
+          <div class="base-header">
+            <span>状态</span>
+          </div>
+          <el-row>
+            <el-col :span="24"
+              ><span class="marg-r">数据状态</span
+              ><select name="" id="" class="selectStyle2">
+                <option value="">暂存</option>
+              </select></el-col
+            >
+          </el-row>
+        </div>
+        <div></div>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    goBack() {
+      console.log(this.$parent);
+      this.$parent.isShow = true;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.baseWidth {
+  width: 46%;
+}
+.inputDate {
+  width: 46%;
+}
+.selectStyle2 {
+  width: 35%;
+}
+.selectStyle {
+  width: 35%;
+}
+.textareaStyle {
+  vertical-align: text-top;
+  resize: none;
+  width: 35%;
+  height: 100px;
+}
+.color {
+  color: #1f93ec;
+}
+.el-col-24 {
+  margin: 6px 0;
+}
+
+.marg-r {
+  padding-right: 15px;
+  font-size: 12px;
+  display: inline-block;
+  width: 120px;
+}
+.base-header {
+  height: 20px;
+  width: 60%;
+  border-bottom: 2px solid gray;
+  span {
+    width: 100px;
+    height: 100%;
+    display: block;
+    text-align: center;
+    color: #fff;
+
+    background-color: gray;
+  }
+}
+.box-card {
+  margin-bottom: 20px;
+}
+.el-col-8 {
+  span {
+    padding-right: 10px;
+    display: inline-block;
+    width: 100px;
+  }
+}
+.baseInfo {
+  display: flex;
+  justify-content: space-between;
+  > div {
+    width: 33%;
+  }
+}
+.sty {
+  margin-bottom: 20px;
+}
+.el-row {
+  margin-bottom: 20px;
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+</style>

+ 121 - 0
src/views/basic_data/warehouse/warehouse_book.vue

@@ -0,0 +1,121 @@
+<template>
+  <div class="base">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>仓库每天预约提货设置</span>
+      </div>
+      <!-- 列表 -->
+      <div class="">
+        <el-table
+          :data="dataList"
+          :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
+            align="center"
+            label="仓库"
+            prop="store"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="预约存货类型"
+            prop="type"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="最大预约单量"
+            prop="maxNum"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.maxNum"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="最大预约台数"
+            prop="maxSets"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.maxSets"></el-input>
+            </template>
+          </el-table-column>
+
+          <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>
+    </el-card>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      dataList: [
+        {
+          num: "1",
+          store: "万豪仓",
+          type: "家用空调",
+          maxNum: "1111",
+          maxSets: "12331",
+        },
+        {
+          num: "1",
+          store: "万豪仓",
+          type: "家用空调",
+          maxNum: "1111",
+          maxSets: "",
+        },
+        {
+          num: "1",
+          store: "万豪仓",
+          type: "家用空调",
+          maxNum: "1111",
+          maxSets: "",
+        },
+        {
+          num: "1",
+          store: "万豪仓",
+          type: "家用空调",
+          maxNum: "1111",
+          maxSets: "",
+        },
+      ],
+    };
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.base {
+  padding: 20px;
+}
+</style>

+ 299 - 0
src/views/basic_data/warehouse/warehouse_cost.vue

@@ -0,0 +1,299 @@
+<template>
+  <div class="main">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>仓库费规则设施</span>
+      </div>
+      <el-row>
+        <el-col :span="4">
+          <strong>仓储费设置:</strong>
+        </el-col>
+        <el-col :span="16">
+          <div class="set">
+            <strong>货品仓库存放</strong
+            ><input class="inputs" v-model="input" placeholder="10" /> ><strong
+              >天内可免费受存储管理费用.</strong
+            >
+          </div>
+          <div>
+            <strong>当超过</strong
+            ><input class="inputs" v-model="input" placeholder="10" />
+            <strong>天后,按每立方米</strong
+            ><input class="inputs" v-model="input" placeholder="10" /><strong
+              >元/天计算</strong
+            >
+          </div>
+          <h5>当商品不足1立方米时,按一立方米计算</h5>
+        </el-col>
+      </el-row>
+      <h4 class="zhu">
+        注:改规则适用所有经销商,个性化液之后,则不再按该规则执行
+      </h4>
+    </el-card>
+    <div class="search">
+      <el-input placeholder="输入筛选条件"></el-input>
+      <el-button type="info">过滤</el-button>
+    </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>
+
+    <!-- 列表 -->
+    <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
+        >
+          <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>
+      <el-pagination class="right" layout="prev, pager, next" :total="1000">
+      </el-pagination>
+    </div>
+
+    <!-- 弹窗 -->
+    <el-dialog
+      title="仓库费规则配置"
+      :visible.sync="showDialog"
+      width="30%"
+      :show-close="false"
+      :close-on-click-modal="false"
+    >
+      <el-form :model="dialogForm" label-width="100px" label-position="right">
+        <el-form-item label="经销商编码">
+          <el-select
+            v-model="dialogForm.bianma"
+            placeholder="请选择活动区域"
+            class="inputStyle"
+          >
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="经销商名称">
+          <el-input v-model="dialogForm.name" class="inputStyle"></el-input>
+        </el-form-item>
+        <el-form-item label="仓库存放" class="sty">
+          <el-input
+            v-model="dialogForm.freeDay"
+            class="inputStyle"
+          />天内可免费受存储管理费用. 当超过
+          <el-input
+            v-model="dialogForm.day"
+            class="inputStyle"
+          />天后,按每立方米
+          <el-input v-model="dialogForm.money" class="inputStyle" />
+          元/天计算
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="showDialog = false">取 消</el-button>
+        <el-button type="primary" @click="showDialog = false">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      dialogForm: {
+        bianma: "",
+        name: "",
+        day: "",
+        freeDay: "",
+        money: "",
+      },
+      showDialog: false,
+      dataList: [
+        {
+          num: "1",
+          bianma: "1002",
+          dealerName: "佛山市禅城区梁云冷气经营部",
+          rule: "0.1",
+          freeDay: "123",
+          createMan: "张三",
+          createDate: "2000/01/01",
+          updateMan: "张三",
+          updateDate: "2020/01/01",
+        },
+        {
+          num: "1",
+          bianma: "1002",
+          dealerName: "佛山市禅城区梁云冷气经营部",
+          rule: "0.1",
+          freeDay: "123",
+          createMan: "张三",
+          createDate: "2000/01/01",
+          updateMan: "张三",
+          updateDate: "2020/01/01",
+        },
+        {
+          num: "1",
+          bianma: "1002",
+          dealerName: "佛山市禅城区梁云冷气经营部",
+          rule: "0.1",
+          freeDay: "123",
+          createMan: "张三",
+          createDate: "2000/01/01",
+          updateMan: "张三",
+          updateDate: "2020/01/01",
+        },
+      ],
+    };
+  },
+  methods: {
+    editFn() {
+      this.showDialog = true;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .sty {
+  width: 85%;
+  .el-form-item__content .el-input {
+    width: 22%;
+    margin: 0px 10px 16px 0;
+  }
+}
+.zhu {
+  padding-top: 18px;
+}
+.set {
+  margin-bottom: 30px;
+}
+.inputs {
+  margin: 0 18px;
+}
+::v-deep .el-form {
+  .inputStyle {
+    width: 80%;
+  }
+}
+::v-deep .dialog-footer {
+  display: flex;
+  justify-content: center;
+}
+::v-deep .el-dialog__header {
+  background-color: #dddddd;
+}
+.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;
+}
+.search {
+  display: flex;
+  margin-top: 12px;
+  ::v-deep .el-input {
+    width: 50%;
+    margin-right: 12px;
+  }
+}
+.main {
+  padding: 12px;
+}
+</style>>
+

+ 221 - 0
src/views/basic_data/warehouse/warehouse_list.vue

@@ -0,0 +1,221 @@
+<template>
+  <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"
+        >
+          <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>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <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">
+        <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
+          >
+            <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 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>
+      </div>
+    </div>
+    <WarehouseListDetail v-else />
+  </div>
+</template>
+
+<script>
+import WarehouseListDetail from "./components/warehouse_list-detail.vue";
+export default {
+  data() {
+    return {
+      isShow: true,
+      dataList: [
+        {
+          bianMa: "BXGM001",
+          name: "冰箱美国仓",
+          address: "",
+          storeUser: "",
+          storeAttribute: "普通仓库",
+          storeType: "",
+          dataState: "已审核",
+          allow: "否",
+          openStore: "否",
+          noStatistics: "否",
+          warning: "是",
+        },
+        {
+          bianMa: "BXGM001",
+          name: "冰箱美国仓",
+          address: "",
+          storeUser: "",
+          storeAttribute: "普通仓库",
+          storeType: "",
+          dataState: "已审核",
+          allow: "否",
+          openStore: "否",
+          noStatistics: "否",
+          warning: "是",
+        },
+        {
+          bianMa: "BXGM001",
+          name: "冰箱美国仓",
+          address: "",
+          storeUser: "",
+          storeAttribute: "普通仓库",
+          storeType: "",
+          dataState: "已审核",
+          allow: "否",
+          openStore: "否",
+          noStatistics: "否",
+          warning: "是",
+        },
+      ], // 列表数据
+
+      screenForm: {
+        // 筛选表单数据
+        name: "", // 名称
+      },
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
+    };
+  },
+  components: {
+    WarehouseListDetail,
+  },
+  methods: {
+    editFn() {
+      this.isShow = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.base {
+  margin-top: 20px;
+}
+::v-deep .fontstyle {
+  color: #0909ff;
+}
+::v-deep .bianma {
+  color: #409eff;
+}
+</style>

+ 298 - 0
src/views/basic_data/warehouse/warehouse_site.vue

@@ -0,0 +1,298 @@
+<template>
+  <div>
+    <!-- 筛选条件 -->
+    <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>
+
+        <el-col :span="14">
+          <div class="right">
+            <el-button type="info">查询</el-button>
+            <el-button type="info">重置</el-button>
+          </div>
+        </el-col>
+      </el-row>
+    </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>
+    <!-- 列表 -->
+    <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
+        >
+          <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>
+      <el-pagination
+        class="right base"
+        layout="prev, pager, next"
+        :total="1000"
+      >
+      </el-pagination>
+    </div>
+
+    <!-- 弹窗 -->
+    <el-dialog
+      title="仓库仓位对应关系"
+      :visible.sync="showDialogForm"
+      width="30%"
+      :show-close="false"
+      :close-on-click-modal="false"
+    >
+      <el-form ref="form" :model="diaLogForm" label-width="100px">
+        <el-form-item label="仓库名称">
+          <el-input v-model="diaLogForm.storeName"></el-input>
+        </el-form-item>
+        <el-form-item label="仓位名称">
+          <el-select
+            v-model="diaLogForm.positionName"
+            multiple
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="库存警戒线">
+          <el-input v-model="diaLogForm.alert"></el-input>
+        </el-form-item>
+        <el-form-item label="库存状态"> - </el-form-item>
+        <el-form-item label="备注">
+          <el-input type="textarea" v-model="diaLogForm.text"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="showDialogForm = false">取 消</el-button>
+        <el-button type="primary" @click="showDialogForm = false"
+          >确 定</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      options: [
+        {
+          value: "选项1",
+          label: "1",
+        },
+        {
+          value: "选项2",
+          label: "2",
+        },
+        {
+          value: "选项3",
+          label: "3",
+        },
+        {
+          value: "选项4",
+          label: "4",
+        },
+        {
+          value: "选项5",
+          label: "5",
+        },
+      ],
+      diaLogForm: {
+        storeName: "",
+        positionName: [],
+        alert: "",
+        text: "",
+      },
+      showDialogForm: false,
+      dataList: [
+        {
+          num: "1",
+          storeName: "万豪仓",
+          positionName: "万豪普通仓",
+          alert: "122台",
+          adequate: "充足",
+          createUser: "LID",
+          createDate: "2022-05-12 12:00",
+          updateUser: "LID",
+          updateDate: "2022-05-24 12:08",
+        },
+        {
+          num: "1",
+          storeName: "万豪仓",
+          positionName: "万豪普通仓",
+          alert: "122台",
+          adequate: "充足",
+          createUser: "LID",
+          createDate: "2022-05-12 12:00",
+          updateUser: "LID",
+          updateDate: "2022-05-24 12:08",
+        },
+        {
+          num: "1",
+          storeName: "万豪仓",
+          positionName: "万豪普通仓",
+          alert: "122台",
+          adequate: "充足",
+          createUser: "LID",
+          createDate: "2022-05-12 12:00",
+          updateUser: "LID",
+          updateDate: "2022-05-24 12:08",
+        },
+      ],
+      searchForm: {
+        positionName: "",
+        storeName: "",
+      },
+    };
+  },
+  methods: {
+    addFn() {
+      this.showDialogForm = true;
+    },
+  },
+};
+</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%;
+}
+::v-deep .el-select {
+  width: 100%;
+}
+::v-deep .el-col-9 .el-button {
+  padding: 5px;
+}
+::v-deep .el-dialog__header {
+  background-color: #dddddd;
+}
+.base {
+  padding: 20px 20px 0;
+}
+.table {
+  margin-top: 12px;
+}
+.right {
+  float: right;
+}
+</style>