暂存

src/apis/components/show-good-data-modal.js

@@ -0,0 +1,7 @@
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 上线商品详情
+  detail: (data, params) => http(api + "goodinfo", data, "post", params),
+
+};

src/components/globalComponents/video-upload/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

src/components/globalComponents/video-upload/main.vue

@@ -0,0 +1,135 @@
+<template>
+  <div>
+    <input
+      ref="inputer"
+      :accept="accept"
+      :multiple="multiple"
+      class="fileUp"
+      type="file"
+      :disabled="disabled"
+      name="file"
+      @change="handleChange($event)"
+    />
+  </div>
+</template>
+
+<script>
+import urlConfig from "@/apis/url-config";
+import { getToken } from "@/utils/auth";
+//Uploadcondition 用于判断个性化文件 //返回 false 就不会上传文件
+//UploadErrorEvent 上传成功
+//UploadErrorEvent 上传失败
+
+export default {
+  name: "videoUpload",
+  props: {
+    //@reject 默认值
+    accept: String, //上传文件类型
+    multiple: {
+      //是否可以上传多张图片
+      type: Boolean,
+      default: false,
+    },
+    disabled: {
+      //是否可以上传多张图片
+      type: Boolean,
+      default: false,
+    },
+    uploadcondition: {
+      type: Function,
+      default: null,
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      imgAPI: urlConfig.baseURL,
+    };
+  },
+  methods: {
+    async handleChange(event) {
+      let that = this;
+      let inputDOM1 = that.$refs.inputer;
+      const files = inputDOM1.files;
+      let length = files.length;
+      if (length === 0) return;
+      that.loading = that.$loading({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+      for (let i = 0; i <= length; i++) {
+        if (i === length) {
+          this.loading.close();
+          that.$refs.inputer.value = "";
+        } else {
+          let str = await that.httpupLoad(files, i);
+          if (str === "error") {
+            that.$emit("UploadErrorEvent");
+          } else if (str === "break") {
+            that.$emit("UploadErrorEvent", "break");
+          } else {
+            that.$emit("UploadSuccessEvent", str);
+          }
+        }
+      }
+    },
+    async httpupLoad(files, i) {
+      return new Promise((resolve, reject) => {
+        let that = this;
+        if (!this.uploadcondition(files[i])) {
+          resolve("break");
+        } else {
+          let form = new FormData();
+          form.append("image", files[i]);
+          form.append("token", getToken());
+          axios
+            .post(`${that.imgAPI}admin/uploadvideo`, form)
+            .then((res) => {
+              const { status } = res;
+              if (status === 200) {
+                let item = res.data;
+                const { code, data } = item;
+                if (code === 0) {
+                  const { url, name } = data[0];
+                  resolve({
+                    url: `${that.imgAPI}storage/${url}`,
+                    name: name,
+                  });
+                } else {
+                  resolve({
+                    url: `noToken`,
+                    name: "",
+                  });
+                }
+              } else {
+                reject();
+              }
+              if (res && res.data && res.status === 200 && res.data.data) {
+              } else {
+              }
+            })
+            .catch((error) => {
+              reject();
+            });
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.fileUp {
+  opacity: 0;
+  width: 100%;
+  height: 100%;
+  outline: none;
+  position: absolute;
+  top: 0;
+  left: 0;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>

src/components/show-good-data-modal/ShowDataTableColumns.js

@@ -0,0 +1,274 @@
+export default [
+  {
+    prop: "good_name",
+    label: "商品名称",
+    _slot_: "good_name",
+  },
+
+  {
+    prop: "speclist",
+    label: "规格",
+    _slot_: "speclist",
+  },
+  {
+    prop: "supplierName",
+    label: "供应商名称",
+  },
+  {
+    prop: "company",
+    label: "业务企业名称",
+  },
+  {
+    prop: "good_info_img",
+    _slot_: "good_info_img",
+    label: "详情图",
+  },
+  {
+    prop: "online_reason",
+    label: "上线原因",
+  },
+  {
+    prop: "spuCode",
+    label: "商品编号",
+    span: 8,
+  },
+
+
+  {
+    prop: "creater",
+    label: "申请人",
+    span: 8,
+  },
+  {
+    prop: "platform_name",
+    label: "上线平台",
+    span: 8,
+  },
+  {
+    prop: "platform_name",
+    label: "平台商品编码",
+    span: 8,
+  },
+  {
+    prop: "online_time",
+    label: "上线时间",
+    span: 8,
+  },
+  {
+    prop: "cat",
+    label: "分类",
+    span: 8,
+  },
+  {
+    prop: "online_remark",
+    label: "上线备注",
+    span: 24,
+  },
+  {
+    prop: "brand_name",
+    label: "品牌",
+    span: 8,
+  },
+  {
+    prop: "unit",
+    label: "单位",
+    span: 8,
+  },
+
+  {
+    prop: "is_auth",
+    label: "供应商权限",
+    _slot_: "is_auth",
+    span: 8,
+  },
+  {
+    prop: "exclusive",
+    label: "专属类型",
+    // _slot_: "exclusive",
+    span: 8,
+  },
+  {
+    prop: "weight",
+    label: "商品总克重",
+    span: 8,
+  },
+  {
+    prop: "is_stock",
+    label: "是否库存品",
+    _slot_: "is_stock",
+    span: 8,
+  },
+  {
+    prop: "tax",
+    label: "税点",
+    span: 8,
+  },
+  {
+    prop: "good_type",
+    label: "是否定制",
+    _slot_: "good_type",
+    span: 8,
+  },
+
+  {
+    prop: "packing_list",
+    label: "包装清单",
+    span: 8,
+  },
+  {
+    prop: "packing_way",
+    label: "包装方式",
+    span: 8,
+  },
+  {
+    prop: "packing_spec",
+    label: "装箱规格",
+    span: 8,
+  },
+  {
+    prop: "packing_weight",
+    label: "装箱重量(g)",
+    span: 8,
+  },
+  {
+    prop: "packing_size",
+    label: "装箱尺寸",
+    span: 8,
+  },
+  {
+    prop: "good_bar",
+    label: "商品条形码",
+    span: 8,
+  },
+  {
+    prop: "supply_area",
+    label: "供货区域",
+    _slot_: "supply_area",
+    span: 8,
+  },
+  {
+    prop: "delivery_place_cn",
+    label: "发货地",
+    span: 8,
+  },
+  {
+    prop: "origin_place_cn",
+    label: "产地",
+    span: 8,
+  },
+  {
+    prop: "delivery_day",
+    label: "物流时间(天)",
+    span: 8,
+  },
+  {
+    prop: "lead_time",
+    label: "供货周期(天)",
+    span: 8,
+  },
+  {
+    prop: "sample_day",
+    label: "调样周期(天)",
+    span: 8,
+  },
+
+
+  {
+    prop: "cert_fee",
+    label: "证书费(元)",
+    span: 8,
+  },
+  {
+    prop: "packing_fee",
+    label: "包装费(元)",
+    span: 8,
+  },
+  {
+    prop: "cost_fee",
+    label: "成本工艺费(元)",
+    span: 8,
+  },
+
+  {
+    prop: "mark_fee",
+    label: "加标费(元)",
+    span: 8,
+  },
+  {
+    prop: "demo_fee",
+    label: "打样费(元)",
+    span: 8,
+  },
+  {
+    prop: "open_fee",
+    label: "开模费(元)",
+    span: 8,
+  },
+
+  {
+    prop: "sample_fee",
+    label: "调样费(元)",
+    span: 8,
+  },
+  {
+    prop: "market_price",
+    label: "市场价(元)",
+    span: 8,
+  },
+  {
+    prop: "nake_price",
+    label: "含税成本合计",
+    span: 8,
+  },
+  {
+    prop: "is_step",
+    label: "启用阶梯",
+    _slot_: "is_step",
+    span: 8,
+  },
+  {
+    prop: "exam_status",
+    label: "状态",
+    _slot_: "exam_status",
+    span: 8,
+  },
+  {
+    prop: "updatetime",
+    label: "更新时间",
+    span: 8,
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 8,
+  },
+
+
+  {
+    prop: "after_sales",
+    label: "售后说明",
+    span: 24,
+  },
+  {
+    prop: "good_remark",
+    label: "商品备注",
+    span: 24,
+  },
+
+  {
+    prop: "craft_desc",
+    label: "工艺说明",
+    span: 24,
+  },
+
+  {
+    prop: "purchase",
+    label: "采购起订量信息",
+    _slot_: "purchase",
+    span: 24,
+  },
+
+
+
+]
+

src/components/show-good-data-modal/columns.js

@@ -0,0 +1,172 @@
+
+//是否定制
+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: "待完善成本" },
+  { id: "2", name: "待产品审核" },
+  { id: "3", name: "待财务定价" },
+  { id: "4", name: "待财务审核定价" },
+  { id: "5", name: "待上线" },
+  { id: "6", name: "上线成功" },
+  { id: "7", name: "审核失败" },
+]
+const listCol = [
+  {
+    prop: "skuCode",
+    label: "编号",
+    fixed: "left",
+    width: "160px",
+  },
+  {
+    prop: "good_thumb_img",
+    label: "图片",
+    _slot_: "good_thumb_img",
+    width: "45px",
+  },
+  {
+    prop: "good_name",
+    label: "名称",
+    "min-width": "160px",
+  },
+  {
+    prop: "platform_code_en",
+    label: "平台编号",
+    width: "170px",
+  },
+  {
+    prop: "platform_name",
+    label: "平台名称",
+    width: "118px",
+  },
+
+  {
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    width: "118px",
+  },
+  {
+    prop: "cat_name",
+    label: "分类",
+    width: "118px",
+  },
+  {
+    prop: "good_type",
+    label: "是否定制",
+    _slot_: "good_type",
+    width: "70px",
+  },
+  // {
+  //   prop: "good_type",
+  //   label: "库存类型",
+  //   _slot_: "good_type",
+  //   width: "70px",
+  // },
+
+  {
+    prop: "brand_name",
+    label: "品牌",
+  },
+
+  // {
+  //   prop: "supplierNo",
+  //   label: "供应商编号",
+  //   width: "110px",
+  // },
+  // {
+  //   prop: "supplier_name",
+  //   label: "供应商名称",
+  //   width: "110px",
+  // },
+  {
+    prop: "companyNo",
+    label: "业务公司编号",
+    width: "110px",
+  },
+  {
+    prop: "company",
+    label: "业务公司名称",
+    width: "110px",
+  },
+
+  {
+    prop: "creater",
+    label: "创建人",
+    width: "70px",
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    width: "140px",
+  },
+  {
+    prop: "",
+    label: "操作",
+    fixed: "right",
+    _noset_: true,
+    width: "50px",
+    _slot_: "operation",
+  },
+]
+const rules = {
+  platform: [
+    {
+      type: "array",
+      required: true,
+      message: "请选择所属平台",
+      trigger: "change",
+    },
+  ],
+  online_reason: [
+    {
+      required: true,
+      message: "上线原因不能为空",
+      trigger: "blur",
+    },
+  ],
+  online_remark: [
+    {
+      required: true,
+      message: "上线备注不能为空",
+      trigger: "blur",
+    },
+  ],
+
+}
+
+export { options1, options2, options3, options4, options5, options6, options7, options8, listCol, rules }

src/components/show-good-data-modal/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

src/components/show-good-data-modal/main.vue

@@ -0,0 +1,238 @@
+<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">
+      <show-data-table
+        :newTime="newTime"
+        v-if="newTime !== ''"
+        :sitem="sitem"
+        :columns="ShowDataTableColumns"
+      >
+        <template slot="good_name">
+          <img
+            v-viewer
+            style="width: 26px; height: 26px; margin: 5px 5px 0 0"
+            class="fl"
+            v-if="sitem.good_thumb_img"
+            :src="sitem.good_thumb_img"
+            alt=""
+          />
+          <div>{{ sitem.good_name }}</div>
+        </template>
+        <template slot="speclist">
+          <span v-for="(si, i) in sitem.speclist" :key="si.spec_id + i">
+            <span v-if="i !== 0">-</span><span>{{ si.spec_value }}</span>
+          </span>
+        </template>
+        <template slot="good_info_img">
+          <img
+            class="fl"
+            style="width: 26px; height: 26px; margin: 5px 5px 2px 0"
+            v-viewer
+            v-for="(si, i) in sitem.good_info_img"
+            :src="si"
+            :key="si + i"
+          />
+        </template>
+        <template slot="is_auth">
+          <el-tag
+            :size="'mini'"
+            v-text="
+              (options3.find((item) => item.id == sitem.is_auth) || {}).name ||
+              '--'
+            "
+          />
+        </template>
+        <!-- <template slot="exclusive">
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (options2.find((item) => item.id == sitem.exclusive) || {})
+                        .name || '--'
+                    "
+                  />
+                </template> -->
+        <template slot="is_stock">
+          <el-tag
+            :size="'mini'"
+            v-text="
+              (options4.find((item) => item.id == sitem.is_stock) || {}).name ||
+              '--'
+            "
+          />
+        </template>
+        <template slot="good_type">
+          <el-tag
+            :size="'mini'"
+            v-text="
+              (options1.find((item) => item.id == sitem.good_type) || {})
+                .name || '--'
+            "
+          />
+          <span v-if="sitem.good_type === '1'"
+            >起订量:{{ sitem.moq }}，工期：{{ sitem.customized }}天</span
+          >
+        </template>
+        <template slot="supply_area">
+          <el-tag
+            :size="'mini'"
+            v-text="
+              (options6.find((item) => item.id == sitem.supply_area) || {})
+                .name || '--'
+            "
+          />
+        </template>
+        <template slot="is_step">
+          <el-tag
+            :size="'mini'"
+            v-text="
+              (options7.find((item) => item.id == sitem.is_step) || {}).name ||
+              '--'
+            "
+          />
+        </template>
+
+        <template slot="exam_status">
+          <el-tag
+            :size="'mini'"
+            v-text="
+              (options8.find((item) => item.id == sitem.exam_status) || {})
+                .name || '--'
+            "
+          />
+        </template>
+        <template slot="purchase">
+          <el-table
+            :data="sitem.ladderlist"
+            :size="'mini'"
+            border
+            stripe
+            style="width: 99%; margin: 10px 10px 10px 0"
+          >
+            <el-table-column prop="min_num" label="起订量(>=)" />
+            <el-table-column prop="nake_fee" label="成本合计" />
+            <el-table-column prop="cost_fee" label="工艺费" />
+            <el-table-column prop="delivery_fee" label="其中运费" />
+          </el-table>
+        </template>
+      </show-data-table>
+    </el-card>
+  </el-dialog>
+</template>
+
+<script>
+import asyncRequest from "@/apis/components/show-good-data-modal";
+import resToken from "@/mixins/resToken";
+import mixinPage from "@/mixins/elPaginationHandle";
+import { mapGetters } from "vuex";
+import ShowDataTableColumns from "./ShowDataTableColumns";
+import {
+  options1,
+  options2,
+  options3,
+  options4,
+  options5,
+  options6,
+  options7,
+  options8,
+  columns,
+} from "./columns";
+export default {
+  name: "showGoodDataModal",
+  mixins: [resToken, mixinPage],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+  },
+  props: ["showModel", "id"],
+
+  /**
+   * 属性集合
+   * @param {Boolean}       showModel             : 是否弹出弹窗        必填
+   * @param {Boolean}       once                  : 是否只选一条        非必填
+   */
+  /**
+   * 事件集合
+   * @resultList             : 选中值变化调用   抛出选中数据
+   */
+  data() {
+    return {
+      ShowDataTableColumns: ShowDataTableColumns,
+      options1: options1,
+      options2: options2,
+      options3: options3,
+      options4: options4,
+      options5: options5,
+      options6: options6,
+      options7: options7,
+      options8: options8,
+      loading: true,
+      showModelThis: false,
+      sitem: null,
+      // 表格 - 列参数
+      columns: columns,
+      newTime: "",
+    };
+  },
+  watch: {
+    showModel: function (val) {
+      this.showModelThis = val;
+      if (val) {
+        this.supplierCode = [];
+        this.initData();
+      }
+    },
+    showModelThis(val) {
+      if (!val) {
+        this.$emit("cancel");
+      }
+    },
+  },
+
+  methods: {
+    async initData() {
+      this.loading = true;
+      const { code, message, data } = await asyncRequest.detail({
+        skuCode: this.id,
+      });
+      this.loading = false;
+      if (code === 0) {
+        this.sitem = JSON.parse(JSON.stringify(data));
+        const { exam_status, cat_info } = this.sitem;
+        let cat = "";
+        if (cat_info && cat_info.length > 0) {
+          cat_info.forEach((e, i) => {
+            cat += i === 0 ? e.name : "/" + e.name;
+          });
+        }
+        this.sitem.cat = cat;
+        this.sitem.good_info_img = this.sitem.good_info_img.split(",");
+        this.status = exam_status;
+        this.getNewTime();
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+      }
+    },
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+  },
+};
+</script>
+
+<style>
+</style>

src/views/goodStore/active/components/baseForm.vue

@@ -216,7 +216,7 @@
                   >
                     <i
                       class="el-icon-view tb-icon"
-                      @click="openEdit(scope.$index, scope.row)"
+                      @click="showGoodModelFun(scope.row.skuCode)"
                     ></i>
                   </el-tooltip>
                   <el-tooltip
@@ -241,6 +241,12 @@
       :once="once"
       :show-model="showModel"
       @resultList="resultList"
+      @cancel="showModel = false"
+    />
+    <show-good-data-modal
+      :show-model="showGoodModel"
+      :id="showGoodId"
+      @cancel="showGoodModel = false"
     />
     <el-col
       :span="24"
@@ -262,12 +268,15 @@ import asyncRequest from "@/apis/service/goodStore/active";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
 import searchGoodOnlineModal from "@/components/search-good-online-modal";
+import showGoodDataModal from "@/components/show-good-data-modal";
+
 export default {
   name: "activeAdd",
   mixins: [resToken],
   props: ["showModel", "id", "type", "sitem"],
   components: {
     searchGoodOnlineModal,
+    showGoodDataModal,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
@@ -325,6 +334,8 @@ export default {
       showModel: false,
       once: false,
       rulesThis: this.rules,
+      showGoodModel: false,
+      showGoodId: "",
       ruleForm: {},
       // 表格 - 数据
       tableData: [],
@@ -413,6 +424,10 @@ export default {
         }
       });
     },
+    showGoodModelFun(skuCode) {
+      this.showGoodModel = true;
+      this.showGoodId = skuCode;
+    },
     openCostEditDelete(index) {
       this.ruleForm.good_list.splice(index, 1);
       this.$refs.ruleForm.validateField("good_list");

src/views/goodStore/active/components/finance-exam-one-form.vue

@@ -46,7 +46,10 @@
             <i class="el-icon-edit tb-icon" @click="openModal(scope.row)"></i>
           </el-tooltip>
           <el-tooltip effect="dark" content="查看商品信息" placement="top">
-            <i class="el-icon-view tb-icon" @click="openEdit(scope.row)"></i>
+            <i
+              class="el-icon-view tb-icon"
+              @click="showGoodModelFun(scope.row.skuCode)"
+            ></i>
           </el-tooltip>
         </template>
       </el-table-column>
@@ -57,6 +60,11 @@
       @refresh="editRefresh"
       @cancel="showModel = false"
     />
+    <show-good-data-modal
+      :show-model="showGoodModel"
+      :id="showGoodId"
+      @cancel="showGoodModel = false"
+    />
     <el-col
       :span="24"
       style="
@@ -73,6 +81,7 @@
 </template>
    <script>
 import asyncRequest from "@/apis/service/goodStore/active";
+import showGoodDataModal from "@/components/show-good-data-modal";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
 import editMinorderForm from "./edit-minorder-form";
@@ -85,11 +94,13 @@ export default {
   },
   components: {
     editMinorderForm,
+    showGoodDataModal,
   },
   data() {
     return {
       status: "",
-
+      showGoodModel: false,
+      showGoodId: "",
       loading: false,
       showModel: false,
       sfinditem: {},
@@ -117,6 +128,10 @@ export default {
         this.$set(this.tableData, i, this.tableData[i]);
       });
     },
+    showGoodModelFun(skuCode) {
+      this.showGoodModel = true;
+      this.showGoodId = skuCode;
+    },
     openModal(e) {
       this.sfinditem = JSON.parse(JSON.stringify(e));
       this.showModel = true;
@@ -155,8 +170,9 @@ export default {
         newlist.push(item);
       });
       if (!isok) {
-        this.$message.warning("起订量不能不合法！");
+        this.$message.warning("部分商品起订量不合法！");
         this.loading = false;
+        return;
       }
       ruleForm.good_list = JSON.parse(JSON.stringify(newlist));
       let res = await asyncRequest.actcost(ruleForm);

src/views/goodStore/active/components/finance-exam-three-form.vue

@@ -132,7 +132,10 @@
         </template>
         <template slot-scope="scope">
           <el-tooltip effect="dark" content="查看商品信息" placement="top">
-            <i class="el-icon-view tb-icon" @click="openEdit(scope.row)"></i>
+            <i
+              class="el-icon-view tb-icon"
+              @click="showGoodModelFun(scope.row.skuCode)"
+            ></i>
           </el-tooltip>
         </template>
       </el-table-column>
@@ -143,6 +146,11 @@
       @refresh="editRefresh"
       @cancel="showModel = false"
     />
+    <show-good-data-modal
+      :show-model="showGoodModel"
+      :id="showGoodId"
+      @cancel="showGoodModel = false"
+    />
     <el-col
       :span="24"
       style="
@@ -162,6 +170,8 @@ import asyncRequest from "@/apis/service/goodStore/active";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
 import setActivePriceForm from "./set-active-price-form";
+import showGoodDataModal from "@/components/show-good-data-modal";
+
 export default {
   name: "financeExamOneForm",
   mixins: [resToken],
@@ -171,6 +181,7 @@ export default {
   },
   components: {
     setActivePriceForm,
+    showGoodDataModal,
   },
   data() {
     return {
@@ -217,6 +228,8 @@ export default {
       showModel: false,
       sfinditem: {},
       tableData: [],
+      showGoodModel: false,
+      showGoodId: "",
       multipleSelection: [],
     };
   },
@@ -235,6 +248,10 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
+    showGoodModelFun(skuCode) {
+      this.showGoodModel = true;
+      this.showGoodId = skuCode;
+    },
     editRefresh(e) {
       this.showModel = false;
       const { skuCode, activity_price } = JSON.parse(JSON.stringify(e));
@@ -295,9 +312,7 @@ export default {
         }
       });
     },
-    openEdit(e) {
-      console.log("2345");
-    },
+
     async submitTable() {
       this.loading = true;
       const { activity_code } = this.sitem;
@@ -322,6 +337,7 @@ export default {
       if (!isok) {
         this.$message.warning("部分商品未审核！");
         this.loading = false;
+        return;
       }
       ritem.good_list = JSON.parse(JSON.stringify(newlist));
       let res = await asyncRequest.status(ritem);

src/views/goodStore/active/components/finance-exam-two-form.vue

@@ -58,7 +58,10 @@
             <i class="el-icon-edit tb-icon" @click="openModal(scope.row)"></i>
           </el-tooltip>
           <el-tooltip effect="dark" content="查看商品信息" placement="top">
-            <i class="el-icon-view tb-icon" @click="openEdit(scope.row)"></i>
+            <i
+              class="el-icon-view tb-icon"
+              @click="showGoodModelFun(scope.row.skuCode)"
+            ></i>
           </el-tooltip>
         </template>
       </el-table-column>
@@ -69,6 +72,11 @@
       @refresh="editRefresh"
       @cancel="showModel = false"
     />
+    <show-good-data-modal
+      :show-model="showGoodModel"
+      :id="showGoodId"
+      @cancel="showGoodModel = false"
+    />
     <el-col
       :span="24"
       style="
@@ -88,6 +96,8 @@ import asyncRequest from "@/apis/service/goodStore/active";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
 import setActivePriceForm from "./set-active-price-form";
+import showGoodDataModal from "@/components/show-good-data-modal";
+
 export default {
   name: "financeExamOneForm",
   mixins: [resToken],
@@ -97,13 +107,15 @@ export default {
   },
   components: {
     setActivePriceForm,
+    showGoodDataModal,
   },
   data() {
     return {
       status: "",
-
       loading: false,
       showModel: false,
+      showGoodModel: false,
+      showGoodId: "",
       sfinditem: {},
       tableData: [],
     };
@@ -126,6 +138,10 @@ export default {
         this.$set(this.tableData, aindex, this.tableData[aindex]);
       }
     },
+    showGoodModelFun(skuCode) {
+      this.showGoodModel = true;
+      this.showGoodId = skuCode;
+    },
     openModal(e) {
       this.sfinditem = JSON.parse(JSON.stringify(e));
       this.showModel = true;
@@ -137,9 +153,7 @@ export default {
       this.tableData =
         info && info.length > 0 ? JSON.parse(JSON.stringify(info)) : [];
     },
-    openEdit(e) {
-      console.log("2345");
-    },
+ 
     async submitForm() {
       this.loading = true;
       const { activity_code } = this.sitem;
@@ -156,7 +170,7 @@ export default {
         };
         newlist.push(item);
       });
-     
+
       ruleForm.good_list = JSON.parse(JSON.stringify(newlist));
       let res = await asyncRequest.setActivity(ruleForm);
       this.loading = false;

src/views/goodStore/goodsOnline/components/fixed-price-form.vue

@@ -25,7 +25,7 @@
       <el-col :span="12">
         <el-form-item label="凭证文件" prop="proof_url">
           <ul class="shangchuan-ul">
-            <li v-if="ruleForm.proof_type === '1'" class="shiping">213132</li>
+            <li v-if="ruleForm.proof_type === '1'" class="shiping">暂无接口</li>
             <li v-if="ruleForm.proof_type === '2'" class="tupian">
               <div class="activity-upload">
                 <div class="btnupload" style="position: relative">
@@ -52,7 +52,7 @@
                 <div class="show-"></div>
               </div>
             </li>
-            <li v-if="ruleForm.proof_type === '3'" class="qita">213132</li>
+            <li v-if="ruleForm.proof_type === '3'" class="qita">暂无接口</li>
           </ul>
         </el-form-item>
       </el-col>

src/views/goodStore/goodsOnline/detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="goodsOnlineDetail">
-    {{ status }}
+    <!-- {{ status }} -->
     <div
       class="goodsOnlineDetail-main"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"