Browse Source

系统管理,存放地点变更待办列表

zhanglei
Zhao Qiqi 3 years ago
parent
commit
a7ef7d303d
  1. 35
      anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangeng.vue
  2. 6
      anrui-system-ui/babel.config.js
  3. 5
      anrui-system-ui/package.json
  4. 5
      anrui-system-ui/src/views/flow/doneList.vue
  5. 44
      anrui-system-ui/src/views/flow/todoList.vue

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

@ -233,41 +233,46 @@ export default {
}, '*')
},
created() {
console.log('url:' + window.location.href)
var a = window.location.href.indexOf('?') + 1 // ?
var b = window.location.href.indexOf('#data') // #data
const info = window.location.href.slice(a, b)
var sid = info.substr(info.indexOf('=') + 1)
this.showInfo(sid)
// console.log('url:' + window.location.href)
// var a = window.location.href.indexOf('?') + 1 // ?
// var b = window.location.href.indexOf('#data') // #data
// const info = window.location.href.slice(a, b)
// var sid = info.substr(info.indexOf('=') + 1)
// this.showInfo(sid)
// ===
var one = window.location.href.lastIndexOf('#') + 1
var two = window.location.href.lastIndexOf('}') + 1
const data = decodeURI(window.location.href.slice(one, two)) // urlunescape()web,使
var tar = data.substr(data.indexOf('=') + 1)
const obj = JSON.parse(tar)
var one = window.location.href.indexOf('?data') + 6
console.log('iframe页面获取的one:', one)
var two = window.location.href.lastIndexOf('&') //+ 1
console.log('iframe页面获取的two:', two)
const data = window.location.href.slice(one, two) // urlunescape()web,使
console.log('iframe页面获取的data:', data)
// var tar = data.substr(data.indexOf('=') + 1)
// console.log('iframetar:', tar)
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.agreeList.businessSid = sid
this.agreeList.businessSid = obj.sid
this.agreeList.instanceId = obj.instanceId
this.agreeList.taskId = obj.taskId
this.agreeList.taskDefKey = obj.taskDefKey
this.agreeList.userSid = obj.userSid
this.agreeList.userSid = window.sessionStorage.getItem('userSid')
this.agreeList.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.regectList.businessSid = sid
this.regectList.businessSid = obj.sid
this.regectList.instanceId = obj.instanceId
this.regectList.taskId = obj.taskId
this.regectList.userSid = obj.userSid
//
this.stopList.businessSid = sid
this.stopList.businessSid = obj.sid
this.stopList.instanceId = obj.instanceId
this.stopList.taskId = obj.taskId
this.stopList.userSid = obj.userSid
//
this.transactState = obj.transactState
//
this.showInfo(obj.sid)
this.getModelDetail(obj.deployId)
this.getFlowViewer(obj.instanceId)
},

6
anrui-system-ui/babel.config.js

@ -1,8 +1,10 @@
module.exports = {
presets: [
/* presets: [
// https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
'@vue/cli-plugin-babel/preset'
],
],*/
presets: [ [ "@vue/app", { useBuiltIns: "entry" } ] ],
'env': {
'development': {
// babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().

5
anrui-system-ui/package.json

@ -15,6 +15,7 @@
},
"dependencies": {
"axios": "0.18.1",
"bpmn-js": "^9.2.2",
"core-js": "^3.19.3",
"element-ui": "2.13.2",
"js-cookie": "2.2.0",
@ -29,7 +30,8 @@
"vue-amap": "^0.5.10",
"vue-router": "3.0.6",
"vuex": "3.1.0",
"vuex-persistedstate": "^4.0.0"
"vuex-persistedstate": "^4.0.0",
"xcrud": "^0.4.19"
},
"devDependencies": {
"@vue/cli-plugin-babel": "4.4.4",
@ -44,6 +46,7 @@
"babel-polyfill": "^6.26.0",
"chalk": "2.4.2",
"connect": "3.6.6",
"css-loader": "^6.7.1",
"eslint": "6.7.2",
"eslint-plugin-vue": "6.2.2",
"html-webpack-plugin": "3.2.0",

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

@ -261,6 +261,7 @@
this.selectUrl_list.taskDefKey = row.taskDefKey
this.selectUrl_list.type = 2 //
const parameter_list = {
businessSid: row.processVariables.businessSid,
instanceId: row.procInsId,
taskId: row.taskId,
taskDefKey: row.taskDefKey,
@ -271,8 +272,8 @@
}
selectUrl(this.selectUrl_list).then((response) => {
if (response.code === '200') {
// this.url = 'http://120.46.131.15' + response.data.url + '?row=' + row.processVariables.businessSid + '#data=' + JSON.stringify(parameter_list) + '?token=' + getStorage()
this.url = 'http://localhost:9531' + response.data.url + '?row=' + row.processVariables.businessSid + '#data=' + JSON.stringify(parameter_list) + '?token=123456abc'
this.url = 'http://localhost:9531' + response.data.url + '?data=' + encodeURI((JSON.stringify(parameter_list))) + '&token=' + getStorage()
// this.url = 'http://120.46.131.15' + response.data.url + '?data=' + JSON.stringify(parameter_list) + '&token=' + getStorage()
} else {
this.$notify({
title: '提示',

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

@ -154,24 +154,25 @@
</template>
<script>
import flow from '@/views/flow/flow'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import {pagerList, businessAgree, rejectTask, breakTask, selectUrl,readXml,getFlowViewer} from '@/api/flow/todo'
import {getStorage} from "@/utils/auth";
import {flowRecord} from "@/api/workflow/finished";
import {loginDetails} from "@/api/user"
export default {
name: "",
components: {
pageye, Pagination,flow
},
data() {
return {
taskList: [],
xmlData: "",
dialogHeight:'80%',
centerDialogVisible: false, //
import flow from '@/views/flow/flow'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import {breakTask, businessAgree, getFlowViewer, pagerList, readXml, rejectTask, selectUrl} from '@/api/flow/todo'
import {getStorage} from "@/utils/auth";
import {flowRecord} from "@/api/workflow/finished";
import {loginDetails} from "@/api/user"
export default {
name: "",
components: {
pageye, Pagination, flow
},
data() {
return {
taskList: [],
xmlData: "",
dialogHeight: '80%',
centerDialogVisible: false, //
editDialog: false,
flowRecordList: [],
listLoading: false,
@ -315,19 +316,18 @@
this.selectUrl_list.taskDefKey = row.taskDefKey
this.selectUrl_list.type = 1
const parameter_list = {
businessSid: row.processVariables.businessSid,
instanceId: row.procInsId,
taskId: row.taskId,
taskName: row.taskName,
deployId: row.deployId,
taskDefKey: row.taskDefKey,
transactState: '00', //
userSid: this.loginInfo.sid,
orgSidPath: this.loginInfo.orgSidPath
}
selectUrl(this.selectUrl_list).then((response) => {
if (response.code === '200') {
// this.url = 'http://120.46.131.15' + response.data.url + '?row=' + row.processVariables.businessSid + '#data=' + JSON.stringify(parameter_list) + '?token=' + getStorage()
this.url = 'http://localhost:9531' + response.data.url + '?row=' + row.processVariables.businessSid + '#data=' + JSON.stringify(parameter_list) + '?token=' + getStorage()
this.url = 'http://localhost:9531' + response.data.url + '?data=' + encodeURI((JSON.stringify(parameter_list))) + '&token=' + getStorage()
// this.url = 'http://120.46.131.15' + response.data.url + '?data=' + JSON.stringify(parameter_list) + '&token=' + getStorage()
} else {
this.$notify({
title: '提示',

Loading…
Cancel
Save