Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/api/operation/workslrsettlement.js

@@ -51,7 +51,7 @@ export default {
   // 流程审批（同意）
   complete: function(params) {
     return request({
-      url: '/pms/v1/asbusrepairbillreversesettle/complete',
+      url: '/as/v1/asbusrepairbillreversesettle/complete',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -60,7 +60,7 @@ export default {
   // 流程审批（加签）
   delegate: function(params) {
     return request({
-      url: '/pms/v1/asbusrepairbillreversesettle/delegate',
+      url: '/as/v1/asbusrepairbillreversesettle/delegate',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -69,7 +69,7 @@ export default {
   // 流程审批（驳回）
   reject: function(params) {
     return request({
-      url: '/pms/v1/asbusrepairbillreversesettle/reject',
+      url: '/as/v1/asbusrepairbillreversesettle/reject',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -78,7 +78,7 @@ export default {
   // 流程审批（终止）
   breakProcess: function(params) {
     return request({
-      url: '/pms/v1/asbusrepairbillreversesettle/breakProcess',
+      url: '/as/v1/asbusrepairbillreversesettle/breakProcess',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -87,7 +87,7 @@ export default {
   // 流程审批（撤回）
   revokeProcess: function(params) {
     return request({
-      url: '/pms/v1/asbusrepairbillreversesettle/revokeProcess',
+      url: '/as/v1/asbusrepairbillreversesettle/revokeProcess',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -96,7 +96,7 @@ export default {
   // 审批流程（同意）获取下一环节
   getNextNodesForSubmit: function(data) {
     return request({
-      url: '/pms/v1/asbusrepairbillreversesettle/getNextNodesForSubmit',
+      url: '/as/v1/asbusrepairbillreversesettle/getNextNodesForSubmit',
       method: 'get',
       params: data
     })
@@ -104,7 +104,7 @@ export default {
   // 审批流程（驳回）获取上一环节
   getPreviousNodesForReject: function(data) {
     return request({
-      url: '/pms/v1/asbusrepairbillreversesettle/getPreviousNodesForReject',
+      url: '/as/v1/asbusrepairbillreversesettle/getPreviousNodesForReject',
       method: 'get',
       params: data
     })

yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlement.vue

@@ -109,6 +109,10 @@
     <workslrsettlementAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
     <!-- 详情 -->
     <workslrsettlementInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
+    <!-- 流程审批记录 -->
+    <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
+      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
+    </el-dialog>
   </div>
 </template>
 
@@ -120,6 +124,7 @@ import req from '@/api/operation/workslrsettlement'
 import workslrsettlementAdd from './workslrsettlementAdd'
 import workslrsettlementInfo from './workslrsettlementInfo'
 import { typeValues } from '@/api/Common/dictcommons'
+import { getStorage } from '@/utils/auth'
 
 export default {
   name: 'WorkSLRSettlement',
@@ -132,6 +137,9 @@ export default {
   },
   data() {
     return {
+      url: '',
+      dialogHeight: '80%',
+      centerDialogVisible: false,
       btndisabled: false,
       btnList: [
         {
@@ -191,6 +199,8 @@ export default {
     this.getList()
   },
   mounted() {
+    // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage
+    window.addEventListener('message', this.handleMessage)
     this.$refs['btnbar'].setButtonList(this.btnList)
   },
   methods: {
@@ -201,6 +211,34 @@ export default {
         }
       })
     },
+    async handleMessage(event) {
+      var code = ''
+      if (event.data.params !== null && event.data.params !== undefined) {
+        code = event.data.params.code
+      }
+      if (code === 1) {
+        this.centerDialogVisible = false
+      } else if (code === 2) {
+        this.dialogHeight = event.data.params.data
+        this.setIframeHeight(document.getElementById('iframe'))
+      }
+    },
+    closeIt() {
+      this.url = ''
+      this.centerDialogVisible = false
+    },
+    setIframeHeight(iframe) {
+      iframe.height = this.dialogHeight
+    },
+    flowRecord(row) {
+      this.centerDialogVisible = true
+      var params = {
+        deployId: row.procDefId,
+        procInsId: row.procInstId,
+        token: getStorage()
+      }
+      this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
+    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow