build

src/config/env.development.js

@@ -3,8 +3,7 @@ module.exports = {
   title: '采销平台',
   baseUrl: 'http://wx.wxhr.sit.futurelab.tv',
   api: {
-    // baseApi: 'http://stock.api.caixiao365.com/'
-    baseApi: 'http://stocknew.test241.wanyuhengtong.com/'
+    baseApi: 'http://stock.api.caixiao365.com/'
     // baseApi: 'http://stockwm.test241.wanyuhengtong.com/'
   },
   webUrl: 'http://project.web.caixiao365.com/#/good-share?id=',

src/views/goodStore/activeGood/index.vue

@@ -133,7 +133,7 @@
             :size="tablebtnSize"
             :type="scope.row.status == '0' ? 'warning' : ''"
             v-text="
-              (statusOptions.find((item) => item.id == scope.row.status) || {}).label ||
+              (statusOptions.find((item) => item.id == scope.row.activity_status) || {}).label ||
               '--'
             "
           ></el-tag>
@@ -214,9 +214,18 @@ export default {
       },
       // 状态
       statusOptions: [
-        { id: "0", label: "未开始" },
-        { id: "1", label: "进行中" },
-        { id: "2", label: "已下架" },
+        // { id: "0", label: "未开始" },
+        // { id: "1", label: "进行中" },
+        // { id: "2", 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: [],
@@ -249,6 +258,7 @@ export default {
           prop: "status",
           label: "状态",
           _slot_: "status",
+          "min-width": "110",
         },
         {
           prop: "activity_stock",