暂存

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

@@ -14,4 +14,15 @@ export default {
   status: (data, params) => http(api + 'supplerstatus', data, 'post', params),
   // 详情
   detail: (data, params) => http(api + "supplerinfo", data, "post", params),
+
+  // 添加
+  kadd: (data, params) => http(api + "keepbcreate", data, "post", params),
+  // 删除
+  kdelete: (data, params) => http(api + "keepbdelete", data, "post", params),
+  // 分页查询
+  klist: (data, params) => http(api + "keepblist", data, "post", params),
+  // 修改状态
+  kstatus: (data, params) => http(api + 'keepbstatus', data, 'post', params),
+  // 详情
+  kdetail: (data, params) => http(api + "keepbinfo", data, "post", params),
 };

src/views/serviceParam/supplier/addEdit.vue

@@ -1,354 +0,0 @@
-<template>
-  <el-dialog
-    v-loading="loading"
-    :title="title"
-    :center="true"
-    align="left"
-    top="5vh"
-    width="1040px"
-    :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="100px"
-            class="demo-ruleForm"
-          >
-            <el-row>
-              <el-col :span="8">
-                <el-form-item label="合作状态" prop="a0">
-                  <el-input
-                    v-model="ruleForm.a0"
-                    :disabled="id == '007'"
-                    placeholder="合作状态"
-                    minlength="20"
-                  />
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="供应商来源" prop="a1">
-                  <el-input
-                    v-model="ruleForm.a1"
-                    :disabled="id == '007'"
-                    placeholder="供应商来源"
-                    minlength="20"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="申请类型" prop="a2">
-                  <el-input
-                    v-model="ruleForm.a2"
-                    :disabled="id == '007'"
-                    placeholder="申请类型"
-                    minlength="20"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="所属类别" prop="a3">
-                  <el-input
-                    v-model="ruleForm.a3"
-                    :disabled="id == '007'"
-                    placeholder="所属类别"
-                    minlength="20"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="物流方式" prop="a4">
-                  <el-input
-                    v-model="ruleForm.a4"
-                    :disabled="id == '007'"
-                    placeholder="物流方式"
-                    minlength="20"
-                  /> </el-form-item
-              ></el-col>
-              <el-col :span="8"
-                ><el-form-item label="供应商类型" prop="a5">
-                  <el-input
-                    v-model="ruleForm.a5"
-                    :disabled="id == '007'"
-                    placeholder="供应商类型"
-                    minlength="20"
-                  /> </el-form-item
-              ></el-col>
-              <el-col :span="16">
-                <el-row>
-                  <el-col :span="12">
-                    <el-form-item label="供应商级别" prop="a6">
-                      <el-input
-                        v-model="ruleForm.a6"
-                        :disabled="id == '007'"
-                        placeholder="供应商级别"
-                        minlength="20"
-                      />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="付款方式" prop="a7">
-                      <el-input
-                        v-model="ruleForm.a7"
-                        :disabled="id == '007'"
-                        placeholder="付款方式"
-                        minlength="20"
-                      />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="24">
-                    <el-form-item
-                      label="营业执照"
-                      prop="logo_url"
-                      :disabled="id == '007'"
-                      class="activity-upload"
-                    >
-                      <div class="btnupload" style="position: relative">
-                        <img
-                          v-if="ruleForm.logo_url"
-                          :src="ruleForm.logo_url"
-                          class="avatar"
-                        />
-                        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                        <file-upload
-                          class="Upload"
-                          :disabled="id == '007'"
-                          :accept="'.jpg,.png,.jpeg'"
-                          :multiple="true"
-                          :uploadcondition="beforeAvatarUpload"
-                          @UploadErrorEvent="UploadErrorEvent"
-                          @UploadSuccessEvent="UploadSuccessEvent"
-                        ></file-upload>
-                      </div>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item
-                  label="资质证明"
-                  prop="logo_url"
-                  :disabled="id == '007'"
-                  class="activity-upload"
-                >
-                  <div class="btnupload" style="position: relative">
-                    <img
-                      v-if="ruleForm.logo_url"
-                      :src="ruleForm.logo_url"
-                      class="avatar"
-                    />
-                    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                    <file-upload
-                      class="Upload"
-                      :disabled="id == '007'"
-                      :accept="'.jpg,.png,.jpeg'"
-                      :multiple="true"
-                      :uploadcondition="beforeAvatarUpload"
-                      @UploadErrorEvent="UploadErrorEvent"
-                      @UploadSuccessEvent="UploadSuccessEvent"
-                    ></file-upload>
-                  </div>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-col>
-        <el-col :span="24" style="text-align: right">
-          <el-button v-if="id !== '007'" type="primary" @click="submitForm"
-            >保 存
-          </el-button>
-          <el-button @click="showModelThis = false">{{
-            id == "007" ? "关 闭" : "取 消"
-          }}</el-button>
-        </el-col>
-      </el-row>
-    </el-card>
-  </el-dialog>
-</template>
-<script>
-import asyncRequest from "@/apis/service/serviceParam/supplier";
-import resToken from "@/mixins/resToken";
-export default {
-  name: "brand",
-  props: ["showModel", "id", "sitem"],
-  mixins: [resToken],
-  data() {
-    return {
-      loading: false,
-      title: "添加供应商",
-      showModelThis: this.showModel,
-      select: "1",
-      activeOptions: [],
-      actionList: [],
-      ruleForm: {},
-      rulesThis: this.rules,
-      rules: {
-        brand_name: [
-          { required: true, message: "公司名称不能为空", trigger: "blur" },
-        ],
-        logo_url: [
-          { required: true, 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.resetFormData();
-      if (this.id === "003") {
-        this.rulesThis = this.rules;
-        this.title = "添加供应商";
-      } else if (this.id === "005") {
-        this.rulesThis = this.rules;
-        this.title = "修改供应商";
-      } else {
-        this.rulesThis = {};
-        this.title = "查看供应商";
-      }
-      await this.resetForm();
-      this.loading = false;
-    },
-    async resetForm() {
-      // 重置
-      await this.$nextTick(() => {
-        if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          this.resetFormData();
-        }
-      });
-    },
-    resetFormData() {
-      this.ruleForm = {
-        id: "",
-        a0: "",
-        a1: "",
-        a2: "",
-        a3: "",
-        a4: "",
-        a5: "",
-        a6: "",
-        a7: "",
-        a8: "",
-        a9: "",
-        a10: "",
-        b1: "",
-        b2: "",
-        b3: "",
-        c1: "",
-        c2: "",
-        c3: "",
-        c4: "",
-        c5: "",
-        c6: "",
-        c7: "",
-      };
-    },
-    async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          this.loading = true;
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-          let res = {};
-          if (this.id === "003") {
-            delete model["id"];
-            res = await asyncRequest.add(model);
-          } else {
-            res = await asyncRequest.update(model);
-          }
-          this.loading = false;
-          if (res && res.code === 0) {
-            const title = this.id === "add" ? "添加成功!" : "修改成功!";
-            this.$notify.success({
-              title,
-              message: "",
-            });
-            this.showModelThis = false;
-            // 刷新
-            this.$emit("refresh");
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-    //判断图片规格
-    beforeAvatarUpload(file) {
-      let isJPG = false,
-        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.logo_url = "";
-        this.$refs.ruleForm.validateField("logo_url");
-      }
-    },
-    //图片上传成功
-    async UploadSuccessEvent(data) {
-      const { url } = data;
-      if (url === "noToken") {
-        await this.logout();
-      } else {
-        this.ruleForm.logo_url = url;
-        this.$message.success("图片上传成功!");
-        this.$refs.ruleForm.validateField("logo_url");
-      }
-    },
-  },
-};
-</script>
-
-   <style lang="scss" scoped>
-.brand {
-}
-</style>

src/views/serviceParam/supplier/components/addEdit.vue

@@ -0,0 +1,348 @@
+<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="gyscode">
+              <el-input
+                v-model="ruleForm.gyscode"
+                disabled
+                placeholder="支持品牌来源"
+                minlength="20"
+              />
+            </el-form-item>
+            <el-form-item label="支持品牌" prop="brand_id">
+              <search-brand
+                :value="ruleForm.brand_id"
+                :size="'mini'"
+                :isDetail="type !== 'add'"
+                :names="brand_name"
+                :placeholder="'商品品牌'"
+                @searchChange="brandidsearchChange"
+              />
+            </el-form-item>
+            <el-form-item label="授权类型" prop="long">
+              <el-radio-group v-model="ruleForm.long">
+                <el-radio :label="'0'">长期</el-radio>
+                <el-radio :label="'1'">非长期</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="授权时间" style="margin: 0">
+              <el-col :span="11">
+                <el-form-item prop="starttime">
+                  <el-date-picker
+                    type="date"
+                    placeholder="开始日期"
+                    v-model="ruleForm.starttime"
+                    style="width: 100%"
+                  ></el-date-picker>
+                </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
+                    type="date"
+                    placeholder="结束日期"
+                    v-model="ruleForm.endtime"
+                    style="width: 100%"
+                  ></el-date-picker>
+                </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"></i>
+                  <file-upload
+                    class="Upload"
+                    :disabled="id == '007'"
+                    :accept="'.jpg,.png,.jpeg'"
+                    :multiple="true"
+                    :uploadcondition="beforeAvatarUpload"
+                    @UploadErrorEvent="UploadErrorEvent"
+                    @UploadSuccessEvent="UploadSuccessEvent"
+                  ></file-upload>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="7" style="text-align: right; padding: 72px 0 0 0">
+              <el-button
+                v-if="id !== '007'"
+                :size="'small'"
+                type="primary"
+                @click="submitForm"
+                >保 存
+              </el-button>
+              <el-button @click="showModelThis = false" :size="'small'">{{
+                id == "007" ? "关 闭" : "取 消"
+              }}</el-button>
+            </el-col>
+          </el-form>
+        </el-col>
+      </el-row>
+    </el-card>
+  </el-dialog>
+</template>
+<script>
+import asyncRequest from "@/apis/service/serviceParam/supplier";
+import resToken from "@/mixins/resToken";
+export default {
+  name: "brand",
+  props: ["showModel", "id", "sitem"],
+  mixins: [resToken],
+  data() {
+    return {
+      loading: false,
+      title: "添加支持品牌",
+      showModelThis: this.showModel,
+      select: "1",
+      activeOptions: [],
+      actionList: [],
+      ruleForm: {},
+      rulesThis: this.rules,
+      rules: {
+        gyscode: [
+          {
+            type: "array",
+            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" },
+        ],
+        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.resetFormData();
+      if (this.id === "003") {
+        this.rulesThis = this.rules;
+        this.title = "添加支持品牌";
+        await this.resetForm();
+      } else if (this.id === "005") {
+        this.rulesThis = this.rules;
+        this.title = "修改支持品牌";
+        await this.resetForm();
+      } else {
+        this.rulesThis = {};
+        this.title = "查看支持品牌";
+        await this.resetForm();
+      }
+
+      this.loading = false;
+    },
+    async resetForm() {
+      // 重置
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields();
+          this.$refs.ruleForm.clearValidate();
+          this.resetFormData();
+        }
+      });
+    },
+    resetFormData() {
+      this.ruleForm = {
+        id: "",
+        gyscode: "",
+        brand_id: [],
+        long: "",
+        starttime: "",
+        endtime: "",
+        brand_book: "",
+      };
+    },
+    async initData() {
+      this.loading = true;
+      const { code, message, data } = await asyncRequest.kdetail({
+        id: this.id,
+      });
+      this.loading = false;
+      if (code === 0) {
+        const {
+          id,
+          brand_book,
+          brand_id,
+          brand_name,
+          long,
+          starttime,
+          endtime,
+          gyscode,
+        } = data;
+        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) {
+          this.loading = true;
+          let model = JSON.parse(JSON.stringify(this.ruleForm));
+          let res = {};
+          if (this.id === "003") {
+            delete model["id"];
+            res = await asyncRequest.add(model);
+          } else {
+            res = await asyncRequest.update(model);
+          }
+          this.loading = false;
+          if (res && res.code === 0) {
+            const title = this.id === "add" ? "添加成功!" : "修改成功!";
+            this.$notify.success({
+              title,
+              message: "",
+            });
+            this.showModelThis = false;
+            // 刷新
+            this.$emit("refresh");
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    //商品品牌选择
+    brandidsearchChange(e) {
+      const { id, code, label } = e;
+      if (id) {
+        this.ruleForm.brand_id = [id];
+      } else {
+        this.ruleForm.brand_id = [];
+      }
+      this.$refs.ruleForm.validateField("brand_id");
+    },
+    //判断图片规格
+    beforeAvatarUpload(file) {
+      let isJPG = false,
+        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/supplier/components/baseForm.vue

@@ -173,6 +173,7 @@
             />
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
             <file-upload
+              v-if="type !== 'view'"
               class="Upload"
               :disabled="id == 'view'"
               :accept="'.jpg,.png,.jpeg'"
@@ -216,7 +217,8 @@
                 v-if="
                   ruleForm &&
                   ruleForm.prove_img &&
-                  ruleForm.prove_img.length < 10
+                  ruleForm.prove_img.length < 10 &&
+                  type !== 'view'
                 "
               >
                 <div class="activity-upload">
@@ -589,7 +591,9 @@ export default {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           this.loading = true;
+
           let model = JSON.parse(JSON.stringify(this.ruleForm));
+          model.prove_img = model.prove_img.toString();
           let res = {};
           if (this.id === "view") {
             res = await asyncRequest.update(model);

src/views/serviceParam/supplier/components/show-brand-list/columns.js

@@ -0,0 +1,73 @@
+export default [
+  // { 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: "good_type",
+    label: "是否定制",
+    _slot_: "good_type",
+    width: "70px",
+  },
+  {
+    prop: "good_unit",
+    label: "单位",
+    width: "45px",
+  },
+  {
+    prop: "tax",
+    label: "税率",
+    width: "45px",
+  },
+
+  {
+    prop: "supplierNo",
+    label: "供应商编号",
+    width: "110px",
+  },
+  {
+    prop: "supplier_name",
+    label: "供应商名称",
+    width: "110px",
+  },
+  {
+    prop: "companyNo",
+    label: "业务公司编号",
+    width: "110px",
+  },
+  {
+    prop: "company",
+    label: "业务公司名称",
+    width: "110px",
+  },
+  {
+    prop: "",
+    label: "操作",
+    fixed: "right",
+    width: "180",
+    _noset_: true,
+    _slot_: "operation",
+  },
+
+]

src/views/serviceParam/supplier/components/show-brand-list/index.vue

@@ -0,0 +1,343 @@
+<template>
+  <el-dialog
+    :title="'支持品牌列表'"
+    :center="true"
+    align="left"
+    top="8vh"
+    width="1040px"
+    @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)"
+    append-to-body
+  >
+    <el-card style="margin-top: -20px" class="modal-form-style">
+      <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="margin: -10px 0 10px 0; width: 100%" class="tr">
+            <el-button
+              type="primary"
+              style="margin: 0 0 0 10px"
+              :size="searchSize"
+              @click="searchList"
+            >
+              刷新
+            </el-button>
+
+            <el-button
+              type="warning"
+              style="margin: 0 0 0 10px"
+              :size="searchSize"
+              @click="restSearch"
+            >
+              重置
+            </el-button>
+            <el-button
+              type="success"
+              style="margin: 0 0 0 10px"
+              :size="searchSize"
+              @click="openCostEdit(-1, 'add')"
+            >
+              添加
+            </el-button>
+          </div>
+        </template>
+        <template #good_thumb_img="{ scope }">
+          <div
+            v-if="scope.row.good_thumb_img"
+            style="width: 20px; height: 20px"
+            class="hover"
+            v-viewer
+          >
+            <img
+              :src="scope.row.good_thumb_img"
+              style="display: inline-block; width: 100%; height: 100%"
+              alt=""
+            />
+          </div>
+        </template>
+        <template #good_type="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.good_type == '0' ? 'warning' : ''"
+            v-text="
+              (options1.find((item) => item.id == scope.row.good_type) || {})
+                .name || '--'
+            "
+          ></el-tag>
+        </template>
+        <template #operation="{ scope }">
+          <el-tooltip effect="dark" content="查看" placement="top">
+            <i
+              class="el-icon-view tb-icon"
+              @click="openCostEdit(scope.row.id, 'view')"
+            ></i>
+          </el-tooltip>
+          <el-tooltip effect="dark" content="修改" placement="top">
+            <i
+              class="el-icon-edit tb-icon"
+              @click="openCostEdit(scope.row.id, 'edit')"
+            ></i>
+          </el-tooltip>
+          <el-tooltip
+            v-if="
+              powers.some((item) => item == '004') && scope.row.status === '1'
+            "
+            effect="dark"
+            content="禁用"
+            placement="top"
+          >
+            <i
+              class="el-icon-video-pause tb-icon"
+              @click="changeStatus(scope.row.id, scope.row.status)"
+            ></i>
+          </el-tooltip>
+          <el-tooltip
+            v-if="
+              powers.some((item) => item == '004') && scope.row.status === '0'
+            "
+            effect="dark"
+            content="启用"
+            placement="top"
+          >
+            <i
+              class="el-icon-video-play tb-icon"
+              @click="changeStatus(scope.row.id, scope.row.status)"
+            ></i>
+          </el-tooltip>
+          <el-tooltip effect="dark" content="删除" placement="top">
+            <i
+              class="el-icon-delete tb-icon"
+              @click="openCostEditDelete(scope.$index)"
+            ></i>
+          </el-tooltip>
+        </template>
+      </ex-table>
+      <add-edit
+        :id="modelId"
+        :type="modelType"
+        :showModel="costshowModel"
+        :code="code"
+      />
+    </el-card>
+  </el-dialog>
+</template>
+
+<script>
+import asyncRequest from "@/apis/service/serviceParam/supplier";
+import resToken from "@/mixins/resToken";
+import mixinPage from "@/mixins/elPaginationHandle";
+import addEdit from "../addEdit";
+import { mapGetters } from "vuex";
+import columns from "./columns";
+export default {
+  name: "searchGoodModal",
+  mixins: [resToken, mixinPage],
+  components: {
+    addEdit,
+  },
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "supplier"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
+  props: ["showModel", "code"],
+
+  /**
+   * 属性集合
+   * @param {Boolean}       showModel             : 是否弹出弹窗        必填
+   * @param {Boolean}       once                  : 是否只选一条        非必填
+   */
+  /**
+   * 事件集合
+   * @resultList             : 选中值变化调用   抛出选中数据
+   */
+  data() {
+    return {
+      options1: [
+        { id: "0", name: "否" },
+        { id: "1", name: "是" },
+      ],
+      costshowModel: false,
+      modelId: "",
+      modelType: {},
+      selectLoading: false,
+      loading: true,
+      showModelThis: false,
+      parmValue: {
+        gyscode: "", // 供应商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: columns,
+    };
+  },
+  watch: {
+    showModel: function (val) {
+      this.showModelThis = val;
+      if (val) {
+        this.searchList();
+      }
+    },
+    showModelThis(val) {
+      if (!val) {
+        this.$emit("cancel");
+      }
+    },
+  },
+
+  methods: {
+    restSearch() {
+      this.parmValue = {
+        gyscode: this.code, // 供应商code
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      };
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
+      this.searchList();
+    },
+    async searchList() {
+      this.loading = true;
+      this.parmValue.gyscode = this.code;
+      const res = await asyncRequest.klist(this.parmValue);
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+    //新建/编辑/查看
+    openCostEdit(id, type) {
+      this.modelId = id;
+      this.modelType = type;
+      this.costshowModel = true;
+    },
+    /**
+     * 启用/禁用
+     * @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("取消");
+        });
+    },
+  },
+};
+</script>
+
+<style>
+</style>

src/views/serviceParam/supplier/index.vue

@@ -124,7 +124,7 @@
       <template #status="{ scope }">
         <el-tag
           :size="tablebtnSize"
-          :type="scope.row.status == '1' ? 'warning' : ''"
+          :type="scope.row.status == '0' ? 'warning' : ''"
           v-text="
             (statusOptions.find((item) => item.id == scope.row.status) || {})
               .label || '--'
@@ -167,7 +167,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '0'
+            powers.some((item) => item == '004') && scope.row.status === '1'
           "
           effect="dark"
           content="禁用"
@@ -180,7 +180,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '1'
+            powers.some((item) => item == '004') && scope.row.status === '0'
           "
           effect="dark"
           content="启用"
@@ -202,14 +202,24 @@
             @click="deleteItem(scope.row.id)"
           ></i>
         </el-tooltip>
+        <el-tooltip
+          v-if="powers.some((item) => item == '006')"
+          effect="dark"
+          content="查看支持品牌"
+          placement="top"
+        >
+          <i
+            class="el-icon-search tb-icon"
+            @click="openModal(scope.row.code)"
+          ></i>
+        </el-tooltip>
       </template>
     </ex-table>
     <no-auth v-else></no-auth>
-    <!-- 弹窗 新增/修改 -->
-    <add-edit
-      :id="modelId"
+    <!-- 查看支持品牌 -->
+    <show-brand-list
+      :code="modelId"
       :show-model="showModel"
-      :stype="stype"
       @refresh="searchList"
       @cancel="showModel = false"
     />
@@ -221,13 +231,14 @@ import statusList from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
-import addEdit from "./addEdit";
+
+import showBrandList from "./components/show-brand-list";
 import resToken from "@/mixins/resToken";
 export default {
   name: "supplier",
   mixins: [mixinPage, resToken],
   components: {
-    addEdit,
+    showBrandList,
   },
   computed: {
     //组件SIZE设置
@@ -316,7 +327,7 @@ export default {
           prop: "",
           label: "操作",
           fixed: "right",
-          width: "140",
+          width: "180",
           _noset_: true,
           _slot_: "operation",
         },
@@ -346,8 +357,7 @@ export default {
       this.searchList();
     },
     // 新建/编辑/详情
-    openModal(id, type) {
-      this.stype = type;
+    openModal(id) {
       this.modelId = id;
       this.showModel = true;
     },
@@ -370,7 +380,7 @@ export default {
      * @param {String} status 0-禁用 1-启用
      */
     async changeStatus(id, status) {
-      await this.$confirm(`确定要改为${status === "0" ? "禁用" : "启用"}？`, {
+      await this.$confirm(`确定要改为${status === "1" ? "禁用" : "启用"}？`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",