Merge branch 'master' of http://121.41.40.202:3000/web/saber into master

src/views/certificate/lists/addList.vue

@@ -42,7 +42,7 @@
         label="证书所有者"
         prop="certificateUserName"
         style="width:45%;"
-        v-if="form.company!=3"
+      
       >
         <el-input
           v-model="form.certificateUserName"
@@ -308,7 +308,7 @@ export default {
         certificateUserName: [{ required: true, message: '请输入证书所有者', trigger: 'blur' }],
         certificateId: [{ required: true, message: '请输入所持证书者身份ID', trigger: 'blur' }],
         enterpriseUnifiedCode: [{ required: true, message: '请输入企业统一社会信用代码', trigger: 'blur' }],
-        // certificateNumber: [{ required: true, message: '请输入证书编号', trigger: 'blur' }],
+        //  certificateNumber: [{ required: true, message: '请输入证书编号', trigger: 'blur' }],
         certificatePassword: [{ required: true, message: '请输入证书密码', trigger: 'blur' }],
         certificateUserId: [{ required: true, message: '请选择关联用户', trigger: 'change' }],
         certificateFileUrl: [{ required: true, message: '请选择证书文件', trigger: 'change' }],
@@ -325,6 +325,22 @@ export default {
     }
   },
   methods: {
+      // 自定义验证函数，根据条件动态设置验证规则
+    validateDependentField(rule, value, callback) {
+      const conditionalFieldValue = this.form.company;
+      // 根据条件字段的值来决定是否必填
+      if (conditionalFieldValue !==3) {
+        // 设置为必填项
+        if (!value) {
+          callback(new Error('certificateNumber 是必填项'));
+        } else {
+          callback();
+        }
+      } else {
+        // 不需要验证
+        callback();
+      }
+    },
     //获取签字公司
     getOptions() {
       getDictbiz({
@@ -625,7 +641,9 @@ export default {
     this.findPfxType();//查询企业签章类型
   },
   mounted () {
-
+     // 在 mounted 钩子中动态添加 dependentField 的验证规则
+     this.rules.certificateNumber.push({ validator: this.validateDependentField, trigger: 'blur' });
+    console.log( this.rules,' this.formRules');
   }
 }
 </script>

src/views/tentative/metadata.vue

@@ -495,7 +495,7 @@ export default {
 
     //新增一条数据
     toadd(){
-      this.$refs.crud.rowCellAdd()
+      this.$refs.crud.rowAdd()
       //console.log(this.$refs.crud.rowCellAdd())
     },