瀏覽代碼

H5表单转件修改

chenjun 1 年之前
父節點
當前提交
585cfd67d8

+ 7 - 6
client/src/views/OaSystem/officeCenter/main/index.vue

@@ -9,24 +9,25 @@ defineOptions({
   name: 'OfficeCenter'
 })
 
-const iframeUrl: string = 'http://10.10.10.7:18080/workflow/HandlerCaseCenter/index'
+const iframeUrl: string = 'http://localhost:6090/HandlerCaseCenter/index'
 // const iframeUrl: string =
 // 'http://localhost:6010/WorkFlow/index?flowInstanceId=018bbd46bf18087013178bbd3ebd000e&activityInstanceId=018bbd46bf34087013178bbd3ebd0012&_fm=018bb7307083087087e58bb722830009&participant=018bbd46bf4f087013178bbd3ebd0014&first=1&status=1&child=0&sourcewindowid=handlerCaseCenter&userId=dc794fe0-66fe-4b1d-9273-f747950b27c3'
 </script>
 
 <style lang="scss" scoped>
 .officeCenterBox {
-  margin-top: 20px;
+  position: relative;
   height: calc(100% - 20px);
+  margin-top: 20px;
+  overflow: hidden;
+  text-align: center;
   background-color: #fff;
   border-radius: 20px;
-  position: relative;
-  text-align: center;
-  overflow: hidden;
+
   > iframe {
     width: 100%;
     height: 100%;
-    border: 0px;
+    border: 0;
   }
 }
 </style>

+ 2 - 11
client_h5/src/pages/attendanceNote/index.vue

@@ -178,7 +178,7 @@ const activityData: FlowDTO = {
   flowOpinion: "",
 };
 
-const submitNextActivity = async (activeOpinion: any) => {
+const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
   form.value.validate().then(async () => {
     formData.value.attendanceNoteTimeCreateList.forEach((x: any) => {
       x.startTime = Date.parse(x.startTime);
@@ -187,16 +187,7 @@ const submitNextActivity = async (activeOpinion: any) => {
     //更新表单业务数据
     const result = await reqest.post("/business/Leave/update", formData.value);
     if (result.code === 200 || result.code === 0) {
-      //工作流转件
-      activityData.activityInstanceId = activityInstanceId;
-      activityData.participantId = participant;
-      activityData.flowOpinion = JSON.stringify(activeOpinion);
-      const result = await getNextActivity(jsonToFormData(activityData));
-      // getNextActivity(activityData).then(result => {
-      //   console.log(result)
-      // }).catch((err) => {
-      //   console.error(err)
-      // })
+      NextActivity();
     }
   });
 };

+ 2 - 11
client_h5/src/pages/commonCost/index.vue

@@ -202,18 +202,9 @@ const activityData: FlowDTO = {
   flowOpinion: "",
 };
 
-const submitNextActivity = async (activeOpinion: any) => {
+const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
   form.value.validate().then(async () => {
-    //工作流转件
-    activityData.activityInstanceId = activityInstanceId;
-    activityData.participantId = participant;
-    activityData.flowOpinion = JSON.stringify(activeOpinion);
-    const result = await getNextActivity(jsonToFormData(activityData));
-    // getNextActivity(activityData).then(result => {
-    //   console.log(result)
-    // }).catch((err) => {
-    //   console.error(err)
-    // })
+    NextActivity();
   });
 };
 const jsonToFormData = (json: any): FormData | null => {

+ 2 - 10
client_h5/src/pages/travel/index.vue

@@ -208,7 +208,7 @@ const activityData: FlowDTO = {
   flowOpinion: "",
 };
 
-const submitNextActivity = async (activeOpinion: any) => {
+const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
   form.value.validate().then(async () => {
     formData.value.travelTimeCreateList.forEach((x: any) => {
       x.startTime = Date.parse(x.startTime);
@@ -218,15 +218,7 @@ const submitNextActivity = async (activeOpinion: any) => {
     const result = await reqest.post("/business/BusinessTravel/update", formData.value);
     if (result.code === 200 || result.code === 0) {
       //工作流转件
-      activityData.activityInstanceId = activityInstanceId;
-      activityData.participantId = participant;
-      activityData.flowOpinion = JSON.stringify(activeOpinion);
-      const result = await getNextActivity(jsonToFormData(activityData));
-      // getNextActivity(activityData).then(result => {
-      //   console.log(result)
-      // }).catch((err) => {
-      //   console.error(err)
-      // })
+      NextActivity();
     }
   });
 };

+ 2 - 10
client_h5/src/pages/travelCost/index.vue

@@ -302,18 +302,10 @@ const activityData: FlowDTO = {
   flowOpinion: "",
 };
 
-const submitNextActivity = async (activeOpinion: any) => {
+const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
   form.value.validate().then(async () => {
     //工作流转件
-    activityData.activityInstanceId = activityInstanceId;
-    activityData.participantId = participant;
-    activityData.flowOpinion = JSON.stringify(activeOpinion);
-    const result = await getNextActivity(jsonToFormData(activityData));
-    // getNextActivity(activityData).then(result => {
-    //   console.log(result)
-    // }).catch((err) => {
-    //   console.error(err)
-    // })
+    NextActivity();
   });
 };
 const jsonToFormData = (json: any): FormData | null => {