存放地点变更流程

anrui-scm/anrui-scm-ui/src/api/flow/cunfangdidianbiangeng.js

@@ -37,16 +37,16 @@ export default {
   getNextNodesForSubmit: function(data) {
     return request({
       url: 'scm/v1/scmvehiclegression/getNextNodesForSubmit',
-      method: 'get',
-      params: data
+      method: 'post',
+      data: data
     })
   },
   // 审批流程（驳回、终止）获取下一环节
   getPreviousNodesForReject: function(data) {
     return request({
       url: 'scm/v1/scmvehiclegression/getPreviousNodesForReject',
-      method: 'get',
-      params: data
+      method: 'post',
+      data: data
     })
   },
   // 读取xml文件

anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangeng.vue

@@ -131,7 +131,7 @@
     <!-- 选择待办人 的弹出框-->
     <el-dialog title="选择待办人" :visible.sync="nodeDialogVisible" width="80%">
       <el-form label-position="right" class="formadd">
-        <el-row>
+        <el-row v-show="currentLink">
           <el-col :span="4" class="tleftb">当前环节</el-col>
           <el-col :span="20" class="trightb">
             <el-form-item prop="purchasingUnitName"><span>{{ current.taskName }}->{{ nextNode.name }}</span>
@@ -182,6 +182,7 @@ export default {
       vehiclePhoto: [],
       rules: {},
       // ------流程所需------------------------------
+      currentLink:true, // 控制当前环节一行的显示隐藏
       dialogList: {
         comment: ''
       },
@@ -304,7 +305,10 @@ export default {
     // 同意
     openAgree(val) {
       this.operation = val
-      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
+      const formVariables = {
+        businessSid: this.agreeList.businessSid
+      }
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, formVariables }).then((resp) => {
         if (resp.success) {
           var arr = resp.data
           this.nextNode = arr[0]
@@ -316,7 +320,10 @@ export default {
     // 驳回
     openReject(val) {
       this.operation = val
-      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
+      const formVariables = {
+        businessSid: this.regectList.businessSid
+      }
+      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, formVariables }).then((resp) => {
         if (resp.success) {
           var arr = resp.data
           this.nextNode = arr[0]
@@ -328,14 +335,19 @@ export default {
     // 终止
     openStop(val) {
       this.operation = val
-      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
-        if (resp.success) {
-          var arr = resp.data
-          this.nextNode = arr[0]
-          this.nodeDialogVisible = true
-        }
-        this.submitdisabled = false
-      })
+      this.currentLink = false // 控制当前环节一行的显示隐藏
+      this.nodeDialogVisible = true
+      // const formVariables = {
+      //   businessSid: this.stopList.businessSid
+      // }
+      // req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, formVariables }).then((resp) => {
+      //   if (resp.success) {
+      //     var arr = resp.data
+      //     this.nextNode = arr[0]
+      //     this.nodeDialogVisible = true
+      //   }
+      //   this.submitdisabled = false
+      // })
     },
     /** 选择代办人确认 */
     confirm() {
@@ -352,11 +364,10 @@ export default {
       this.agreeList.comment = this.dialogList.comment
       req.agreeTask(this.agreeList).then((response) => {
         if (response.success) {
-          this.$notify({
-            title: '提示',
+          this.$message({
+            showClose: true,
             message: '执行成功',
-            type: 'success',
-            duration: 2000
+            type: 'success'
           })
           this.nodeDialogVisible = false
           // 子页面向父级页面传递值
@@ -367,13 +378,6 @@ export default {
               code: 1
             }
           }, '*')
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '执行失败',
-            type: 'error',
-            duration: 2000
-          })
         }
       })
     },
@@ -382,11 +386,10 @@ export default {
       this.regectList.comment = this.dialogList.comment
       req.rejectTask(this.regectList).then((response) => {
         if (response.success) {
-          this.$notify({
-            title: '提示',
+          this.$message({
+            showClose: true,
             message: '执行成功',
-            type: 'success',
-            duration: 2000
+            type: 'success'
           })
           this.nodeDialogVisible = false
           // 子页面向父级页面传递值
@@ -397,13 +400,6 @@ export default {
               code: 1
             }
           }, '*')
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '执行失败',
-            type: 'error',
-            duration: 2000
-          })
         }
       })
     },
@@ -412,11 +408,10 @@ export default {
       this.stopList.comment = this.dialogList.comment
       req.breakTask(this.stopList).then((response) => {
         if (response.success) {
-          this.$notify({
-            title: '提示',
+          this.$message({
+            showClose: true,
             message: '执行成功',
-            type: 'success',
-            duration: 2000
+            type: 'success'
           })
           this.nodeDialogVisible = false
           // 子页面向父级页面传递值
@@ -427,13 +422,6 @@ export default {
               code: 1
             }
           }, '*')
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '执行失败',
-            type: 'error',
-            duration: 2000
-          })
         }
       })
     },

anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangengInfo.vue

@@ -174,6 +174,7 @@ export default {
     // const data = window.location.href.slice(one, two) // url解码unescape()已从web中移除,尽量不使用
     const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
     const obj = JSON.parse(decodeURIComponent(data))
+    console.log('obj',obj)
     // var a = window.location.href.indexOf('?') + 1 // 第一个?后面的一个字符的位置
     // var b = window.location.href.indexOf('#data') // 第一个#data出现的位置
     // const info = window.location.href.slice(a, b)
@@ -239,12 +240,11 @@ export default {
       // this.revokeList.comment = this.dialogList.comment
       req.revokeTask(this.revokeList).then((response) => {
         if (response.success) {
-          this.$notify({
-            title: '提示',
+          this.$message({
+            showClose: true,
             message: '执行成功',
-            type: 'success',
-            duration: 2000
-          })
+            type: 'success'
+          });
           // 子页面向父级页面传递值
           window.parent.postMessage({
             cmd: 'returnHeight',
@@ -253,13 +253,6 @@ export default {
               code: 1
             }
           }, '*')
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '执行失败',
-            type: 'error',
-            duration: 2000
-          })
         }
       })
     },

anrui-system-ui/src/views/flow/doneList.vue

@@ -272,8 +272,8 @@
         }
         selectUrl(this.selectUrl_list).then((response) => {
           if (response.code === '200') {
-            // this.url = 'http://localhost:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
-            this.url = 'http://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+            this.url = 'http://localhost:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+            // this.url = 'http://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
           } else {
             this.$notify({
               title: '提示',

anrui-system-ui/src/views/flow/todoList.vue

@@ -328,8 +328,8 @@ export default {
         }
         selectUrl(this.selectUrl_list).then((response) => {
           if (response.code === '200') {
-            // this.url = 'http://localhost:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
-            this.url = 'http://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+            this.url = 'http://localhost:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+            // this.url = 'http://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
             console.log('已办拼接url:',this.url)
           } else {
             this.$notify({