Merge branch 'feature/Feature-basic_data' into develop

src/api/basic_data/dealer.js

@@ -38,7 +38,7 @@ export function getDealerStockAdd(data) {
 export function deleDealerStockList(params) {
   return request({
     url: '/customer/pt/delete',
-    method: 'get',
+    method: 'post',
     params
   })
 }
@@ -66,6 +66,22 @@ export function deleDealerDeposit(params) {
     params
   })
 }
+//修改经销商工程机配置
+export function editDealerDeposit(data) {
+  return request({
+    url: '/customer/deposit/update',
+    method: 'post',
+    data
+  })
+}
+//经销商工程机配置详情
+export function infoDealerDeposit(params) {
+  return request({
+    url: '/customer/deposit/detail',
+    method: 'get',
+    params
+  })
+}
 //经销商申请列表
 export function getDealerApplyList(params) {
   return request({

src/api/basic_data/taker.js

@@ -56,6 +56,14 @@ export function addDataListApi(data) {
     data
   })
 }
+//编辑提货车辆档案
+export function editDataListApi(data) {
+  return request({
+    url: '/take-car-record/edit',
+    method: 'post',
+    data
+  })
+}
 //删除提货车辆档案
 export function delCarFn(params) {
   return request({
@@ -63,4 +71,12 @@ export function delCarFn(params) {
     method: 'post',
     params
   })
+}
+//提货车辆档案列表导出
+export function exportCarList(params) {
+  return request({
+    url: '/take-car-record/export',
+    method: 'get',
+    params
+  })
 }

src/views/basic_data/dealer/dealer_apply.vue

@@ -85,21 +85,21 @@
             <el-table-column
               align="center"
               label="企业名称"
-              prop="enterprise"
+              prop="customerName"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="联系人"
-              prop="friend"
+              prop="linkName"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="联系电话"
-              prop="telephone"
+              prop="linkPhone"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -113,7 +113,7 @@
             <el-table-column
               align="center"
               label="联系地址"
-              prop="address"
+              prop="linkAddress"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -127,21 +127,21 @@
             <el-table-column
               align="center"
               label="跟进人"
-              prop="person"
+              prop="lastFollowerName"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="跟进时间"
-              prop="personDate"
+              prop="lastFollowerTime"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="跟进状态"
-              prop="state"
+              prop="status"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -204,17 +204,6 @@ export default {
     await this.getList({ pageNum: 1, pageSize: 10 });
   },
   methods: {
-    // 提交筛选表单
-    submitScreenForm() {
-      this.currentPage = 1;
-      this.getList({ pageNum: 1, pageSize: 10 });
-    },
-    // 重置筛选表单
-    resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList({ pageNum: 1, pageSize: 10 });
-    },
     // 更改每页数量
     handleSizeChange(val) {
       this.pageSize = val;

src/views/basic_data/dealer/dealer_deposit.vue

@@ -14,18 +14,29 @@
     </el-card> -->
     <!-- 筛选条件 -->
     <div>
-      <el-form label-width="100px" size="small" label-position="left">
+      <el-form
+        ref="searchForm"
+        :model="searchForm"
+        label-width="100px"
+        size="small"
+        label-position="left"
+      >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商名称" prop="account">
-              <el-input placeholder="请输入经销商名称"></el-input>
+            <el-form-item label="经销商名称" prop="customerName">
+              <el-input
+                v-model="searchForm.customerName"
+                placeholder="请输入经销商名称"
+              ></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :xs="24" :sm="12" :lg="18">
             <el-form-item label="" class="fr">
-              <el-button size="small">清空</el-button>
-              <el-button size="small" type="primary">搜索</el-button>
+              <el-button size="small" @click="clearFn">清空</el-button>
+              <el-button size="small" type="primary" @click="searchFn"
+                >搜索</el-button
+              >
             </el-form-item>
           </el-col>
         </el-row>
@@ -66,7 +77,7 @@
           <el-table-column
             align="center"
             label="经销商编码"
-            prop="customerName"
+            prop="customerNumber"
             min-width="160"
             show-overflow-tooltip
           />
@@ -126,7 +137,12 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-button type="text" class="textColor">编辑</el-button>
+              <el-button
+                type="text"
+                class="textColor"
+                @click="editFn(scope.row.id)"
+                >编辑</el-button
+              >
               <el-popconfirm
                 @onConfirm="deleFn(scope.row.id)"
                 title="这是一段内容确定删除吗？"
@@ -156,15 +172,24 @@
 
     <!-- 弹窗 -->
     <el-dialog
-      title="经销商工程机押金比例设置"
+      :title="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
+        ref="dialogForm"
+        :model="dialogForm"
+        label-width="100px"
+        label-position="right"
+      >
         <el-form-item label="经销商名称">
-          <el-select v-model="dialogForm.customerId" placeholder="名称">
+          <el-select
+            class="inputStyle"
+            v-model="dialogForm.customerId"
+            placeholder="名称"
+          >
             <el-option
               v-for="item in dealerList"
               :key="item.id"
@@ -183,20 +208,22 @@
         </el-form-item>
         <el-form-item label="开始时间">
           <el-date-picker
+            class="inputStyle"
             v-model="dialogForm.startTime"
-            type="date"
-            placeholder="选择日期"
-            format="yyyy 年 MM 月 dd 日"
+            type="datetime"
+            placeholder="选择日期时间"
+            default-time="00:00:00"
             value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="结束时间">
           <el-date-picker
+            class="inputStyle"
             v-model="dialogForm.endTime"
-            type="date"
-            placeholder="选择日期"
-            format="yyyy 年 MM 月 dd 日"
+            type="datetime"
+            placeholder="选择日期时间"
+            default-time="23:59:59"
             value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
@@ -211,7 +238,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="showDialog = false">取 消</el-button>
+        <el-button @click="cancelFn">取 消</el-button>
         <el-button type="primary" @click="addDataListFn">确 定</el-button>
       </div>
     </el-dialog>
@@ -224,16 +251,21 @@ import {
   getDealerDepositAdd,
   getDealerList,
   deleDealerDeposit,
+  editDealerDeposit,
+  infoDealerDeposit,
 } from "@/api/basic_data/dealer";
 
 export default {
   data() {
     return {
+      title: "",
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表
       listLoading: false, // 列表加载loading
-      screenForm: {},
+      searchForm: {
+        customerName: "",
+      },
       dialogForm: {
         amount: 0,
         customerId: "",
@@ -255,6 +287,29 @@ export default {
     await this.getDealerDataList({ pageNum: 1, pageSize: 10 });
   },
   methods: {
+    //取消
+    cancelFn() {
+      this.dialogForm = {
+        amount: 0,
+        customerId: "",
+        customerName: "",
+        customerNumber: "",
+        endTime: "",
+
+        rate: 0,
+        remark: "",
+        startTime: "",
+      };
+      this.showDialog = false;
+    },
+    //编辑
+    async editFn(id) {
+      console.log(id);
+      this.title = "编辑经销商工程机配置";
+      const res = await infoDealerDeposit({ id });
+      this.dialogForm = res.data;
+      this.showDialog = true;
+    },
     //删除
     async deleFn(id) {
       await deleDealerDeposit({ id });
@@ -266,17 +321,7 @@ export default {
       const res = await getDealerList(data);
       this.dealerList = res.data.records;
     },
-    // 提交筛选表单
-    submitScreenForm() {
-      this.currentPage = 1;
-      this.getList({ pageNum: 1, pageSize: 10 });
-    },
-    // 重置筛选表单
-    resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList({ pageNum: 1, pageSize: 10 });
-    },
+
     // 更改每页数量
     handleSizeChange(val) {
       this.pageSize = val;
@@ -291,7 +336,11 @@ export default {
     //搜索功能
     async searchFn() {
       console.log(this.searchForm);
-      await this.getList({ ...this.searchForm, pageNum: 1, pageSize: 10 });
+      await this.getList({
+        keyword: this.searchForm.customerName,
+        pageNum: 1,
+        pageSize: 10,
+      });
     },
     //重置
     clearFn() {
@@ -309,21 +358,38 @@ export default {
       let res = this.dealerList.filter(
         (v) => v.id === this.dialogForm.customerId
       )[0];
-      console.log(res);
+
       this.dialogForm.customerName = res.name;
       this.dialogForm.customerNumber = res.number;
 
-      console.log(this.dialogForm);
-      await getDealerDepositAdd({
-        ...this.dialogForm,
-        rate: Number(this.dialogForm.rate),
-        amount: Number(this.dialogForm.amount),
-      });
-      this.$message.success("添加成功");
-      await this.getList({ pageNum: 1, pageSize: 10 });
+      if (this.dialogForm.id) {
+        await editDealerDeposit({ ...this.dialogForm });
+        this.$message.success("编辑成功");
+      } else {
+        await getDealerDepositAdd({
+          ...this.dialogForm,
+          rate: Number(this.dialogForm.rate),
+          amount: Number(this.dialogForm.amount),
+        });
+        this.$message.success("添加成功");
+      }
+      this.dialogForm = {
+        amount: 0,
+        customerId: "",
+        customerName: "",
+        customerNumber: "",
+        endTime: "",
+
+        rate: 0,
+        remark: "",
+        startTime: "",
+      };
+
+      this.getList({ pageNum: 1, pageSize: 10 });
       this.showDialog = false;
     },
     addFn() {
+      this.title = "新增经销商工程机配置";
       this.showDialog = true;
     },
   },
@@ -331,6 +397,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-textarea__inner {
+  resize: none;
+}
 ::v-deep .el-form {
   .inputStyle {
     width: 80%;

src/views/basic_data/dealer/dealer_list.vue

@@ -64,7 +64,7 @@
             <el-table-column
               align="center"
               label="简称"
-              prop=""
+              prop="shortName"
               min-width="160"
             ></el-table-column>
             <el-table-column
@@ -73,9 +73,19 @@
               prop="danJuZhuangTai"
               min-width="160"
             ></el-table-column>
-            <el-table-column align="center" label="禁用状态" min-width="160">
+            <el-table-column
+              prop="forbidStatus"
+              align="center"
+              label="禁用状态"
+              min-width="160"
+            >
               <template slot-scope="scope">
-                {{ scope.row.forbidStatus === "A" ? "正常" : "禁用" }}
+                <el-tag type="success" v-if="scope.row.forbidStatus === 'A'"
+                  >正常</el-tag
+                >
+                <el-tag type="danger" v-else-if="scope.row.flag === 'B'"
+                  >禁用</el-tag
+                >
               </template>
             </el-table-column>
             <el-table-column

src/views/basic_data/dealer/dealer_stock.vue

@@ -21,7 +21,7 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="存货分类编码" prop="bianMa">
               <el-input
-                v-model="searchForm.bianMa"
+                v-model="searchForm.mainId"
                 placeholder="请输入"
               ></el-input>
             </el-form-item>
@@ -51,7 +51,15 @@
       <div class="fl">
         <el-button type="primary" size="small" @click="addFn">新增</el-button>
         <el-button type="primary" size="small">编辑</el-button>
-        <el-button type="primary" size="small">删除</el-button>
+        <el-popconfirm @onConfirm="deleFn" title="这是一段内容确定删除吗？">
+          <el-button
+            type="primary"
+            size="small"
+            class="textColor"
+            slot="reference"
+            >删除</el-button
+          >
+        </el-popconfirm>
       </div>
       <div class="fr">
         <el-button type="primary" size="small">导入</el-button>
@@ -66,6 +74,8 @@
         <el-table
           v-loading="listLoading"
           :data="dataList"
+          @select="hanleSelect"
+          @select-all="hanleSelect"
           element-loading-text="Loading"
           border
           fit
@@ -87,7 +97,7 @@
           <el-table-column
             align="center"
             label="存货分类编码"
-            prop="bianma"
+            prop="mainId"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -177,7 +187,11 @@
         label-position="right"
       >
         <el-form-item label="经销商名称">
-          <el-select v-model="addForm.customerId" placeholder="名称">
+          <el-select
+            class="selectStyle"
+            v-model="addForm.customerId"
+            placeholder="名称"
+          >
             <el-option
               v-for="item in dealerList"
               :key="item.id"
@@ -188,7 +202,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="存货分类">
-          <el-select v-model="addForm.mainId" placeholder="请选择">
+          <el-select
+            class="selectStyle"
+            v-model="addForm.mainId"
+            placeholder="请选择"
+          >
             <el-option
               v-for="item in selectList"
               :key="item.value"
@@ -230,16 +248,17 @@ export default {
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
-      screenForm: {},
+
       searchForm: {
         customerName: "",
-        bianMa: "",
+        mainId: "",
         mainName: "",
       },
       dataList: [], // 列表数据
       listLoading: false, // 列表加载loading
       dealerList: [],
       selectList: [],
+      ids: [],
     };
   },
   async created() {
@@ -249,6 +268,14 @@ export default {
   },
   computed: {},
   methods: {
+    // 筛选部分数据或者单个
+    hanleSelect(selection) {
+      // this.ids = selection.map((k) => {
+      //   return k.id;
+      // });
+      console.log(selection);
+      this.ids = selection.map((v) => v.id);
+    },
     //存货分类
     async getSelectList(data) {
       const res = await getDictionaries(data);
@@ -257,8 +284,10 @@ export default {
     },
     //删除
     async deleFn(id) {
-      console.log(id);
-      await deleDealerStockList({ id });
+      this.ids.push(id);
+      let res = this.ids.toString();
+
+      await deleDealerStockList({ ids: res });
       this.getList({ pageNum: 1, pageSize: 10 });
       this.$message.success("删除成功");
     },
@@ -297,17 +326,7 @@ export default {
       const res = await getDealerList(data);
       this.dealerList = res.data.records;
     },
-    // 提交筛选表单
-    submitScreenForm() {
-      this.currentPage = 1;
-      this.getList({ pageNum: 1, pageSize: 10 });
-    },
-    // 重置筛选表单
-    resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList({ pageNum: 1, pageSize: 10 });
-    },
+
     // 更改每页数量
     handleSizeChange(val) {
       this.pageSize = val;
@@ -322,7 +341,11 @@ export default {
     //搜索功能
     async searchFn() {
       console.log(this.searchForm);
-      await this.getList({ ...this.searchForm, pageNum: 1, pageSize: 10 });
+      await this.getList({
+        cusotmerName: this.searchForm.customerName,
+        pageNum: 1,
+        pageSize: 10,
+      });
     },
     //重置
     clearFn() {
@@ -341,9 +364,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.aaa {
-  padding: 10px 0;
+::v-deep .el-popover__reference {
+  margin-left: 10px;
+}
+::v-deep .selectStyle .el-input--suffix {
+  width: 200%;
 }
+
 ::v-deep .el-input--suffix {
   width: 300px;
 }
@@ -359,7 +386,4 @@ export default {
   width: 70%;
   margin-right: 20px;
 }
-.right {
-  float: right;
-}
 </style>

src/views/basic_data/taker/taker_car.vue

@@ -11,7 +11,7 @@
       >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商名称" prop="">
+            <el-form-item label="经销商名称" prop="customerName">
               <el-input
                 v-model="searchForm.customerName"
                 placeholder="请输入经销商名称"
@@ -19,7 +19,7 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="车牌" prop="">
+            <el-form-item label="车牌" prop="carBrand">
               <el-input
                 v-model="searchForm.carBrand"
                 placeholder="请输入车牌"
@@ -29,7 +29,7 @@
 
           <el-col :xs="24" :sm="12" :lg="12" class="tr">
             <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
+              <el-button size="small" @click="clearFn">清空</el-button>
               <el-button size="small" type="primary" @click="searchFn"
                 >搜索</el-button
               >
@@ -45,11 +45,21 @@
           >新增</el-button
         >
         <el-button type="primary" size="small">编辑</el-button>
-        <el-button type="primary" size="small">删除</el-button>
+        <el-popconfirm @onConfirm="delFn" title="这是一段内容确定删除吗？">
+          <el-button
+            size="small"
+            type="primary"
+            class="textColor"
+            slot="reference"
+            >删除</el-button
+          >
+        </el-popconfirm>
       </div>
       <div class="fr">
         <el-button type="primary" size="small">导入</el-button>
-        <el-button type="primary" size="small">导出</el-button>
+        <el-button type="primary" size="small" @click="exportFn"
+          >导出</el-button
+        >
       </div>
     </div>
     <!-- 列表 -->
@@ -59,6 +69,8 @@
           v-loading="listLoading"
           :data="dataList"
           element-loading-text="Loading"
+          @select="hanleSelect"
+          @select-all="hanleSelect"
           border
           fit
           highlight-current-row
@@ -118,7 +130,10 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-button type="text" class="textColor" @click="editFn"
+              <el-button
+                type="text"
+                class="textColor"
+                @click="editFn(scope.row)"
                 >编辑</el-button
               >
               <el-popconfirm
@@ -136,6 +151,8 @@
       <!-- 分页 -->
       <div class="fr">
         <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-sizes="[10, 20, 30, 50]"
           :page-size="10"
@@ -188,7 +205,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogForm = false">取 消</el-button>
+        <el-button @click="cancelFn">取 消</el-button>
         <el-button type="primary" @click="addDataListFn">确 定</el-button>
       </div>
     </el-dialog>
@@ -196,8 +213,14 @@
 </template>
 
 <script>
-import { getCarList, addDataListApi, delCarFn } from "@/api/basic_data/taker";
+import {
+  getCarList,
+  addDataListApi,
+  delCarFn,
+  editDataListApi,
+} from "@/api/basic_data/taker";
 import { getDealerList } from "@/api/basic_data/dealer";
+import { downloadFiles } from "@/utils/util";
 
 export default {
   data() {
@@ -220,6 +243,7 @@ export default {
         carBrand: "",
       },
       dealerList: [],
+      ids: [],
     };
   },
   async created() {
@@ -227,15 +251,61 @@ export default {
     await this.getDealerDataList({ pageNum: 1, pageSize: 10 });
   },
   methods: {
+    // 筛选部分数据或者单个
+    hanleSelect(selection) {
+      // this.ids = selection.map((k) => {
+      //   return k.id;
+      // });
+      console.log(selection);
+      this.ids = selection.map((v) => v.id);
+      console.log(this.ids);
+    },
+    //导出
+    exportFn() {
+      let screenData = {
+        customerName: this.searchForm.customerName,
+        carBrand: this.searchForm.carBrand,
+      };
+      downloadFiles("/take-car-record/export", screenData);
+    },
+    //取消
+    cancelFn() {
+      this.addForm = {
+        customerId: "",
+        mobile: "",
+        carType: "",
+        volume: "",
+        carBrand: "",
+      };
+      this.dialogForm = false;
+    },
+    //编辑
+    editFn(data) {
+      this.dialogForm = true;
+      this.addForm = data;
+    },
+    //重置
+    clearFn() {
+      console.log(this.$refs.searchForm);
+      this.$refs.searchForm.resetFields();
+    },
     //搜索
     async searchFn() {
       console.log(this.searchForm);
-      await this.getDataList({ ...this.searchForm, pageNum: 1, pageSize: 10 });
+      await this.getDataList({
+        ...this.searchForm,
+        pageNum: 1,
+        pageSize: this.pageSize,
+      });
     },
     //删除
     async delFn(ids) {
-      console.log(ids);
-      await delCarFn({ ids });
+      this.ids.push(ids);
+      let res = this.ids.toString();
+      await delCarFn({ ids: res });
+      this.$message.success("删除成功");
+
+      this.getDataList({ pageNum: this.currentPage, pageSize: this.pageSize });
     },
     //获取经销商数据
     async getDealerDataList(data) {
@@ -247,9 +317,28 @@ export default {
       this.dialogForm = true;
     },
     async addDataListFn() {
-      await addDataListApi({ ...this.addForm, orgNumber: "1122" });
-      this.$message.success("添加成功");
-      await this.getDataList({ pageNum: 1, pageSize: 10 });
+      const res = this.dealerList.filter(
+        (v) => v.id === this.addForm.customerId
+      )[0];
+
+      if (this.addForm.id) {
+        await editDataListApi({ ...this.addForm });
+        this.$message.success("编辑成功");
+      } else {
+        await addDataListApi({ ...this.addForm, orgNumber: res.useOrgNumber });
+        this.$message.success("添加成功");
+      }
+
+      // console.log(res);
+      //
+      // this.addForm = {
+      //   customerId: "",
+      //   mobile: "",
+      //   carType: "",
+      //   volume: "",
+      //   carBrand: "",
+      // };
+      this.getDataList({ pageNum: this.currentPage, pageSize: this.pageSize });
       this.dialogForm = false;
     },
     //获取列表数据
@@ -259,34 +348,26 @@ export default {
       this.dataList = res.data.records;
       this.listTotal = res.data.total;
     },
-    editFn() {},
-    // 提交筛选表单
-    submitScreenForm() {
-      this.currentPage = 1;
-      this.getDataList();
-    },
-    // 重置筛选表单
-    resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getDataList();
-    },
+
     // 更改每页数量
     handleSizeChange(val) {
       this.pageSize = val;
       this.currentPage = 1;
-      this.getDataList();
+      this.getDataList({ pageNum: 1, pageSize: this.pageSize });
     },
     // 更改当前页
     handleCurrentChange(val) {
       this.currentPage = val;
-      this.getDataList();
+      this.getDataList({ pageNum: val, pageSize: this.pageSize });
     },
   },
 };
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-popover__reference {
+  margin-left: 10px;
+}
 ::v-deep .el-date-editor {
   width: 100%;
 }

src/views/basic_data/taker/taker_list.vue

@@ -145,7 +145,14 @@
             prop="flag"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              <el-tag type="success" v-if="scope.row.flag === 1">有效</el-tag>
+              <el-tag type="danger" v-else-if="scope.row.flag === 2"
+                >失效</el-tag
+              >
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="操作"
@@ -154,12 +161,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope"
-              ><el-button
-                type="text"
-                class="textColor"
-                @click="editFn(scope.row.id)"
-                >详情</el-button
-              >
+              ><el-button type="text" class="textColor">查看</el-button>
               <el-button
                 type="text"
                 class="textColor"
@@ -194,12 +196,8 @@
       :close-on-click-modal="false"
     >
       <el-form ref="addForm" :model="addForm" label-width="120px">
-        <el-form-item label="经销商名称">
-          <el-select
-            @onchange="changeFn"
-            v-model="addForm.customerId"
-            placeholder="名称"
-          >
+        <el-form-item label="经销商名称" prop="customerId">
+          <el-select v-model="addForm.customerId" placeholder="名称">
             <el-option
               v-for="item in dealerList"
               :key="item.id"
@@ -211,27 +209,27 @@
         </el-form-item>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="提货人姓名">
+            <el-form-item label="提货人姓名" prop="takerName">
               <el-input v-model="addForm.takerName"></el-input> </el-form-item
           ></el-col>
           <el-col :span="12">
-            <el-form-item label="身份证号码">
+            <el-form-item label="身份证号码" prop="identity">
               <el-input v-model="addForm.identity"></el-input> </el-form-item
           ></el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="联系电话">
+            <el-form-item label="联系电话" prop="phone">
               <el-input v-model="addForm.phone"></el-input> </el-form-item
           ></el-col>
           <el-col :span="12">
-            <el-form-item label="备用电话">
+            <el-form-item label="备用电话" prop="sparePhone">
               <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-form-item label="有效期" prop="expireTime">
               <el-date-picker
                 v-model="addForm.expireTime"
                 type="date"
@@ -242,7 +240,7 @@
               </el-date-picker> </el-form-item
           ></el-col>
           <el-col :span="12">
-            <el-form-item label="验证码">
+            <el-form-item label="验证码" prop="code">
               <el-row :gutter="6">
                 <el-col :span="14">
                   <el-input v-model="addForm.code" />
@@ -256,11 +254,11 @@
             </el-form-item></el-col
           >
         </el-row>
-        <el-form-item label="上传提货人附件">
+        <!-- <el-form-item label="上传提货人附件">
           <el-upload class="upload-demo">
             <el-button size="small" type="info">点击上传</el-button>
           </el-upload>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogForm = false">取 消</el-button>
@@ -325,6 +323,8 @@ export default {
     //停用提货人档案
     async stopFn(id) {
       await stopTaker({ id });
+      this.$message.success("成功");
+      this.getDataList({ pageNum: 1, pageSize: this.pageSize });
     },
     //获取验证码
     async getCodeFn() {
@@ -368,8 +368,13 @@ export default {
     //新增
     async addDataFn() {
       console.log(this.addForm);
-      await addDataList({ ...this.addForm, orgNumber: "1122" });
+      const res = this.dealerList.filter(
+        (v) => v.id === this.addForm.customerId
+      )[0];
+      console.log(res);
+      await addDataList({ ...this.addForm, orgNumber: res.useOrgNumber });
       this.$message.success("新增成功");
+      this.$refs.addForm.resetFields();
       this.getDataList({ pageNum: 1, pageSize: 10 });
       this.dialogForm = false;
     },