Merge remote-tracking branch 'origin/master'

client_h5/src/pages/leave/index.vue

@@ -189,11 +189,12 @@ const showPicker = ref(false);
 const columns = getDictOptions(DICT_TYPE.WF_LEAVE_TYPE, {
   label: 'text'
 })
-const { activityInstanceId, participant,flowInstanceId,read } = route.query as {
+const { activityInstanceId, participant,flowInstanceId,read,_o } = route.query as {
   activityInstanceId: string;
   participant: string;
   flowInstanceId: string;
   read: string;
+  _o: string;
 };
 const activityData: FlowDTO = {
   activityInstanceId,
@@ -325,7 +326,7 @@ const endTimeChange = (value:string) =>{
 /** 初始化 */
 onMounted(() => {
   initFormData()
-  if(read==='1'){
+  if(read==='1' || _o==='v'){
     formRead.value=true
   }
 })

zjugis-business/src/main/resources/templates/FlowContractInvoice/apply.ftl

@@ -734,7 +734,7 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                           <td>到款金额（元）</td>
                           <td>到款日期</td>
                           <td>备注</td>
-                          <td>操作</td>
+                          <td style="width: 170px;">操作</td>
                       </tr>
                       </thead>
                       <tbody class="tbody tbodyQjsq" name="returnMoney"></tbody>

zjugis-business/src/main/resources/templates/FlowContractInvoice/js/apply.js

@@ -60,9 +60,10 @@
     function initReturnReg(){
         let register = z.ui.comm.getUrlParam("registerReturn");
         if(register === '1'){
-            $("[name=addData]").show();
-            $("[name=return-header]").show();
-            $("[name=return-body]").show();
+            $("[name=addData]").show().removeClass("z-hide").removeClass("z-readonly");
+            $("[name=return-header]").css("display", "flex").removeClass("z-hide").removeClass("z-readonly");
+            $("[name=return-body]").css("display", "flex").removeClass("z-hide").removeClass("z-readonly");
+            $("[name=returnStats]").css("display", "flex").removeClass("z-hide").removeClass("z-readonly");
         }
     }