Merge branch 'zth' into dev

src/components/ConfigForm/index.vue

@@ -84,6 +84,10 @@
           if (/^Select|RadioButtonGroup$/.test(item.component)) {
             res['options'] = item?.componentProps?.options
           }
+          // 判断是否为表单外权限控制
+          if (item.field?.includes('permissions-')) {
+            res['permissions'] = false
+          }
           return res
         })
         const Apidata = {

src/views/baseinfo/formset/component/form.vue

@@ -37,7 +37,7 @@
     <div class="opt-box">
       <h3>字段属性设置</h3>
       <!-- 表格操作列组件 -->
-      <a-form ref="form" :model="formItems.formData" :rules="rules">
+      <a-form ref="form" :model="formItems.formData" :rules="rules" v-if="!isPermissions">
         <a-form-item label="字段名称（中文）" name="label">
           <a-input
             v-model:value="formItems.formData.label"
@@ -99,6 +99,14 @@
           />
         </a-form-item>
       </a-form>
+      <a-form ref="form" :model="formItems.formData" :rules="rules" v-else>
+        <a-form-item label="是否不校验" name="permissions">
+          <a-radio-group v-model:value="formItems.formData.permissions" :disabled="formDisable">
+            <a-radio :value="true">是</a-radio>
+            <a-radio :value="false">否</a-radio>
+          </a-radio-group>
+        </a-form-item>
+      </a-form>
     </div>
   </div>
 </template>
@@ -157,6 +165,8 @@
   }
   // 选择字段触发编辑
   const chooseItem = (item) => {
+    console.log(item)
+
     if (formItems.formData.field) {
       form.value.validate().then(() => {
         formToggle(item)
@@ -165,9 +175,12 @@
       formToggle(item)
     }
   }
+  const isPermissions = ref(false)
   const formToggle = (item) => {
     form.value.clearValidate()
     activeClass.value = item.field
+    item.field.includes('permissions-')
+    isPermissions.value = item.field.includes('permissions-') ? true : false
     formItems.formData = item
     formDisable.value = false
   }

src/views/baseinfo/infoclient/TenantAuditStepModal.vue

@@ -392,6 +392,7 @@
   const DIYformSchema = ref([])
   const grade = ref('A')
   const CustomerOrSupplier = ref('')
+  const PContact = ref(false)
   // 获取表单设置数据
   const getFormSet = async () => {
     let res: any = await GetFormSetListByModule({ permissionId: permissionsInfo().permissionId })
@@ -401,6 +402,11 @@
         const content = JSON.parse(data[0].content).columns
         updateSchema(content)
         DIYformSchema.value = content
+        content.forEach((e) => {
+          if (e.field == 'permissions-contact') {
+            PContact.value = e.permissions
+          }
+        })
       }
     }
   }
@@ -1099,7 +1105,7 @@
   async function SubmitAudit() {
     if (rowId.value) {
       const res = await ApiList(formatParams({ ClientId: clientId.value }))
-      if (res.succeeded && res.data.length) {
+      if (PContact.value || (res.succeeded && res.data.length)) {
         const auditStatus = getFieldsValue().auditStatus
         if (auditStatus == -1 || auditStatus == 2) {
           let ApiData: any = { ids: [rowId.value] }

src/views/baseinfo/infoclient/columns.tsx

@@ -1338,6 +1338,13 @@ export const formSchema: FormSchema[] = [
       rows: 4,
     },
   },
+  {
+    field: 'permissions-contact',
+    label: '权限-联系人信息是否必有一条数据',
+    component: 'Switch',
+    show: false,
+    permissions: false,
+  },
 ]
 
 export const formSchema2: FormSchema[] = [