Merge branch '机构介绍新增' of sckj/mz-cloud into master

ruoyi-ui/src/views/organization/jggl/jcxx/index.vue

@@ -1635,18 +1635,21 @@ export default {
             }
 	          console.log(pamar, 'pamar')
 
-            if(this.form2.zt!="0"){
-              delJgjs(this.form2.jgid).then(response =>{
-                this.form2.jgid=this.form.id;
-                addJgjs(this.form2);
-                this.form2.zt="1";
-              });
-              // updateJgjs(this.form2);
-            }else{
-              this.form2.jgid=this.form.id;
-              addJgjs(this.form2);
-              this.form2.zt="1";
-            }
+            this.form2.jgid=this.form.id;
+            addJgjs(this.form2);
+
+            // if(this.form2.zt!="0"){
+            //   delJgjs(this.form2.jgid).then(response =>{
+            //     this.form2.jgid=this.form.id;
+            //     addJgjs(this.form2);
+            //     this.form2.zt="1";
+            //   });
+            //   // updateJgjs(this.form2);
+            // }else{
+            //   this.form2.jgid=this.form.id;
+            //   addJgjs(this.form2);
+            //   this.form2.zt="1";
+            // }
 
             if (this.form.id != null) {
               let formData = this.comparisonObject({ ...this.form, ...pamar }, this.copyForm)

ruoyi-ui/src/views/organization/jggl/sqJcxx/index.vue

@@ -1909,18 +1909,21 @@ export default {
               szxzqh: szxzqh
             }
 
-            if(this.form2.zt!="0"){
-              delJgjs(this.form2.jgid).then(response =>{
-                this.form2.jgid=this.form.id;
-                addJgjs(this.form2);
-                this.form2.zt="1";
-              });
-              // updateJgjs(this.form2);
-            }else{
-              this.form2.jgid=this.form.id;
-              addJgjs(this.form2);
-              this.form2.zt="1";
-            }
+            this.form2.jgid=this.form.id;
+            addJgjs(this.form2);
+
+            // if(this.form2.zt!="0"){
+            //   delJgjs(this.form2.jgid).then(response =>{
+            //     this.form2.jgid=this.form.id;
+            //     addJgjs(this.form2);
+            //     this.form2.zt="1";
+            //   });
+            //   // updateJgjs(this.form2);
+            // }else{
+            //   this.form2.jgid=this.form.id;
+            //   addJgjs(this.form2);
+            //   this.form2.zt="1";
+            // }
 
             if (this.form.id != null) {
               let formData = this.comparisonObject({ ...this.form, ...pamar }, this.copyForm)