重点安全利用率权限问题处理

src/views/zcgl/monitor/components/cfzgForm.vue

@@ -71,8 +71,9 @@
     async (val: any) => {
       if (val) {
         //重置表单
-        await resetFields();
         await nextTick();
+        await resetFields();
+
         await setFieldsValue({
           ...val,
         });

src/views/zcgl/monitor/components/gkxfFrom.vue

@@ -111,8 +111,9 @@
     async (val: any) => {
       if (val) {
         //重置表单
-        await resetFields();
         await nextTick();
+        await resetFields();
+
         await setFieldsValue({
           ...val,
         });

src/views/zcgl/monitor/components/jcForm.vue

@@ -75,8 +75,9 @@
     async (val: any) => {
       if (val) {
         //重置表单
-        await resetFields();
         await nextTick();
+        await resetFields();
+
         await setFieldsValue({
           ...val,
         });

src/views/zcgl/monitor/components/kfForm.vue

@@ -67,41 +67,34 @@
         };
       },
     },
+    // 用updateSchema更新不了
     {
       label: '区县',
       field: 'countryCode',
       ifShow: () => {
-        return userStore?.userInfo?.userIdentity == '2' || userStore?.userInfo?.userIdentity == '1' ? true : false;
+        return userStore?.userInfo?.userIdentity == '1' ? true : false;
       },
       component: 'ApiSelect',
-      componentProps: ({ formModel, formActionType }) => {
-        console.log(formModel, 'formModel');
-        if (userStore?.userInfo?.userIdentity == '2') {
-          const { updateSchema } = formActionType;
-          updateSchema({
-            label: '区县',
-            field: 'countryCode',
-            ifShow: true,
-            componentProps: {
-              api: getTown,
-              params: userStore?.userInfo?.codeRegion,
-              labelField: 'name',
-              valueField: 'id',
-            },
-          });
-        }
-        return {
-          labelField: 'name',
-          valueField: 'id',
-        };
+      componentProps: {
+        labelField: 'name',
+        valueField: 'id',
+      },
+    },
+    {
+      label: '区县',
+      field: 'countryCode',
+      ifShow: () => {
+        return userStore?.userInfo?.userIdentity == '2' ? true : false;
+      },
+      component: 'ApiSelect',
+      componentProps: {
+        api: getTown,
+        params: userStore?.userInfo?.codeRegion,
+        labelField: 'name',
+        valueField: 'id',
       },
     },
 
-    // {
-    //   label: '年度',
-    //   field: 'nd',
-    //   component: 'InputNumber',
-    // },
     {
       label: '项目名称',
       field: 'xmmc',
@@ -179,8 +172,9 @@
     async (val: any) => {
       if (val) {
         //重置表单
-        await resetFields();
         await nextTick();
+        await resetFields();
+
         await setFieldsValue({
           ...val,
         });

src/views/zcgl/monitor/modules/SaveModal.vue

@@ -24,6 +24,7 @@
   import cfzgForm from '../components/cfzgForm.vue';
   import { formSchema } from '../data';
   import { saveAdd, saveEdit } from '../api';
+  import { useUserStore } from '/@/store/modules/user';
   // Emits声明
   const emit = defineEmits(['register', 'success']);
   const activeKey = ref(['1', '2', '3', '4']);
@@ -33,6 +34,7 @@
   const jcForms = ref<any>(null);
   const gkxfForms = ref<any>(null);
   const cfzgForms = ref<any>(null);
+  const userStore: any = useUserStore();
   //表单配置
   const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
     labelWidth: 220,
@@ -77,6 +79,14 @@
       let values = await validate();
       const params = { ...kfForm, ...jcForm, ...gkxfForm, ...cfzgForm, ...values };
 
+      if (userStore?.userInfo?.userIdentity != 1) {
+        // 获取市的值
+        params.cityCode = userStore?.userInfo?.codeRegion.substring(0, userStore?.userInfo?.codeRegion.length - 2) + '00';
+      }
+      // 土地使用权人4 如果有权限 再加个4
+      if (userStore?.userInfo?.userIdentity == '3' && !params.id) {
+        if (!params.countryCode) params.countryCode = userStore?.userInfo?.codeRegion;
+      }
       setModalProps({ confirmLoading: true });
       console.log(params, 'params');