Commit 46576367 by liaoxing

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110
parents bff01f13 e54ffbe7
......@@ -134,20 +134,5 @@ export default {
closeHandlerDialog() {
this.initdialog = false;
},
/**
* 打开详情页面
* @param {string} inr
*/
display(inr) {
getTrnNameByInr({ inr }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + inr
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
},
};
......@@ -246,7 +246,7 @@
style="margin-left: 0"
size="small"
@click="display(scope.row['inr'])"
>详情
>快照
</c-button
>
</template>
......@@ -317,16 +317,16 @@
</div>
</template>
<script>
import commonProcess from "~/mixin/commonProcess"
import event from "../event"
import BctselModel from "~/model/Bctsel"
import BusNavbar from "~/views/Public/BusNavbar";
import operationFunc from "@/mixin/operationFunc";
export default {
inject: ['root'],
props: ["model", "codes"],
mixins: [event],
mixins: [event,operationFunc],
components: {"m-busbtn": BusNavbar},
data() {
return {
......
......@@ -136,23 +136,5 @@ export default {
closeHandlerDialog() {
this.initdialog = false;
},
/**
* 打开详情页面
* @param {string} inr
*/
display(inr) {
getTrnNameByInr({ inr }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = '/#/display/' + trnName + '?trn=' + inr;
window.open(
viewurl,
'newwindow',
'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no'
);
}
});
},
},
};
......@@ -335,7 +335,7 @@
style="margin-left: 0"
size="small"
@click="display(scope.row['inr'])"
>详情</c-button
>快照</c-button
>
</template>
</el-table-column>
......@@ -414,11 +414,12 @@
// import BetselModel from "~/model/Betsel";
import BusNavbar from "~/views/Public/BusNavbar";
import event from "../event";
import operationFunc from "@/mixin/operationFunc";
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [event],
mixins: [event,operationFunc],
components: { "m-busbtn": BusNavbar },
data() {
return {
......
......@@ -134,20 +134,5 @@ export default {
closeHandlerDialog() {
this.initdialog = false;
},
/**
* 打开详情页面
* @param {string} inr
*/
display(inr) {
getTrnNameByInr({ inr }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + inr
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
},
};
......@@ -207,7 +207,7 @@
style="margin-left: 0"
size="small"
@click="display(scope.row['inr'])"
>详情</c-button
>快照</c-button
>
</template>
</el-table-column>
......@@ -280,11 +280,12 @@
import event from "../event";
import BotselModel from "~/model/Botsel"
import BusNavbar from "~/views/Public/BusNavbar";
import operationFunc from "@/mixin/operationFunc";
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [event],
mixins: [event,operationFunc],
components: { "m-busbtn": BusNavbar },
data() {
return {
......
......@@ -135,19 +135,5 @@ export default {
this.initdialog = false;
},
/**
* 打开详情页面
* @param {string} inr
*/
display(inr) {
getTrnNameByInr({ inr }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + inr
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
},
};
......@@ -335,7 +335,7 @@
style="margin-left: 0"
size="small"
@click="display(scope.row['inr'])"
>详情</c-button
>快照</c-button
>
</template>
</el-table-column>
......@@ -402,11 +402,12 @@
</template>
<script>
import event from "../event";
import operationFunc from "@/mixin/operationFunc";
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [event],
mixins: [event,operationFunc],
components: {},
data() {
return {
......
......@@ -134,20 +134,5 @@ export default {
closeHandlerDialog() {
this.initdialog = false;
},
/**
* 打开详情页面
* @param {string} inr
*/
display(inr) {
getTrnNameByInr({ inr }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + inr
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
},
};
......@@ -336,7 +336,7 @@
style="margin-left: 0"
size="small"
@click="display(scope.row['inr'])"
>详情</c-button
>快照</c-button
>
</template>
</el-table-column>
......@@ -407,6 +407,7 @@
import event from "../event";
import CctselModel from "~/model/Cctsel";
import BusNavbar from "~/views/Public/BusNavbar";
import operationFunc from "@/mixin/operationFunc";
/*export default {
inject: ['root'],
......@@ -426,7 +427,7 @@ import BusNavbar from "~/views/Public/BusNavbar";
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [event],
mixins: [event,operationFunc],
components: { "m-busbtn": BusNavbar },
data() {
return {
......
......@@ -133,20 +133,5 @@ export default {
closeHandlerDialog() {
this.initdialog = false;
},
/**
* 打开详情页面
* @param {string} inr
*/
display(inr) {
getTrnNameByInr({ inr }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + inr
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
},
};
......@@ -208,7 +208,7 @@
style="margin-left: 0"
size="small"
@click="display(scope.row['inr'])"
>详情</c-button
>快照</c-button
>
</template>
</el-table-column>
......@@ -276,11 +276,12 @@
import event from "../event";
import CltselModel from "~/model/Cltsel"
import BusNavbar from "./BusNavbar";
import operationFunc from "@/mixin/operationFunc";
export default {
inject: ['root'],
props: ["model", "codes"],
mixins: [event],
mixins: [event,operationFunc],
components: { "m-busbtn": BusNavbar },
data() {
return {
......
......@@ -144,18 +144,5 @@ export default {
closeHandlerDialog() {
this.initdialog = false;
},
/**
* 打开详情页面
* @param {string} inr
*/
display(inr) {
getTrnNameByInr({ inr }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + inr
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
}
},
};
......@@ -523,7 +523,7 @@
style="margin-left: 0"
size="small"
@click="display(scope.row['inr'])"
>详情</c-button
>快照</c-button
>
</template>
</el-table-column>
......@@ -583,10 +583,11 @@
</template>
<script>
import event from '../event'
import operationFunc from "@/mixin/operationFunc";
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [event],
mixins: [event,operationFunc],
components: {},
data() {
return {
......
......@@ -129,20 +129,6 @@ export default {
closeHandlerDialog() {
this.initdialog = false;
},
/**
* 打开详情页面
* @param {string} inr
*/
display(inr) {
getTrnNameByInr({ inr }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + inr
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
toLetopn() {
// 点击开立,清空从待经办进来的时候带的行参数
localStorage.setItem('row_letopn', null)
......
......@@ -346,7 +346,7 @@
style="margin-left: 0"
size="small"
@click="display(scope.row['inr'])"
>详情</c-button
>快照</c-button
>
</template>
</el-table-column>
......@@ -425,11 +425,12 @@ import LetselModel from "~/model/Letsel";
import BusNavbar from "~/views/Public/BusNavbar";
import event from "../event";
import operationFunc from "@/mixin/operationFunc";
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [event],
mixins: [event,operationFunc],
components: { "m-busbtn": BusNavbar },
data() {
return {
......
......@@ -165,19 +165,19 @@ export default {
closeHandlerDialog() {
this.initdialog = false;
},
/**
* 打开详情页面
* @param {string} inr
*/
display(inr) {
getTrnNameByInr({ inr }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + inr
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
// /**
// * 打开详情页面
// * @param {string} inr
// */
// display(inr) {
// getTrnNameByInr({ inr }).then((res) => {
// if (res.respCode == SUCCESS) {
// const trnName = res.data.toLowerCase();
// let viewurl = "/#/display/" + trnName + "?trn=" + inr
// window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
// }
// });
// },
checkData(row){
this.$router.history.push({
path: '/business-new/litdck',
......
......@@ -186,7 +186,7 @@
style="margin-left: 0"
size="small"
@click="display(scope.row['inr'])"
>详情
>快照
</c-button
>
</template>
......@@ -262,11 +262,12 @@
</template>
<script>
import event from '../event'
import operationFunc from "@/mixin/operationFunc";
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [event],
mixins: [event,operationFunc],
components: {},
data() {
return {
......
......@@ -134,20 +134,5 @@ export default {
closeHandlerDialog() {
this.initdialog = false;
},
/**
* 打开详情页面
* @param {string} inr
*/
display(inr) {
getTrnNameByInr({ inr }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + inr
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
},
};
......@@ -373,7 +373,7 @@
style="margin-left: 0"
size="small"
@click="display(scope.row['inr'])"
>详情
>快照
</c-button
>
</template>
......@@ -449,11 +449,12 @@ import event from "../event";
import BusNavbar from "~/views/Public/BusNavbar";
import TrtselModel from "~/model/Trtsel";
import operationFunc from "@/mixin/operationFunc";
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [event],
mixins: [event,operationFunc],
components: {"m-busbtn": BusNavbar},
data() {
return {
......
......@@ -216,20 +216,20 @@ export default {
},
//交易快照
display(inr) {
let params = {
inr: inr,
transName: 'trnrel',
userId: sessionStorage.getItem('userId') || 'ZL',
};
Api.post('/service/trnrel/getTrnNameByInr', params).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trninr=" + inr
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
// display(inr) {
// let params = {
// inr: inr,
// transName: 'trnrel',
// userId: sessionStorage.getItem('userId') || 'ZL',
// };
// Api.post('/service/trnrel/getTrnNameByInr', params).then((res) => {
// if (res.respCode == SUCCESS) {
// const trnName = res.data.toLowerCase();
// let viewurl = "/#/display/" + trnName + "?trninr=" + inr
// window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
// }
// });
// },
//处理-退回
async onReprow(idx) {
......
......@@ -214,7 +214,7 @@ export default {
getTrnNameByInr({ inr }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + inr
let viewurl = "/#/display/" + trnName + "?trninr=" + inr
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
......
// 此文件存放交易流转的一些公共方法
import Api from '~/service/Api';
import Utils from "../utils"
import {getTrnNameByInr} from "@/service/business/common";
export default {
methods: {
// 提交
......@@ -177,5 +178,15 @@ export default {
async handleRefuse(data) {
this.$store.state.Transaction.operateFuns[data.operateId]["refuse"]()
},
display(inr) {
getTrnNameByInr({ inr }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trninr=" + inr
window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
}
}
}
\ No newline at end of file
import Api from "~/service/Api"
export function getTrnNameByInr(data) {
return Api.post('/business/getTrnNameByInr', data)
return Api.post('/service/trnrel/getTrnNameByInr', data)
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment