暂存

src/apis/components/show-voucher-model.js

@@ -0,0 +1,7 @@
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 列表
+  list: (data, params) => http(api + "goodproof", data, "post", params),
+
+};

src/components/globalComponents/file-upload-pdf/main.vue

@@ -60,13 +60,11 @@ export default {
         } else {
           let str = await that.httpupLoad(files, i);
           if (str === "error") {
-            that.$emit("UploadErrorEvent",true);
-          } else if (str === "token") {
-            that.$emit("UploadErrorEvent", false);
+            that.$emit("UploadErrorEvent", true);
+          } else if (str === "break") {
+            that.$emit("UploadErrorEvent", "break");
           } else {
-            that.$emit("UploadSuccessEvent", {
-              url: str,
-            });
+            that.$emit("UploadSuccessEvent", str);
           }
         }
       }
@@ -83,18 +81,21 @@ export default {
           axios
             .post(`${that.imgAPI}admin/uploadfile`, form)
             .then((res) => {
-              if (res && res.data && res.status === 200) {
-                const { data, code } = res.data;
+              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 if (code >= 100 && code <= 104) {
-                  resolve("token");
                 } else {
-                  resolve("error");
+                  resolve({
+                    url: `noToken`,
+                    name: "",
+                  });
                 }
               } else {
                 reject();

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

@@ -106,9 +106,6 @@ export default {
               } else {
                 reject();
               }
-              if (res && res.data && res.status === 200 && res.data.data) {
-              } else {
-              }
             })
             .catch((error) => {
               reject();

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

@@ -82,7 +82,7 @@ export default {
           resolve("break");
         } else {
           let form = new FormData();
-          form.append("image", files[i]);
+          form.append("video", files[i]);
           form.append("token", getToken());
           axios
             .post(`${that.imgAPI}admin/uploadvideo`, form)

src/components/show-voucher-model/columns.js

@@ -0,0 +1,27 @@
+export default [
+  { type: "selection", fixed: "left", _noset_: true },
+  {
+    prop: "spuCode",
+    label: "商品编号",
+    width: "160px",
+  },
+  {
+    prop: "proof_type",
+    label: "凭证类型",
+    _slot_: "proof_type",
+  },
+  {
+    prop: "proof_url",
+    label: "凭证文件",
+    _slot_: "proof_url",
+  },
+  {
+    prop: "creater",
+    label: "创建人",
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    width: "145px",
+  },
+]

src/components/show-voucher-model/index.js

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

src/components/show-voucher-model/main.vue

@@ -0,0 +1,248 @@
+<template>
+  <el-dialog
+    :title="'历史凭证列表'"
+    :center="true"
+    align="left"
+    top="8vh"
+    width="740px"
+    @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="{ selection }">
+          <div style="width: 100%">
+            <el-row style="margin: -15px 0 0 0">
+              <el-col
+                :span="3"
+                class="fr"
+                style="width: 66px; padding: 0 0 0 10px"
+              >
+                <el-button
+                  type="success"
+                  :size="searchSize"
+                  @click="resultList(selection)"
+                >
+                  保存
+                </el-button>
+              </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-row>
+          </div>
+        </template>
+        <template #proof_type="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (options.find((item) => item.value == scope.row.proof_type) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
+
+        <template #proof_url="{ scope }">
+          <div
+            v-if="scope.row.proof_type === '1'"
+            style="width: 20px; height: 20px"
+            class="hover"
+          >
+            <i
+              class="el-icon-video-camera"
+              style="background: #000; color: #fff"
+            ></i>
+          </div>
+          <div
+            v-else-if="scope.row.proof_type === '2'"
+            style="width: 20px; height: 20px"
+            class="hover"
+            v-viewer
+          >
+            <img
+              :src="scope.row.proof_url"
+              style="display: inline-block; width: 100%; height: 100%"
+              alt=""
+            />
+          </div>
+          <a
+            v-else
+            :href="scope.row.proof_url"
+            target="_blank"
+            rel="noopener noreferrer"
+            >点击下载</a
+          >
+        </template>
+      </ex-table>
+    </el-card>
+  </el-dialog>
+</template>
+
+<script>
+import asyncRequest from "@/apis/components/show-voucher-model";
+import resToken from "@/mixins/resToken";
+import mixinPage from "@/mixins/elPaginationHandle";
+import { mapGetters } from "vuex";
+import columns from "./columns";
+export default {
+  name: "showVoucherModel",
+  mixins: [resToken, mixinPage],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+  },
+  props: ["showModel", "once", "id"],
+
+  /**
+   * 属性集合
+   * @param {Boolean}       showModel             : 是否弹出弹窗        必填
+   * @param {Boolean}       once                  : 是否只选一条        非必填
+   */
+  /**
+   * 事件集合
+   * @resultList             : 选中值变化调用   抛出选中数据
+   */
+  data() {
+    return {
+      loading: true,
+      showModelThis: false,
+      options: [
+        {
+          value: "1",
+          label: "视频",
+        },
+        {
+          value: "2",
+          label: "图片",
+        },
+        {
+          value: "3",
+          label: "其他",
+        },
+      ],
+      parmValue: {
+        spuCode: "",
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      },
+      // 表格 - 数据
+      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.supplierCode = [];
+        this.searchList();
+      }
+    },
+    showModelThis(val) {
+      if (!val) {
+        this.$emit("cancel");
+      }
+    },
+  },
+
+  methods: {
+    restSearch() {
+      this.supplierCode = [];
+      this.parmValue = {
+        spuCode: "",
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      };
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
+      this.searchList();
+    },
+    async searchList() {
+      this.loading = true;
+      const res = await asyncRequest.list(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;
+    },
+    resultList(selection) {
+      let length = selection ? selection.length : 0;
+      if (length === 0) {
+        this.$message.warning("请选择历史凭证！");
+        return;
+      }
+      if (this.once && length !== 1) {
+        this.$message.warning("只能选择一条凭证！");
+        return;
+      }
+      this.showModelThis = false;
+      this.$emit("searchChange", JSON.parse(JSON.stringify(selection)));
+    },
+  },
+};
+</script>
+
+<style>
+.a {
+  background: #000;
+  color: #fff;
+}
+</style>

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

@@ -10,9 +10,12 @@
     :size="'mini'"
   >
     <el-row>
-      <el-col :span="12"
+      <el-col :span="24"
         ><el-form-item label="售价凭证类型" prop="proof_type">
-          <el-radio-group v-model="ruleForm.proof_type">
+          <el-radio-group
+            v-model="ruleForm.proof_type"
+            @change="set_proof_url()"
+          >
             <el-radio
               v-for="item in options"
               :key="item.value"
@@ -20,21 +23,75 @@
               >{{ item.label }}</el-radio
             >
           </el-radio-group>
+          <el-button class="fr" type="primary" @click="showVoucher = true"
+            >查看历史凭证</el-button
+          >
         </el-form-item>
+
+        <show-voucher-model
+          :showModel="showVoucher"
+          :id="id"
+          @cancel="showVoucher = false"
+        />
       </el-col>
-      <el-col :span="12">
+      <el-col :span="24">
         <el-form-item label="凭证文件" prop="proof_url">
           <ul class="shangchuan-ul">
-            <li v-if="ruleForm.proof_type === '1'" class="shiping">暂无接口</li>
-            <li v-if="ruleForm.proof_type === '2'" class="tupian">
-              <div class="activity-upload">
+            <li v-if="ruleForm.proof_type === '1'" class="shiping">
+              <div v-if="video_url" class="clearfix">
+                <video width="250" controls class="fl">
+                  <source :src="video_url" type="video/mp4" />
+                  <source :src="video_url" type="video/avi" />
+                  您的浏览器不支持Video标签。
+                </video>
+                <el-link
+                  :underline="false"
+                  @click="deleteUrl('1')"
+                  type="warning"
+                  style="margin: 0 0 0 16px"
+                  >删除</el-link
+                >
+              </div>
+
+              <div class="activity-upload" v-else>
                 <div class="btnupload" style="position: relative">
-                  <img
-                    v-if="ruleForm.proof_url"
-                    :src="ruleForm.proof_url"
-                    class="avatar"
+                  <i class="el-icon-plus avatar-uploader-icon"></i>
+                  <video-upload
+                    class="Upload"
+                    :disabled="type === 'view' || type === 'editCoin'"
+                    :accept="'.mp4,.avi'"
+                    :multiple="false"
+                    :uploadcondition="beforeVideoUpload"
+                    @UploadErrorEvent="UploadVideoEventproof_url"
+                    @UploadSuccessEvent="UploadSuccessVideoproof_url"
                   />
-                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                </div>
+
+                <div class="txt-tips fl">
+                  <p>建议大小：小于5MB</p>
+                  <p>文件格式：.mp4,.avi</p>
+                </div>
+              </div>
+            </li>
+            <li v-if="ruleForm.proof_type === '2'" class="tupian">
+              <div v-if="img_url" class="clearfix">
+                <img
+                  style="width: 102px; height: 102px"
+                  :src="img_url"
+                  class="avatar fl"
+                />
+                <el-link
+                  :underline="false"
+                  @click="deleteUrl('2')"
+                  type="warning"
+                  style="margin: 0 0 0 16px"
+                  >删除</el-link
+                >
+              </div>
+
+              <div class="activity-upload" v-else>
+                <div class="btnupload" style="position: relative">
+                  <i class="el-icon-plus avatar-uploader-icon"></i>
                   <file-upload
                     class="Upload"
                     :disabled="type === 'view' || type === 'editCoin'"
@@ -49,10 +106,39 @@
                   <p>建议大小：小于1MB</p>
                   <p>文件格式：.jpg,.png,.jpeg</p>
                 </div>
-                <div class="show-"></div>
               </div>
             </li>
-            <li v-if="ruleForm.proof_type === '3'" class="qita">暂无接口</li>
+            <li v-if="ruleForm.proof_type === '3'" class="qita">
+              <div v-if="other_url" class="clearfix">
+                <a :href="other_url" download="凭证文件">点击下载</a>
+
+                <el-link
+                  :underline="false"
+                  @click="deleteUrl('3')"
+                  type="warning"
+                  style="margin: 0 0 0 16px"
+                  >删除</el-link
+                >
+              </div>
+
+              <div class="activity-upload" v-else>
+                <div class="btnupload" style="position: relative">
+                  <i class="el-icon-plus avatar-uploader-icon"></i>
+                  <file-upload-pdf
+                    class="Upload"
+                    :accept="'.xlsx,.xls,.pdf,.zip,.rar,.7z'"
+                    :multiple="false"
+                    :uploadcondition="beforeOtherUpload"
+                    @UploadErrorEvent="UploadErrorOtherproof_url"
+                    @UploadSuccessEvent="UploadSuccessOtherproof_url"
+                  />
+                </div>
+                <div class="txt-tips fl">
+                  <p>建议大小：小于5MB</p>
+                  <p>文件格式：.xlsx,.xls,.pdf,.zip,.rar,.7z</p>
+                </div>
+              </div>
+            </li>
           </ul>
         </el-form-item>
       </el-col>
@@ -121,11 +207,13 @@
 <script>
 import costFormAddEdit from "./costFormAddEdit";
 import asyncRequest from "@/apis/service/goodStore/goodsOnline";
+import showVoucherModel from "@/components/show-voucher-model";
 export default {
   name: "exam-form",
   props: ["size", "statusList", "disabled", "isMust", "labelWidth", "id"],
   components: {
     costFormAddEdit,
+    showVoucherModel,
   },
   /**
    * 属性集合
@@ -143,6 +231,10 @@ export default {
   data() {
     return {
       loading: false,
+      showVoucher: false,
+      video_url: "",
+      img_url: "",
+      other_url: "",
       options: [
         {
           value: "1",
@@ -184,7 +276,7 @@ export default {
         proof_url: [
           {
             required: true,
-            message: "请上传",
+            message: "请上传凭证文件",
             trigger: "change",
           },
         ],
@@ -327,8 +419,8 @@ export default {
       if (url === "noToken") {
         await this.logout();
       } else {
-        this.ruleForm.proof_url = url;
-        this.$refs.ruleForm.validateField("proof_url");
+        this.img_url = url;
+        this.set_proof_url();
         this.$message.success("图片上传成功!");
       }
     },
@@ -336,8 +428,8 @@ export default {
     //图片上传失败
     UploadErrorEventproof_url(res) {
       if (res !== "break") {
+        this.set_proof_url();
         this.$message.error("图片上传失败!");
-        this.$refs.ruleForm.validateField("proof_url");
       }
     },
 
@@ -360,6 +452,125 @@ export default {
       }
       return isJPG && isLt2M;
     },
+
+    //视频上传成功
+    async UploadSuccessVideoproof_url(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
+        this.video_url = url;
+        this.set_proof_url();
+        this.$message.success("视频上传成功!");
+      }
+    },
+
+    //视频上传失败
+    UploadErrorVideoproof_url(res) {
+      if (res !== "break") {
+        this.set_proof_url();
+        this.$message.error("视频上传失败!");
+      }
+    },
+
+    //判断视频规格
+    beforeVideoUpload(file) {
+      let isJPG = false;
+      if (file.type === "video/mp4" || file.type === "video/avi") {
+        isJPG = true;
+      }
+      const isLt2M = file.size / 1024 / 1024 < 5;
+      if (!isJPG) {
+        this.$message.error("视频格式不正确！");
+      }
+      if (!isLt2M) {
+        this.$message.error("视频大小不能超过 5MB!");
+      }
+      return isJPG && isLt2M;
+    },
+
+    // 其他文件上传成功
+    async UploadSuccessOtherproof_url(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
+        this.other_url = url;
+        this.set_proof_url();
+        this.$message.success("文件成功!");
+      }
+    },
+
+    //其他文件上传失败
+    UploadErrorOtherproof_url(res) {
+      if (res !== "break") {
+        this.set_proof_url();
+        this.$message.error("文件上传失败!");
+      }
+    },
+
+    //判断其他文件规格
+    beforeOtherUpload(file) {
+      console.log(file);
+      let isJPG = false;
+      if (
+        file.type === "application/vnd.ms-excel" ||
+        file.type ===
+          "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" ||
+        file.type === "application/pdf" ||
+        file.type === "application/x-zip-compressed"
+      ) {
+        isJPG = true;
+      }
+      let name = file.name;
+      let list = name.split(".");
+      if (list[list.length - 1] === "rar" || list[list.length - 1] === "7z") {
+        isJPG = true;
+      }
+
+      const isLt2M = file.size / 1024 / 1024 < 5;
+      if (!isJPG) {
+        this.$message.error("文件格式不正确！");
+      }
+      if (!isLt2M) {
+        this.$message.error("文件大小不能超过 5MB!");
+      }
+      return isJPG && isLt2M;
+    },
+
+    deleteUrl(type) {
+      switch (type) {
+        case "1":
+          this.video_url = "";
+          break;
+        case "2":
+          this.img_url = "";
+          break;
+        case "3":
+          this.other_url = "";
+          break;
+        default:
+          this.video_url = "";
+      }
+      this.set_proof_url();
+    },
+    set_proof_url() {
+      const { proof_type } = this.ruleForm;
+      switch (proof_type) {
+        case "1":
+          this.ruleForm.proof_url = this.video_url;
+          break;
+        case "2":
+          this.ruleForm.proof_url = this.img_url;
+          break;
+        case "3":
+          this.ruleForm.proof_url = this.other_url;
+          break;
+        default:
+          this.ruleForm.proof_url = this.video_url;
+      }
+      this.$refs.ruleForm.validateField("proof_url");
+    },
   },
 };
 </script>

src/views/goodStore/goodsOnline/detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="goodsOnlineDetail">
-    <!-- {{ status }} -->
+    {{ status }}-{{ powers }}
     <div
       class="goodsOnlineDetail-main"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
@@ -311,7 +311,7 @@ export default {
           skuCode: this.queryId,
           exam_status: "6",
           plat_code: e.plat_code,
-          remark: e.remark||"",
+          remark: e.remark || "",
         };
         await this.setstatus("提交商品上线结果", model);
       }