Merge remote-tracking branch 'origin/master'

supervise-enterprise-ui/src/views/Rkzysq/index.vue

@@ -234,8 +234,8 @@ export default {
     /** 流程流转记录 */
     handleFlowRecord(row) {
       this.getModelDetail(row.procDefId)
-      this.getFlowViewer(row.procInsId)
-      this.getFlowRecordList(row.procInsId, row.procDefId)
+      this.getFlowViewer(row.procInstId)
+      this.getFlowRecordList(row.procInstId, row.procDefId)
       this.editDialog = true
     },
     /** xml 文件 */
@@ -247,15 +247,15 @@ export default {
       })
     },
     // 已办环节的节点
-    getFlowViewer(procInsId) {
+    getFlowViewer(procInstId) {
       var token = getStorage()
-      getFlowViewer(procInsId, token).then(res => {
+      getFlowViewer(procInstId, token).then(res => {
         this.taskList = res.data
       })
     },
     /** 流程流转记录 */
-    getFlowRecordList(procInsId, procDefId) {
-      req.flowRecord(procInsId, procDefId).then(res => {
+    getFlowRecordList(procInstId, procDefId) {
+      req.flowRecord(procInstId, procDefId).then(res => {
         this.flowRecordList = res.data.flowList
         // 流程过程中不存在初始化表单 直接读取的流程变量中存储的表单值
         //   if (res.data.formData) {

supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue

@@ -345,4 +345,10 @@ export default {
 .rowClass{
   border-top: 1px solid #E0E3EB;
 }
+
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
+}
 </style>

supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue

@@ -206,4 +206,10 @@ export default {
   font-size: 15px;
   font-weight: 400;
 }
+
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
+}
 </style>

supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue

@@ -194,4 +194,10 @@ export default {
   font-size: 15px;
   font-weight: 400;
 }
+
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
+}
 </style>

supervise-portal-ui/src/views/flow/doneList.vue

@@ -273,8 +273,9 @@ import flowRecords from '@/components/flow/flowRecord'
         selectUrl(this.selectUrl_list).then((response) => {
           if (response.success && response.data.url !== '') {
             // this.url = 'http://127.0.0.1:9531' + '/production/#/paichanguanli/haveDone' + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
-             this.url = ''+ response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+             this.url = 'http://jg.yyundong.com/' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
             // this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+            console.log(this.url)
           } else if (response.success && response.data.url === '') {
             this.$notify({
               title: '提示',

supervise-portal-ui/src/views/flow/todoList.vue

@@ -312,7 +312,7 @@ export default {
         selectUrl(this.selectUrl_list).then((response) => {
           if (response.success && response.data.url !== '') {
             // this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
-             this.url = '' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+             this.url = 'http://jg.yyundong.com/' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
             // this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
             console.log('已办拼接url:', this.url)
           } else if (response.success && response.data.url === '') {