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

# Conflicts:
#	src/views/system/cooperatorDetailed.vue

package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     
-    "serve": " vue-cli-service serve",
+    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
     "build": "vue-cli-service build"
   },
   "dependencies": {

src/views/system/cooperatorDetailed.vue

@@ -32,7 +32,7 @@
               </el-col>
               <el-col span="12"  >
                 <el-form-item label="合作方证件类型: " width="100px">
-                <span>{{corp_certificate_type_name}}</span>
+                <span>{{corpCertificateType}}</span>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -239,7 +239,7 @@ export default {
       input:'',
       cooperatorField : [],
       cooperatorFieldShow : [],
-      corp_certificate_type_name:'',
+
       cooperatorProduct : [],
       cooperatorProductShow : [],
 
@@ -257,10 +257,6 @@ export default {
   beforeMount() {},
   mounted() 
   {
-    if(this.corpCertificateType == "20"){
-      this.corp_certificate_type_name = "统一社会信用代码"}
-    else
-      this.corp_certificate_type_name =  "组织机构代码"
     if(this.templateId){
     getTemplateById(this.templateId).then(
       res=>