build

src/apis/service/goodStore/active/index.js

@@ -12,10 +12,11 @@ export default {
     actcost: (data, params) => http(api + "actcost", data, "post", params),
     // 财务定活动价
     setActivity: (data, params) => http(api + "activity", data, "post", params),
-    // 状态
+    // 财务审核活动价
     status: (data, params) => http(api + "actexam", data, "post", params),
-    
-    // 更新
+    // 产品部门审核
+    actstatus: (data, params) => http(api + "actstatus", data, "post", params),
+    // 更新库存
     update: (data, params) => http(api + "customaredit", data, "post", params),
     // 删除
     delete: (data, params) => http(api + "customardelete", data, "post", params),

src/apis/service/goodStore/searchSort/index.js

@@ -0,0 +1,8 @@
+// 物业管理员
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+ 
+  // 分页查询
+  list: (data, params) => http(api + "cattlist", data, "post", params),
+};

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="activeAdd pagePadding">
+  <div class="activeAdd">
     <el-form
       :model="ruleForm"
       status-icon
@@ -14,7 +14,7 @@
           <el-form-item label="业务企业" prop="company_id">
             <search-work-company
               :value="ruleForm.company_id"
-              :disabled="false"
+              :disabled="status !== ''"
               :size="'mini'"
               :isDetail="false"
               :placeholder="'业务企业'"
@@ -26,6 +26,7 @@
           <el-form-item label="活动标题" prop="activity_name">
             <el-input
               placeholder="活动标题"
+              :disabled="status !== ''"
               v-model="ruleForm.activity_name"
               maxlength="100"
             />
@@ -35,7 +36,7 @@
           <el-form-item label="所属平台" prop="platform_code">
             <search-terrace
               :value="ruleForm.platform_code"
-              :disabled="false"
+              :disabled="status !== ''"
               :size="'mini'"
               :isDetail="false"
               :placeholder="'所属平台'"
@@ -51,6 +52,7 @@
                   <el-date-picker
                     type="datetime"
                     placeholder="开始时间"
+                    :disabled="status !== ''"
                     value-format="yyyy-MM-dd hh:mm:ss"
                     :picker-options="pickerOptions1"
                     v-model="ruleForm.activity_start"
@@ -65,6 +67,7 @@
                     type="datetime"
                     value-format="yyyy-MM-dd hh:mm:ss"
                     placeholder="结束时间"
+                    :disabled="status !== ''"
                     :picker-options="pickerOptions2"
                     v-model="ruleForm.activity_end"
                     style="width: 100%"
@@ -79,6 +82,7 @@
             <el-select
               v-model="ruleForm.is_stock"
               style="width: 100%"
+              :disabled="status !== ''"
               placeholder="库存类型"
             >
               <el-option
@@ -97,13 +101,14 @@
               placeholder="活动描述"
               type="textarea"
               :rows="2"
+              :disabled="status !== ''"
               show-word-limit
               v-model="ruleForm.activity_desc"
               maxlength="500"
             />
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="24" v-if="status !== '1'">
           <el-form-item
             label="活动商品"
             :label-position="'top'"
@@ -116,17 +121,83 @@
               :size="'mini'"
               style="width: 100%"
             >
-              <el-table-column prop="skuCode" label="商品编码" width="180">
-              </el-table-column>
-              <el-table-column prop="good_name" label="商品名称" width="180">
+              <el-table-column
+                prop="skuCode"
+                label="商品编码"
+                show-overflow-tooltip
+                width="170"
+              />
+              <el-table-column
+                prop="good_name"
+                label="商品名称"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                prop="activity_stock"
+                label="活动库存"
+                width="100"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                prop="moq_num"
+                label="起订量"
+                width="100"
+                v-if="!(status === '' || status === '0')"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                prop="cost_price"
+                label="成本单价(元)"
+                width="100"
+                v-if="!(status === '' || status === '0')"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                prop="sale_price"
+                label="非活动价(元)"
+                width="100"
+                show-overflow-tooltip
+              />
+              <el-table-column
+                prop="activity_price"
+                label="活动价(元)"
+                width="100"
+                show-overflow-tooltip
+              />
+              <el-table-column prop="status" label="审核状态" width="100">
+                <template slot-scope="scope">
+                  <el-tag
+                    :size="'mini'"
+                    :type="
+                      scope.row.status == '0'
+                        ? 'warning'
+                        : scope.row.status == '2'
+                        ? 'danger'
+                        : ''
+                    "
+                    v-text="
+                      (
+                        options.find(
+                          (item) => item.value == scope.row.status
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
+                </template>
               </el-table-column>
-              <el-table-column prop="address" label="地址"> </el-table-column>
-              <el-table-column fixed="right" width="100">
+              <el-table-column
+                prop="remark"
+                label="审核备注"
+                width="100"
+                show-overflow-tooltip
+              />
+              <el-table-column fixed="right" width="80">
                 <template slot="header" slot-scope="scope">
                   <span>操作</span>
                   <el-tooltip
                     class="item"
                     effect="dark"
+                    v-if="status === ''"
                     content="添加活动商品"
                     placement="top"
                   >
@@ -138,13 +209,22 @@
                   </el-tooltip>
                 </template>
                 <template slot-scope="scope">
-                  <el-tooltip effect="dark" content="查看" placement="top">
+                  <el-tooltip
+                    effect="dark"
+                    content="查看商品信息"
+                    placement="top"
+                  >
                     <i
                       class="el-icon-view tb-icon"
                       @click="openEdit(scope.$index, scope.row)"
                     ></i>
                   </el-tooltip>
-                  <el-tooltip effect="dark" content="删除" placement="top">
+                  <el-tooltip
+                    v-if="status === ''"
+                    effect="dark"
+                    content="删除"
+                    placement="top"
+                  >
                     <i
                       class="el-icon-delete tb-icon"
                       @click="openCostEditDelete(scope.$index)"
@@ -164,6 +244,7 @@
     />
     <el-col
       :span="24"
+      v-if="status === ''"
       style="
         text-align: right;
         padding: 15px 0 15px 0;
@@ -184,6 +265,7 @@ import searchGoodOnlineModal from "@/components/search-good-online-modal";
 export default {
   name: "activeAdd",
   mixins: [resToken],
+  props: ["showModel", "id", "type", "sitem"],
   components: {
     searchGoodOnlineModal,
   },
@@ -194,6 +276,21 @@ export default {
     return {
       size: "small",
       activeName: "3",
+      status: "",
+      options: [
+        {
+          value: "0",
+          label: "待审核",
+        },
+        {
+          value: "1",
+          label: "通过",
+        },
+        {
+          value: "2",
+          label: "驳回",
+        },
+      ],
       is_stock: [
         { id: "0", name: "非库存品" },
         { id: "1", name: "库存品" },
@@ -229,6 +326,8 @@ export default {
       once: false,
       rulesThis: this.rules,
       ruleForm: {},
+      // 表格 - 数据
+      tableData: [],
       rules: {
         activity_name: [
           {
@@ -357,16 +456,32 @@ export default {
       });
     },
     resetFormData() {
+      this.tableData = [];
+      const {
+        activity_name,
+        activity_desc,
+        is_stock,
+        end,
+        start,
+        platform_code,
+        company_id,
+        info,
+        status,
+      } = this.sitem;
       this.ruleForm = {
-        activity_name: "活动",
-        platform_code: ["8"],
-        company_id: "GSe61q220222143052",
-        activity_start: "",
-        activity_end: "",
-        activity_desc: "活动备注",
-        is_stock: "1",
-        good_list: [],
+        activity_name: activity_name || "",
+        platform_code: platform_code ? [platform_code] : [],
+        company_id: company_id || "",
+        activity_start: start || "",
+        activity_end: end || "",
+        activity_desc: activity_desc || "",
+        is_stock: is_stock || "",
+        good_list:
+          info && info.length > 0 ? JSON.parse(JSON.stringify(info)) : [],
       };
+      this.status = status || "";
+      this.tableData =
+        info && info.length > 0 ? JSON.parse(JSON.stringify(info)) : [];
     },
     handleClick(row) {
       console.log(row);
@@ -393,45 +508,40 @@ export default {
             return;
           }
           let model = JSON.parse(JSON.stringify(this.ruleForm));
-          model.cat_id = model.cat_id[model.cat_id.length - 1];
-          model.brandid = model.brandid.toString();
-          model.supplierNo = model.supplierNo.toString();
-          model.delivery_place = model.delivery_place.toString();
-          model.origin_place = model.origin_place.toString();
-          model.good_info_img = model.good_info_img.toString();
-          model.unit = model.unit.toString();
-          model.speclist = JSON.parse(JSON.stringify(this.setResData(1)));
-          model.good_ladder = JSON.parse(JSON.stringify(this.setResData(2)));
+          model.platform_code = model.platform_code.toString();
+          const { good_list } = model;
+
+          let list = JSON.parse(JSON.stringify(good_list));
+          let newList = [];
+          model.good_list = [];
+          list.forEach((e) => {
+            let item = {
+              skuCode: e.skuCode,
+              activity_stock: 1 + "",
+            };
+            newList.push(item);
+          });
+          model.good_list = newList;
           let res = {};
-          delete model["id"];
+          console.log(this.id, this.type);
           if (this.type === "add") {
             delete model["id"];
             delete model["spuCode"];
             res = await asyncRequest.add(model);
-          } else if (this.type === "editBase") {
-            let item1 = this.setModel(model, "1");
-            res = await asyncRequest.update(item1);
           } else {
-            let item2 = this.setModel(model, "2");
-            res = await asyncRequest.updateP(item2);
+            res = await asyncRequest.update(model);
           }
           console.log(res);
           this.loading = false;
           if (res && res.code === 0) {
-            const { spuCode } = res.data;
-            const title =
-              this.type === "add"
-                ? "新建成功！"
-                : this.type === "editBase"
-                ? "基础信息修改成功！"
-                : "成本信息修改成功!";
+            const title = this.type === "add" ? "新建成功！" : "库存修改成功!";
             this.$notify.success({
               title: title,
               message: "",
             });
             this.showModelThis = false;
             // 刷新
-            this.$emit("refresh", { spuCode: spuCode });
+            this.$emit("refresh", true);
           }
         } else {
           console.log("error submit!!");

src/views/goodStore/active/components/edit-minorder-form.vue

@@ -0,0 +1,208 @@
+<template>
+  <el-dialog
+    v-loading="loading"
+    :title="'编辑活动信息'"
+    :center="true"
+    align="left"
+    top="12vh"
+    width="600px"
+    :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"
+            label-width="80px"
+            class="demo-ruleForm"
+          >
+            <el-form-item label="商品编号" prop="skuCode">
+              <el-input
+                v-model="ruleForm.skuCode"
+                placeholder="商品编号"
+                minlength="100"
+                disabled
+              />
+            </el-form-item>
+            <el-form-item label="商品名称" prop="good_name">
+              <el-input
+                v-model="ruleForm.good_name"
+                disabled
+                placeholder="商品名称"
+                minlength="100"
+              />
+            </el-form-item>
+            <el-form-item label="活动库存" prop="activity_stock">
+              <el-input
+                v-model="ruleForm.activity_stock"
+                disabled
+                placeholder="活动库存"
+                minlength="100"
+              />
+            </el-form-item>
+            <el-form-item label="起订量" prop="moq_num">
+              <digital-input
+                :values="ruleForm.moq_num"
+                :placeholder="'起订量'"
+                :min="0"
+                :max="10000000000"
+                :position="'right'"
+                :precision="0"
+                :controls="false"
+                :append="''"
+                @reschange="moq_num_change"
+              />
+            </el-form-item>
+            <el-form-item label="成本单价" prop="cost_price">
+              <digital-input
+                :values="ruleForm.cost_price"
+                :placeholder="'起订量'"
+                :min="0"
+                :max="10000000000"
+                :position="'right'"
+                :precision="2"
+                :controls="false"
+                :append="'元'"
+                @reschange="cost_price_change"
+              />
+            </el-form-item>
+          </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>
+export default {
+  name: "editMinorderForm",
+  props: ["showModel", "sitem"],
+  data() {
+    const validate_moq_num = (rule, value, callback) => {
+      let activity_stock = parseInt(this.ruleForm.activity_stock) || 0;
+      if (value === "") {
+        callback(new Error("起订量不能为空！"));
+      } else if (value === "0") {
+        callback(new Error("起订量不能为零！"));
+      } else if (parseInt(value) > activity_stock) {
+        callback(new Error("起订量不能大于活动库存数！"));
+      } else {
+        callback();
+      }
+    };
+    const validate_cost_price = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("成本单价不能为空！"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      loading: false,
+      showModelThis: this.showModel,
+      ruleForm: {
+        skuCode: "",
+        good_name: "",
+        activity_stock: "",
+        moq_num: "",
+        cost_price: "",
+      },
+      rulesThis: this.rules,
+      rules: {
+        moq_num: [
+          { required: true, validator: validate_moq_num, trigger: "blur" },
+        ],
+        cost_price: [
+          {
+            required: true,
+            validator: validate_cost_price,
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  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.rulesThis = this.rules;
+      await this.resetForm();
+      this.loading = false;
+    },
+
+    async resetForm() {
+      // 重置
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields();
+          this.$refs.ruleForm.clearValidate();
+          this.ruleForm = this.sitem
+            ? JSON.parse(JSON.stringify(this.sitem))
+            : {
+                skuCode: "",
+                good_name: "",
+                activity_stock: "",
+                moq_num: "",
+                cost_price: "",
+              };
+        }
+      });
+    },
+    moq_num_change(e) {
+      this.ruleForm.moq_num = e + "";
+      this.$refs.ruleForm.validateField("moq_num");
+    },
+    cost_price_change(e) {
+      this.ruleForm.cost_price = e + "";
+      this.$refs.ruleForm.validateField("cost_price");
+    },
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          this.loading = true;
+          let model = JSON.parse(JSON.stringify(this.ruleForm));
+          this.showModelThis = false;
+          // 刷新
+          this.$emit("refresh", model);
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
+
+   <style lang="scss" scoped>
+.sort {
+}
+</style>

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

@@ -0,0 +1,209 @@
+<template>
+  <div class="finance-exam-one-form">
+    <el-table
+      :data="tableData"
+      stripe
+      border
+      :size="'mini'"
+      style="width: 100%"
+    >
+      <el-table-column
+        prop="skuCode"
+        label="商品编码"
+        show-overflow-tooltip
+        width="170"
+      />
+      <el-table-column
+        prop="good_name"
+        label="商品名称"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="activity_stock"
+        label="活动库存"
+        width="100"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="moq_num"
+        label="起订量"
+        width="100"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="cost_price"
+        label="成本单价(元)"
+        width="100"
+        show-overflow-tooltip
+      />
+
+      <el-table-column fixed="right" width="80">
+        <template slot="header" slot-scope="scope">
+          <span>操作</span>
+        </template>
+        <template slot-scope="scope">
+          <el-tooltip effect="dark" content="编辑成本" placement="top">
+            <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>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+    <edit-minorder-form
+      :sitem="sfinditem"
+      :showModel="showModel"
+      @refresh="editRefresh"
+      @cancel="showModel = false"
+    />
+    <el-col
+      :span="24"
+      style="
+        text-align: right;
+        padding: 15px 0 15px 0;
+        border-top: 1px solid #dcdfe6;
+      "
+    >
+      <el-button :size="'mini'" type="primary" @click="submitForm"
+        >保 存
+      </el-button>
+    </el-col>
+  </div>
+</template>
+   <script>
+import asyncRequest from "@/apis/service/goodStore/active";
+import resToken from "@/mixins/resToken";
+import { mapGetters } from "vuex";
+import editMinorderForm from "./edit-minorder-form";
+export default {
+  name: "financeExamOneForm",
+  mixins: [resToken],
+  props: ["id", "type", "sitem"],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+  },
+  components: {
+    editMinorderForm,
+  },
+  data() {
+    return {
+      status: "",
+
+      loading: false,
+      showModel: false,
+      sfinditem: {},
+      tableData: [],
+    };
+  },
+  mounted() {
+    this.initForm();
+  },
+  methods: {
+    async initForm() {
+      this.loading = true;
+      this.resetFormData();
+      this.loading = false;
+    },
+    editRefresh(e) {
+      this.showModel = false;
+      const { skuCode, moq_num, cost_price } = JSON.parse(JSON.stringify(e));
+      const aindex = this.tableData.findIndex((eis) => eis.skuCode === skuCode);
+      if (aindex !== -1) {
+        this.tableData[aindex].moq_num = moq_num;
+        this.tableData[aindex].cost_price = cost_price;
+      }
+      this.tableData.forEach((s, i) => {
+        this.$set(this.tableData, i, this.tableData[i]);
+      });
+    },
+    openModal(e) {
+      this.sfinditem = JSON.parse(JSON.stringify(e));
+      this.showModel = true;
+    },
+    resetFormData() {
+      this.tableData = [];
+      const { info, status } = this.sitem;
+
+      this.status = status || "";
+      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;
+      let ruleForm = {
+        activity_code: activity_code || "",
+        good_list: [],
+      };
+      let list = JSON.parse(JSON.stringify(this.tableData));
+      let isok = true;
+      let newlist = [];
+      list.forEach((e) => {
+        if (e.moq_num + "" === "0" || e.moq_num + "" === "") {
+          isok = false;
+        }
+        let item = {
+          id: e.id,
+          skuCode: e.skuCode,
+          cost_price: e.cost_price,
+          moq_num: e.moq_num,
+        };
+        newlist.push(item);
+      });
+      if (!isok) {
+        this.$message.warning("起订量不能不合法！");
+        this.loading = false;
+      }
+      ruleForm.good_list = JSON.parse(JSON.stringify(newlist));
+      let res = await asyncRequest.actcost(ruleForm);
+      this.loading = false;
+      if (res && res.code === 0) {
+        this.$notify.success({
+          title: "提交成功！",
+          message: "",
+        });
+        // 刷新
+        this.$emit("refresh", true);
+      }
+    },
+  },
+};
+</script>
+   <style lang="scss" scoped>
+.activeAdd {
+  .activeAdd-title {
+    border-top: 1px solid #ebeef5;
+    span {
+      height: 50px;
+      line-height: 50px;
+      font-family: "微软雅黑", sans-serif;
+      font-weight: 400;
+      font-style: normal;
+      font-size: 16fpx;
+      text-align: left;
+    }
+  }
+  /deep/ .ddiv {
+    border-top: 1px solid #dcdfe6;
+  }
+  /deep/ .dtitle {
+    width: 40px;
+    text-align: center;
+    height: 100%;
+    min-height: 100%;
+    ul {
+      padding: 20px 0 0 0;
+    }
+  }
+  /deep/ .dmain {
+    padding: 20px 0 0 0;
+    width: calc(100% - 40px);
+    border-left: 1px solid #dcdfe6;
+  }
+}
+</style>
+   

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

@@ -0,0 +1,374 @@
+<template>
+  <div class="finance-exam-three-form">
+    <el-form
+      :model="ruleForm"
+      status-icon
+      :rules="rulesThis"
+      ref="ruleForm"
+      :size="'mini'"
+      label-width="90px"
+      class="demo-ruleForm"
+    >
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="审核状态" prop="status">
+            <el-select
+              v-model="ruleForm.status"
+              style="width: 100%"
+              placeholder="审核状态"
+              @change="statusChange"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审核备注" prop="remark">
+            <el-input
+              placeholder="审核备注"
+              v-model="ruleForm.remark"
+              maxlength="100"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-button
+            :size="'mini'"
+            type="success"
+            style="float: right"
+            @click="submitForm"
+          >
+            批量设置状态
+          </el-button>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table
+      :data="tableData"
+      stripe
+      border
+      tooltip-effect="dark"
+      ref="multipleTable"
+      :size="'mini'"
+      style="width: 100%"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="40"> </el-table-column>
+      <el-table-column
+        prop="skuCode"
+        label="商品编码"
+        show-overflow-tooltip
+        width="170"
+      />
+      <el-table-column
+        prop="good_name"
+        label="商品名称"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="activity_stock"
+        label="活动库存"
+        width="100"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="moq_num"
+        label="起订量"
+        width="100"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="cost_price"
+        label="成本单价(元)"
+        width="100"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="sale_price"
+        label="非活动价(元)"
+        width="100"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="activity_price"
+        label="活动价(元)"
+        width="100"
+        show-overflow-tooltip
+      />
+      <el-table-column prop="status" label="审核状态" width="100">
+        <template slot-scope="scope">
+          <el-tag
+            :size="'mini'"
+            :type="
+              scope.row.status == '0'
+                ? 'warning'
+                : scope.row.status == '2'
+                ? 'danger'
+                : ''
+            "
+            v-text="
+              (options.find((item) => item.value == scope.row.status) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="remark"
+        label="审核备注"
+        width="100"
+        show-overflow-tooltip
+      />
+
+      <el-table-column fixed="right" width="50">
+        <template slot="header" slot-scope="scope">
+          <span>操作</span>
+        </template>
+        <template slot-scope="scope">
+          <el-tooltip effect="dark" content="查看商品信息" placement="top">
+            <i class="el-icon-view tb-icon" @click="openEdit(scope.row)"></i>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+    <set-active-price-form
+      :sitem="sfinditem"
+      :showModel="showModel"
+      @refresh="editRefresh"
+      @cancel="showModel = false"
+    />
+    <el-col
+      :span="24"
+      style="
+        text-align: right;
+        padding: 15px 0 15px 0;
+        border-top: 1px solid #dcdfe6;
+      "
+    >
+      <el-button :size="'mini'" type="primary" @click="submitTable"
+        >保 存
+      </el-button>
+    </el-col>
+  </div>
+</template>
+   <script>
+import asyncRequest from "@/apis/service/goodStore/active";
+import resToken from "@/mixins/resToken";
+import { mapGetters } from "vuex";
+import setActivePriceForm from "./set-active-price-form";
+export default {
+  name: "financeExamOneForm",
+  mixins: [resToken],
+  props: ["id", "type", "sitem"],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+  },
+  components: {
+    setActivePriceForm,
+  },
+  data() {
+    return {
+      status: "",
+      ruleForm: {
+        status: "1", // 通过or驳回
+        remark: "",
+      },
+      rulesThis: this.rules,
+      rules: {
+        status: [
+          {
+            required: true,
+            message: "请选择审核状态！",
+            trigger: "change",
+          },
+        ],
+
+        remark: [
+          { required: true, message: "审核备注不能为空！", trigger: "blur" },
+          {
+            min: 1,
+            max: 250,
+            message: "长度在 1 到 250 个字符",
+            trigger: "blur",
+          },
+        ],
+      },
+      options: [
+        {
+          value: "0",
+          label: "待审核",
+        },
+        {
+          value: "1",
+          label: "通过",
+        },
+        {
+          value: "2",
+          label: "驳回",
+        },
+      ],
+      loading: false,
+      showModel: false,
+      sfinditem: {},
+      tableData: [],
+      multipleSelection: [],
+    };
+  },
+  mounted() {
+    this.initForm();
+  },
+  methods: {
+    async initForm() {
+      this.loading = true;
+      this.resetFormData();
+      this.rulesThis = this.rules;
+      await this.resetForm();
+      this.statusChange();
+      this.loading = false;
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    editRefresh(e) {
+      this.showModel = false;
+      const { skuCode, activity_price } = JSON.parse(JSON.stringify(e));
+      const aindex = this.tableData.findIndex((eis) => eis.skuCode === skuCode);
+      if (aindex !== -1) {
+        this.tableData[aindex].activity_price = activity_price;
+        this.$set(this.tableData, aindex, this.tableData[aindex]);
+      }
+    },
+    openModal(e) {
+      this.sfinditem = JSON.parse(JSON.stringify(e));
+      this.showModel = true;
+    },
+    statusChange() {
+      this.rulesThis.remark[0].required = this.ruleForm.status === "2";
+    },
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          const { status, remark } = this.ruleForm;
+          if (this.multipleSelection && this.multipleSelection.length > 0) {
+            this.tableData.forEach((a, ai) => {
+              let findex = this.multipleSelection.findIndex(
+                (b) => b.id === a.id
+              );
+              if (findex !== -1) {
+                this.tableData[ai].status = status;
+                this.tableData[ai].remark = remark;
+                this.$set(this.tableData, ai, this.tableData[ai]);
+              }
+            });
+          } else {
+            this.$message.warning("请选择商品！");
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    resetFormData() {
+      this.tableData = [];
+      const { info, status } = this.sitem;
+      this.status = status || "";
+      this.tableData =
+        info && info.length > 0 ? JSON.parse(JSON.stringify(info)) : [];
+    },
+    async resetForm() {
+      // 重置
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields();
+          this.$refs.ruleForm.clearValidate();
+          this.ruleForm = {
+            status: "1", // 通过or驳回
+            remark: "",
+          };
+        }
+      });
+    },
+    openEdit(e) {
+      console.log("2345");
+    },
+    async submitTable() {
+      this.loading = true;
+      const { activity_code } = this.sitem;
+      let ritem = {
+        activity_code: activity_code || "",
+        good_list: [],
+      };
+      let list = JSON.parse(JSON.stringify(this.tableData));
+      let isok = true;
+      let newlist = [];
+      list.forEach((e) => {
+        if (e.status !== "1" && e.status !== "2") {
+          isok = false;
+        }
+        let item = {
+          id: e.id,
+          status: e.status,
+          remark: e.remark,
+        };
+        newlist.push(item);
+      });
+      if (!isok) {
+        this.$message.warning("部分商品未审核！");
+        this.loading = false;
+      }
+      ritem.good_list = JSON.parse(JSON.stringify(newlist));
+      let res = await asyncRequest.status(ritem);
+      this.loading = false;
+      if (res && res.code === 0) {
+        this.$notify.success({
+          title: "提交成功！",
+          message: "",
+        });
+        // 刷新
+        this.$emit("refresh", true);
+      }
+    },
+  },
+};
+</script>
+   <style lang="scss" scoped>
+.activeAdd {
+  .activeAdd-title {
+    border-top: 1px solid #ebeef5;
+    span {
+      height: 50px;
+      line-height: 50px;
+      font-family: "微软雅黑", sans-serif;
+      font-weight: 400;
+      font-style: normal;
+      font-size: 16fpx;
+      text-align: left;
+    }
+  }
+  /deep/ .ddiv {
+    border-top: 1px solid #dcdfe6;
+  }
+  /deep/ .dtitle {
+    width: 40px;
+    text-align: center;
+    height: 100%;
+    min-height: 100%;
+    ul {
+      padding: 20px 0 0 0;
+    }
+  }
+  /deep/ .dmain {
+    padding: 20px 0 0 0;
+    width: calc(100% - 40px);
+    border-left: 1px solid #dcdfe6;
+  }
+}
+</style>
+   

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

@@ -0,0 +1,208 @@
+<template>
+  <div class="finance-exam-one-form">
+    <el-table
+      :data="tableData"
+      stripe
+      border
+      :size="'mini'"
+      style="width: 100%"
+    >
+      <el-table-column
+        prop="skuCode"
+        label="商品编码"
+        show-overflow-tooltip
+        width="170"
+      />
+      <el-table-column
+        prop="good_name"
+        label="商品名称"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="activity_stock"
+        label="活动库存"
+        width="100"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="moq_num"
+        label="起订量"
+        width="100"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="cost_price"
+        label="成本单价(元)"
+        width="100"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="sale_price"
+        label="非活动价(元)"
+        width="100"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="activity_price"
+        label="活动价(元)"
+        width="100"
+        show-overflow-tooltip
+      />
+
+      <el-table-column fixed="right" width="80">
+        <template slot="header" slot-scope="scope">
+          <span>操作</span>
+        </template>
+        <template slot-scope="scope">
+          <el-tooltip effect="dark" content="编辑成本" placement="top">
+            <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>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+    <set-active-price-form
+      :sitem="sfinditem"
+      :showModel="showModel"
+      @refresh="editRefresh"
+      @cancel="showModel = false"
+    />
+    <el-col
+      :span="24"
+      style="
+        text-align: right;
+        padding: 15px 0 15px 0;
+        border-top: 1px solid #dcdfe6;
+      "
+    >
+      <el-button :size="'mini'" type="primary" @click="submitForm"
+        >保 存
+      </el-button>
+    </el-col>
+  </div>
+</template>
+   <script>
+import asyncRequest from "@/apis/service/goodStore/active";
+import resToken from "@/mixins/resToken";
+import { mapGetters } from "vuex";
+import setActivePriceForm from "./set-active-price-form";
+export default {
+  name: "financeExamOneForm",
+  mixins: [resToken],
+  props: ["id", "type", "sitem"],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+  },
+  components: {
+    setActivePriceForm,
+  },
+  data() {
+    return {
+      status: "",
+
+      loading: false,
+      showModel: false,
+      sfinditem: {},
+      tableData: [],
+    };
+  },
+  mounted() {
+    this.initForm();
+  },
+  methods: {
+    async initForm() {
+      this.loading = true;
+      this.resetFormData();
+      this.loading = false;
+    },
+    editRefresh(e) {
+      this.showModel = false;
+      const { skuCode, activity_price } = JSON.parse(JSON.stringify(e));
+      const aindex = this.tableData.findIndex((eis) => eis.skuCode === skuCode);
+      if (aindex !== -1) {
+        this.tableData[aindex].activity_price = activity_price;
+        this.$set(this.tableData, aindex, this.tableData[aindex]);
+      }
+    },
+    openModal(e) {
+      this.sfinditem = JSON.parse(JSON.stringify(e));
+      this.showModel = true;
+    },
+    resetFormData() {
+      this.tableData = [];
+      const { info, status } = this.sitem;
+      this.status = status || "";
+      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;
+      let ruleForm = {
+        activity_code: activity_code || "",
+        good_list: [],
+      };
+      let list = JSON.parse(JSON.stringify(this.tableData));
+      let newlist = [];
+      list.forEach((e) => {
+        let item = {
+          id: e.id,
+          activity_price: e.activity_price,
+        };
+        newlist.push(item);
+      });
+     
+      ruleForm.good_list = JSON.parse(JSON.stringify(newlist));
+      let res = await asyncRequest.setActivity(ruleForm);
+      this.loading = false;
+      if (res && res.code === 0) {
+        this.$notify.success({
+          title: "提交成功！",
+          message: "",
+        });
+        // 刷新
+        this.$emit("refresh", true);
+      }
+    },
+  },
+};
+</script>
+   <style lang="scss" scoped>
+.activeAdd {
+  .activeAdd-title {
+    border-top: 1px solid #ebeef5;
+    span {
+      height: 50px;
+      line-height: 50px;
+      font-family: "微软雅黑", sans-serif;
+      font-weight: 400;
+      font-style: normal;
+      font-size: 16fpx;
+      text-align: left;
+    }
+  }
+  /deep/ .ddiv {
+    border-top: 1px solid #dcdfe6;
+  }
+  /deep/ .dtitle {
+    width: 40px;
+    text-align: center;
+    height: 100%;
+    min-height: 100%;
+    ul {
+      padding: 20px 0 0 0;
+    }
+  }
+  /deep/ .dmain {
+    padding: 20px 0 0 0;
+    width: calc(100% - 40px);
+    border-left: 1px solid #dcdfe6;
+  }
+}
+</style>
+   

src/views/goodStore/active/components/set-active-price-form.vue

@@ -0,0 +1,209 @@
+<template>
+  <el-dialog
+    v-loading="loading"
+    :title="'编辑活动信息'"
+    :center="true"
+    align="left"
+    top="12vh"
+    width="600px"
+    :size="'mini'"
+    :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"
+            label-width="80px"
+            class="demo-ruleForm"
+          >
+            <el-form-item label="商品编号" prop="skuCode">
+              <el-input
+                v-model="ruleForm.skuCode"
+                placeholder="商品编号"
+                minlength="100"
+                disabled
+              />
+            </el-form-item>
+            <el-form-item label="商品名称" prop="good_name">
+              <el-input
+                v-model="ruleForm.good_name"
+                disabled
+                placeholder="商品名称"
+                minlength="100"
+              />
+            </el-form-item>
+            <el-form-item label="活动库存" prop="activity_stock">
+              <el-input
+                v-model="ruleForm.activity_stock"
+                disabled
+                placeholder="活动库存"
+                minlength="100"
+              />
+            </el-form-item>
+            <el-form-item label="起订量" prop="moq_num">
+              <el-input
+                v-model="ruleForm.moq_num"
+                disabled
+                placeholder="起订量"
+                minlength="100"
+              />
+            </el-form-item>
+            <el-form-item label="成本单价" prop="cost_price">
+              <el-input
+                v-model="ruleForm.cost_price"
+                disabled
+                placeholder="成本单价"
+                minlength="100"
+              >
+                <template slot="append">元</template></el-input
+              >
+            </el-form-item>
+            <el-form-item label="非活动价" prop="sale_price">
+              <el-input
+                v-model="ruleForm.sale_price"
+                disabled
+                placeholder="非活动价"
+                minlength="100"
+              >
+                <template slot="append">元</template></el-input
+              >
+            </el-form-item>
+            <el-form-item label="活动价" prop="activity_price">
+              <digital-input
+                :values="ruleForm.activity_price"
+                :placeholder="'活动价'"
+                :min="0"
+                :max="10000000000"
+                :position="'right'"
+                :precision="2"
+                :controls="false"
+                :append="'元'"
+                @reschange="activity_price_change"
+              />
+            </el-form-item>
+          </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>
+export default {
+  name: "editMinorderForm",
+  props: ["showModel", "sitem"],
+  data() {
+    const validate_activity_price = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("活动价价不能为空！"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      loading: false,
+      showModelThis: this.showModel,
+      ruleForm: {
+        skuCode: "",
+        good_name: "",
+        activity_stock: "",
+        moq_num: "",
+        cost_price: "",
+        sale_price: "",
+        activity_price: "",
+      },
+      rulesThis: this.rules,
+      rules: {
+        activity_price: [
+          {
+            required: true,
+            validator: validate_activity_price,
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  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.rulesThis = this.rules;
+      await this.resetForm();
+      this.loading = false;
+    },
+
+    async resetForm() {
+      // 重置
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields();
+          this.$refs.ruleForm.clearValidate();
+          this.ruleForm = this.sitem
+            ? JSON.parse(JSON.stringify(this.sitem))
+            : {
+                skuCode: "",
+                good_name: "",
+                activity_stock: "",
+                moq_num: "",
+                cost_price: "",
+                sale_price: "",
+                activity_price: "",
+              };
+        }
+      });
+    },
+    activity_price_change(e) {
+      this.ruleForm.activity_price = e + "";
+      this.$refs.ruleForm.validateField("activity_price");
+    },
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          this.loading = true;
+          let model = JSON.parse(JSON.stringify(this.ruleForm));
+          this.showModelThis = false;
+          // 刷新
+          this.$emit("refresh", model);
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
+
+   <style lang="scss" scoped>
+.sort {
+}
+</style>

src/views/goodStore/active/detail.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="activeDetail">
+    <div>{{ powers }},{{ status }}</div>
     <div
       class="activeDetail-main"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
@@ -16,33 +17,79 @@
           />
         </el-tab-pane>
         <el-tab-pane label="商品详情" name="1" v-if="queryType !== 'add'">
-          <!-- <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
-            <el-collapse-item title="商品详情" name="0"> -->
-          <base-form
-            v-if="newTime !== ''"
-            :type="queryType"
-            :id="queryId"
-            :newTime="newTime"
-            :sitem="sitem"
-            @refresh="refresh"
-          />
-          <!-- </el-collapse-item> -->
-          <!-- <el-collapse-item title="采购部门审批" name="1"> 
-                 <exam-form
+          <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
+            <el-collapse-item title="商品详情" name="0">
+              <base-form
+                v-if="newTime !== ''"
+                :type="queryType"
+                :id="queryId"
+                :newTime="newTime"
+                :sitem="sitem"
+                @refresh="refresh"
+              />
+            </el-collapse-item>
+            <el-collapse-item
+              title="产品部门审批"
+              name="1"
+              v-if="status == '0'"
+            >
+              <exam-form
                 :statusList="statusList"
                 :newTime="newTime"
                 :disabled="false"
                 :isMust="false"
                 @searchChange="examForm"
               />
-              
-              123 </el-collapse-item> -->
+            </el-collapse-item>
+            <el-collapse-item
+              title="采购部门定价"
+              name="2"
+              v-if="status == '1'"
+            >
+              <finance-exam-one-form
+                v-if="newTime !== ''"
+                :type="queryType"
+                :id="queryId"
+                :newTime="newTime"
+                :sitem="sitem"
+                @refresh="initData()"
+              />
+            </el-collapse-item>
 
-          <!-- </el-collapse> -->
+            <el-collapse-item
+              title="财务定活动价"
+              name="3"
+              v-if="status == '2'"
+            >
+              <finance-exam-two-form
+                v-if="newTime !== ''"
+                :type="queryType"
+                :id="queryId"
+                :newTime="newTime"
+                :sitem="sitem"
+                @refresh="initData()"
+              />
+            </el-collapse-item>
+
+            <el-collapse-item
+              title="财务定活动价"
+              name="4"
+              v-if="status == '3'"
+            >
+              <finance-exam-three-form
+                v-if="newTime !== ''"
+                :type="queryType"
+                :id="queryId"
+                :newTime="newTime"
+                :sitem="sitem"
+                @refresh="initData()"
+              />
+            </el-collapse-item>
+          </el-collapse>
         </el-tab-pane>
-        <!-- <el-tab-pane label="审批记录" name="2" v-if="queryType !== 'add'">
+        <el-tab-pane label="审批记录" name="2" v-if="queryType !== 'add'">
           111
-        </el-tab-pane> -->
+        </el-tab-pane>
       </el-tabs>
     </div>
     <div v-else>
@@ -55,11 +102,17 @@ import asyncRequest from "@/apis/service/goodStore/active";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
 import baseForm from "./components/baseForm";
+import financeExamOneForm from "./components/finance-exam-one-form";
+import financeExamTwoForm from "./components/finance-exam-two-form";
+import financeExamThreeForm from "./components/finance-exam-three-form";
 export default {
   name: "activeDetail",
   mixins: [resToken],
   components: {
     baseForm,
+    financeExamOneForm,
+    financeExamTwoForm,
+    financeExamThreeForm,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
@@ -81,7 +134,7 @@ export default {
       statusList: [],
       size: "small",
       activeTabs: "1",
-      activeNames: ["0", "1"],
+      activeNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
       newTime: "",
       loading: false,
       queryType: "",
@@ -114,23 +167,22 @@ export default {
     async examForm(e) {
       console.log(e);
       if (!this.loading) {
-        let type = e.state === "1" ? "1" : e.rebut;
-        await this.setstatus(type, "提交采购部门审核", e.remark);
+        let model = {
+          activity_code: this.queryId,
+          status: e.state === "1" ? "1" : "8",
+          remark: e.remark,
+        };
+        await this.setstatus("提交产品部门审核", model);
       }
     },
-    async setstatus(type, detail, remark) {
+    async setstatus(detail, model) {
       await this.$confirm(`确定要${detail}？`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(async () => {
-          let _model = {
-            spuCode: this.queryId,
-            status: type,
-            remark: remark,
-          };
-          let res = await asyncRequest.status(_model);
+          let res = await asyncRequest.actstatus(model);
           if (res && res.code === 0) {
             this.$notify.success({
               title: "提交成功！",
@@ -161,7 +213,7 @@ export default {
     async initData() {
       this.loading = true;
       const { code, message, data } = await asyncRequest.detail({
-        id: this.queryId,
+        activity_code: this.queryId,
       });
       this.loading = false;
       if (code === 0) {

src/views/goodStore/active/index.vue

@@ -48,10 +48,10 @@
                 "
               >
                 <el-option
-                  v-for="item in statusList"
-                  :key="'status' + item.code"
-                  :label="item.name"
-                  :value="item.code"
+                  v-for="item in statusOptions"
+                  :key="'status' + item.id"
+                  :label="item.label"
+                  :value="item.id"
                 />
               </el-select>
             </el-col>
@@ -147,7 +147,9 @@
           "
         ></el-tag>
       </template>
-
+      <template #atime="{ scope }">
+        {{ scope.row.start }}~{{ scope.row.end }}
+      </template>
       <template #operation="{ scope }">
         <el-tooltip
           v-if="powers.some((item) => item == '007')"
@@ -158,60 +160,13 @@
           <i
             class="el-icon-view tb-icon"
             @click="
-              routeGoto('activeDetail', { id: scope.row.id, type: 'view' })
+              routeGoto('activeDetail', {
+                id: scope.row.activity_code,
+                type: 'view',
+              })
             "
           ></i>
         </el-tooltip>
-        <el-tooltip
-          v-if="powers.some((item) => item == '005')"
-          effect="dark"
-          content="修改"
-          placement="top"
-        >
-          <i
-            class="el-icon-edit tb-icon"
-            @click="
-              routeGoto('activeDetail', { id: scope.row.id, type: '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
-          v-if="powers.some((item) => item == '006')"
-          effect="dark"
-          content="删除"
-          placement="top"
-        >
-          <i
-            class="el-icon-delete tb-icon"
-            @click="deleteItem(scope.row.id)"
-          ></i>
-        </el-tooltip>
       </template>
     </ex-table>
     <no-auth v-else></no-auth>
@@ -227,8 +182,6 @@
 </template>
 <script>
 import asyncRequest from "@/apis/service/goodStore/active";
-import statusList from "@/assets/js/statusList";
-import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
@@ -255,9 +208,6 @@ export default {
       select: "1",
       sinput: "",
       loading: false,
-      showModel: false,
-      modelId: "000",
-      sitem: {},
       parmValue: {
         activity_name: "",
         activity_code: "",
@@ -272,8 +222,15 @@ export default {
       },
       // 状态
       statusOptions: [
-        { id: "0", label: "禁用" },
-        { id: "1", label: "启用" },
+        { id: "0", label: "待产品部审核" },
+        { id: "1", label: "待采购定价" },
+        { id: "2", label: "待财务定售价" },
+        { id: "3", label: "待活动价审核" },
+        { id: "4", label: "审核完成" },
+        { id: "5", label: "活动未开始" },
+        { id: "6", label: "活动进行中" },
+        { id: "7", label: "活动已结束" },
+        { id: "8", label: "审核未通过" },
       ],
       // 表格 - 数据
       tableData: [],
@@ -292,27 +249,45 @@ export default {
       // 表格 - 列参数
       columns: [
         {
-          prop: "id",
-          label: "ID",
+          prop: "activity_code",
+          label: "活动编码",
+          fixed: "left",
+          width: "155",
         },
         {
-          prop: "active",
+          prop: "activity_name",
           label: "活动名称",
         },
         {
           prop: "status",
           label: "状态",
-          sortable: true,
+          width: "105",
           _slot_: "status",
         },
+
+        {
+          prop: "atime",
+          label: "活动时间",
+          _slot_: "atime",
+          width: "270",
+        },
+        {
+          prop: "platform_code",
+          label: "平台编号",
+        },
+        {
+          prop: "platform_name",
+          label: "平台名称",
+        },
         {
           prop: "creater",
           label: "创建人",
+          width: "60",
         },
         {
           prop: "addtime",
           label: "创建时间",
-          sortable: true,
+          width: "142",
         },
         {
           prop: "",
@@ -320,6 +295,7 @@ export default {
           fixed: "right",
           _noset_: true,
           _slot_: "operation",
+          width: "50",
         },
       ],
     };
@@ -336,12 +312,15 @@ export default {
         total: 0,
       };
       this.parmValue = {
-        page: 1, // 页码
-        size: 15, // 每页显示条数
-        starttime: "",
-        endtime: "",
+        activity_name: "",
+        activity_code: "",
         status: "",
         platform_code: [],
+        starttime: "",
+        endtime: "",
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+        company_id: "",
         creater: "",
       };
       this.searchList();

src/views/goodStore/activeGood/index.vue

@@ -46,10 +46,10 @@
                 />
               </el-select>
             </el-col>
-            <el-col :span="4" style="width: 210px; padding: 0 0 0 10px">
+            <el-col :span="4" style="width: 220px; padding: 0 0 0 10px">
               <el-input
                 :size="searchSize"
-                v-model="parmValue.name"
+                v-model="parmValue.skuCode"
                 :maxlength="40"
                 @blur="
                   pageInfo.curr = 1;
@@ -59,10 +59,10 @@
                 placeholder="商品编号"
               ></el-input>
             </el-col>
-            <el-col :span="4" style="width: 260px; padding: 0 0 0 10px">
+            <el-col :span="4" style="width: 300px; padding: 0 0 0 10px">
               <el-input
                 :size="searchSize"
-                v-model="parmValue.name"
+                v-model="parmValue.good_name"
                 :maxlength="40"
                 @blur="
                   pageInfo.curr = 1;
@@ -82,43 +82,22 @@
                 刷新
               </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-row>
           <el-row>
             <el-col :span="6" style="width: 240px">
-              <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>
+              <search-terrace
+                :value="parmValue.platform_code"
+                :disabled="false"
+                :size="'mini'"
+                :isDetail="false"
+                :placeholder="'所属平台'"
+                @searchChange="platform_codesearchChange"
+              />
             </el-col>
-            <el-col :span="4" style="width: 210px; padding: 0 0 0 10px">
+            <el-col :span="4" style="width: 220px; padding: 0 0 0 10px">
               <el-input
                 :size="searchSize"
-                v-model="parmValue.name"
+                v-model="parmValue.activity_code"
                 :maxlength="40"
                 @blur="
                   pageInfo.curr = 1;
@@ -128,10 +107,10 @@
                 placeholder="活动编号"
               ></el-input>
             </el-col>
-            <el-col :span="4" style="width: 260px; padding: 0 0 0 10px">
+            <el-col :span="4" style="width: 300px; padding: 0 0 0 10px">
               <el-input
                 :size="searchSize"
-                v-model="parmValue.name"
+                v-model="parmValue.activity_name"
                 :maxlength="40"
                 @blur="
                   pageInfo.curr = 1;
@@ -145,15 +124,9 @@
               :span="3"
               class="fr"
               style="width: 66px; padding: 0 0 0 10px"
-              v-if="powers.some((item) => item == '003')"
             >
-              <el-button
-                :size="searchSize"
-                type="success"
-                style="float: right"
-                @click="openModal({}, '003')"
-              >
-                添加
+              <el-button type="warning" :size="searchSize" @click="restSearch">
+                重置
               </el-button>
             </el-col>
           </el-row>
@@ -182,54 +155,6 @@
             @click="openModal(scope.row, '007')"
           ></i>
         </el-tooltip>
-        <el-tooltip
-          v-if="powers.some((item) => item == '005')"
-          effect="dark"
-          content="修改"
-          placement="top"
-        >
-          <i
-            class="el-icon-edit tb-icon"
-            @click="openModal(scope.row, '005')"
-          ></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
-          v-if="powers.some((item) => item == '006')"
-          effect="dark"
-          content="删除"
-          placement="top"
-        >
-          <i
-            class="el-icon-delete tb-icon"
-            @click="deleteItem(scope.row.id)"
-          ></i>
-        </el-tooltip>
       </template>
     </ex-table>
     <no-auth v-else></no-auth>
@@ -271,12 +196,18 @@ export default {
         start: "",
         end: "",
         status: "",
+        platform_code: [],
+        skuCode: "",
+        good_name: "",
+        activity_name: "",
+        activity_code: "",
         creater: "",
       },
       // 状态
       statusOptions: [
-        { id: "0", label: "禁用" },
-        { id: "1", label: "启用" },
+        { id: "0", label: "未开始" },
+        { id: "1", label: "进行中" },
+        { id: "2", label: "已下架" },
       ],
       // 表格 - 数据
       tableData: [],
@@ -295,12 +226,14 @@ export default {
       // 表格 - 列参数
       columns: [
         {
-          prop: "id",
-          label: "ID",
+          prop: "skuCode",
+          label: "商品编号",
+          width: "170",
         },
         {
-          prop: "activeGood_name",
+          prop: "good_name",
           label: "商品名称",
+          "min-width": "170",
         },
         {
           prop: "status",
@@ -308,17 +241,47 @@ export default {
           _slot_: "status",
         },
         {
-          prop: "creater",
-          label: "创建人",
+          prop: "activity_stock",
+          label: "活动库存",
+        },
+        {
+          prop: "moq_num",
+          label: "起订量",
+        },
+
+        {
+          prop: "cost_price",
+          label: "成本单价",
         },
         {
-          prop: "addtime",
-          label: "创建时间",
+          prop: "sale_price",
+          label: "非活动价",
+        },
+        {
+          prop: "activity_price",
+          label: "活动价",
+        },
+        {
+          prop: "platform_code",
+          label: "平台编号",
+        },
+        {
+          prop: "platform_name",
+          label: "平台名称",
+        },
+        {
+          prop: "activity_code",
+          label: "活动编号",
+        },
+        {
+          prop: "activity_name",
+          label: "活动名称",
         },
         {
           prop: "",
           label: "操作",
           fixed: "right",
+          width: "50",
           _noset_: true,
           _slot_: "operation",
         },
@@ -342,6 +305,11 @@ export default {
         start: "",
         end: "",
         status: "",
+        platform_code: [],
+        skuCode: "",
+        good_name: "",
+        activity_name: "",
+        activity_code: "",
         creater: "",
       };
       this.searchList();
@@ -365,6 +333,15 @@ export default {
         await this.searchList();
       }
     },
+    async platform_codesearchChange(e) {
+      if (e) {
+        const { id, code, label } = e;
+        this.parmValue.platform_code = id ? [id] : [];
+      }
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
+      await this.searchList();
+    },
     /**
      * 启用/禁用
      * @param {String} id id
@@ -431,7 +408,9 @@ export default {
     // 刷新表格
     async searchList() {
       this.loading = true;
-      const res = await asyncRequest.list(this.parmValue);
+      let model = JSON.parse(JSON.stringify(this.parmValue));
+      model.platform_code = model.platform_code.toString();
+      const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);

src/views/goodStore/searchSort/index.vue

@@ -0,0 +1,296 @@
+<template>
+  <div class="searchSort pagePadding">
+    <ex-table
+      v-loading="loading"
+      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      :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 style="padding: 0 0 10px 80px">
+            <el-col :span="6" style="width: 303px">
+              <period-date-picker
+                :type="1"
+                :width="'135px'"
+                :size="searchSize"
+                :start="parmValue.start"
+                :end="parmValue.end"
+                @timeReturned="handleTime"
+              />
+            </el-col>
+            <el-col :span="4" style="width: 160px">
+              <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="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-row>
+          <el-row>
+            <el-col :span="4" style="width: 373px">
+              <el-input
+                :size="searchSize"
+                v-model="parmValue.cat_name"
+                :maxlength="40"
+                @blur="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                placeholder="分类名称"
+              ></el-input>
+            </el-col>
+            <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
+              <el-input
+                :size="searchSize"
+                v-model="parmValue.creater"
+                :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"
+              v-if="powers.some((item) => item == '003')"
+            >
+              <el-button
+                :size="searchSize"
+                type="success"
+                style="float: right"
+                @click="openModal({}, '003')"
+              >
+                添加
+              </el-button>
+            </el-col>
+          </el-row>
+        </div></template
+      >
+      <template #status="{ scope }">
+        <el-tag
+          :size="tablebtnSize"
+          :type="scope.row.status == '0' ? 'warning' : ''"
+          v-text="
+            (statusOptions.find((item) => item.id == scope.row.status) || {})
+              .label || '--'
+          "
+        ></el-tag>
+      </template>
+    </ex-table>
+    <no-auth v-else></no-auth>
+  </div>
+</template>
+<script>
+import asyncRequest from "@/apis/service/goodStore/searchSort";
+import statusList from "@/assets/js/statusList";
+import roleLevel from "@/assets/js/roleLevel";
+import mixinPage from "@/mixins/elPaginationHandle";
+import { mapGetters } from "vuex";
+import resToken from "@/mixins/resToken";
+export default {
+  name: "searchSort",
+  mixins: [mixinPage, resToken],
+
+  computed: {
+    //组件SIZE设置
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "searchSort"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
+  data() {
+    return {
+      statusList: statusList,
+      roleLevel: roleLevel,
+      loading: true,
+      showModel: false,
+      modelId: "000",
+      sitem: {},
+      parmValue: {
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+        start: "",
+        end: "",
+        status: "",
+        creater: "",
+        cat_name: "",
+      },
+      // 状态
+      statusOptions: [
+        { id: "0", label: "禁用" },
+        { id: "1", label: "启用" },
+      ],
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ["setcol"],
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      // 表格 - 列参数
+      columns: [
+        {
+          prop: "id",
+          label: "ID",
+          width: "80px",
+        },
+        {
+          prop: "cat_name",
+          label: "分类名称",
+          width: "140px",
+        },
+        {
+          prop: "status",
+          label: "状态",
+          _slot_: "status",
+          width: "70px",
+        },
+        {
+          prop: "level",
+          label: "分类等级",
+          width: "70px",
+        },
+
+        {
+          prop: "cat_desc",
+          label: "售后说明",
+        },
+
+        {
+          prop: "addtime",
+          label: "创建时间",
+          sortable: true,
+          width: "145px",
+        },
+      ],
+    };
+  },
+  mounted() {
+    this.searchList();
+  },
+  methods: {
+    restSearch() {
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
+      this.parmValue = {
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+        start: "",
+        end: "",
+        status: "",
+        creater: "",
+        cat_name: "",
+      };
+
+      this.searchList();
+    },
+
+    // 时间
+    async handleTime(e) {
+      this.parmValue.start = e.startTime || "";
+      this.parmValue.end = e.endTime || "";
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end !== "") ||
+        (this.parmValue.start === "" && this.parmValue.end === "")
+      ) {
+        this.pageInfo.curr = 1;
+        this.parmValue.page = 1;
+        await 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;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+</style>