Browse Source

钉钉端去掉非空校验

jzh 1 year ago
parent
commit
b39b315aa3

+ 2 - 4
client_h5/src/pages/contract-invoice/index.vue

@@ -444,10 +444,8 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
-  form.value.validate().then(async () => {
-    NextActivity();
-  });
+const submitNextActivity = async (NextActivity: () => Promise<any>) => {
+  NextActivity();
 };
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)

+ 2 - 4
client_h5/src/pages/contract-out/index.vue

@@ -175,10 +175,8 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
-  form.value.validate().then(async () => {
-    NextActivity();
-  });
+const submitNextActivity = async (NextActivity: () => Promise<any>) => {
+  NextActivity();
 };
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)

+ 3 - 4
client_h5/src/pages/contract-sub/index.vue

@@ -144,6 +144,7 @@ import {DICT_TYPE, getDictLabel} from "@/utils/dict";
 
 const route = useRoute();
 const form = ref(null);
+
 interface FormDataType {
 }
 
@@ -165,10 +166,8 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
-  form.value.validate().then(async () => {
-    NextActivity();
-  });
+const submitNextActivity = async (NextActivity: () => Promise<any>) => {
+  NextActivity();
 };
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)

+ 2 - 4
client_h5/src/pages/contract/index.vue

@@ -358,10 +358,8 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
-  form.value.validate().then(async () => {
-    NextActivity();
-  });
+const submitNextActivity = async (NextActivity: () => Promise<any>) => {
+  NextActivity();
 };
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)

+ 7 - 7
client_h5/src/pages/interview/index.vue

@@ -301,14 +301,16 @@ import reqest from "@/utils/request";
 import FlowForm from '@/components/flowForm.vue';
 import Card from '@/components/card.vue';
 import {DICT_TYPE, getDictLabel} from "@/utils/dict";
+
 const route = useRoute();
+
 interface FormDataType {
 }
-const formData = ref<FormDataType>({
-})
+
+const formData = ref<FormDataType>({})
 const form = ref(null);
 
-const { activityInstanceId, participant,flowInstanceId,read } = route.query as {
+const {activityInstanceId, participant, flowInstanceId, read} = route.query as {
   activityInstanceId: string;
   participant: string;
   flowInstanceId: string;
@@ -319,10 +321,8 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
-  form.value.validate().then(async () => {
-    NextActivity();
-  });
+const submitNextActivity = async (NextActivity: () => Promise<any>) => {
+  NextActivity();
 };
 
 const jsonToFormData = (json: any): FormData | null => {

+ 2 - 4
client_h5/src/pages/outsourcing-apply/index.vue

@@ -213,10 +213,8 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
-  form.value.validate().then(async () => {
-    NextActivity();
-  });
+const submitNextActivity = async (NextActivity: () => Promise<any>) => {
+  NextActivity();
 };
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)

+ 6 - 7
client_h5/src/pages/project/index.vue

@@ -169,13 +169,14 @@ import {DICT_TYPE, getDictLabel} from "@/utils/dict";
 
 const route = useRoute();
 const form = ref(null);
+
 interface FormDataType {
 }
-const formData = ref<FormDataType>({
-})
+
+const formData = ref<FormDataType>({})
 
 
-const { activityInstanceId, participant,flowInstanceId,read } = route.query as {
+const {activityInstanceId, participant, flowInstanceId, read} = route.query as {
   activityInstanceId: string;
   participant: string;
   flowInstanceId: string;
@@ -186,10 +187,8 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
-  form.value.validate().then(async () => {
-    NextActivity();
-  });
+const submitNextActivity = async (NextActivity: () => Promise<any>) => {
+  NextActivity();
 };
 
 const jsonToFormData = (json: any): FormData | null => {

+ 12 - 14
client_h5/src/pages/recruit/index.vue

@@ -1,7 +1,7 @@
 <template>
   <flow-form :data="formData" @submit="submitNextActivity">
     <card title="基础信息" style="height: auto">
-      <van-form required="true" ref="form" >
+      <van-form required="true" ref="form">
         <van-cell-group inset>
           <van-field
               v-model="formData.userNickname"
@@ -36,10 +36,10 @@
               <van-cell title="替补人员" :value="item.changer"/>
               <van-cell title="备注" :value="item.bz"/>
             </card-cell>
-<!--            <template #right>-->
-<!--              <van-button square type="primary" text="编辑" @click="detailView(index,item)"/>-->
-<!--              <van-button square type="danger" text="删除" @click="detailDelte(index)"/>-->
-<!--            </template>-->
+            <!--            <template #right>-->
+            <!--              <van-button square type="primary" text="编辑" @click="detailView(index,item)"/>-->
+            <!--              <van-button square type="danger" text="删除" @click="detailDelte(index)"/>-->
+            <!--            </template>-->
           </van-swipe-cell>
         </div>
       </template>
@@ -58,15 +58,15 @@ import {DICT_TYPE, getDictLabel} from "@/utils/dict";
 
 const route = useRoute();
 const form = ref(null);
+
 interface FormDataType {
 }
-const formData = ref<FormDataType>({
-})
-const detailData = ref({
-})
+
+const formData = ref<FormDataType>({})
+const detailData = ref({})
 
 
-const { activityInstanceId, participant,flowInstanceId,read } = route.query as {
+const {activityInstanceId, participant, flowInstanceId, read} = route.query as {
   activityInstanceId: string;
   participant: string;
   flowInstanceId: string;
@@ -77,10 +77,8 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
-  form.value.validate().then(async () => {
-    NextActivity();
-  });
+const submitNextActivity = async (NextActivity: () => Promise<any>) => {
+  NextActivity();
 };
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)

+ 7 - 7
client_h5/src/pages/regular/index.vue

@@ -158,16 +158,17 @@ import reqest from "@/utils/request";
 import FlowForm from '@/components/flowForm.vue';
 import Card from '@/components/card.vue';
 import {DICT_TYPE, getDictLabel} from "@/utils/dict";
+
 const route = useRoute();
 const form = ref(null);
+
 interface FormDataType {
 }
 
-const formData = ref<FormDataType>({
-})
+const formData = ref<FormDataType>({})
 
 
-const { activityInstanceId, participant,flowInstanceId,read } = route.query as {
+const {activityInstanceId, participant, flowInstanceId, read} = route.query as {
   activityInstanceId: string;
   participant: string;
   flowInstanceId: string;
@@ -178,10 +179,8 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
-  form.value.validate().then(async () => {
-    NextActivity();
-  });
+const submitNextActivity = async (NextActivity: () => Promise<any>) => {
+  NextActivity();
 };
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)
@@ -276,6 +275,7 @@ onMounted(() => {
 
 <style lang="scss" scoped>
 @import "./index.scss";
+
 ::v-deep .van-field__label {
   width: 30%;
 }

+ 5 - 7
client_h5/src/pages/resign/index.vue

@@ -95,14 +95,14 @@ import {Checkbox, CheckboxGroup} from 'vant';
 
 const route = useRoute();
 const form = ref(null);
+
 interface FormDataType {
 }
 
-const formData = ref<FormDataType>({
-})
+const formData = ref<FormDataType>({})
 
 
-const { activityInstanceId, participant,flowInstanceId,read } = route.query as {
+const {activityInstanceId, participant, flowInstanceId, read} = route.query as {
   activityInstanceId: string;
   participant: string;
   flowInstanceId: string;
@@ -113,10 +113,8 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
-  form.value.validate().then(async () => {
-    NextActivity();
-  });
+const submitNextActivity = async (NextActivity: () => Promise<any>) => {
+  NextActivity();
 };
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)

+ 7 - 7
client_h5/src/pages/staff/index.vue

@@ -207,15 +207,17 @@ import Card from '@/components/card.vue';
 import CardCell from '@/components/cardCell.vue';
 import {Checkbox, CheckboxGroup} from 'vant';
 import {DICT_TYPE, getDictLabel} from "@/utils/dict";
+
 const form = ref(null);
 const route = useRoute();
+
 interface FormDataType {
 }
-const formData = ref<FormDataType>({
-})
+
+const formData = ref<FormDataType>({})
 
 
-const { activityInstanceId, participant,flowInstanceId,read } = route.query as {
+const {activityInstanceId, participant, flowInstanceId, read} = route.query as {
   activityInstanceId: string;
   participant: string;
   flowInstanceId: string;
@@ -226,10 +228,8 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
-  form.value.validate().then(async () => {
-    NextActivity();
-  });
+const submitNextActivity = async (NextActivity: () => Promise<any>) => {
+  NextActivity();
 };
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)

+ 6 - 7
client_h5/src/pages/transfer/index.vue

@@ -80,13 +80,13 @@ import {DICT_TYPE, getDictLabel} from "@/utils/dict";
 
 const route = useRoute();
 const form = ref(null);
+
 interface FormDataType {
 }
 
-const formData = ref<FormDataType>({
-})
+const formData = ref<FormDataType>({})
 
-const { activityInstanceId, participant,flowInstanceId,read } = route.query as {
+const {activityInstanceId, participant, flowInstanceId, read} = route.query as {
   activityInstanceId: string;
   participant: string;
   flowInstanceId: string;
@@ -97,10 +97,8 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
-  form.value.validate().then(async () => {
-    NextActivity();
-  });
+const submitNextActivity = async (NextActivity: () => Promise<any>) => {
+  NextActivity();
 };
 
 const jsonToFormData = (json: any): FormData | null => {
@@ -147,6 +145,7 @@ onMounted(() => {
 
 <style lang="scss" scoped>
 @import "./index.scss";
+
 ::v-deep .van-field__label {
   width: auto;
 }