Merge remote-tracking branch 'origin/master'

client/src/views/OaSystem/financialManagement/ptbxDeptPage/index.vue

@@ -89,11 +89,6 @@
           label="申请时间"
         />
         <el-table-column align="center" prop="totalAmount" label="报销总金额" />
-        <el-table-column label="是否代办" align="center" prop="isAgent">
-          <template #default="scope">
-            <dict-tag :type="DICT_TYPE.COMMON_STATE" :value="scope.row.isAgent" />
-          </template>
-        </el-table-column>
         <el-table-column align="center" prop="status" label="状态" />
         <el-table-column align="center" label="操作" width="80" fixed="right">
           <template #default="scope">

client/src/views/OaSystem/financialManagement/ptbxPage/index.vue

@@ -113,11 +113,6 @@
           label="申请时间"
         />
         <el-table-column align="center" prop="totalAmount" label="报销总金额" />
-        <el-table-column label="是否代办" align="center" prop="isAgent">
-          <template #default="scope">
-            <dict-tag :type="DICT_TYPE.COMMON_STATE" :value="scope.row.isAgent" />
-          </template>
-        </el-table-column>
         <el-table-column align="center" prop="status" label="状态" />
         <el-table-column align="center" label="操作" width="80" fixed="right">
           <template #default="scope">

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>

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();
     }
   });
 };

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 => {

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();
     }
   });
 };

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 => {

zjugis-business/src/main/resources/templates/RecruitDemand/js/index.js

@@ -72,13 +72,9 @@
     //手动列表添加只读效果
     function detailReadonly(i) {
         $("#delBtn_" + i).css("display", "none");
-        //设置只读属性
-        $("[name='RecruitDetailDO\\[" + i + "\\]\\$post']").addClass("z-readonly");
-        $("[name='RecruitDetailDO\\[" + i + "\\]\\$type']").addClass("z-readonly");
-
-        //设置输入框鼠标不可选
-        $("[name='RecruitDetailDO\\[" + i + "\\]\\$post']").css("pointer-events", "none");
-        $("[name='RecruitDetailDO\\[" + i + "\\]\\$type']").css("pointer-events", "none");
+        //设置只读属性 设置输入框鼠标不可选
+        $("[name='RecruitDetailDO\\[" + i + "\\]\\$post']").addClass("z-readonly").css("pointer-events", "none");
+        $("[name='RecruitDetailDO\\[" + i + "\\]\\$type']").addClass("z-readonly").css("pointer-events", "none");
         $("[name='changer[" + i + "]']").addClass("z-readonly").css("pointer-events", "none");
 
 
@@ -99,14 +95,9 @@
 
     function detailWrite(i) {
         $("#delBtn_" + i).css("display", "block");
-        //设置只读属性
-        $("[name='RecruitDetailDO\\[" + i + "\\]\\$post']").removeClass("z-readonly");
-        $("[name='RecruitDetailDO\\[" + i + "\\]\\$type']").removeClass("z-readonly");
-
-        //设置输入框鼠标不可选
-        $("[name='RecruitDetailDO\\[" + i + "\\]\\$post']").css("pointer-events", "auto");
-        $("[name='RecruitDetailDO\\[" + i + "\\]\\$type']").css("pointer-events", "auto");
-
+        //设置只读属性 设置输入框鼠标不可选
+        $("[name='RecruitDetailDO\\[" + i + "\\]\\$post']").removeClass("z-readonly").css("pointer-events", "auto");
+        $("[name='RecruitDetailDO\\[" + i + "\\]\\$type']").removeClass("z-readonly").css("pointer-events", "auto");
         $("[name='changer[" + i + "]']").removeClass("z-readonly").css("pointer-events", "auto");
 
 
@@ -161,7 +152,6 @@
         let obj = isTimes[i];
         let inps1 = $("[name='RecruitDetailDO[" + i + "]$requireNum']")[0].children[0]; //需求人数
         let inps2 = $("[name='RecruitDetailDO[" + i + "]$recruitNum']")[0].children[0]; //已招人数
-        let inps3 = $("[name='RecruitDetailDO[" + i + "]$type']")[0].children[0]; //所属类型
         inps1.addEventListener("blur", e => {
             let event = e || window.event;
             let inputInfo = event.target.value;
@@ -172,6 +162,8 @@
                 obj.requireNum = inputInfo
             }
         });
+
+
         inps2.addEventListener("blur", e => {
             let event = e || window.event;
             let inputInfo = event.target.value;
@@ -185,18 +177,6 @@
                 obj.recruitNum = inputInfo
             }
         });
-        inps3.addEventListener("blur", e => {
-            let event = e || window.event;
-            let inputInfo = event.target.value;
-            if (inputInfo === 2) {
-                $("[name='changer[" + index + "]']").addClass("z-readonly").css("pointer-events", "auto");
-            } else {
-                $("[name='changer[" + index + "]']").removeClass("z-readonly").css("pointer-events", "auto");
-                obj.recruitNum = '';
-            }
-        });
-
-
     }