页面集成

src/views/contract/components/EditContract.vue

@@ -20,13 +20,6 @@
             prop="meeting_flow_id" 
             :label="'资金上会流程' + (isMeetingFlowRequired ? ' *' : '')"
           >
-            <!-- 调试信息 -->
-            <div style="font-size: 12px; color: #999; margin-bottom: 5px;">
-              调试: is_common_purchase={{form.is_common_purchase}}, 
-              total_money={{form.total_money}}, 
-              disabled={{isMeetingFlowDisabled}}, 
-              required={{isMeetingFlowRequired}}
-            </div>
             <el-select 
               v-model="form.meeting_flow_id" 
               style="width: 100%"
@@ -44,7 +37,7 @@
               <span style="float: left">{{ item.data.yiti }}-{{ item.title }}</span>
               <span 
                 style="float: right; color: #8492a6; font-size: 13px; cursor: pointer;" 
-                @click.stop="viewOaFlow('other',item.id)"
+                @click.stop="viewOaFlow(item.id)"
               >查看</span>
             </el-option>
             </el-select>
@@ -551,6 +544,21 @@
         <el-button type="primary" @click="isShowContractToContracts = false">确 定</el-button>
       </span>
     </xy-dialog>
+          <!-- OA流程Modal -->
+          <Modal
+      v-model="isShowOaModal"
+      :width="86"
+      class-name="oa-modal"
+      title="流程办理"
+      fullscreen
+      :z-index="999999"
+      :mask-closable="false"
+      footer-hide
+    >
+      <div style="width: 100%;height: 100%;">
+        <iframe style="width: 100%;height: 100%;border-radius: 0 0 6px 6px;" :src="oaUrl" frameborder="0" />
+      </div>
+    </Modal>
   </div>
 </template>
 
@@ -561,6 +569,7 @@ import { deepCopy } from '@/utils'
 import { getBudget } from '@/api/budget/budget'
 import { flowStatusConfig } from '@/api/common'
 import {getShList} from "@/api/oatoken"
+import { getToken } from "@/utils/auth";
 export default {
   props: {
     isShow: {
@@ -606,6 +615,8 @@ export default {
   },
   data() {
     return {
+      isShowOaModal:false,
+      oaUrl:'',
       shList:[],
       // flow_list
       flowStatus: new Map([
@@ -1089,7 +1100,11 @@ export default {
     // 查看OA流程
     viewOaFlow(flowId) {
       // 调用父组件的toOaDetail方法
-      this.$parent.toOaDetail('other', null, flowId)
+            // 调用本地的toOaDetail方法
+      let url = `${process.env.VUE_APP_OUT_URL}/#/flow/detail?auth_token=${window.encodeURIComponent(getToken())}&isSinglePage=1&flow_id=${flowId}`
+      
+      this.oaUrl = url
+      this.isShowOaModal = true
     },
     // 获取上会列表
     async getSh(){

src/views/contract/components/detailPaymentRegistration.vue

@@ -197,6 +197,7 @@
       class-name="oa-modal"
       title="流程办理"
       fullscreen
+            :z-index="999999"
       :mask-closable="false"
       footer-hide
     >

src/views/contract/components/paymentRegistration.vue

@@ -400,6 +400,7 @@
       class-name="oa-modal"
       title="流程办理"
       fullscreen
+            :z-index="999999"
       :mask-closable="false"
       footer-hide
     >

src/views/contract/contractEdit.vue

@@ -215,7 +215,7 @@
                     <span style="float: left">{{ item.data.yiti }}-{{ item.title }}</span>
                     <span 
                       style="float: right; color: #8492a6; font-size: 13px; cursor: pointer;" 
-                      @click.stop="viewOaFlow('other', item.id)"
+                      @click.stop="viewOaFlow(item.id)"
                     >查看</span>
                   </el-option>
                 </el-select>
@@ -718,7 +718,7 @@
                     <span style="float: left">{{ item.data.yiti }}-{{ item.title }}</span>
                     <span 
                       style="float: right; color: #8492a6; font-size: 13px; cursor: pointer;" 
-                      @click.stop="viewOaFlow('other', item.id)"
+                      @click.stop="viewOaFlow(item.id)"
                     >查看</span>
                   </el-option>
                 </el-select>
@@ -1268,6 +1268,7 @@
       class-name="oa-modal"
       title="流程办理"
       fullscreen
+      :z-index="999999"
       :mask-closable="false"
       footer-hide
     >