123

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js

@@ -330,6 +330,7 @@
                 query: {
                     channelUserId: this.$root.channelUserId,
                     deliveryOrderNo: row.deliveryOrderNo,
+                    channelOrderNo:row.channelServiceNo,
                 }
             });
             window.scrollTo(0, 0);

igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.html

@@ -240,7 +240,8 @@
 
       </el-form>
       <!-- page2 -->
-      <el-form v-show="step==2" ref="apply" :rules="applyrules" :model="apply" class="demo-ruleForm" label-width="120px">
+      <el-form v-show="step==2" ref="apply" :rules="applyrules" :model="apply" class="demo-ruleForm"
+        label-width="120px">
         <div class="selftmreg_main selfmreg-step2">
           <div class="selftmreg_shu"></div>
           <h4 style="color:#535353"><i class="selftmreg_shuxian"></i>填写申请人信息</h4>
@@ -778,5 +779,11 @@
       {{message.info}}
     </div>
   </transition>
-
+  <el-dialog title="提示" :visible.sync="showConfrim" width="30%" style="z-Index:9999;">
+    <span v-if="showConfrim">{{nclOne[0].code}}类{{nclOne[0].name}}，商品/服务项目<span style="color:red;">不足10项</span>，已选{{nclSelected}}项，还可选{{10-nclSelected}}个小项</span>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeConfrim()">取 消</el-button>
+      <el-button type="primary" @click="submitForm(\'form\',true)">确 定</el-button>
+    </span>
+  </el-dialog>
 </div>
\ No newline at end of file

igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js

@@ -292,6 +292,9 @@
           info: "",
           show: false,
         },
+        showConfrim: false,
+        agree: false,
+        nclSelected: null,
       }
     },
   computed: Vuex.mapState({
@@ -344,7 +347,6 @@
             this.$refs.tree.setChecked(newVal[1], false);
             this.$refs.tree.setChecked(newVal[1].nclThree[0], false);
             newVal.pop();
-
             this.message.show = !this.message.show;
             this.message.info = "只能选择同一个类别";
             var timer = setTimeout(() => {
@@ -357,7 +359,6 @@
             this.$refs.tree.setChecked(newVal[0].nclThree[10], false);
             newVal[0].nclThree.pop();
             console.log(newVal, newVal[0].nclThree, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
-
             this.message.show = !this.message.show;
             this.message.info = "最多只能选择10项";
             var timer2 = setTimeout(() => {
@@ -1106,22 +1107,35 @@
     selfclear(){
       this.nclOne = [];
     },
-    submitForm(formName) {
+    closeConfrim(){
+      this.agree = false;
+      this.showConfrim = false;
+    },
+    submitForm(formName, agree) {
       var that = this;
-      console.log(formName, ";;;;;;;;;;;;;");
-      if (formName == "form") {
+      if (agree) {
+        this.agree = agree;
+        this.showConfrim = false;
+        if (!this.form.name || !this.form.colorizedPicUrl) {
+          this.$message("请完善信息");
+          this.agree = false;
+          return;
+        }
+      }
+      console.log(formName, ";;;;;;;;;;;;;", this.agree);
+      if (this.agree == false) {
         if (this.nclOne.length > 0) {
           if (this.nclOne[0].nclThree.length < 10) {
-            this.message.show = !this.message.show;
-            this.message.info = "小类必须选择10项";
-            var timer3 = setTimeout(() => {
-              this.message.show = false;
-              clearTimeout(timer3);
-            }, 2000);
+            this.nclSelected = this.nclOne[0].nclThree.length;
+            this.showConfrim = true;
             return;
           }
         }
       };
+      if (!this.form.name || !this.form.colorizedPicUrl) {
+        this.$message.warning("请完善信息");
+        return false;
+      }
       if (formName == "form" || formName == "apply") {
         if (formName == "apply") {
           console.log(this.apply);
@@ -1132,10 +1146,11 @@
           }
         };
         this.$refs[formName].validate((valid) => {
+          console.log(valid);
           if (valid) {
-            if (formName == "form") {
 
-            }
+
+
             if (formName == "form" && that.nclOne.length < 1) {
               that.$message.warning(`请选择商标分类`);
               return false;
@@ -1152,15 +1167,7 @@
       if (formName == "order") {
         this.form.name = this.form.tmFormType == 5 ? this.form.name + '及图' : this.form.name;
         this.savehistory();
-        var obj = {
-          tm: this.form,
-          apply: this.apply,
-          nclones: this.nclOne,
-          itemCode: this.itemCode,
-          channelParams: this.channelParams,
-          channelOrder: this.channelOrder,
-          channelUser: this.channelUser,
-        };
+
         /* 
         if (!this.currentUser) {
           obj["step"] = this.step;
@@ -1176,31 +1183,49 @@
           return false;
         }
         */
-        var obj = this.$root.copyParams(obj, "subTmOrder", "/action/tmOrder/springBoard", "yes");
-        that.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
-          console.log('nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn0', d);
-          if (d.status == 0) {
-            var order = d.data;
-            that.toTop();
-            that.$message.warning("订单提交成功");
-            that.$router.push({ path: "/1688/jdindentlist" });
-            /*
-            that.$root.pushx({
-              title: "订单支付",
-              name: "/orderpay",
-              params: {
-                orderNum: order.code
-              }
-            });
-            */
-          } else {
-            that.$message.warning(d.msg);
-          }
 
-        }).catch(function (e) {
-          that.$message.warning("操作失败");
+        console.log(this.$route.query.channelServiceNo, ">>>>>>>>>>>>>>>>>>>>>>>");
+        var channelOrderNo = this.$root.copyParams({ channelOrderNo: this.$route.query.channelOrderNo }, "get1688ChannelOrderInfo", "/action/tmOrder/springBoard", "yes", "yes");
+        that.$root.postReq("/web/trademark/tmqueryCtl/doPost", channelOrderNo).then((d) => {
+          obj.channelOrderNo = d.channelOrderNo;
+          obj.channelUser = d.channelUser;
+        }).then(() => {
+          var obj = {
+            tm: that.form,
+            apply: that.apply,
+            nclones: that.nclOne,
+            itemCode: that.itemCode,
+            channelParams: that.channelParams,
+            channelOrder: that.channelOrder,
+            channelUser: that.channelUser,
+          };
+          var obj = this.$root.copyParams(obj, "subTmOrder", "/action/tmOrder/springBoard", "yes");
+          that.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
+            console.log('nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn0', d);
+            if (d.status == 0) {
+              var order = d.data;
+              that.toTop();
+              that.$message.warning("订单提交成功");
+              that.$router.push({ path: "/1688/jdindentlist" });
+              /*
+              that.$root.pushx({
+                title: "订单支付",
+                name: "/orderpay",
+                params: {
+                  orderNum: order.code
+                }
+              });
+              */
+            } else {
+              that.$message.warning(d.msg);
+            }
+
+          }).catch(function (e) {
+            that.$message.warning("操作失败");
+
+          });
+        })
 
-        });
       }