xy 2 years ago
parent 346c0aa1f9
commit 95f2e1ba8a

@ -6,7 +6,7 @@ VUE_APP_DOMIAN=http://192.168.0.66:9001/
VUE_APP_UPLOAD_API = http://192.168.00.66:9001/api/admin/upload-file VUE_APP_UPLOAD_API = http://192.168.00.66:9001/api/admin/upload-file
VUE_APP_BASE_API = '' VUE_APP_BASE_API = ''
VUE_APP_OUT_Book = http://192.168.0.66:9002/ VUE_APP_OUT_Book = http://192.168.0.66:9002/
VUE_APP_OUT_GDZC = http://192.168.0.66:17777/admin/ VUE_APP_OUT_GDZC = http://192.168.0.66:17777/admin
VUE_APP_OUT_OLD = http://192.168.0.66 VUE_APP_OUT_OLD = http://192.168.0.66
VUE_APP_OUT_URL = http://192.168.60.18:2021 VUE_APP_OUT_URL = http://192.168.60.18:2021
VUE_APP_OLD_OA = http://192.168.0.66:16667 VUE_APP_OLD_OA = http://192.168.0.66:16667

@ -129,7 +129,7 @@ export default {
return { return {
active: 0, active: 0,
bookUrl: process.env.VUE_APP_OUT_Book, bookUrl: process.env.VUE_APP_OUT_Book,
gdzcUrl: `${process.env.VUE_APP_OUT_GDZC}/member/oss_login?id=${this.$store.state.user.userId}&username=${this.$store.state.user.username}`, gdzcUrl: `${process.env.VUE_APP_OUT_GDZC}?auth_token=${this.$store.getters.oa_token}`,
oldUrl: `${process.env.VUE_APP_OUT_OLD}/login/oss_login?auth_token=${this.$store.getters.oa_token}`, oldUrl: `${process.env.VUE_APP_OUT_OLD}/login/oss_login?auth_token=${this.$store.getters.oa_token}`,
goodsUrl: `${process.env.VUE_APP_OUT_GOODS}/admin/oss-login?id=${this.$store.state.user.userId}&username=${this.$store.state.user.username}`, goodsUrl: `${process.env.VUE_APP_OUT_GOODS}/admin/oss-login?id=${this.$store.state.user.userId}&username=${this.$store.state.user.username}`,
oldOaUrl: `${process.env.VUE_APP_OLD_OA}/login/oss_login?auth_token=${this.$store.getters.oa_token}` oldOaUrl: `${process.env.VUE_APP_OLD_OA}/login/oss_login?auth_token=${this.$store.getters.oa_token}`
@ -211,7 +211,7 @@ export default {
}, },
created() { created() {
let gdzcIframe = document.createElement('iframe'); let gdzcIframe = document.createElement('iframe');
gdzcIframe.src = `${process.env.VUE_APP_OUT_GDZC}/member/oss_login?id=${this.$store.state.user.userId}&username=${this.$store.state.user.username}` gdzcIframe.src = `${process.env.VUE_APP_OUT_GDZC}?auth_token=${this.$store.getters.oa_token}`
gdzcIframe.onload = () => { gdzcIframe.onload = () => {
gdzcIframe = null; gdzcIframe = null;
} }

@ -544,10 +544,6 @@
> >
查看 查看
</Button> </Button>
<!-- (new RegExp(/contractLedger/g).test($route.path)) ?-->
<!-- ($refs['addContractLedger'].setId(scope.row.id),$refs['addContractLedger'].setType('editor'),$refs['addContractLedger'].show()) :-->
<!-- ($refs['editor'].isShowEditor = true,-->
<!-- $refs['editor'].getDetail(scope.row.id))-->
<template v-if="scope.row.status != 2 || hasEdit"> <template v-if="scope.row.status != 2 || hasEdit">
<Button <Button
class="slot-btns-item" class="slot-btns-item"
@ -555,18 +551,9 @@
type="primary" type="primary"
@click=" @click="
(new RegExp(/contractLedger/g).test($route.path)) ? (new RegExp(/contractLedger/g).test($route.path)) ?
$router.push({ ($refs['addContractLedger'].setId(scope.row.id),$refs['addContractLedger'].setType('editor'),$refs['addContractLedger'].show()) :
path: '/contract/contractEdit', ($refs['editor'].isShowEditor = true,
query: { $refs['editor'].getDetail(scope.row.id))
isLedger: 1,
contractId: scope.row.id
}
}) : $router.push({
path: '/contract/contractEdit',
query: {
contractId: scope.row.id
}
})
" "
>编辑 >编辑
</Button> </Button>

Loading…
Cancel
Save