Merge branch 'sit'

src/apis/service/serviceParam/supplierAccount/index.js

@@ -1,21 +1,21 @@
 // 物业管理员
-import http from "@/apis/axios";
-const api = "admin/";
+import http from '@/apis/axios'
+const api = 'admin/'
 export default {
   // 分页查询
-  slist: (data, params) => http(api + "supplerlist", data, "post", params),
+  slist: (data, params) => http(api + 'supplerlist', data, 'post', params),
   // 添加
-  add: (data, params) => http(api + "addAccount", data, "post", params),
+  add: (data, params) => http(api + 'addAccount', data, 'post', params),
   // 删除
-  delete: (data, params) => http(api + "deleteAccount", data, "post", params),
+  delete: (data, params) => http(api + 'deleteAccount', data, 'post', params),
   // 分页查询
-  list: (data, params) => http(api + "getAccountList", data, "post", params),
+  list: (data, params) => http(api + 'getAccountList', data, 'post', params),
   // 更新
-  update: (data, params) => http(api + "editAccount", data, "post", params),
+  update: (data, params) => http(api + 'editAccount', data, 'post', params),
   // 修改状态
-  status: (data, params) => http(api + "statusAccount", data, "post", params),
+  status: (data, params) => http(api + 'statusAccount', data, 'post', params),
   // 详情
-  detail: (data, params) => http(api + "readAccount", data, "post", params),
+  detail: (data, params) => http(api + 'readAccount', data, 'post', params),
   // 修改密码
-  setpwd: (data, params) => http(api + "changePassword", data, "post", params),
-};
+  setpwd: (data, params) => http(api + 'changePassword', data, 'post', params)
+}

src/views/sellOut/salesOrder/components/addReturnAllModel.vue

@@ -1,24 +1,24 @@
 <template>
   <el-dialog
+    v-loading="loading"
     :title="'新建退货单'"
     :center="true"
     align="left"
     top="8vh"
     width="950px"
-    @close="showModelThis = false"
     :close-on-click-modal="false"
     :visible.sync="showModelThis"
-    v-loading="loading"
     element-loading-text="拼命加载中"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)"
+    @close="showModelThis = false"
   >
     <el-card style="margin: -20px 0 0 0">
       <el-form
+        ref="ruleForm"
         :model="ruleForm"
         status-icon
         :rules="rulesThis"
-        ref="ruleForm"
         :size="'mini'"
         label-width="80px"
         class="demo-ruleForm"
@@ -38,15 +38,14 @@
           <el-col :span="24">
             <el-form-item label="退货备注" prop="remark">
               <el-input
+                v-model="ruleForm.remark"
                 :disabled="isDetail"
                 type="textarea"
                 :rows="2"
                 maxlength="250"
                 show-word-limit
                 placeholder="请填写备注"
-                v-model="ruleForm.remark"
-              /> </el-form-item
-          ></el-col>
+              /> </el-form-item></el-col>
           <el-col :span="24">
             <el-row>
               <el-col :span="8">
@@ -56,7 +55,7 @@
                     :disabled="true"
                     placeholder="可退数量"
                     maxlength="10"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-col>
 
@@ -77,12 +76,17 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8" style="text-align: right">
-                <el-button type="primary" @click="submitForm" :size="'mini'"
-                  >保 存
+                <el-button
+                  type="primary"
+                  :size="'mini'"
+                  @click="submitForm"
+                >保 存
                 </el-button>
-                <el-button @click="showModelThis = false" v-if="!isDetail" :size="'mini'"
-                  >关 闭</el-button
-                >
+                <el-button
+                  v-if="!isDetail"
+                  :size="'mini'"
+                  @click="showModelThis = false"
+                >关 闭</el-button>
               </el-col>
             </el-row>
           </el-col>
@@ -92,188 +96,188 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/sellOut/salesOrder/detail";
-import resToken from "@/mixins/resToken";
-import { isnumber } from "@/utils/validate";
+import asyncRequest from '@/apis/service/sellOut/salesOrder/detail'
+import resToken from '@/mixins/resToken'
+import { isnumber } from '@/utils/validate'
 export default {
-  name: "sellReturn",
-  props: ["showModel", "id", "isDetail", "sitem"],
+  name: 'SellReturn',
   mixins: [resToken],
+  props: ['showModel', 'id', 'isDetail', 'sitem'],
   data() {
     return {
       loading: false,
       showModelThis: this.showModel,
       statusOptions: [
-        { id: "0", label: "待公司采购" },
-        { id: "1", label: "待库管发货" },
-        { id: "2", label: "已发货待收货" },
-        { id: "3", label: "已收货" },
-        { id: "4", label: "已全部退货" },
+        { id: '0', label: '待公司采购' },
+        { id: '1', label: '待库管发货' },
+        { id: '2', label: '已发货待收货' },
+        { id: '3', label: '已收货' },
+        { id: '4', label: '已全部退货' }
       ],
       ruleForm: {
-        good_num: "",
-        thnum: "",
-        return_type: "1",
-        orderCode: "", //发货申请单编号
-        remark: "", //退货备注
-        errorCode: "", //退货原因
-        returnT: "",
+        good_num: '',
+        thnum: '',
+        return_type: '1',
+        orderCode: '', // 发货申请单编号
+        remark: '', // 退货备注
+        errorCode: '', // 退货原因
+        returnT: ''
       },
       rulesThis: this.rules,
       options: [
         {
-          value: "1",
-          label: "无地址",
+          value: '1',
+          label: '无地址'
         },
         {
-          value: "2",
-          label: "有地址",
-        },
+          value: '2',
+          label: '有地址'
+        }
       ],
       rules: {
         errorCode: [
           {
             required: true,
-            message: "请选择退货原因",
-            trigger: "change",
-          },
+            message: '请选择退货原因',
+            trigger: 'change'
+          }
         ],
 
         thnum: [
           {
             required: true,
-            message: "请输入退货数量",
-            trigger: "blur",
-          },
+            message: '请输入退货数量',
+            trigger: 'blur'
+          }
         ],
         remark: [
           {
             required: true,
-            message: "请输入退货备注",
-            trigger: "blur",
-          },
-        ],
+            message: '请输入退货备注',
+            trigger: 'blur'
+          }
+        ]
       },
       get_product_go: [],
       noAddrT: 0,
       hasAddrT: 0,
-      type_change: true,
-    };
+      type_change: true
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
 
   methods: {
     errorCode_change(e) {
-      this.ruleForm.errorCode = e && e.code ? e.code : "";
-      this.$refs.ruleForm.validateField("errorCode");
+      this.ruleForm.errorCode = e && e.code ? e.code : ''
+      this.$refs.ruleForm.validateField('errorCode')
     },
     async initForm() {
-      this.loading = true;
-      this.rulesThis = this.rules;
-      await this.resetForm();
-      this.loading = false;
+      this.loading = true
+      this.rulesThis = this.rules
+      await this.resetForm()
+      this.loading = false
     },
 
     return_type_change() {
-      const { return_type } = this.ruleForm;
-      this.ruleForm.returnT = return_type === "1" ? this.noAddrT : this.hasAddrT;
+      const { return_type } = this.ruleForm
+      this.ruleForm.returnT = return_type === '1' ? this.noAddrT : this.hasAddrT
     },
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
           const {
             orderCode,
-            remark, //退货备注
-            errorCode, //退货原因
+            remark, // 退货备注
+            errorCode, // 退货原因
             thnum,
-            returnT,
-          } = this.sitem;
+            returnT
+          } = this.sitem
           this.ruleForm = {
-            thnum: thnum || "0",
-            orderCode, //发货申请单编号
-            remark, //退货备注
-            errorCode, //退货原因
-            returnT: returnT || "0",
-          };
+            thnum: thnum || '0',
+            orderCode, // 发货申请单编号
+            remark, // 退货备注
+            errorCode, // 退货原因
+            returnT: returnT || '0'
+          }
         }
-      });
+      })
     },
 
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
-          if (this.loading) return;
+          if (this.loading) return
 
-          this.loading = true;
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-          delete model["thnum"];
-          delete model["returnT"];
+          this.loading = true
+          const model = JSON.parse(JSON.stringify(this.ruleForm))
+          delete model['thnum']
+          delete model['returnT']
 
-          const { code, data, message } = await asyncRequest.returnAll(model);
-          this.loading = false;
+          const { code, data, message } = await asyncRequest.returnAll(model)
+          this.loading = false
           if (code === 0) {
             this.$notify.success({
-              title: "退货申请创建成功！",
-              message: "",
-            });
-            this.showModelThis = false;
+              title: '退货申请创建成功！',
+              message: ''
+            })
+            this.showModelThis = false
             // 刷新
-            this.$emit("refresh", false);
+            this.$emit('refresh', false)
           } else if (code >= 100 && code <= 104) {
-            await this.logout();
+            await this.logout()
           } else {
-            this.$message.warning(message);
+            this.$message.warning(message)
           }
         } else {
-          return false;
+          return false
         }
-      });
+      })
     },
-    //保存某一行
+    // 保存某一行
     checkRow(rowIndex) {
-      const { wsend_num, return_num } = this.get_product_go[rowIndex];
+      const { wsend_num, return_num } = this.get_product_go[rowIndex]
       if (!isnumber(return_num)) {
-        this.$message.warning("退货数量不规范！");
-        return;
+        this.$message.warning('退货数量不规范！')
+        return
       }
       if (parseInt(wsend_num) < parseInt(return_num)) {
-        this.$message.warning("退货数量不能大于未发货总数量！");
-        return;
+        this.$message.warning('退货数量不能大于未发货总数量！')
+        return
       }
-      this.get_product_go[rowIndex].edit = false;
-      this.get_product_go[rowIndex].newTime = new Date().valueOf() + "";
-      this.$set(this.get_product_go, rowIndex, this.get_product_go[rowIndex]);
+      this.get_product_go[rowIndex].edit = false
+      this.get_product_go[rowIndex].newTime = new Date().valueOf() + ''
+      this.$set(this.get_product_go, rowIndex, this.get_product_go[rowIndex])
     },
-    //编辑某一行
+    // 编辑某一行
     editRow(rowIndex) {
-      let list = JSON.parse(JSON.stringify(this.get_product_go));
-      console.log(list);
-      let index = list.findIndex((v) => v.edit === true);
+      const list = JSON.parse(JSON.stringify(this.get_product_go))
+      console.log(list)
+      const index = list.findIndex((v) => v.edit === true)
       if (index !== -1) {
-        this.$message.warning("请完成其他行的编辑！");
-        return;
+        this.$message.warning('请完成其他行的编辑！')
+        return
       }
-      this.get_product_go[rowIndex].edit = true;
-      this.get_product_go[rowIndex].newTime = new Date().valueOf() + "";
-      this.$set(this.get_product_go, rowIndex, this.get_product_go[rowIndex]);
-    },
-  },
-};
+      this.get_product_go[rowIndex].edit = true
+      this.get_product_go[rowIndex].newTime = new Date().valueOf() + ''
+      this.$set(this.get_product_go, rowIndex, this.get_product_go[rowIndex])
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped></style>

src/views/serviceParam/supplierAccount/columns.js

@@ -1,551 +1,551 @@
-import { isSpecialSymbol, hasSpace } from "@/utils/validate";
+import { isSpecialSymbol, hasSpace } from '@/utils/validate'
 
-//是否定制
+// 是否定制
 const options1 = [
-  { id: "0", name: "否" },
-  { id: "1", name: "是" },
-];
-//专属类型
+  { id: '0', name: '否' },
+  { id: '1', name: '是' }
+]
+// 专属类型
 const options2 = [
-  { id: "0", name: "非泰康" },
-  { id: "1", name: "泰康" },
-];
-//销售权限
+  { id: '0', name: '非泰康' },
+  { id: '1', name: '泰康' }
+]
+// 销售权限
 const options3 = [
-  { id: "0", name: "无销售权限" },
-  { id: "1", name: "有销售权限" },
-];
+  { id: '0', name: '无销售权限' },
+  { id: '1', name: '有销售权限' }
+]
 
-//是否库存品
+// 是否库存品
 const options4 = [
-  { id: "0", name: "非库存品" },
-  { id: "1", name: "库存品" },
-];
-//是否启用实时金价
+  { id: '0', name: '非库存品' },
+  { id: '1', name: '库存品' }
+]
+// 是否启用实时金价
 const options5 = [
-  { id: "0", name: "否" },
-  { id: "1", name: "是" },
-];
-//供货区域
+  { id: '0', name: '否' },
+  { id: '1', name: '是' }
+]
+// 供货区域
 const options6 = [
-  { id: "1", name: "全国" },
-  { id: "2", name: "全国除偏远" },
-];
-//是否启用阶梯
+  { id: '1', name: '全国' },
+  { id: '2', name: '全国除偏远' }
+]
+// 是否启用阶梯
 const options7 = [
-  { id: "0", name: "否" },
-  { id: "1", name: "是" },
-];
+  { id: '0', name: '否' },
+  { id: '1', name: '是' }
+]
 
-//有无工差
+// 有无工差
 const options8 = [
-  { id: "0", name: "无工差" },
-  { id: "1", name: "有工差" },
-];
-//配置要求
-const options9 = ["证书", "包装盒", "绒布袋", "标签", "其他"];
+  { id: '0', name: '无工差' },
+  { id: '1', name: '有工差' }
+]
+// 配置要求
+const options9 = ['证书', '包装盒', '绒布袋', '标签', '其他']
 const listCol = [
-  { type: "selection", fixed: "left", _noset_: true },
+  { type: 'selection', fixed: 'left', _noset_: true },
   {
-    prop: "spuCode",
-    label: "编号",
-    width: "160px",
+    prop: 'spuCode',
+    label: '编号',
+    width: '160px'
   },
   {
-    prop: "good_thumb_img",
-    label: "图片",
-    _slot_: "good_thumb_img",
-    width: "45px",
+    prop: 'good_thumb_img',
+    label: '图片',
+    _slot_: 'good_thumb_img',
+    width: '45px'
   },
   {
-    prop: "good_name",
-    label: "名称",
-    "min-width": "160px",
+    prop: 'good_name',
+    label: '名称',
+    'min-width': '160px'
   },
   {
-    prop: "cat_name",
-    label: "分类",
+    prop: 'cat_name',
+    label: '分类'
   },
   {
-    prop: "brand_name",
-    label: "品牌",
+    prop: 'brand_name',
+    label: '品牌'
   },
   {
-    prop: "isonline",
-    label: "是否上线",
-    _slot_: "isonline",
-    width: "70px",
+    prop: 'isonline',
+    label: '是否上线',
+    _slot_: 'isonline',
+    width: '70px'
   },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "118px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '118px'
   },
   {
-    prop: "supplierNo",
-    label: "供应商编号",
-    width: "110px",
+    prop: 'supplierNo',
+    label: '供应商编号',
+    width: '110px'
   },
   {
-    prop: "supplier_name",
-    label: "供应商名称",
-    width: "110px",
+    prop: 'supplier_name',
+    label: '供应商名称',
+    width: '110px'
   },
   {
-    prop: "companyNo",
-    label: "业务公司编号",
-    width: "110px",
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '110px'
   },
   {
-    prop: "company",
-    label: "业务公司名称",
-    width: "110px",
+    prop: 'company',
+    label: '业务公司名称',
+    width: '110px'
   },
   {
-    prop: "company_name",
-    label: "创建人部门",
-    minWidth: "150px",
+    prop: 'company_name',
+    label: '创建人部门',
+    minWidth: '150px'
   },
   {
-    prop: "creater",
-    label: "创建人",
-    width: "70px",
+    prop: 'creater',
+    label: '创建人',
+    width: '70px'
   },
 
   {
-    prop: "addtime",
-    label: "创建时间",
-    width: "140px",
+    prop: 'addtime',
+    label: '创建时间',
+    width: '140px'
   },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    width: "200px",
-    _slot_: "operation",
-  },
-];
+    width: '200px',
+    _slot_: 'operation'
+  }
+]
 const validate_num = (rule, value, callback) => {
-  const { required } = rule;
-  if (required && value === "") {
-    callback(new Error("不能为空！"));
+  const { required } = rule
+  if (required && value === '') {
+    callback(new Error('不能为空！'))
   } else {
-    callback();
+    callback()
   }
-};
+}
 const validate_num_0 = (rule, value, callback) => {
-  const { required } = rule;
-  if (required && value === "") {
-    callback(new Error("不能为空！"));
+  const { required } = rule
+  if (required && value === '') {
+    callback(new Error('不能为空！'))
   } else if (
     required &&
-    (value === "0" ||
-      value === "0." ||
-      value === "0.0" ||
-      value === "0.00" ||
-      value === "0.000")
+    (value === '0' ||
+      value === '0.' ||
+      value === '0.0' ||
+      value === '0.00' ||
+      value === '0.000')
   ) {
-    callback(new Error("不能为零！"));
+    callback(new Error('不能为零！'))
   } else {
-    callback();
+    callback()
   }
-};
+}
 const validate_good_img = (rule, value, callback) => {
-  const { required } = rule;
+  const { required } = rule
   if (required && value.length == 0) {
-    callback(new Error("请上传商品主图！"));
+    callback(new Error('请上传商品主图！'))
   } else if (required && (value.length < 3 || value.length > 10)) {
-    callback(new Error("商品主图应为3~10张！"));
+    callback(new Error('商品主图应为3~10张！'))
   } else {
-    callback();
+    callback()
   }
-};
+}
 const validate_desc = (rule, value, callback) => {
-  const { required } = rule;
+  const { required } = rule
   if (required && value.length == 0) {
-    callback(new Error("不能为空！"));
+    callback(new Error('不能为空！'))
   } else if (isSpecialSymbol(value)) {
-    callback(new Error("不能使用英文特殊字符！"));
+    callback(new Error('不能使用英文特殊字符！'))
   } else {
-    callback();
+    callback()
   }
-};
+}
 const validate_good_name = (rule, value, callback) => {
-  const { required } = rule;
+  const { required } = rule
   if (required && value.length == 0) {
-    callback(new Error("不能为空！"));
+    callback(new Error('不能为空！'))
   } else if (hasSpace(value)) {
-    callback(new Error("不能出现回车/换行符！"));
+    callback(new Error('不能出现回车/换行符！'))
   } else if (isSpecialSymbol(value)) {
-    callback(new Error("不能使用英文特殊字符！"));
+    callback(new Error('不能使用英文特殊字符！'))
   } else {
-    callback();
+    callback()
   }
-};
+}
 const rules = {
   cat_id: [
     {
-      type: "array",
+      type: 'array',
       required: true,
-      message: "请选择商品分类",
-      trigger: "change",
-    },
+      message: '请选择商品分类',
+      trigger: 'change'
+    }
   ],
   brandid: [
     {
-      type: "array",
+      type: 'array',
       required: true,
-      message: "请选择商品品牌",
-      trigger: "change",
-    },
+      message: '请选择商品品牌',
+      trigger: 'change'
+    }
   ],
   noble_weight: [
     {
       required: true,
       validator: validate_num_0,
-      trigger: "blur",
-    },
+      trigger: 'blur'
+    }
   ],
   weight: [
     {
       required: true,
       validator: validate_num,
-      trigger: "blur",
-    },
+      trigger: 'blur'
+    }
   ],
   good_type: [
     {
       required: true,
-      message: "请选择是否定制",
-      trigger: "change",
-    },
+      message: '请选择是否定制',
+      trigger: 'change'
+    }
   ],
   is_stock: [
     {
       required: true,
-      message: "请选择是否库存品",
-      trigger: "change",
-    },
+      message: '请选择是否库存品',
+      trigger: 'change'
+    }
   ],
   company_id: [
     {
       required: true,
-      message: "请选择业务公司",
-      trigger: "change",
-    },
+      message: '请选择业务公司',
+      trigger: 'change'
+    }
   ],
   supplierNo: [
     {
-      type: "array",
+      type: 'array',
       required: true,
-      message: "请选择供应商",
-      trigger: "change",
-    },
+      message: '请选择供应商',
+      trigger: 'change'
+    }
   ],
   is_auth: [
     {
       required: true,
-      message: "请选择是否有权限销售",
-      trigger: "change",
-    },
+      message: '请选择是否有权限销售',
+      trigger: 'change'
+    }
   ],
   tax: [
     {
       required: true,
-      message: "请选择税率",
-      trigger: "change",
-    },
+      message: '请选择税率',
+      trigger: 'change'
+    }
   ],
   good_name: [
     {
       required: true,
       validator: validate_good_name,
-      trigger: "blur",
-    },
+      trigger: 'blur'
+    }
   ],
   unit: [
     {
-      type: "array",
+      type: 'array',
       required: true,
-      message: "请输入商品单位",
-      trigger: "blur",
-    },
+      message: '请输入商品单位',
+      trigger: 'blur'
+    }
   ],
   is_exclusive: [
     {
       required: true,
-      type: "array",
-      message: "请选择专属类型",
-      trigger: "change",
-    },
+      type: 'array',
+      message: '请选择专属类型',
+      trigger: 'change'
+    }
   ],
   noble_metal: [
     {
       required: true,
-      message: "请选择贵金属种类",
-      trigger: "change",
-    },
+      message: '请选择贵金属种类',
+      trigger: 'change'
+    }
   ],
   is_gold_price: [
     {
       required: true,
-      message: "请选择是否启用实时金价",
-      trigger: "change",
-    },
+      message: '请选择是否启用实时金价',
+      trigger: 'change'
+    }
   ],
   moq: [
     {
       required: true,
       validator: validate_num,
-      trigger: "blur",
-    },
+      trigger: 'blur'
+    }
   ],
   stock_moq: [
     {
       required: true,
       validator: validate_num_0,
-      trigger: "blur",
-    },
+      trigger: 'blur'
+    }
   ],
   customized: [
     {
       required: true,
       validator: validate_num,
-      trigger: "blur",
-    },
+      trigger: 'blur'
+    }
   ],
   after_sales: [
     {
       required: true,
-      message: "售后说明不能为空",
-      trigger: "blur",
+      message: '售后说明不能为空',
+      trigger: 'blur'
     },
     {
       required: true,
       validator: validate_desc,
-      trigger: "blur",
-    },
+      trigger: 'blur'
+    }
   ],
   // isSpecialSymbol
   good_remark: [
     {
       required: true,
-      message: "商品备注不能为空",
-      trigger: "blur",
+      message: '商品备注不能为空',
+      trigger: 'blur'
     },
     {
       required: true,
       validator: validate_desc,
-      trigger: "blur",
-    },
+      trigger: 'blur'
+    }
   ],
-  //包装/发货/图片
+  // 包装/发货/图片
   packing_list: [
     {
       required: true,
-      message: "请输入包装清单",
-      trigger: "blur",
-    },
+      message: '请输入包装清单',
+      trigger: 'blur'
+    }
   ],
   packing_way: [
     {
       required: true,
-      message: "请输入包装方式",
-      trigger: "blur",
-    },
+      message: '请输入包装方式',
+      trigger: 'blur'
+    }
   ],
 
   packing_spec: [
     {
       required: true,
-      message: "请输入装箱规格",
-      trigger: "blur",
-    },
+      message: '请输入装箱规格',
+      trigger: 'blur'
+    }
   ],
   packing_weight: [
     {
       required: true,
-      message: "请输入装箱重量",
-      trigger: "blur",
-    },
+      message: '请输入装箱重量',
+      trigger: 'blur'
+    }
   ],
   packing_szie: [
     {
       required: true,
-      message: "请输入装箱尺寸",
-      trigger: "blur",
-    },
+      message: '请输入装箱尺寸',
+      trigger: 'blur'
+    }
   ],
   supply_area: [
     {
       required: true,
-      message: "请选择供货区域",
-      trigger: "change",
-    },
+      message: '请选择供货区域',
+      trigger: 'change'
+    }
   ],
   delivery_place: [
     {
-      type: "array",
+      type: 'array',
       required: true,
-      message: "请选择发货地",
-      trigger: "change",
-    },
+      message: '请选择发货地',
+      trigger: 'change'
+    }
   ],
   origin_place: [
     {
-      type: "array",
+      type: 'array',
       required: true,
-      message: "请选择产地",
-      trigger: "change",
-    },
+      message: '请选择产地',
+      trigger: 'change'
+    }
   ],
   delivery_day: [
     {
       required: true,
-      message: "请输入物流时间",
-      trigger: "blur",
-    },
+      message: '请输入物流时间',
+      trigger: 'blur'
+    }
   ],
   lead_time: [
     {
       required: true,
-      message: "请输入供货周期",
-      trigger: "blur",
-    },
+      message: '请输入供货周期',
+      trigger: 'blur'
+    }
   ],
   sample_day: [
     {
       required: true,
-      message: "请输入调样周期",
-      trigger: "blur",
-    },
+      message: '请输入调样周期',
+      trigger: 'blur'
+    }
   ],
   packing_size: [
     {
       required: true,
-      message: "请输入装箱尺寸",
-      trigger: "blur",
-    },
+      message: '请输入装箱尺寸',
+      trigger: 'blur'
+    }
   ],
   good_size: [
     {
       required: true,
-      message: "请输入商品尺寸",
-      trigger: "blur",
-    },
+      message: '请输入商品尺寸',
+      trigger: 'blur'
+    }
   ],
   good_thumb_img: [
     {
       required: true,
-      message: "请上传商品缩略图",
-      trigger: "change",
-    },
+      message: '请上传商品缩略图',
+      trigger: 'change'
+    }
   ],
   good_img: [
     {
-      type: "array",
+      type: 'array',
       required: true,
       validator: validate_good_img,
-      trigger: "change",
-    },
+      trigger: 'change'
+    }
   ],
   good_info_img: [
     {
-      type: "array",
+      type: 'array',
       required: true,
-      message: "至少上传一张商品详情介绍图",
-      trigger: "change",
-    },
+      message: '至少上传一张商品详情介绍图',
+      trigger: 'change'
+    }
   ],
   demo_fee: [
     {
       required: true,
       validator: validate_num,
-      trigger: "blur",
-    },
+      trigger: 'blur'
+    }
   ],
   is_diff: [
     {
       required: true,
-      message: "请选择有无工差",
-      trigger: "change",
-    },
+      message: '请选择有无工差',
+      trigger: 'change'
+    }
   ],
   config: [
     {
       required: true,
-      type: "array",
-      message: "请选择配置要求",
-      trigger: "change",
-    },
+      type: 'array',
+      message: '请选择配置要求',
+      trigger: 'change'
+    }
   ],
   other_config: [
     {
       required: true,
-      message: "其他要求不能为空",
-      trigger: "blur",
-    },
+      message: '其他要求不能为空',
+      trigger: 'blur'
+    }
   ],
   open_fee: [
     {
       required: true,
       validator: validate_num,
-      trigger: "blur",
-    },
+      trigger: 'blur'
+    }
   ],
   sample_fee: [
     {
       required: true,
       validator: validate_num,
-      trigger: "blur",
-    },
+      trigger: 'blur'
+    }
   ],
   market_price: [
     {
       required: true,
       validator: validate_num,
-      trigger: "blur",
-    },
+      trigger: 'blur'
+    }
   ],
 
   cgd_gold_price: [
     {
       required: true,
       validator: validate_num,
-      trigger: "blur",
-    },
+      trigger: 'blur'
+    }
   ],
   craft_desc: [
     {
       required: false,
       validator: validate_desc,
-      trigger: "blur",
-    },
-  ],
+      trigger: 'blur'
+    }
+  ]
 
   // is_step: {
   //   required: true,
   //   message: "请选择是否启用阶梯",
   //   trigger: "change",
   // },
-};
+}
 // 表格 - 列参数
 const columns = [
-  { type: "expand", _slot_: "expand" },
+  { type: 'expand', _slot_: 'expand' },
 
   {
-    prop: "nickname",
-    label: "姓名",
+    prop: 'nickname',
+    label: '姓名'
   },
   {
-    prop: "mobile",
-    label: "手机号",
+    prop: 'mobile',
+    label: '手机号'
   },
   {
-    prop: "email",
-    label: "邮箱",
+    prop: 'email',
+    label: '邮箱'
   },
   // {
   //   prop: "supplier_list",
@@ -553,29 +553,29 @@ const columns = [
   //   _slot_: "supplier_list",
   // },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status'
   },
 
   {
-    prop: "creater",
-    label: "创建人",
+    prop: 'creater',
+    label: '创建人'
   },
   {
-    prop: "addtime",
-    label: "创建时间",
-    width: "145",
+    prop: 'addtime',
+    label: '创建时间',
+    width: '145'
   },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
-    width: "170",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
+    width: '170',
     _noset_: true,
-    _slot_: "operation",
-  },
-];
+    _slot_: 'operation'
+  }
+]
 export {
   options1,
   options2,
@@ -588,5 +588,5 @@ export {
   options9,
   listCol,
   rules,
-  columns,
-};
+  columns
+}

src/views/serviceParam/supplierBrand/supplierlist.vue

@@ -1,17 +1,20 @@
 <template>
-  <div class="supplier-list" v-loading="loading">
+  <div v-loading="loading" class="supplier-list">
     <div class="role-list__title">
       <p class="title">
         <span class="font">供应商列表</span>
 
-        <el-button type="warning" class="fr" size="mini" @click="restSearch"
-          >重置</el-button
-        >
+        <el-button
+          type="warning"
+          class="fr"
+          size="mini"
+          @click="restSearch"
+        >重置</el-button>
       </p>
       <p class="search">
         <el-input
-          placeholder="供应商名称"
           v-model="parmValue.name"
+          placeholder="供应商名称"
           class="input-with-select"
           size="small"
           @blur="
@@ -28,7 +31,7 @@
               pageInfo.curr = 1;
               searchList();
             "
-          ></el-button>
+          />
         </el-input>
       </p>
     </div>
@@ -52,7 +55,7 @@
       </ul>
     </div>
 
-    <div class="Pagination tc">
+    <div class="Pagination tc" style="bottom:-100px">
       <el-pagination
         :current-page="pageInfo.curr"
         :size="'small'"
@@ -64,33 +67,33 @@
   </div>
 </template>
 <script>
-import asyncRequest from "@/apis/service/serviceParam/supplierAccount";
-import mixinPage from "@/mixins/elPaginationHandle";
-import { mapGetters } from "vuex";
+import asyncRequest from '@/apis/service/serviceParam/supplierAccount'
+import mixinPage from '@/mixins/elPaginationHandle'
+import { mapGetters } from 'vuex'
 
-import resToken from "@/mixins/resToken";
+import resToken from '@/mixins/resToken'
 export default {
-  name: "supplierAccount",
+  name: 'SupplierAccount',
   mixins: [mixinPage, resToken],
 
   computed: {
-    //组件SIZE设置
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    // 组件SIZE设置
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size'])
   },
   data() {
     return {
       loading: false,
-      activeCode: "",
+      activeCode: '',
       parmValue: {
         page: 1, // 页码
         size: 20, // 每页显示条数
-        start: "",
-        end: "",
-        status: "",
-        creater: "",
-        company_name: "",
-        name: "",
-        ocr_status: "",
+        start: '',
+        end: '',
+        status: '',
+        creater: '',
+        company_name: '',
+        name: '',
+        ocr_status: ''
       },
 
       // 表格 - 数据
@@ -99,18 +102,18 @@ export default {
       table: {
         stripe: true,
         border: true,
-        _defaultHeader_: ["setcol"],
+        _defaultHeader_: ['setcol']
       },
       // 表格 - 分页
       pageInfo: {
         size: 20,
         curr: 1,
-        total: 0,
-      },
-    };
+        total: 0
+      }
+    }
   },
   mounted() {
-    this.searchList();
+    this.searchList()
   },
   methods: {
     restSearch() {
@@ -118,57 +121,57 @@ export default {
       this.pageInfo = {
         size: 20,
         curr: 1,
-        total: 0,
-      };
+        total: 0
+      }
       this.parmValue = {
         page: 1, // 页码
         size: 20, // 每页显示条数
-        start: "",
-        end: "",
-        status: "",
-        company_name: "", //创建人部门
-        creater: "",
-        name: "",
-        person: "",
-        ocr_status: "",
-      };
-      this.searchList();
+        start: '',
+        end: '',
+        status: '',
+        company_name: '', // 创建人部门
+        creater: '',
+        name: '',
+        person: '',
+        ocr_status: ''
+      }
+      this.searchList()
     },
     switchRoleHandle(code) {
-      this.activeCode = code;
-      this.$emit("change", code);
+      this.activeCode = code
+      this.$emit('change', code)
     },
     async currentChange(e) {
-      this.parmValue.page = e;
-      this.pageInfo.curr = e;
-      await this.searchList();
+      this.parmValue.page = e
+      this.pageInfo.curr = e
+      await this.searchList()
     },
     // 刷新表格
     async searchList() {
-      if (this.loading) return;
-      this.activeCode = "";
-      this.loading = true;
-      const { code, data } = await asyncRequest.slist(this.parmValue);
-      const scode = parseInt(code);
+      if (this.loading) return
+      this.activeCode = ''
+      this.loading = true
+      const { code, data } = await asyncRequest.slist(this.parmValue)
+      const scode = parseInt(code)
       if (scode === 0) {
-        const { list, count } = data;
-        this.tableData = list;
-        this.pageInfo.total = Number(count + "");
+        const { list, count } = data
+        this.tableData = list
+        this.pageInfo.total = Number(count + '')
         if (list.length !== 0) {
-          this.switchRoleHandle(list[0].code);
+          this.switchRoleHandle(list[0].code)
         } else {
-          this.switchRoleHandle("");
+          this.switchRoleHandle('')
         }
       } else if (scode >= 100 && scode <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.tableData = [];
-        this.pageInfo.total = 0;
+        this.tableData = []
+        this.pageInfo.total = 0
       }
-      this.loading = false;
-    },
-  },
-};
+      this.loading = false
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/serviceParam/supplierQuery/addEdit.vue

@@ -0,0 +1,381 @@
+<template>
+  <el-dialog
+    v-loading="loading"
+    :title="title"
+    :center="true"
+    align="left"
+    top="5vh"
+    width="600px"
+    append-to-body
+    :close-on-click-modal="false"
+    :visible.sync="showModelThis"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+    @close="showModelThis = false"
+  >
+    <el-card style="margin: -20px 0 0 0">
+      <el-row :gutter="10">
+        <el-col :span="24">
+          <el-form
+            ref="ruleForm"
+            :model="ruleForm"
+            status-icon
+            :rules="rulesThis"
+            :size="'mini'"
+            label-width="90px"
+            class="demo-ruleForm"
+          >
+            <el-form-item label="支持品牌" prop="brand_id">
+              <search-brand
+                :value="ruleForm.brand_id"
+                :size="'mini'"
+                :disabled="type === 'view'"
+                :is-detail="type !== 'add'"
+                :names="brand_name"
+                :placeholder="'商品品牌'"
+                @searchChange="brandidsearchChange"
+              />
+            </el-form-item>
+            <el-form-item label="授权类型" prop="long">
+              <el-radio-group v-model="ruleForm.long" :disabled="type === 'view'">
+                <el-radio :label="'0'">长期</el-radio>
+                <el-radio :label="'1'">非长期</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item v-if="ruleForm.long === '1'" label="授权时间" style="margin: 0">
+              <el-col :span="11">
+                <el-form-item prop="starttime">
+                  <el-date-picker
+                    v-model="ruleForm.starttime"
+                    type="date"
+                    :disabled="type === 'view'"
+                    placeholder="开始日期"
+                    :picker-options="pickerOptions1"
+                    style="width: 100%"
+                    value-format="yyyy-MM-dd"
+                    @change="timeChange"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col class="line tc" :span="2">-</el-col>
+              <el-col :span="11">
+                <el-form-item prop="endtime">
+                  <el-date-picker
+                    v-model="ruleForm.endtime"
+                    type="date"
+                    :disabled="type === 'view'"
+                    placeholder="结束日期"
+                    value-format="yyyy-MM-dd"
+                    :picker-options="pickerOptions2"
+                    style="width: 100%"
+                    @change="timeChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-form-item>
+            <el-col :span="17">
+              <el-form-item
+                label="授权图片"
+                prop="brand_book"
+                :disabled="id == '007'"
+                class="activity-upload"
+              >
+                <div class="btnupload" style="position: relative">
+                  <img
+                    v-if="ruleForm.brand_book"
+                    :src="ruleForm.brand_book"
+                    class="avatar"
+                  >
+                  <i v-else class="el-icon-plus avatar-uploader-icon" />
+                  <file-upload
+                    class="Upload"
+                    :disabled="type === 'view'"
+                    :accept="'.jpg,.png,.jpeg'"
+                    :multiple="true"
+                    :uploadcondition="beforeAvatarUpload"
+                    @UploadErrorEvent="UploadErrorEvent"
+                    @UploadSuccessEvent="UploadSuccessEvent"
+                  />
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="7" style="text-align: right; padding: 72px 0 0 0">
+              <el-button
+                v-if="type !== 'view'"
+                :size="'small'"
+                type="primary"
+                @click="submitForm"
+              >保 存
+              </el-button>
+              <el-button :size="'small'" @click="showModelThis = false">{{
+                type === "view" ? "关 闭" : "取 消"
+              }}</el-button>
+            </el-col>
+          </el-form>
+        </el-col>
+      </el-row>
+    </el-card>
+  </el-dialog>
+</template>
+<script>
+import asyncRequest from '@/apis/service/serviceParam/supplierBrand'
+import resToken from '@/mixins/resToken'
+export default {
+  name: 'Brand',
+  mixins: [resToken],
+  props: ['showModel', 'id', 'type', 'sitem'],
+  data() {
+    return {
+      loading: false,
+      title: '添加支持品牌',
+      showModelThis: this.showModel,
+      brand_name: '',
+      ruleForm: {},
+      rulesThis: this.rules,
+      pickerOptions1: {
+        disabledDate: (time) => {
+          if (this.ruleForm.endtime != null && this.ruleForm.endtime != '' && time) {
+            return time.getTime() > new Date(this.ruleForm.endtime).valueOf()
+          }
+        }
+      },
+      pickerOptions2: {
+        disabledDate: (time) => {
+          if (this.ruleForm.starttime != null && this.ruleForm.starttime != '' && time) {
+            return time.getTime() < new Date(this.ruleForm.starttime).valueOf()
+          }
+        }
+      },
+      rules: {
+        gyscode: [
+          {
+            required: true,
+            message: '供应商不能为空',
+            trigger: 'change'
+          }
+        ],
+
+        brand_id: [
+          {
+            type: 'array',
+            required: true,
+            message: '请选择支持品牌',
+            trigger: 'blur'
+          }
+        ],
+        long: [{ required: false, message: '请选择授权类型', trigger: 'change' }],
+        starttime: [{ required: false, message: '请选择授权开始日期', trigger: 'blur' }],
+        brand_book: [{ required: false, message: '授权图片不能为空', trigger: 'change' }]
+      }
+    }
+  },
+  watch: {
+    showModel: function(val) {
+      this.showModelThis = val
+      if (val) {
+        this.initForm()
+      }
+    },
+    showModelThis(val) {
+      if (!val) {
+        this.$emit('cancel')
+      }
+    }
+  },
+  methods: {
+    async initForm() {
+      this.loading = true
+      this.brand_name = ''
+      this.resetFormData()
+      if (this.type === 'add') {
+        this.rulesThis = this.rules
+        this.title = '添加支持品牌'
+        await this.resetForm()
+      } else if (this.type === 'edit') {
+        this.rulesThis = this.rules
+        this.title = '修改支持品牌'
+        await this.resetForm()
+        await this.initData()
+      } else {
+        this.rulesThis = {}
+        this.title = '查看支持品牌'
+        await this.resetForm()
+        await this.initData()
+      }
+      this.loading = false
+    },
+    async resetForm() {
+      // 重置
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
+          this.resetFormData()
+        }
+      })
+    },
+    timeChange() {
+      if (
+        this.ruleForm.starttime !== '' &&
+        this.ruleForm.starttime !== null &&
+        this.ruleForm.endtime !== '' &&
+        this.ruleForm.endtime !== null
+      ) {
+        if (
+          new Date(this.ruleForm.endtime).valueOf() <
+          new Date(this.ruleForm.starttime).valueOf()
+        ) {
+          this.$message.warning('结束时间不大于开始时间！')
+          this.ruleForm.endtime = ''
+          this.ruleForm.starttime = ''
+          this.$refs.ruleForm.validateField('starttime')
+          this.$refs.ruleForm.validateField('endtime')
+        } else {
+          this.$refs.ruleForm.validateField('starttime')
+          this.$refs.ruleForm.validateField('endtime')
+        }
+      } else {
+        this.$refs.ruleForm.validateField('starttime')
+        this.$refs.ruleForm.validateField('endtime')
+      }
+    },
+    resetFormData() {
+      this.ruleForm = {
+        id: '',
+        gyscode: this.sitem,
+        brand_id: [],
+        long: '1',
+        starttime: '',
+        endtime: '',
+        brand_book: ''
+      }
+      console.log(this.sitem)
+    },
+    async initData() {
+      this.loading = true
+      const { code, message, data } = await asyncRequest.detail({
+        id: this.id
+      })
+      this.loading = false
+      if (code === 0) {
+        const {
+          id,
+          brand_book,
+          brand_id,
+          brand_name,
+          long,
+          starttime,
+          endtime,
+          gyscode
+        } = data
+        this.brand_name = brand_name
+        this.ruleForm = {
+          id: id || '',
+          gyscode: gyscode,
+          brand_id: brand_id ? [brand_id] : [],
+          long: long || '',
+          starttime: starttime || '',
+          endtime: endtime || '',
+          brand_book: brand_book || ''
+        }
+      } else if (code >= 100 && code <= 104) {
+        await this.logout()
+      } else {
+        this.$message.warning(message)
+      }
+    },
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async(valid) => {
+        if (valid) {
+          if (this.loading) return
+          this.loading = true
+          const model = JSON.parse(JSON.stringify(this.ruleForm))
+          model.brand_id = model.brand_id.toString()
+          // model.gyscode = model.gyscode.toString();
+
+          let res = {}
+          if (this.type === 'add') {
+            delete model['id']
+            res = await asyncRequest.add(model)
+          } else {
+            res = await asyncRequest.update(model)
+          }
+          this.loading = false
+          const { code, data, message } = res
+          if (code === 0) {
+            const title = this.type === 'add' ? '添加成功!' : '修改成功!'
+            this.$notify.success({
+              title,
+              message: ''
+            })
+            this.showModelThis = false
+            // 刷新
+            this.$emit('refresh')
+          } else if (code >= 100 && code <= 104) {
+            await this.logout()
+          } else {
+            this.$message.warning(message)
+          }
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    // 商品品牌选择
+    brandidsearchChange(e) {
+      const { id } = e
+      this.ruleForm.brand_id = id ? [id] : []
+      this.$refs.ruleForm.validateField('brand_id')
+    },
+    // 判断图片规格
+    beforeAvatarUpload(file) {
+      let isJPG = false
+      let isLt2M = false
+      if (file) {
+        if (
+          file.type === 'image/jpg' ||
+          file.type === 'image/png' ||
+          file.type === 'image/jpeg'
+        ) {
+          isJPG = true
+        }
+        isLt2M = file.size / 1024 / 1024 < 1
+        if (!isJPG) {
+          this.$message.error('图片格式不正确！')
+        }
+        if (!isLt2M) {
+          this.$message.error('图片大小不能超过 1MB!')
+        }
+      }
+
+      return isJPG && isLt2M
+    },
+    // 图片上传失败
+    UploadErrorEvent(res) {
+      if (res !== 'break') {
+        this.$message.error('图片上传失败!')
+        this.ruleForm.brand_book = ''
+        this.$refs.ruleForm.validateField('brand_book')
+      }
+    },
+    // 图片上传成功
+    async UploadSuccessEvent(data) {
+      const { url } = data
+      if (url === 'noToken') {
+        await this.logout()
+      } else {
+        this.ruleForm.brand_book = url
+        this.$message.success('图片上传成功!')
+        this.$refs.ruleForm.validateField('brand_book')
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.brand {
+}
+</style>

src/views/serviceParam/supplierQuery/columns.js

@@ -0,0 +1,584 @@
+import { isSpecialSymbol, hasSpace } from '@/utils/validate'
+
+// 是否定制
+const options1 = [
+  { id: '0', name: '否' },
+  { id: '1', name: '是' }
+]
+// 专属类型
+const options2 = [
+  { id: '0', name: '非泰康' },
+  { id: '1', name: '泰康' }
+]
+// 销售权限
+const options3 = [
+  { id: '0', name: '无销售权限' },
+  { id: '1', name: '有销售权限' }
+]
+
+// 是否库存品
+const options4 = [
+  { id: '0', name: '非库存品' },
+  { id: '1', name: '库存品' }
+]
+// 是否启用实时金价
+const options5 = [
+  { id: '0', name: '否' },
+  { id: '1', name: '是' }
+]
+// 供货区域
+const options6 = [
+  { id: '1', name: '全国' },
+  { id: '2', name: '全国除偏远' }
+]
+// 是否启用阶梯
+const options7 = [
+  { id: '0', name: '否' },
+  { id: '1', name: '是' }
+]
+
+// 有无工差
+const options8 = [
+  { id: '0', name: '无工差' },
+  { id: '1', name: '有工差' }
+]
+// 配置要求
+const options9 = ['证书', '包装盒', '绒布袋', '标签', '其他']
+const listCol = [
+  { type: 'selection', fixed: 'left', _noset_: true },
+  {
+    prop: 'spuCode',
+    label: '编号',
+    width: '160px'
+  },
+  {
+    prop: 'good_thumb_img',
+    label: '图片',
+    _slot_: 'good_thumb_img',
+    width: '45px'
+  },
+  {
+    prop: 'good_name',
+    label: '名称',
+    'min-width': '160px'
+  },
+  {
+    prop: 'cat_name',
+    label: '分类'
+  },
+  {
+    prop: 'brand_name',
+    label: '品牌'
+  },
+  {
+    prop: 'isonline',
+    label: '是否上线',
+    _slot_: 'isonline',
+    width: '70px'
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '118px'
+  },
+  {
+    prop: 'supplierNo',
+    label: '供应商编号',
+    width: '110px'
+  },
+  {
+    prop: 'supplier_name',
+    label: '供应商名称',
+    width: '110px'
+  },
+  {
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '110px'
+  },
+  {
+    prop: 'company',
+    label: '业务公司名称',
+    width: '110px'
+  },
+  {
+    prop: 'company_name',
+    label: '创建人部门',
+    minWidth: '150px'
+  },
+  {
+    prop: 'creater',
+    label: '创建人',
+    width: '70px'
+  },
+
+  {
+    prop: 'addtime',
+    label: '创建时间',
+    width: '140px'
+  },
+  {
+    prop: '',
+    label: '操作',
+    fixed: 'right',
+    _noset_: true,
+    width: '200px',
+    _slot_: 'operation'
+  }
+]
+const validate_num = (rule, value, callback) => {
+  const { required } = rule
+  if (required && value === '') {
+    callback(new Error('不能为空！'))
+  } else {
+    callback()
+  }
+}
+const validate_num_0 = (rule, value, callback) => {
+  const { required } = rule
+  if (required && value === '') {
+    callback(new Error('不能为空！'))
+  } else if (
+    required &&
+    (value === '0' ||
+      value === '0.' ||
+      value === '0.0' ||
+      value === '0.00' ||
+      value === '0.000')
+  ) {
+    callback(new Error('不能为零！'))
+  } else {
+    callback()
+  }
+}
+const validate_good_img = (rule, value, callback) => {
+  const { required } = rule
+  if (required && value.length == 0) {
+    callback(new Error('请上传商品主图！'))
+  } else if (required && (value.length < 3 || value.length > 10)) {
+    callback(new Error('商品主图应为3~10张！'))
+  } else {
+    callback()
+  }
+}
+const validate_desc = (rule, value, callback) => {
+  const { required } = rule
+  if (required && value.length == 0) {
+    callback(new Error('不能为空！'))
+  } else if (isSpecialSymbol(value)) {
+    callback(new Error('不能使用英文特殊字符！'))
+  } else {
+    callback()
+  }
+}
+const validate_good_name = (rule, value, callback) => {
+  const { required } = rule
+  if (required && value.length == 0) {
+    callback(new Error('不能为空！'))
+  } else if (hasSpace(value)) {
+    callback(new Error('不能出现回车/换行符！'))
+  } else if (isSpecialSymbol(value)) {
+    callback(new Error('不能使用英文特殊字符！'))
+  } else {
+    callback()
+  }
+}
+const rules = {
+  cat_id: [
+    {
+      type: 'array',
+      required: true,
+      message: '请选择商品分类',
+      trigger: 'change'
+    }
+  ],
+  brandid: [
+    {
+      type: 'array',
+      required: true,
+      message: '请选择商品品牌',
+      trigger: 'change'
+    }
+  ],
+  noble_weight: [
+    {
+      required: true,
+      validator: validate_num_0,
+      trigger: 'blur'
+    }
+  ],
+  weight: [
+    {
+      required: true,
+      validator: validate_num,
+      trigger: 'blur'
+    }
+  ],
+  good_type: [
+    {
+      required: true,
+      message: '请选择是否定制',
+      trigger: 'change'
+    }
+  ],
+  is_stock: [
+    {
+      required: true,
+      message: '请选择是否库存品',
+      trigger: 'change'
+    }
+  ],
+  company_id: [
+    {
+      required: true,
+      message: '请选择业务公司',
+      trigger: 'change'
+    }
+  ],
+  supplierNo: [
+    {
+      type: 'array',
+      required: true,
+      message: '请选择供应商',
+      trigger: 'change'
+    }
+  ],
+  is_auth: [
+    {
+      required: true,
+      message: '请选择是否有权限销售',
+      trigger: 'change'
+    }
+  ],
+  tax: [
+    {
+      required: true,
+      message: '请选择税率',
+      trigger: 'change'
+    }
+  ],
+  good_name: [
+    {
+      required: true,
+      validator: validate_good_name,
+      trigger: 'blur'
+    }
+  ],
+  unit: [
+    {
+      type: 'array',
+      required: true,
+      message: '请输入商品单位',
+      trigger: 'blur'
+    }
+  ],
+  is_exclusive: [
+    {
+      required: true,
+      type: 'array',
+      message: '请选择专属类型',
+      trigger: 'change'
+    }
+  ],
+  noble_metal: [
+    {
+      required: true,
+      message: '请选择贵金属种类',
+      trigger: 'change'
+    }
+  ],
+  is_gold_price: [
+    {
+      required: true,
+      message: '请选择是否启用实时金价',
+      trigger: 'change'
+    }
+  ],
+  moq: [
+    {
+      required: true,
+      validator: validate_num,
+      trigger: 'blur'
+    }
+  ],
+  stock_moq: [
+    {
+      required: true,
+      validator: validate_num_0,
+      trigger: 'blur'
+    }
+  ],
+  customized: [
+    {
+      required: true,
+      validator: validate_num,
+      trigger: 'blur'
+    }
+  ],
+  after_sales: [
+    {
+      required: true,
+      message: '售后说明不能为空',
+      trigger: 'blur'
+    },
+    {
+      required: true,
+      validator: validate_desc,
+      trigger: 'blur'
+    }
+  ],
+  // isSpecialSymbol
+  good_remark: [
+    {
+      required: true,
+      message: '商品备注不能为空',
+      trigger: 'blur'
+    },
+    {
+      required: true,
+      validator: validate_desc,
+      trigger: 'blur'
+    }
+  ],
+  // 包装/发货/图片
+  packing_list: [
+    {
+      required: true,
+      message: '请输入包装清单',
+      trigger: 'blur'
+    }
+  ],
+  packing_way: [
+    {
+      required: true,
+      message: '请输入包装方式',
+      trigger: 'blur'
+    }
+  ],
+
+  packing_spec: [
+    {
+      required: true,
+      message: '请输入装箱规格',
+      trigger: 'blur'
+    }
+  ],
+  packing_weight: [
+    {
+      required: true,
+      message: '请输入装箱重量',
+      trigger: 'blur'
+    }
+  ],
+  packing_szie: [
+    {
+      required: true,
+      message: '请输入装箱尺寸',
+      trigger: 'blur'
+    }
+  ],
+  supply_area: [
+    {
+      required: true,
+      message: '请选择供货区域',
+      trigger: 'change'
+    }
+  ],
+  delivery_place: [
+    {
+      type: 'array',
+      required: true,
+      message: '请选择发货地',
+      trigger: 'change'
+    }
+  ],
+  origin_place: [
+    {
+      type: 'array',
+      required: true,
+      message: '请选择产地',
+      trigger: 'change'
+    }
+  ],
+  delivery_day: [
+    {
+      required: true,
+      message: '请输入物流时间',
+      trigger: 'blur'
+    }
+  ],
+  lead_time: [
+    {
+      required: true,
+      message: '请输入供货周期',
+      trigger: 'blur'
+    }
+  ],
+  sample_day: [
+    {
+      required: true,
+      message: '请输入调样周期',
+      trigger: 'blur'
+    }
+  ],
+  packing_size: [
+    {
+      required: true,
+      message: '请输入装箱尺寸',
+      trigger: 'blur'
+    }
+  ],
+  good_size: [
+    {
+      required: true,
+      message: '请输入商品尺寸',
+      trigger: 'blur'
+    }
+  ],
+  good_thumb_img: [
+    {
+      required: true,
+      message: '请上传商品缩略图',
+      trigger: 'change'
+    }
+  ],
+  good_img: [
+    {
+      type: 'array',
+      required: true,
+      validator: validate_good_img,
+      trigger: 'change'
+    }
+  ],
+  good_info_img: [
+    {
+      type: 'array',
+      required: true,
+      message: '至少上传一张商品详情介绍图',
+      trigger: 'change'
+    }
+  ],
+  demo_fee: [
+    {
+      required: true,
+      validator: validate_num,
+      trigger: 'blur'
+    }
+  ],
+  is_diff: [
+    {
+      required: true,
+      message: '请选择有无工差',
+      trigger: 'change'
+    }
+  ],
+  config: [
+    {
+      required: true,
+      type: 'array',
+      message: '请选择配置要求',
+      trigger: 'change'
+    }
+  ],
+  other_config: [
+    {
+      required: true,
+      message: '其他要求不能为空',
+      trigger: 'blur'
+    }
+  ],
+  open_fee: [
+    {
+      required: true,
+      validator: validate_num,
+      trigger: 'blur'
+    }
+  ],
+  sample_fee: [
+    {
+      required: true,
+      validator: validate_num,
+      trigger: 'blur'
+    }
+  ],
+  market_price: [
+    {
+      required: true,
+      validator: validate_num,
+      trigger: 'blur'
+    }
+  ],
+
+  cgd_gold_price: [
+    {
+      required: true,
+      validator: validate_num,
+      trigger: 'blur'
+    }
+  ],
+  craft_desc: [
+    {
+      required: false,
+      validator: validate_desc,
+      trigger: 'blur'
+    }
+  ]
+
+  // is_step: {
+  //   required: true,
+  //   message: "请选择是否启用阶梯",
+  //   trigger: "change",
+  // },
+}
+// 表格 - 列参数
+const columns = [
+  { type: 'expand', _slot_: 'expand' },
+
+  {
+    prop: 'nickname',
+    label: '姓名'
+  },
+  {
+    prop: 'mobile',
+    label: '手机号'
+  },
+  {
+    prop: 'email',
+    label: '邮箱'
+  },
+  // {
+  //   prop: "supplier_list",
+  //   label: "所在供应商",
+  //   _slot_: "supplier_list",
+  // },
+  {
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status'
+  },
+
+  {
+    prop: 'creater',
+    label: '创建人'
+  },
+  {
+    prop: 'addtime',
+    label: '创建时间',
+    width: '145'
+  }
+]
+export {
+  options1,
+  options2,
+  options3,
+  options4,
+  options5,
+  options6,
+  options7,
+  options8,
+  options9,
+  listCol,
+  rules,
+  columns
+}

src/views/serviceParam/supplierQuery/index.vue

@@ -0,0 +1,435 @@
+<template>
+  <div class="supplierBrand">
+    <div class="supplierBrand_show_box" v-if="powers.some((i) => i == '001')">
+      <div class="role-list fl">
+        <supplierlist @change="supplierChange" />
+      </div>
+      <div class="rule-view fr">
+        <ex-table
+          v-loading="loading"
+          :table="table"
+          :data="tableData"
+          :columns="columns"
+          :page="pageInfo"
+          :size="size"
+          @page-curr-change="handlePageChange"
+          @page-size-change="handleSizeChange"
+          @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+          @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        >
+          <template #table-header="{}">
+            <div style="width: 100%">
+              <el-row>
+                <el-col :span="4" style="width: 120px">
+                  <el-select
+                    v-model="parmValue.status"
+                    filterable
+                    clearable
+                    :size="searchSize"
+                    placeholder="状态"
+                    style="width: 100%"
+                    @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                  >
+                    <el-option
+                      v-for="item in statusList"
+                      :key="'status' + item.code"
+                      :label="item.name"
+                      :value="item.code"
+                    />
+                  </el-select>
+                </el-col>
+                <el-col :span="4" style="width: 200px; padding: 0 0 0 10px">
+                  <el-input
+                    :size="searchSize"
+                    v-model="parmValue.keyword"
+                    :maxlength="40"
+                    @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                    placeholder="姓名/手机号"
+                  ></el-input>
+                </el-col>
+
+                <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
+                  <el-button type="primary" :size="searchSize" @click="searchList">刷新</el-button>
+                </el-col>
+                <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
+                  <el-button type="warning" :size="searchSize" @click="restSearch">重置</el-button>
+                </el-col>
+                <el-col
+                  :span="3"
+                  class="fr"
+                  style="width: 66px; padding: 0 0 0 10px"
+                  v-if="powers.some((i) => i == '003')"
+                >
+                </el-col>
+              </el-row>
+            </div>
+          </template>
+          <template #status="{ scope }">
+            <el-tag
+              :size="tablebtnSize"
+              :type="scope.row.status == '0' ? 'warning' : ''"
+              v-text="
+              (options2.find((item) => item.id == scope.row.status) || {}).name ||
+              '--'
+            "
+            ></el-tag>
+          </template>
+          <template #expand="{ scope }">
+            <el-table :data="scope.row.supplier_list" style="width: 100%" border>
+              <el-table-column prop="supplierNo" label="供应商编号" width="180" show-overflow-tooltip />
+              <el-table-column prop="supplierName" label="供应商名称" show-overflow-tooltip />
+            </el-table>
+          </template>
+
+        </ex-table>
+        <add-edit
+          :id="modelId"
+          :type="isDetail"
+          :showModel="showModel"
+          :sitem="sitem"
+          @cancel="showModel = false"
+          @refresh="(showModel = false), searchList()"
+        />
+      </div>
+    </div>
+
+    <no-auth v-else></no-auth>
+  </div>
+</template>
+<script>
+import asyncRequest from "@/apis/service/serviceParam/supplierAccount";
+import { statusList } from "@/assets/js/statusList";
+import mixinPage from "@/mixins/elPaginationHandle";
+import { mapGetters } from "vuex";
+import supplierlist from "./supplierlist";
+import addEdit from "./addEdit";
+import resToken from "@/mixins/resToken";
+import {columns} from "./columns";
+export default {
+  name: "supplierBrand",
+  mixins: [mixinPage, resToken],
+  components: {
+    supplierlist,
+    addEdit
+  },
+  computed: {
+    //组件SIZE设置
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      const tran =
+        this.$store.getters.btnList.find(
+          item => item.menu_route == "supplierBrand"
+        ) || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    }
+  },
+  data() {
+    return {
+      statusList: statusList,
+      loading: true,
+      options1: [
+        { id: "0", name: "长期" },
+        { id: "1", name: "非长期" }
+      ],
+      options2: [
+        { id: "0", name: "禁用" },
+        { id: "1", name: "启用" }
+      ],
+      showModel: false,
+      modelSitem: null,
+      modelId: "",
+      modelType: "",
+      selectLoading: false,
+      loading: true,
+      showModelThis: false,
+      parmValue: {
+        supplierNo: "", // 供应商code
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+      },
+      tableData: [],
+      passwordModel: false,
+      passwordModelId: 0,
+      isPasswordDetail: false,
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true
+        // _defaultHeader_: ["setcol"],
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0
+      },
+      // 表格 - 列参数
+      columns
+    };
+  },
+
+  methods: {
+    async supplierChange(e) {
+      this.parmValue.page = 1;
+      this.parmValue.supplierNo = e;
+      await this.searchList();
+    },
+
+    restSearch() {
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0
+      };
+      this.parmValue.page = 1;
+      this.parmValue.size = 15;
+      this.parmValue.keyword = "";
+      this.parmValue.status = "";
+      this.searchList();
+    },
+    openModal(id, isDetail) {
+      if (this.parmValue.gyscode === "") {
+        this.$message.warning("请选择供应商！");
+        return;
+      }
+      this.modelId = id;
+      this.isDetail = isDetail;
+      this.sitem = this.parmValue.gyscode;
+      this.showModel = true;
+    },
+
+    gotoEdit(row, type) {
+      const { status } = row;
+      if (type === "005" && status === "1") {
+        this.$message.warning("禁用后，才可以修改！");
+        return;
+      }
+      this.routeGoto("supplierBrandDetail", {
+        id: row.code,
+        type: "edit"
+      });
+    },
+    /**
+     * 启用/禁用
+     * @param {String} id id
+     * @param {String} status 0-禁用 1-启用
+     */
+    async changeStatus(id, status) {
+      await this.$confirm(`确定要改为${status === "1" ? "禁用" : "启用"}？`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(async () => {
+          this.loading = true;
+          const model = {
+            id: id,
+            status: status === "1" ? "0" : "1"
+          };
+          const res = await asyncRequest.status(model);
+          if (res && res.code === 0) {
+            this.loading = false;
+            this.$notify.success({
+              title: "状态修改成功！",
+              message: ""
+            });
+            await this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.loading = false;
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+    async deleteItem(id) {
+      await this.$confirm("确定要删除？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(async () => {
+          const model = {
+            id: id
+          };
+          const res = await asyncRequest.delete(model);
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "删除成功",
+              message: ""
+            });
+            this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+    // 刷新表格
+    async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start == "" && this.parmValue.end != "")
+      ) {
+        this.$message.warning("开始时间和结束时间不能为空");
+        return;
+      }
+      this.loading = true;
+      const { code, data, message } = await asyncRequest.list(this.parmValue);
+      let scode = parseInt(code + "");
+      if (scode === 0) {
+        const { list, count } = data;
+        this.tableData = list;
+        this.pageInfo.total = Number(count + "");
+      } else if (scode >= 100 && scode <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/mixin.scss";
+.supplierBrand {
+  position: relative;
+  width: 100%;
+  height: calc(100vh - 50px);
+  overflow: hidden;
+
+  .supplierBrand_show_box {
+    // position: relative;
+    // height: calc(100% - 50px);
+    // min-height: calc(100% - 50px);
+
+    display: relative;
+    width: 100%;
+    height: 100%;
+    // height: calc(100vh - 50px);
+    // overflow: hidden;
+    // text-align: left;
+    //左侧
+    .role-list {
+      height: 100%;
+      overflow-y: auto;
+      width: 320px;
+      // padding: 8px 16px;
+      min-height: 100%;
+      flex-shrink: 0;
+      border-right: 2px solid #dfe6ec;
+      @include scrollBar();
+      &::after {
+        content: "";
+        position: absolute;
+        top: 0;
+        right: 0;
+        height: 100%;
+        width: 2px;
+        background-color: #e4e7ed;
+        z-index: 1;
+      }
+      .role-list__title {
+        color: #b4b6c0;
+        line-height: 32px;
+      }
+      .role-list__item {
+        position: relative;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        height: 32px;
+        line-height: 32px;
+        padding-left: 8px;
+        color: rgb(48, 49, 51);
+        cursor: pointer;
+        i {
+          position: absolute;
+          right: 0;
+          line-height: 32px;
+        }
+      }
+      .role-list__item.active {
+        color: #63cbe7;
+        background: #f7f7f7;
+      }
+    }
+    //右侧
+    .rule-view {
+      height: calc(100% - 50px);
+      width: calc(100% - 320px);
+      overflow-y: auto;
+      padding: 10px 16px;
+      @include scrollBar();
+      .rule-list {
+        border-right: 1px solid #dfe6ec;
+        .title {
+          padding: 18px 18px 12px 18px;
+          border-bottom: 1px dashed #dfe6ec;
+          font-size: 15px;
+          color: #000;
+        }
+        .main {
+          padding: 18px 18px 12px 18px;
+          border-bottom: 1px solid #dfe6ec;
+        }
+        .main-title {
+          width: 80px;
+        }
+        .main-item {
+          width: calc(100% - 80px);
+        }
+      }
+    }
+    .rule-bottom {
+      padding: 10px 18px 8px 0;
+      background: #fff;
+      width: calc(100% - 200px);
+      position: absolute;
+      text-align: right;
+      bottom: 0;
+      right: 0;
+      &::before {
+        content: "";
+        position: absolute;
+        top: 0;
+        right: 0;
+        height: 2px;
+        width: 100%;
+        background-color: #e4e7ed;
+        z-index: 1;
+      }
+    }
+  }
+}
+</style>

src/views/serviceParam/supplierQuery/supplierlist.vue

@@ -0,0 +1,230 @@
+<template>
+  <div v-loading="loading" class="supplier-list">
+    <div class="role-list__title">
+      <p class="title">
+        <span class="font">供应商列表</span>
+
+        <el-button
+          type="warning"
+          class="fr"
+          size="mini"
+          @click="restSearch"
+        >重置</el-button>
+      </p>
+      <p class="search">
+        <el-input
+          v-model="parmValue.name"
+          placeholder="供应商名称"
+          class="input-with-select"
+          size="small"
+          @blur="
+            parmValue.page = 1;
+            pageInfo.curr = 1;
+            searchList();
+          "
+        >
+          <el-button
+            slot="append"
+            icon="el-icon-search"
+            @click="
+              parmValue.page = 1;
+              pageInfo.curr = 1;
+              searchList();
+            "
+          />
+        </el-input>
+      </p>
+    </div>
+    <div class="data-show">
+      <p
+        v-if="tableData.length == 0"
+        style="line-height: 60px; text-align: center; color: #909399"
+      >
+        暂无数据
+      </p>
+      <ul v-else class="main">
+        <li
+          v-for="(item, index) in tableData"
+          :key="'supplier' + index"
+          class="role-list__item"
+          :class="{ active: item.code == activeCode }"
+          @click="switchRoleHandle(item.code)"
+        >
+          {{ item.name }}
+        </li>
+      </ul>
+    </div>
+
+    <div class="Pagination tc" style="bottom:-100px">
+      <el-pagination
+        :current-page="pageInfo.curr"
+        :size="'small'"
+        layout="total,  jumper"
+        :total="pageInfo.total"
+        @current-change="currentChange"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import asyncRequest from '@/apis/service/serviceParam/supplierAccount'
+import mixinPage from '@/mixins/elPaginationHandle'
+import { mapGetters } from 'vuex'
+
+import resToken from '@/mixins/resToken'
+export default {
+  name: 'SupplierAccount',
+  mixins: [mixinPage, resToken],
+
+  computed: {
+    // 组件SIZE设置
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size'])
+  },
+  data() {
+    return {
+      loading: false,
+      activeCode: '',
+      parmValue: {
+        page: 1, // 页码
+        size: 20, // 每页显示条数
+        start: '',
+        end: '',
+        status: '',
+        creater: '',
+        company_name: '',
+        name: '',
+        ocr_status: ''
+      },
+
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ['setcol']
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 20,
+        curr: 1,
+        total: 0
+      }
+    }
+  },
+  mounted() {
+    this.searchList()
+  },
+  methods: {
+    restSearch() {
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 20,
+        curr: 1,
+        total: 0
+      }
+      this.parmValue = {
+        page: 1, // 页码
+        size: 20, // 每页显示条数
+        start: '',
+        end: '',
+        status: '',
+        company_name: '', // 创建人部门
+        creater: '',
+        name: '',
+        person: '',
+        ocr_status: ''
+      }
+      this.searchList()
+    },
+    switchRoleHandle(code) {
+      this.activeCode = code
+      this.$emit('change', code)
+    },
+    async currentChange(e) {
+      this.parmValue.page = e
+      this.pageInfo.curr = e
+      await this.searchList()
+    },
+    // 刷新表格
+    async searchList() {
+      if (this.loading) return
+      this.activeCode = ''
+      this.loading = true
+      const { code, data } = await asyncRequest.slist(this.parmValue)
+      const scode = parseInt(code)
+      if (scode === 0) {
+        const { list, count } = data
+        this.tableData = list
+        this.pageInfo.total = Number(count + '')
+        if (list.length !== 0) {
+          this.switchRoleHandle(list[0].code)
+        } else {
+          this.switchRoleHandle('')
+        }
+      } else if (scode >= 100 && scode <= 104) {
+        await this.logout()
+      } else {
+        this.tableData = []
+        this.pageInfo.total = 0
+      }
+      this.loading = false
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.supplier-list {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  .role-list__title {
+    width: 100%;
+    top: 0;
+    left: 0;
+    padding: 12px 16px;
+    background: #f7f7f7;
+    position: absolute;
+    z-index: 2;
+    margin: 0 0 10px 0;
+    p.title {
+      height: 35px;
+      line-height: 29px;
+      padding-left: 5px;
+      span.font {
+        font-size: 16px;
+        font-weight: bolder;
+      }
+    }
+  }
+  .data-show {
+    padding: 100px 16px 70px 16px;
+    .main {
+      li {
+        height: 33px;
+        line-height: 33px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        &:hover {
+          cursor: pointer;
+        }
+        &.active {
+          color: #409eff;
+          // background: #f7f7f7;
+        }
+      }
+    }
+  }
+
+  .Pagination {
+    background: #f7f7f7;
+    position: absolute;
+    z-index: 2;
+    bottom: 0;
+    left: 0;
+    padding: 12px 0 18px 0;
+    width: 100%;
+  }
+}
+</style>