Browse Source

供应链管理--采购退库、存放地点变更申请、main.js,系统管理--代办、已办、Home.vue更改

master
Zhao Qiqi 3 years ago
parent
commit
dcdce700f2
  1. 55
      anrui-scm/anrui-scm-ui/src/main.js
  2. 4
      anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAwait.vue
  3. 25
      anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangeng.vue
  4. 16
      anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangengEdit.vue
  5. 32
      anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangengInfo.vue
  6. 12
      anrui-system-ui/src/views/Home/Home.vue
  7. 3
      anrui-system-ui/src/views/flow/doneList.vue
  8. 3
      anrui-system-ui/src/views/flow/todoList.vue

55
anrui-scm/anrui-scm-ui/src/main.js

@ -1,45 +1,45 @@
import 'babel-polyfill'
import Vue from 'vue'
import 'normalize.css/normalize.css' // A modern alternative to CSS resets
import ElementUI from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css'
Vue.use(ElementUI)
import '@/styles/index.scss' // global css
import App from './App'
import store from './store'
import router from './router'
import '@/icons' // 引入icon文件夹下所有的svg
// 全局自定义组件
import Pagination from '@/components/pagination/index.vue'
import tabsearch from '@/components/tab-search/index.vue'
import eimage from '@/components/E-image/index.vue'
import moment from 'moment'
import Print from '@/utils/print' // 引入附件的js文件
import request from '@/utils/request'
import { setStorage } from './utils/auth.js'
import VueAMap from 'vue-amap'
Vue.use(ElementUI)
// import '@/permission' //权限控制
Vue.prototype.$userInfo = null // 用户信息
// 全局自定义组件
import Pagination from '@/components/pagination/index.vue'
Vue.component('Pagination', Pagination)
import tabsearch from '@/components/tab-search/index.vue'
Vue.component('tab-search', tabsearch)
import eimage from '@/components/E-image/index.vue'
Vue.component('eimage', eimage)
import moment from 'moment'
Vue.prototype.moment = moment
Vue.filter('dateFormat', function(dateStr, pattern = 'YYYY-MM-DD') {
return moment(dateStr).format(pattern)
})
import Print from '@/utils/print' // 引入附件的js文件
Vue.use(Print) // 注册
import request from '@/utils/request'
import { setStorage, getStorage } from './utils/auth.js'
let token = null
token = GetQueryString('token')
if (token) {
setStorage(token)
let href = window.location.href
href = href.split(`token=${token}`)[0]
window.location.href = href.slice(0, href.length - 1)
setStorage(token)
let href = window.location.href
// href = href.split(`token=${token}`)[0]
// window.location.href = href.slice(0, href.length - 1)
}
// 获取登录用户信息
@ -86,12 +86,27 @@ function getUserInfo() {
getUserInfo()
function GetQueryString(name) {
var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)')
var r = window.location.search.substr(1).match(reg)
if (r != null) return unescape(r[2]); return null
var one = window.location.href.indexOf('?token=') + 7
var two = window.location.href.lastIndexOf('&') //+ 1
var data = window.location.href.substr(one)
if (two > one) {
data = window.location.href.slice(one, two)
console.log('token', data)
}
if (data) {
return data
}
return null
// var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)')
// var rrr = window.location.href.?token=
// console.log('rrr',rrr)
// var rr = rrr.substr(1)
// console.log('rr',rr)
// var r = rr.match(reg)
// console.log('r',r)
// if (r != null) return unescape(r[2]); return null
}
import VueAMap from 'vue-amap'
Vue.use(VueAMap)
VueAMap.initAMapApiLoader({
key: 'ccda12d8bffc72e9f1a32c599323a876', // 此处的key,在高德开放平台申请

4
anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAwait.vue

@ -59,8 +59,8 @@
<el-table-column width="140px" prop="dispatchedDate" label="发车日期" align="center"/>
<el-table-column width="140px" prop="inspectedDate" label="验车日期" align="center"/>
<el-table-column width="140px" prop="inspectedName" label="验车人" align="center"/>
<el-table-column width="140px" prop="address" label="存放地点" align="center"/>
<el-table-column width="140px" prop="name" label="仓库管理员" align="center"/>
<!-- <el-table-column width="140px" prop="address" label="存放地点" align="center"/>-->
<!-- <el-table-column width="140px" prop="name" label="仓库管理员" align="center"/>-->
</el-table>
</div>
<!--End 项目列表-->

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

@ -233,25 +233,12 @@ 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)
// ===
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)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.agreeList.businessSid = obj.sid
this.agreeList.businessSid = obj.businessSid
this.agreeList.instanceId = obj.instanceId
this.agreeList.taskId = obj.taskId
this.agreeList.taskDefKey = obj.taskDefKey
@ -260,19 +247,19 @@ export default {
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.regectList.businessSid = obj.sid
this.regectList.businessSid = obj.businessSid
this.regectList.instanceId = obj.instanceId
this.regectList.taskId = obj.taskId
this.regectList.userSid = obj.userSid
//
this.stopList.businessSid = obj.sid
this.stopList.businessSid = obj.businessSid
this.stopList.instanceId = obj.instanceId
this.stopList.taskId = obj.taskId
this.stopList.userSid = obj.userSid
//
this.transactState = obj.transactState
//
this.showInfo(obj.sid)
this.showInfo(obj.businessSid)
this.getModelDetail(obj.deployId)
this.getFlowViewer(obj.instanceId)
},

16
anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangengEdit.vue

@ -192,19 +192,11 @@ 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)
// ===
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)
console.log('iframe页面获取的obj:', obj)
this.showEdit(sid,obj.instanceId,obj.taskId)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
this.showEdit(obj.businessSid,obj.instanceId,obj.taskId)
},
methods: {
getType() {

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

@ -168,25 +168,29 @@ 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)
// ===
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)
console.log('iframe页面获取的obj:', obj)
var one = window.location.href.indexOf('&data') + 6
// var two = window.location.href.lastIndexOf('&') //+ 1
// const data = window.location.href.slice(one, two) // urlunescape()web,使
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
// 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)
// // ===
// 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)
this.showInfo(obj.businessSid)
//
this.revokeList.businessSid = sid
this.revokeList.businessSid = obj.businessSid
this.revokeList.instanceId = obj.instanceId
this.revokeList.taskId = obj.taskId
this.revokeList.taskDefKey = obj.taskDefKey
this.revokeList.userSid = obj.userSid
this.revokeList.userSid = window.sessionStorage.getItem('userSid')
//
this.transactState = obj.transactState
//

12
anrui-system-ui/src/views/Home/Home.vue

@ -259,17 +259,17 @@
// this.$router.push({path: '/index'})
let myPopup = window.open('/#/index', '_blank')
} else if (index == '7') {
let myPopup = window.open('http://120.46.131.15/base' + '?token=' + getStorage(), '_blank')
let myPopup = window.open('http://120.46.131.15/base/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '8') {
let myPopup = window.open('http://120.46.131.15/message' + '?token=' + getStorage(), '_blank')
let myPopup = window.open('http://120.46.131.15/message/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '1') {
let myPopup = window.open('http://127.0.0.1:9531/scm' + '?token=' + getStorage(), '_blank')
let myPopup = window.open('http://127.0.0.1:9531/scm/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '4') {
let myPopup = window.open('http://120.46.131.15/fin' + '?token=' + getStorage(), '_blank')
let myPopup = window.open('http://120.46.131.15/fin/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '5') {
let myPopup = window.open('http://120.46.131.15/manage' + '?token=' + getStorage(), '_blank')
let myPopup = window.open('http://120.46.131.15/manage/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '0') {
let myPopup = window.open('http://120.46.131.15/buscenter' + '?token=' + getStorage(), '_blank')
let myPopup = window.open('http://120.46.131.15/buscenter/#/' + '?token=' + getStorage(), '_blank')
}
// const page = this.$router.resolve({name: name})
// window.open(page.href,'_blank')

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

@ -261,7 +261,6 @@
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,
@ -272,7 +271,7 @@
}
selectUrl(this.selectUrl_list).then((response) => {
if (response.code === '200') {
this.url = 'http://localhost:9531' + response.data.url + '?data=' + encodeURI((JSON.stringify(parameter_list))) + '&token=' + getStorage()
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 + '?data=' + JSON.stringify(parameter_list) + '&token=' + getStorage()
} else {
this.$notify({

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

@ -326,8 +326,9 @@ export default {
}
selectUrl(this.selectUrl_list).then((response) => {
if (response.code === '200') {
this.url = 'http://localhost:9531' + response.data.url + '?data=' + encodeURI((JSON.stringify(parameter_list))) + '&token=' + getStorage()
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 + '?data=' + JSON.stringify(parameter_list) + '&token=' + getStorage()
console.log('已办拼接url:',this.url)
} else {
this.$notify({
title: '提示',

Loading…
Cancel
Save