Merge remote-tracking branch 'origin/develop' into develop

src/api/index.js

@@ -202,7 +202,6 @@ export function modelDefineList(){
     return request.get('/model_define/modelDefineList');
 }
 
-
 export function cooperatorProductApply(cooperator_num, cooperator_name,  product_num, product_name, model_id,fieldSelected) {
     return request.post('/cooperator_product/apply', {
         cooperator_num : cooperator_num,

src/views/system/cooperatorAdd.vue

@@ -240,11 +240,10 @@ export default {
             })
         },
         submit() {
-            if (this.corp_certificate_type_name == "统一社会信用代码")
+            if (this.corp_certificate_type_name == 1)
                 this.corp_certificate_type = "20"
-            else
+            else if(this.corp_certificate_type_name==2)
                 this.corp_certificate_type = "30"
-            console.log(this.fieldTemplateId)
 
             if (this.cooperator_name == "") {
                 this.$alert("请输入合作方名称");
@@ -254,6 +253,7 @@ export default {
                 this.$alert("请输入证件号码");
                 return;
             }
+            console.log(this.corpCertificateNum)
             if (this.corp_certificate_type == "") {
                 this.$alert("请选择证件类型");
                 return;

src/views/system/cooperatorProductApply.vue

@@ -158,7 +158,7 @@ import {
     findCooperatorProductFieldByNum,
     cooperatorProductApply,
     findCooperatorFieldsByName,
-    cooperatorList
+    cooperatorList,
 } from '@/api/index.js'
 import store from "@/store";
 import request from '@/utils/request.js'
@@ -410,7 +410,14 @@ export default {
             this.selected6 = true;
         },
         paneNext1() {
-            this.activeName2 = "second"
+            request.post('/cooperator_product/checkDupProdNum', {
+                product_num: this.cooperator_product_no
+            }).then(
+                res => {
+                    this.activeName2 = "second"
+                },
+            )
+
         },
         paneNext2() {
             this.activeName2 = "third"