Merge branch 'sit'

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

@@ -4,7 +4,8 @@ const api = "admin/";
 export default {
   // 添加
   add: (data, params) => http(api + "goodupcreate", data, "post", params),
-
+  // 添加
+  online_add: (data, params) => http(api + "gooduponline", data, "post", params),
   // 分页查询
   list: (data, params) => http(api + "gooduplist", data, "post", params),
   // 获取全部规格值
@@ -17,11 +18,15 @@ export default {
   update: (data, params) => http(api + "goodupeditinfo", data, "post", params),
   // 成本更改
   updateP: (data, params) => http(api + "goodupeditfee", data, "post", params),
-
+  // 商品数据修改(全部)
+  edit_update: (data, params) => http(api + "goodupedit", data, "post", params),
   // 删除
   delete: (data, params) => http(api + "goodupdelall", data, "post", params),
   // 更新状态
   status: (data, params) => http(api + "goodexam", data, "post", params),
   // 获取分类详情
   catinfo: (data, params) => http(api + "catinfo", data, "post", params),
+  // 删除
+  copy: (data, params) => http(api + "goodupcopy", data, "post", params),
+
 };

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

@@ -17,7 +17,10 @@ export default {
   ladderOne: (data, params) => http(api + "goodupeditladder", data, "post", params),
   // 删除
   delete: (data, params) => http(api + "gooddel", data, "post", params),
-
+  // 重新发起审核流程
+  againonline: (data, params) => http(api + "againonline", data, "post", params),
+  // 获取系统售价
+  goodupprice: (data, params) => http(api + "goodupprice", data, "post", params),
 
   // 复制
   copy: (data, params) => http(api + "goodcopy", data, "post", params),

src/assets/js/btnList.js

@@ -76,6 +76,10 @@ const btnList = [
   { code: "075", name: "编辑支持品牌" },
   { code: "076", name: "启/禁用支持品牌" },
   { code: "077", name: "删除支持品牌" },
+<<<<<<< HEAD
+=======
+  { code: "078", name: "再次发起审核流程" },
+>>>>>>> sit
 
 ];
 export default btnList;

src/views/goodStore/goodsCost/columns.js

@@ -71,9 +71,9 @@ const listCol = [
   },
   {
     prop: "good_type",
-    label: "是否定制",
+    label: "定制",
     _slot_: "good_type",
-    width: "70px",
+    width: "50px",
   },
   {
     prop: "status",
@@ -113,7 +113,7 @@ const listCol = [
     label: "操作",
     fixed: "right",
     _noset_: true,
-    width: "150px",
+    width: "170px",
     _slot_: "operation",
   },
 ]

src/views/goodStore/goodsCost/components/addEdit.vue

@@ -4,7 +4,7 @@
     :title="'添加商品上线'"
     :center="true"
     align="left"
-    top="18vh"
+    top="8vh"
     width="1040px"
     :close-on-click-modal="false"
     :visible.sync="showModelThis"
@@ -13,21 +13,102 @@
     element-loading-background="rgba(0, 0, 0, 0.8)"
     @close="showModelThis = false"
   >
-    <el-card style="margin: -20px 0 0 0;  padding-bottom: 0;">
+    <el-card style="margin: -20px 0 0 0; padding-bottom: 0">
       <el-row :gutter="10">
-        <el-col :span="24">
+        <el-col :span="24" style="padding: 0 0 15px 0">
           <el-table
             :data="sitem"
             stripe
             :size="'mini'"
             border
+            max-height="380px"
             style="width: 100%"
           >
-            <el-table-column prop="date" label="日期" width="180">
+            <el-table-column
+              prop="spuCode"
+              label="编号"
+              width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="good_thumb_img"
+              label="图片"
+              width="45"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <div
+                  v-if="scope.row.good_thumb_img"
+                  style="width: 20px; height: 20px"
+                  class="hover"
+                  v-viewer
+                >
+                  <img
+                    :src="scope.row.good_thumb_img"
+                    style="display: inline-block; width: 100%; height: 100%"
+                    alt=""
+                  />
+                </div>
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="姓名" width="180">
+            <el-table-column
+              prop="good_name"
+              label="名称"
+              min-width="160px"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="cat_name"
+              label="分类"
+              min-width="100"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="brand_name"
+              label="品牌"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="good_type"
+              label="定制"
+              width="50"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <el-tag
+                  :size="'mini'"
+                  :type="scope.row.good_type == '1' ? '' : 'warning'"
+                  v-text="
+                    (options1.find((item) => item.id == scope.row.status) || {})
+                      .name || '--'
+                  "
+                ></el-tag>
+              </template>
             </el-table-column>
-            <el-table-column prop="address" label="地址"> </el-table-column>
+            <el-table-column
+              prop="supplierNo"
+              label="供应商编号"
+              width="110"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="supplier_name"
+              label="供应商名称"
+              width="110"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="companyNo"
+              label="业务公司编号"
+              width="110"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="company"
+              label="业务公司名称"
+              width="110"
+              show-overflow-tooltip
+            />
           </el-table>
         </el-col>
         <el-col :span="24">
@@ -35,7 +116,6 @@
             ref="ruleForm"
             :model="ruleForm"
             status-icon
-            
             :rules="rulesThis"
             label-width="80px"
             class="demo-ruleForm"
@@ -90,7 +170,7 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/goodStore/brand";
+import asyncRequest from "@/apis/service/goodStore/goodsCost";
 import resToken from "@/mixins/resToken";
 export default {
   name: "brand",
@@ -105,6 +185,11 @@ export default {
         online_reason: "", //string	上线原因
         online_remark: "", //string	上线备注
       },
+      //是否定制
+      options1: [
+        { id: "0", name: "否" },
+        { id: "1", name: "是" },
+      ],
       rulesThis: this.rules,
       rules: {
         platform: [
@@ -158,7 +243,6 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          const { id, brand_name } = this.sitem;
           this.ruleForm = {
             platform: [], //string	平台id
             online_reason: "", //string	上线原因
@@ -177,25 +261,47 @@ export default {
         if (valid) {
           this.loading = true;
           let model = JSON.parse(JSON.stringify(this.ruleForm));
-          let res = {};
-          if (this.id === "003") {
-            delete model["id"];
-            res = await asyncRequest.add(model);
-          } else {
-            res = await asyncRequest.update(model);
-          }
+          model.platform = model.platform.toString();
+          model.codes = [];
+          let list = JSON.parse(JSON.stringify(this.sitem));
+          list.forEach((e) => {
+            model.codes.push(e.spuCode);
+          });
+          let { code, data, message } = await asyncRequest.online_add(model);
           this.loading = false;
-          if (res && res.code === 0) {
-            const title = this.id === "add" ? "添加成功!" : "修改成功!";
+          if (code === 0) {
             this.$notify.success({
-              title,
+              title: "已成功添加至上线流程！",
               message: "",
             });
             this.showModelThis = false;
             // 刷新
             this.$emit("refresh");
-          } else if (res && res.code >= 100 && res.code <= 104) {
+          } else if (code >= 100 && code <= 104) {
             await this.logout();
+          } else if (code === 1009) {
+            let resList = JSON.parse(JSON.stringify(data));
+
+            let htmlList = "<ul>";
+            resList.forEach((v) => {
+              htmlList += `<li>
+          <img src='${v.good_img}' style='width: 20px; height: 20px'
+                  class='hover'
+                  v-viewer/>
+                  <span>${v.good_name}__</span>`;
+              const { speclist } = v;
+              let str = "<span>";
+              speclist.forEach((a, ai) => {
+                str += `${ai !== 0 ? "--" : ""}${a.spec_name}[${a.spec_value}]`;
+              });
+              htmlList += str + "</span>" + `</li>`;
+            });
+            htmlList += "</ul>";
+            this.$notify({
+              title: "一下商品已上线或已经在审批流程中！",
+              dangerouslyUseHTMLString: true,
+              message: htmlList,
+            });
           } else {
             this.$message.warning(res.message);
           }
@@ -211,6 +317,5 @@ export default {
 
    <style lang="scss" scoped>
 .brand {
-
 }
 </style>

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

@@ -421,7 +421,7 @@
           <el-table-column prop="spec_value_value" label="规格值" />
           <el-table-column
             fixed="right"
-            v-if="type === 'add' || type === 'editBase'"
+            v-if="type === 'add' || type === 'editBase'|| type === 'edit'"
           >
             <template slot="header" slot-scope="scope">
               <span>操作</span>
@@ -982,7 +982,7 @@
               <el-table-column prop="delivery_fee" label="其中运费" />
               <el-table-column
                 fixed="right"
-                v-if="type === 'add' || type === 'editCoin'"
+                v-if="type === 'add' || type === 'editCoin'|| type === 'edit'"
               >
                 <template slot="header" slot-scope="scope">
                   <span>操作</span>
@@ -1023,7 +1023,12 @@
       </el-col>
       <el-col
         :span="24"
-        v-if="type === 'editBase' || type === 'add' || type === 'editCoin'"
+        v-if="
+          type === 'editBase' ||
+          type === 'add' ||
+          type === 'editCoin' ||
+          type === 'edit'
+        "
         style="
           text-align: right;
           padding: 15px 0 15px 0;
@@ -1216,15 +1221,18 @@ export default {
           let res = {};
           delete model["id"];
           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 {
+          } else if (this.type === "editCoin") {
             let item2 = this.setModel(model, "2");
             res = await asyncRequest.updateP(item2);
+          } else {
+            model.companyNo = model.company_id;
+            delete model["company_id"];
+            res = await asyncRequest.edit_update(model);
           }
           console.log(res);
           this.loading = false;
@@ -1235,7 +1243,9 @@ export default {
                 ? "新建成功！"
                 : this.type === "editBase"
                 ? "基础信息修改成功！"
-                : "成本信息修改成功!";
+                : this.type === "editCoin"
+                ? "成本信息修改成功!"
+                : "商品信息修改成功";
             this.$notify.success({
               title: title,
               message: "",

src/views/goodStore/goodsCost/detail.vue

@@ -33,7 +33,8 @@
               name="1"
               v-if="
                 (status === '0' || status === '2' || status === '3') &&
-                queryType === 'view'&&powers.some((item) => item == '036')
+                queryType === 'view' &&
+                powers.some((item) => item == '036')
               "
             >
               <exam-form
@@ -120,7 +121,19 @@ export default {
     async examForm(e) {
       console.log(e);
       if (!this.loading) {
-        let type = e.state === "1" ? "1" : e.rebut;
+        let type = "";
+        if (e.state === "1") {
+          type = "1";
+        } else {
+          type =
+            this.status === "0"
+              ? "6"
+              : this.status === "2"
+              ? "4"
+              : this.status === "3"
+              ? "6"
+              : "";
+        }
         await this.setstatus(type, "提交采购部门审核", e.remark);
       }
     },

src/views/goodStore/goodsCost/index.vue

@@ -199,7 +199,10 @@
       <template #status="{ scope }">
         <el-tag
           :size="tablebtnSize"
-          :type="scope.row.status == '1' ? '' : 'warning'"
+          :type="
+            (statusList.find((item) => item.code == scope.row.status) || {})
+              .type || '--'
+          "
           v-text="
             (statusList.find((item) => item.code == scope.row.status) || {})
               .name || '--'
@@ -235,7 +238,28 @@
           ></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((item) => item == '054')"
+          v-if="
+            powers.some((item) => item == '005') &&
+            (scope.row.status === '7' || scope.row.status === '6')
+          "
+          effect="dark"
+          content="修改"
+          placement="top"
+        >
+          <i
+            class="el-icon-edit tb-icon"
+            @click="
+              routeGoto('goodsCostDetail', {
+                id: scope.row.spuCode,
+                type: 'edit',
+              })
+            "
+          ></i>
+        </el-tooltip>
+        <el-tooltip
+          v-if="
+            powers.some((item) => item == '054') && scope.row.status === '1'
+          "
           effect="dark"
           content="修改基础信息"
           placement="top"
@@ -246,7 +270,9 @@
           ></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((item) => item == '053')"
+          v-if="
+            powers.some((item) => item == '053') && scope.row.status === '1'
+          "
           effect="dark"
           content="修改成本信息"
           placement="top"
@@ -256,6 +282,20 @@
             @click="wantto(scope.row.spuCode, scope.row.status, '3')"
           ></i>
         </el-tooltip>
+        <el-tooltip
+          v-if="
+            powers.some((item) => item == '053') && scope.row.status !== '7'
+          "
+          effect="dark"
+          content="复制商品"
+          placement="top"
+        >
+          <i
+            class="el-icon-document-copy tb-icon"
+            @click="good_copy(scope.row.spuCode)"
+          ></i>
+        </el-tooltip>
+
         <el-tooltip
           v-if="powers.some((item) => item == '006')"
           effect="dark"
@@ -314,18 +354,42 @@ export default {
         {
           code: "0",
           name: "新建待审核",
+          type: "",
         },
         {
           code: "1",
           name: "审核通过",
+          type: "success",
         },
         {
           code: "2",
           name: "基础修改待审核",
+          type: "",
         },
         {
           code: "3",
           name: "成本修改待审核",
+          type: "",
+        },
+        {
+          code: "4",
+          name: "基础修改驳回",
+          type: "danger",
+        },
+        {
+          code: "5",
+          name: "成本修改驳回",
+          type: "danger",
+        },
+        {
+          code: "6",
+          name: "新建审核驳回",
+          type: "danger",
+        },
+        {
+          code: "7",
+          name: "复制商品待编辑",
+          type: "info",
         },
       ],
       showModel: false,
@@ -465,6 +529,36 @@ export default {
         await this.searchList();
       }
     },
+    async good_copy(spuCode) {
+      await this.$confirm(`确定要复制该商品？`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          this.loading = true;
+          const model = {
+            spuCode: spuCode,
+          };
+          const res = await asyncRequest.copy(model);
+          if (res && res.code === 0) {
+            this.loading = false;
+            this.$notify.success({
+              title: "复制商品成功！",
+              message: "",
+            });
+            await this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.loading = false;
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
     /**
      * 启用/禁用
      * @param {String} id id
@@ -569,6 +663,16 @@ export default {
         this.$message.warning("至少选择一个商品！");
         return;
       }
+      let isok = true;
+      this.changeList.forEach((e) => {
+        if (e.status !== "1") {
+          isok = false;
+        }
+      });
+      if (!isok) {
+        this.$message.warning("只有审核通过的商品可以上线！");
+        return;
+      }
       this.showModel = true;
     },
   },

src/views/goodStore/goodsOnline/ShowDataTableColumns.js

@@ -28,7 +28,7 @@ export default [
     label: "上线原因",
   },
   {
-    prop: "spuCode",
+    prop: "skuCode",
     label: "商品编号",
     span: 6,
   },

src/views/goodStore/goodsOnline/columns.js

@@ -128,7 +128,7 @@ const listCol = [
     label: "操作",
     fixed: "right",
     _noset_: true,
-    width: "50px",
+    width: "80px",
     _slot_: "operation",
   },
 ]

src/views/goodStore/goodsOnline/components/costFormAddEdit.vue

@@ -22,7 +22,7 @@
             status-icon
             :size="'small'"
             :rules="rulesThis"
-            label-width="110px"
+            label-width="85px"
             class="demo-ruleForm"
           >
             <el-form-item label="起订量" prop="min_num">
@@ -34,11 +34,22 @@
                 :position="'right'"
                 :precision="0"
                 :controls="false"
+                :size="'small'"
                 :disabled="id === '007'"
                 :append="''"
                 @reschange="min_num_change"
               />
             </el-form-item>
+            <el-form-item label="系统售价" prop="new_sale_price">
+              <el-input
+                placeholder="系统售价"
+                v-loading="search_loading"
+                :disabled="true"
+                v-model="ruleForm.new_sale_price"
+              >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
             <el-form-item label="售价" prop="sale_price">
               <digital-input
                 :values="ruleForm.sale_price"
@@ -48,6 +59,7 @@
                 :position="'right'"
                 :precision="2"
                 :controls="false"
+                :size="'small'"
                 :disabled="id === '007'"
                 :append="'元'"
                 @reschange="sale_price_change"
@@ -62,6 +74,7 @@
                 :position="'right'"
                 :precision="2"
                 :controls="false"
+                :size="'small'"
                 :disabled="id === '007'"
                 :append="'元'"
                 @reschange="market_price_change"
@@ -75,31 +88,36 @@
                 maxlength="20"
               />
             </el-form-item>
-            <el-form-item label="阶梯使用状态" prop="status">
-              <el-radio-group v-model="ruleForm.status">
-                <el-radio :label="'1'">启用</el-radio>
-                <el-radio :label="'0'">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
+            <el-row :gutter="10">
+              <el-col :span="16">
+                <el-form-item label="状态" prop="status">
+                  <el-radio-group v-model="ruleForm.status">
+                    <el-radio :label="'1'">启用</el-radio>
+                    <el-radio :label="'0'">禁用</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" style="text-align: right">
+                <el-button :size="'small'" type="primary" @click="submitForm"
+                  >保 存
+                </el-button>
+                <el-button @click="showModelThis = false" :size="'small'">{{
+                  "取 消"
+                }}</el-button>
+              </el-col>
+            </el-row>
           </el-form>
         </el-col>
-        <el-col :span="24" style="text-align: right">
-          <el-button :size="'small'" type="primary" @click="submitForm"
-            >保 存
-          </el-button>
-          <el-button @click="showModelThis = false" :size="'small'">{{
-            "取 消"
-          }}</el-button>
-        </el-col>
       </el-row>
     </el-card>
   </el-dialog>
 </template>
 <script>
 import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/goodStore/goodsOnline";
 export default {
   name: "brand",
-  props: ["showModel", "index", "sitem"],
+  props: ["showModel", "index", "sitem", "spuCode"],
   mixins: [resToken],
   data() {
     const validate_min_num = (rule, value, callback) => {
@@ -129,8 +147,19 @@ export default {
       loading: false,
       title: "",
       showModelThis: this.showModel,
-      ruleForm: {},
+      ruleForm: {
+        id: "",
+        index: "-1",
+        min_num: "0",
+        sale_price: "0",
+        market_price: "0",
+        market_platform: "",
+        new_sale_price: "",
+        status: "1",
+        is_del: "0",
+      },
       rulesThis: this.rules,
+      search_loading: false,
       rules: {
         min_num: [
           {
@@ -179,8 +208,7 @@ export default {
   methods: {
     async initForm() {
       this.loading = true;
-      await this.resetFormData();
-      console.log(this.index);
+      await this.resetForm();
       this.rulesThis = this.rules;
       if (this.index + "" === "-1") {
         this.title = "添加销售成本阶梯";
@@ -188,7 +216,6 @@ export default {
         this.title = "修改销售成本阶梯";
       }
 
-      await this.resetForm();
       this.loading = false;
     },
     async resetForm() {
@@ -218,9 +245,11 @@ export default {
         sale_price: sale_price || "0",
         market_price: market_price || "0",
         market_platform: market_platform || "",
+        new_sale_price: "",
         status: status || "1",
         is_del: is_del || "0",
       };
+      await this.get_new(this.ruleForm.min_num);
     },
 
     async submitForm() {
@@ -236,9 +265,34 @@ export default {
         }
       });
     },
-    min_num_change(e) {
-      this.ruleForm.min_num = e;
+    async min_num_change(e) {
+      this.ruleForm.min_num = e + "";
       this.$refs.ruleForm.validateField("min_num");
+      await this.get_new(this.ruleForm.min_num);
+    },
+    async get_new(min_num) {
+      if (!this.search_loading) {
+        if (min_num === "" || min_num === "0") {
+          this.ruleForm.new_sale_price = "0";
+        } else {
+          this.search_loading = true;
+          let { code, data, message } = await asyncRequest.goodupprice({
+            min_num: min_num,
+            spuCode: this.spuCode,
+          });
+          this.search_loading = false;
+          if (code === 0) {
+            const { sale_price } = data;
+            this.ruleForm.new_sale_price = sale_price;
+          } else if (code >= 100 && code <= 104) {
+            await this.logout();
+          } else if (code == 1010) {
+            this.ruleForm.new_sale_price = "0";
+          } else {
+            this.$message.warning(message);
+          }
+        }
+      }
     },
     sale_price_change(e) {
       this.ruleForm.sale_price = e;

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

@@ -156,11 +156,13 @@
           <el-table-column prop="market_price" label="市场价" />
           <el-table-column prop="market_platform" label="对比平台" />
           <el-table-column prop="status" label="状态">
-            <el-tag
-              :size="'mini'"
-              :type="scope.row.status == '1' ? '' : 'warning'"
-              >{{ scope.row.status == "1" ? "启用" : "禁用" }}</el-tag
-            >
+            <template slot-scope="scope">
+              <el-tag
+                :size="'mini'"
+                :type="scope.row.status == '1' ? '' : 'warning'"
+                >{{ scope.row.status == "1" ? "启用" : "禁用" }}</el-tag
+              >
+            </template>
           </el-table-column>
           <el-table-column fixed="right">
             <template slot="header" slot-scope="scope">
@@ -180,12 +182,7 @@
                 ></i>
               </el-tooltip>
 
-              <el-tooltip
-                effect="dark"
-                content="删除"
-                placement="top"
-                v-if="scope.row.id === ''"
-              >
+              <el-tooltip effect="dark" content="删除" placement="top">
                 <i
                   class="el-icon-delete tb-icon"
                   @click="openCostEditDelete(scope.$index)"
@@ -199,6 +196,7 @@
           :index="costmodelIndex"
           :show-model="costshowModel"
           :sitem="costsitem"
+          :spuCode="spuCode"
           @refresh="costrefreshEdit"
           @cancel="costshowModel = false"
         />
@@ -230,6 +228,7 @@ export default {
     "labelWidth",
     "id",
     "spuCode",
+    "sitem",
   ],
   components: {
     costFormAddEdit,
@@ -297,7 +296,7 @@ export default {
           {
             required: true,
             message: "请上传凭证文件",
-            trigger: "change",
+            trigger: "blur,change",
           },
         ],
         rebut: [
@@ -339,8 +338,9 @@ export default {
     async initForm() {
       console.log(this.spuCode);
       this.loading = true;
-      this.rulesThis = this.rules;
       await this.resetForm();
+      this.rulesThis = this.rules;
+
       this.loading = false;
     },
 
@@ -392,13 +392,32 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
+          const { proof, ladderlist } = this.sitem;
 
           this.ruleForm = {
             skuCode: this.id,
-            proof_type: "1", // 通过or驳回
-            proof_url: "", //驳回至
-            good_ladder: [],
+            proof_type: proof && proof.proof_type ? proof.proof_type : "1", // 通过or驳回
+            proof_url: proof && proof.proof_url ? proof.proof_url : "", //驳回至
+            good_ladder:
+              ladderlist && ladderlist.length > 0
+                ? JSON.parse(JSON.stringify(ladderlist))
+                : [],
           };
+          console.log(this.ruleForm.proof_url);
+          switch (this.ruleForm.proof_type) {
+            case "1":
+              this.video_url = this.ruleForm.proof_url;
+              break;
+            case "2":
+              this.img_url = this.ruleForm.proof_url;
+              break;
+            case "3":
+              this.other_url = this.ruleForm.proof_url;
+              break;
+            default:
+              this.video_url = this.ruleForm.proof_url;
+          }
+          this.$refs.ruleForm.validateField("proof_url");
         }
       });
     },
@@ -425,10 +444,11 @@ export default {
               title: "信息提交成功",
               message: "",
             });
-            // this.showModelThis = false;
-            // 刷新
             this.$emit("resSuccess", true);
-            // this.routeReGoto("goodsOnline", {});
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
           }
         } else {
           console.log("error submit!!");

src/views/goodStore/goodsOnline/components/handle-online-form.vue

@@ -33,7 +33,15 @@ import costFormAddEdit from "./costFormAddEdit";
 import asyncRequest from "@/apis/service/goodStore/goodsOnline";
 export default {
   name: "exam-form",
-  props: ["size", "statusList", "disabled", "isMust", "labelWidth", "id"],
+  props: [
+    "size",
+    "statusList",
+    "disabled",
+    "isMust",
+    "labelWidth",
+    "id",
+    "code",
+  ],
   components: {
     costFormAddEdit,
   },
@@ -76,11 +84,11 @@ export default {
       },
     };
   },
-   newTime: function (val) {
-      if (val) {
-        this.initForm();
-      }
-    },
+  newTime: function (val) {
+    if (val) {
+      this.initForm();
+    }
+  },
   mounted() {
     this.initForm();
   },
@@ -100,7 +108,7 @@ export default {
           this.$refs.ruleForm.clearValidate();
 
           this.ruleForm = {
-            plat_code: "",
+            plat_code: this.code || "",
           };
         }
       });
@@ -118,45 +126,6 @@ export default {
         }
       });
     },
-    //图片上传成功
-    async UploadSuccessEventproof_url(data) {
-      const { url } = data;
-      if (url === "noToken") {
-        await this.logout();
-      } else {
-        this.ruleForm.proof_url = url;
-        this.$refs.ruleForm.validateField("proof_url");
-        this.$message.success("图片上传成功!");
-      }
-    },
-
-    //图片上传失败
-    UploadErrorEventproof_url(res) {
-      if (res !== "break") {
-        this.$message.error("图片上传失败!");
-        this.$refs.ruleForm.validateField("proof_url");
-      }
-    },
-
-    //判断图片规格
-    beforeAvatarUpload(file) {
-      let isJPG = false;
-      if (
-        file.type === "image/jpg" ||
-        file.type === "image/png" ||
-        file.type === "image/jpeg"
-      ) {
-        isJPG = true;
-      }
-      const isLt2M = file.size / 1024 / 1024 < 1;
-      if (!isJPG) {
-        this.$message.error("图片格式不正确！");
-      }
-      if (!isLt2M) {
-        this.$message.error("图片大小不能超过 1MB!");
-      }
-      return isJPG && isLt2M;
-    },
   },
 };
 </script>

src/views/goodStore/goodsOnline/components/online-exam-form.vue

@@ -72,7 +72,7 @@
 <script>
 export default {
   name: "exam-form",
-  props: ["size", "statusList", "disabled", "isMust", "labelWidth"],
+  props: ["size", "statusList", "disabled", "isMust", "labelWidth",'time'],
   /**
    * 属性集合
    * @param {String}        size             : 组件大小             非必填
@@ -188,7 +188,7 @@ export default {
           this.ruleForm = {
             state: "1", // 通过or驳回
             rebut: "", //驳回至
-            online_time: "",
+            online_time: this.time||"",
             remark: "",
           };
         }

src/views/goodStore/goodsOnline/detail.vue

@@ -170,9 +170,10 @@
               <online-exam-form
                 :newTime="newTime"
                 v-if="newTime !== ''"
-                :options8="options8"
+                :time="sitem.online_time"
                 :disabled="false"
                 :isMust="false"
+                :statusList="[]"
                 @searchChange="examForm"
               />
             </el-collapse-item>
@@ -190,6 +191,7 @@
                 :id="queryId"
                 :spuCode="spuCode"
                 v-if="newTime !== ''"
+                :sitem="sitem"
                 :disabled="false"
                 :isMust="false"
                 @resSuccess="initForm"
@@ -226,6 +228,7 @@
                 :newTime="newTime"
                 v-if="newTime !== ''"
                 :options="[]"
+                :code="sitem.plat_code"
                 :disabled="false"
                 :isMust="false"
                 @resSuccess="examForm3"
@@ -333,7 +336,7 @@ export default {
       if (!this.loading) {
         let model = {
           skuCode: this.queryId,
-          exam_status: e.state === "1" ? "3" : e.rebut,
+          exam_status: e.state === "1" ? "3" : '7',
           online_time: e.online_time,
           remark: e.remark,
         };

src/views/goodStore/goodsOnline/index.vue

@@ -24,7 +24,7 @@
       <template #table-header="{}">
         <div style="width: 100%">
           <el-row style="padding: 0 0 10px 80px">
-             <el-col :span="4" style="width: 120px;">
+            <el-col :span="4" style="width: 120px">
               <el-select
                 v-model="parmValue.good_type"
                 filterable
@@ -46,7 +46,7 @@
                 />
               </el-select>
             </el-col>
-            <el-col :span="6" style="width: 303px;padding:0 0 0 10px">
+            <el-col :span="6" style="width: 303px; padding: 0 0 0 10px">
               <period-date-picker
                 :type="1"
                 :width="'135px'"
@@ -56,7 +56,7 @@
                 @timeReturned="handleTime"
               />
             </el-col>
-           
+
             <el-col :span="6" style="width: 310px; padding: 0 0 0 10px">
               <good-class
                 :value="parmValue.cat_id"
@@ -111,7 +111,7 @@
                 />
               </el-select>
             </el-col>
-            <el-col :span="4" style="width: 240px;padding:0 0 0 10px">
+            <el-col :span="4" style="width: 240px; padding: 0 0 0 10px">
               <search-brand
                 :value="brandid"
                 :disabled="type === 'view' || type === 'editCoin'"
@@ -185,7 +185,13 @@
       <template #status="{ scope }">
         <el-tag
           :size="tablebtnSize"
-          :type="scope.row.status == '6' ? '' : scope.row.status == '7' ?'danger':'warning'"
+          :type="
+            scope.row.status == '6'
+              ? ''
+              : scope.row.status == '7'
+              ? 'danger'
+              : 'warning'
+          "
           v-text="
             (options8.find((item) => item.id == scope.row.status) || {}).name ||
             '--'
@@ -220,6 +226,20 @@
             "
           ></i>
         </el-tooltip>
+        <el-tooltip
+          v-if="
+            powers.some((item) => item == '078') &&
+            (scope.row.status === '7' || scope.row.status === '8')
+          "
+          effect="dark"
+          content="重新发起上线流程"
+          placement="top"
+        >
+          <i
+            class="el-icon-upload tb-icon"
+            @click="get_againonline(scope.row.skuCode)"
+          ></i>
+        </el-tooltip>
       </template>
     </ex-table>
     <no-auth v-else></no-auth>
@@ -364,6 +384,41 @@ export default {
         await this.searchList();
       }
     },
+    /**
+     * 商品重新上线
+     * @param {String} id id
+     * @param {String} status 0-禁用 1-启用
+     */
+    async get_againonline(skuCode) {
+      await this.$confirm(`确定要重新发起上线流程？`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          this.loading = true;
+          const model = {
+            skuCode: skuCode,
+          };
+          const res = await asyncRequest.againonline(model);
+          if (res && res.code === 0) {
+            this.loading = false;
+            this.$notify.success({
+              title: "重新发起上线流程成功！",
+              message: "",
+            });
+            await this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.loading = false;
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
     /**
      * 启用/禁用
      * @param {String} id id

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

@@ -26,7 +26,7 @@
             label-width="90px"
             class="demo-ruleForm"
           >
-            <el-form-item label="供应商" v-if="gys_name" prop="gyscode">
+            <el-form-item label="供应商"  prop="gyscode">
               <search-supplier
                 :disabled="true"
                 :value="ruleForm.gyscode"
@@ -239,7 +239,9 @@ export default {
         await this.resetForm();
         await this.initData();
       }
-      console.log(this.brand_name, this.gys_name, this.ruleForm);
+      console.log(this.brand_name);
+      console.log(this.gys_name);
+      console.log(this.ruleForm.gyscode);
       this.loading = false;
     },
     async resetForm() {
@@ -278,6 +280,7 @@ export default {
       }
     },
     resetFormData() {
+      console.log(this.sitem);
       const { code, name } = JSON.parse(JSON.stringify(this.sitem));
       if (this.type === "add") {
         this.gys_name = name || "";

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

@@ -37,7 +37,11 @@
       >
         <template #table-header="{}">
           <div style="margin: -10px 0 10px 0; width: 100%" class="tr">
-            <div v-if="modelSitem" class="fl" style="height:28px;line-height:28px">
+            <div
+              v-if="modelSitem"
+              class="fl"
+              style="height: 28px; line-height: 28px"
+            >
               <span>供应商：</span>{{ modelSitem.name }}
             </div>
             <el-button
@@ -58,6 +62,11 @@
               重置
             </el-button>
             <el-button
+              v-if="
+                powers &&
+                powers.length > 0 &&
+                powers.some((item) => item == '073')
+              "
               type="success"
               style="margin: 0 0 0 10px"
               :size="searchSize"
@@ -105,21 +114,43 @@
           ></el-tag>
         </template>
         <template #operation="{ scope }">
-          <el-tooltip effect="dark" content="查看" placement="top">
+          <el-tooltip
+            effect="dark"
+            content="查看"
+            v-if="
+              powers &&
+              powers.length > 0 &&
+              powers.some((item) => item == '074') &&
+              scope.row.status === '0'
+            "
+            placement="top"
+          >
             <i
               class="el-icon-view tb-icon"
               @click="openCostEdit(scope.row.id, 'view')"
             ></i>
           </el-tooltip>
-          <el-tooltip effect="dark" content="修改" placement="top">
+          <el-tooltip
+            effect="dark"
+            content="修改"
+            v-if="
+              powers &&
+              powers.length > 0 &&
+              powers.some((item) => item == '075') &&
+              scope.row.status === '0'
+            "
+            placement="top"
+          >
             <i
               class="el-icon-edit tb-icon"
               @click="openCostEdit(scope.row.id, 'edit')"
-            ></i>
-          </el-tooltip>
-          <el-tooltip
+            ></i> </el-tooltip
+          ><el-tooltip
             v-if="
-              powers.some((item) => item == '004') && scope.row.status === '1'
+              powers &&
+              powers.length > 0 &&
+              powers.some((item) => item == '076') &&
+              scope.row.status === '1'
             "
             effect="dark"
             content="禁用"
@@ -132,7 +163,10 @@
           </el-tooltip>
           <el-tooltip
             v-if="
-              powers.some((item) => item == '004') && scope.row.status === '0'
+              powers &&
+              powers.length > 0 &&
+              powers.some((item) => item == '076') &&
+              scope.row.status === '0'
             "
             effect="dark"
             content="启用"
@@ -141,9 +175,18 @@
             <i
               class="el-icon-video-play tb-icon"
               @click="changeStatus(scope.row.id, scope.row.status)"
-            ></i>
-          </el-tooltip>
-          <el-tooltip effect="dark" content="删除" placement="top">
+            ></i> </el-tooltip
+          ><el-tooltip
+            effect="dark"
+            content="删除"
+            placement="top"
+            v-if="
+              powers &&
+              powers.length > 0 &&
+              powers.some((item) => item == '077') &&
+              scope.row.status === '0'
+            "
+          >
             <i
               class="el-icon-delete tb-icon"
               @click="deleteItem(scope.row.id)"
@@ -169,8 +212,8 @@ import asyncRequest from "@/apis/service/serviceParam/supplier";
 import resToken from "@/mixins/resToken";
 import mixinPage from "@/mixins/elPaginationHandle";
 import addEdit from "../addEdit";
-import { mapGetters } from "vuex";
 import columns from "./columns";
+import { mapGetters } from "vuex";
 export default {
   name: "searchGoodModal",
   mixins: [resToken, mixinPage],
@@ -178,6 +221,7 @@ export default {
     addEdit,
   },
   computed: {
+    //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       let tran =
@@ -263,6 +307,7 @@ export default {
   methods: {
     async initd() {
       this.modelSitem = JSON.parse(JSON.stringify(this.sitem));
+      console.log(this.modelSitem);
       await this.restSearch();
     },
     async restSearch() {