123

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

@@ -1377,7 +1377,7 @@
         submitEdit(v, agree){
             console.log(v);
             this.$nextTick(() => {
-                if(this.$refs[this.popupValue].validate){
+                if(v != "商标类别"){
                     this.$refs[this.popupValue].validate(valid => {
                         if (valid) {
                             console.log(valid);
@@ -1408,44 +1408,7 @@
                                         this.$message(e);
                                     });
                                     break;
-                                case '商标类别':
-                                    this.editNcl.deliveryOrderNo = this.deliveryOrderNo;
-                                    this.editNcl.tbCode = this.nclInfo[this.nclIndex].tbCode;
-                                    this.editNcl.nclOneCodes = this.nclOne[0].code;
-                                    this.editNcl.nclSmallCodes = this.nclOne[0].nclThree;
-                                    console.log(this.nclInfo, this.nclOne, this.editNcl, `xxxxxxxxxxxxxxxxxxxxxxxx`);
-                                    if (this.nclOne.length > 0) {
-                                        if (this.nclOne[0].nclThree.length < 10) {
-                                            this.nclSelected = this.nclOne[0].nclThree.length;
-                                            this.showConfrim = true;
-                                            if (agree) {
-                                                this.agree = agree;
-                                                this.showConfrim = false;
-                                                this.$root.loading = true;
-                                            } else {
-                                                return;
-                                            }
-                                        }
-                                    }
-                                    var obj = this.$root.copyParams(this.editNcl, "updateNclInfo", "/action/tmOrder/springBoard", "yes", "yes");
-                                    this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
-                                        if (res.status == 0) {
-                                            console.log(res);
-                                            this.dialogTableVisible = false;
-                                            this.$message({
-                                                type: 'success',
-                                                message: '修改成功!'
-                                            });
-                                            this.$root.loading = false;
-                                            this.$router.go(0);
-    
-                                        } else {
-                                            this.$message(res.msg);
-                                        }
-                                    }).catch((e) => {
-                                        this.$message(e);
-                                    });
-                                    break;
+                                
                                 case '交官文件':
                                     this.$root.loading = true;
                                     this.apply.deliveryOrderNo = this.deliveryOrderNo;
@@ -1524,7 +1487,42 @@
                         }
                     });
                 }else{
+                    this.editNcl.deliveryOrderNo = this.deliveryOrderNo;
+                    this.editNcl.tbCode = this.nclInfo[this.nclIndex].tbCode;
+                    this.editNcl.nclOneCodes = this.nclOne[0].code;
+                    this.editNcl.nclSmallCodes = this.nclOne[0].nclThree;
+                    console.log(this.nclInfo, this.nclOne, this.editNcl, `xxxxxxxxxxxxxxxxxxxxxxxx`);
+                    if (this.nclOne.length > 0) {
+                        if (this.nclOne[0].nclThree.length < 10) {
+                            this.nclSelected = this.nclOne[0].nclThree.length;
+                            this.showConfrim = true;
+                            if (agree) {
+                                this.agree = agree;
+                                this.showConfrim = false;
+                                this.$root.loading = true;
+                            } else {
+                                return;
+                            }
+                        }
+                    }
+                    var obj = this.$root.copyParams(this.editNcl, "updateNclInfo", "/action/tmOrder/springBoard", "yes", "yes");
+                    this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
+                        if (res.status == 0) {
+                            console.log(res);
+                            this.dialogTableVisible = false;
+                            this.$message({
+                                type: 'success',
+                                message: '修改成功!'
+                            });
+                            this.$root.loading = false;
+                            this.$router.go(0);
 
+                        } else {
+                            this.$message(res.msg);
+                        }
+                    }).catch((e) => {
+                        this.$message(e);
+                    });
                 }
                 
             });