build

src/components/globalComponents/process-time-line/main.vue

@@ -21,8 +21,12 @@
         >
           {{ item.status_name }}
         </div>
-        <!-- v-if="index + 1 !== options.length" -->
-        <div slot="description" style="padding: 20px 0 0 0">
+
+        <div
+          slot="description"
+          style="padding: 20px 0 0 0"
+          v-if="index + 1 !== options.length"
+        >
           <p class="name">
             &nbsp;操&nbsp;作&nbsp;人&nbsp;：
             {{ item.action_name ? item.action_name : "未知" }}

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

@@ -927,81 +927,74 @@ export default {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           if (!this.loading) {
-            this.loading = true;
             let model = JSON.parse(JSON.stringify(this.ruleForm));
-
-            if (this.addrForm.good_ladder.length === 0) {
-              this.$message.warning("至少添加一条销售价信息！");
-              this.loading = false;
-              return;
-            }
-            let list = JSON.parse(JSON.stringify(this.addrForm.good_ladder));
-            let isedit = false;
-            list.forEach((v) => {
-              if (v.edit) {
-                isedit = true;
+            const { state } = model;
+            if (state + "" === "1") {
+              this.loading = true;
+              if (this.addrForm.good_ladder.length === 0) {
+                this.$message.warning("至少添加一条销售价信息！");
+                this.loading = false;
+                return;
+              }
+              let list = JSON.parse(JSON.stringify(this.addrForm.good_ladder));
+              let isedit = false;
+              list.forEach((v) => {
+                if (v.edit) {
+                  isedit = true;
+                }
+              });
+              if (isedit) {
+                this.$message.warning("请保存阶梯售价！");
+                this.loading = false;
+                return;
               }
-            });
-            if (isedit) {
-              this.$message.warning("请保存阶梯售价！");
-              this.loading = false;
-              return;
-            }
 
-            let all_is_ok = true;
-            for (let i = 0; i < this.addrForm.good_ladder; i++) {
-              this.addrForm.good_ladder[i].search_loading = true;
-              let { isok, price, new_cost_fee } = await this.get_new(i);
-              if (isok === 0) {
-                this.addrForm.good_ladder[i].new_sale_price = price;
-                this.addrForm.good_ladder[i].new_cost_fee = new_cost_fee;
-                this.addrForm.good_ladder[i].this.addrForm.good_ladder[i].edit = false;
-              } else if (isok >= 100 && isok <= 104) {
-                await this.logout();
-              } else {
-                all_is_ok = false;
-                this.addrForm.good_ladder[i].new_sale_price = price;
-                this.addrForm.good_ladder[i].new_cost_fee = new_cost_fee;
-                this.addrForm.good_ladder[i].edit = true;
-                this.addrForm.good_ladder[i].newTime = new Date().valueOf() + "";
+              let all_is_ok = true;
+              for (let i = 0; i < this.addrForm.good_ladder; i++) {
+                this.addrForm.good_ladder[i].search_loading = true;
+                let { isok, price, new_cost_fee } = await this.get_new(i);
+                if (isok === 0) {
+                  this.addrForm.good_ladder[i].new_sale_price = price;
+                  this.addrForm.good_ladder[i].new_cost_fee = new_cost_fee;
+                  this.addrForm.good_ladder[i].this.addrForm.good_ladder[i].edit = false;
+                } else if (isok >= 100 && isok <= 104) {
+                  await this.logout();
+                } else {
+                  all_is_ok = false;
+                  this.addrForm.good_ladder[i].new_sale_price = price;
+                  this.addrForm.good_ladder[i].new_cost_fee = new_cost_fee;
+                  this.addrForm.good_ladder[i].edit = true;
+                  this.addrForm.good_ladder[i].newTime = new Date().valueOf() + "";
+                }
               }
-            }
-            if (!all_is_ok) {
-              this.$message.warning("阶梯售价未满足成本最低起订量！");
-              this.loading = false;
-            }
-            let list2 = [];
-            list.forEach((e) => {
-              let n = JSON.parse(JSON.stringify(e));
-              for (let key in n) {
-                n[key] += "";
+              if (!all_is_ok) {
+                this.$message.warning("阶梯售价未满足成本最低起订量！");
+                this.loading = false;
               }
-              delete n["index"];
-              list2.push(n);
-            });
-            this.good_ladder.forEach((si, sii) => {
-              const index = list2.findIndex((ai, aii) => si.id === ai.id);
-              if (index === -1) {
-                si.is_del = "1";
-                list2.push(si);
-              }
-            });
-            model.good_ladder = list2;
-            model.skuCode = this.id;
-            model.exam_remark = model.remark;
-            delete model["remark"];
-            let res = await asyncRequest.ladderOne(model);
-            this.loading = false;
-            if (res && res.code === 0) {
-              this.$notify.success({
-                title: "信息提交成功",
-                message: "",
+              let list2 = [];
+              list.forEach((e) => {
+                let n = JSON.parse(JSON.stringify(e));
+                for (let key in n) {
+                  n[key] += "";
+                }
+                delete n["index"];
+                list2.push(n);
               });
-              this.$emit("resSuccess", true);
-            } else if (res && res.code >= 100 && res.code <= 104) {
-              await this.logout();
+              this.good_ladder.forEach((si, sii) => {
+                const index = list2.findIndex((ai, aii) => si.id === ai.id);
+                if (index === -1) {
+                  si.is_del = "1";
+                  list2.push(si);
+                }
+              });
+              model.good_ladder = list2;
+              await this.successHttp(model);
+              model.skuCode = this.id;
+              model.exam_remark = model.remark;
+              delete model["remark"];
             } else {
-              this.$message.warning(res.message);
+              model.numStatus = "7";
+              this.$emit("rejectRes", model);
             }
           }
         } else {
@@ -1010,6 +1003,22 @@ export default {
         }
       });
     },
+    async successHttp(model) {
+      const { code, message } = await asyncRequest.ladderOne(model);
+      this.loading = false;
+      if (code === 0) {
+        this.$notify.success({
+          title: "信息提交成功",
+          message: "",
+        });
+        this.$emit("resSuccess", true);
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+      }
+    },
+
     resvoucher(e) {
       const { proof_type, proof_url } = e;
       this.ruleForm.proof_type = proof_type || "1";

src/views/goodStore/goodsOnline/detail.vue

@@ -259,6 +259,7 @@
                 :isMust="false"
                 @resSuccess="initForm"
                 @searchChange="examForm1"
+                @rejectRes="examForm2"
               />
             </el-collapse-item>
             <el-collapse-item
@@ -475,6 +476,8 @@ export default {
           //点击保存
           // return;
           await this.setstatus("提交财务审核结果", model);
+        } else if (e.numStatus == "7") {
+          await this.setstatus("提交审核驳回吗", model);
         } else {
           //驳回下线
           await this.setstatus("驳回下线吗", model);