Commit 18acc58a by zenghuan

Merge remote-tracking branch 'origin/develop' into develop

parents e7e5ba78 37ca2025
......@@ -2,9 +2,9 @@ import Api from '~/service/Api';
import commonFunctions from '~/mixin/commonFunctions.js';
import Utils from "~/utils/index";
export default {
mixins: [commonFunctions],
methods: {
async handleSearch() {
mixins: [commonFunctions],
methods: {
async handleSearch () {
let opndatfrom = this.model.opndatfrom;
if (!opndatfrom || opndatfrom == '') {
this.$notify.error({ title: this.$t('factoring.错误'), message: this.$t('factoring.查询开始日期必输!') });
......@@ -22,7 +22,7 @@ export default {
opndatfrom: moment(opndatfrom).format('YYYY-MM-DD'),
opndatto: moment(opndatto).format('YYYY-MM-DD'),
};
this.model.branch = JSON.parse(sessionStorage.getItem('currentOrg')).departmentnumber
this.model.branch = JSON.parse(sessionStorage.getItem('currentOrg')).departmentNumber
this.load = true;
let rtnmsg = await Api.post("/factoring/trtsel/list", params);
if (rtnmsg.respCode == SUCCESS) {
......@@ -39,7 +39,7 @@ export default {
}
this.load = false;
},
async handleReset() {
async handleReset () {
this.model.sealcrtyp = '';
this.model.opndatfrom = new Date();
this.model.opndatto = new Date();
......@@ -58,32 +58,32 @@ export default {
this.model.searef = '';
},
// pageSize改变
handleSizeChange(val) {
handleSizeChange (val) {
this.pagination.pageNum = 1;
this.pagination.pageSize = val;
this.handleSearch();
},
// 页码改变
handleCurrentChange(val) {
handleCurrentChange (val) {
this.pagination.pageNum = val;
this.handleSearch();
},
// 获取处理按钮
getButtons(row) {
getButtons (row) {
this.$set(this.codes, "rowList", row);
this.handleVisible = true;
},
// 跳转对应交易
onChoose(code, row) {
onChoose (code, row) {
this.routerPush({
path: "/business/" + code,
query: { inr: row.inr}
query: { inr: row.inr }
});
this.handleVisible = false;
},
// 保理开立
toTrtopn() {
toTrtopn () {
this.routerPush('/business/bftepn');
},
}
}
}
\ No newline at end of file
......@@ -3,88 +3,88 @@ import commonFunctions from '~/mixin/commonFunctions.js';
import Api from '~/service/Api';
export default {
mixins: [commonFunctions],
methods: {
async handleSearch() {
let opndatfrom = this.model.opndatfrom;
if (!opndatfrom || opndatfrom == '') {
this.$notify.error({title: this.$t('factoring.错误'), message: this.$t('factoring.查询开始日期必输!')});
return;
}
let opndatto = this.model.opndatto;
if (!opndatto || opndatto == '') {
this.$notify.error({title: this.$t('factoring.错误'), message: this.$t('factoring.查询结束日期必输!')});
return;
}
let params = {
...this.model,
pageNum: this.pagination.pageNum,
pageSize: this.pagination.pageSize,
opndatfrom: moment(opndatfrom).format('YYYY-MM-DD'),
opndatto: moment(opndatto).format('YYYY-MM-DD'),
};
this.model.branch = JSON.parse(sessionStorage.getItem('currentOrg')).departmentnumber
this.load = true;
let rtnmsg = await Api.post("/factoring/fitsee/list", params);
if (rtnmsg.respCode == SUCCESS) {
this.load = false;
this.stmData.data = [];
this.stmData.data = rtnmsg.data.list;
this.pagination = {
pageNum: rtnmsg.data.pageNum || 1,
pageSize: rtnmsg.data.pageSize || 10,
total: rtnmsg.data.total
};
} else {
this.$notify.error({title: this.$t('factoring.错误'), message: this.$t('factoring.服务请求失败!')});
}
this.load = false;
},
async handleReset() {
this.model.sealcrtyp = '';
this.model.opndatfrom = new Date((new Date).getTime() - (7 * 24 * 60 * 60 * 1000));
this.model.opndatto = new Date();
this.model.seaownref = '';
this.model.seashgref = '';
this.model.seaamtfr = '';
this.model.seasta = '';
this.model.seacur = '';
this.model.pty.extkey = '';
this.model.pty.nam = '';
this.model.usr.extkey = '';
this.model.seaamtto = '';
this.model.searol = '';
this.model.nam = '';
this.model.seapty = '';
this.model.searef = '';
},
// pageSize改变
handleSizeChange(val) {
this.pagination.pageNum = 1;
this.pagination.pageSize = val;
this.handleSearch();
},
// 页码改变
handleCurrentChange(val) {
this.pagination.pageNum = val;
this.handleSearch();
},
// 获取处理按钮
getButtons(row) {
this.$set(this.codes, "rowList", row);
this.handleVisible = true;
},
// 跳转对应交易
onChoose(code, row) {
this.routerPush({
path: "/business/" + code,
query: {inr: row.inr}
});
this.handleVisible = false;
},
// 保理开立
toTrtopn() {
this.routerPush('/business/fitepn');
},
}
mixins: [commonFunctions],
methods: {
async handleSearch () {
let opndatfrom = this.model.opndatfrom;
if (!opndatfrom || opndatfrom == '') {
this.$notify.error({ title: this.$t('factoring.错误'), message: this.$t('factoring.查询开始日期必输!') });
return;
}
let opndatto = this.model.opndatto;
if (!opndatto || opndatto == '') {
this.$notify.error({ title: this.$t('factoring.错误'), message: this.$t('factoring.查询结束日期必输!') });
return;
}
let params = {
...this.model,
pageNum: this.pagination.pageNum,
pageSize: this.pagination.pageSize,
opndatfrom: moment(opndatfrom).format('YYYY-MM-DD'),
opndatto: moment(opndatto).format('YYYY-MM-DD'),
};
this.model.branch = JSON.parse(sessionStorage.getItem('currentOrg')).departmentNumber
this.load = true;
let rtnmsg = await Api.post("/factoring/fitsee/list", params);
if (rtnmsg.respCode == SUCCESS) {
this.load = false;
this.stmData.data = [];
this.stmData.data = rtnmsg.data.list;
this.pagination = {
pageNum: rtnmsg.data.pageNum || 1,
pageSize: rtnmsg.data.pageSize || 10,
total: rtnmsg.data.total
};
} else {
this.$notify.error({ title: this.$t('factoring.错误'), message: this.$t('factoring.服务请求失败!') });
}
this.load = false;
},
async handleReset () {
this.model.sealcrtyp = '';
this.model.opndatfrom = new Date((new Date).getTime() - (7 * 24 * 60 * 60 * 1000));
this.model.opndatto = new Date();
this.model.seaownref = '';
this.model.seashgref = '';
this.model.seaamtfr = '';
this.model.seasta = '';
this.model.seacur = '';
this.model.pty.extkey = '';
this.model.pty.nam = '';
this.model.usr.extkey = '';
this.model.seaamtto = '';
this.model.searol = '';
this.model.nam = '';
this.model.seapty = '';
this.model.searef = '';
},
// pageSize改变
handleSizeChange (val) {
this.pagination.pageNum = 1;
this.pagination.pageSize = val;
this.handleSearch();
},
// 页码改变
handleCurrentChange (val) {
this.pagination.pageNum = val;
this.handleSearch();
},
// 获取处理按钮
getButtons (row) {
this.$set(this.codes, "rowList", row);
this.handleVisible = true;
},
// 跳转对应交易
onChoose (code, row) {
this.routerPush({
path: "/business/" + code,
query: { inr: row.inr }
});
this.handleVisible = false;
},
// 保理开立
toTrtopn () {
this.routerPush('/business/fitepn');
},
}
}
\ No newline at end of file
......@@ -5,7 +5,7 @@ import Api from '~/service/Api';
export default {
mixins: [commonFunctions],
methods: {
async handleSearch() {
async handleSearch () {
let opndatfrom = this.model.opndatfrom;
if (!opndatfrom || opndatfrom == '') {
this.$notify.error({ title: this.$t('factoring.错误'), message: this.$t('factoring.查询开始日期必输!') });
......@@ -23,7 +23,7 @@ export default {
opndatfrom: moment(opndatfrom).format('YYYY-MM-DD'),
opndatto: moment(opndatto).format('YYYY-MM-DD'),
};
this.model.branch = JSON.parse(sessionStorage.getItem('currentOrg')).departmentnumber
this.model.branch = JSON.parse(sessionStorage.getItem('currentOrg')).departmentNumber
this.load = true;
let rtnmsg = await Api.post("/factoring/fitsei/list", params);
if (rtnmsg.respCode == SUCCESS) {
......@@ -40,7 +40,7 @@ export default {
}
this.load = false;
},
async handleReset() {
async handleReset () {
this.model.fidOwnref = '';
this.model.fidNam = '';
this.model.opndatfrom = new Date((new Date).getTime() - (7 * 24 * 60 * 60 * 1000));
......@@ -53,23 +53,23 @@ export default {
this.model.exfref = "";
},
// pageSize改变
handleSizeChange(val) {
handleSizeChange (val) {
this.pagination.pageNum = 1;
this.pagination.pageSize = val;
this.handleSearch();
},
// 页码改变
handleCurrentChange(val) {
handleCurrentChange (val) {
this.pagination.pageNum = val;
this.handleSearch();
},
// 获取处理按钮
getButtons(row) {
getButtons (row) {
this.$set(this.codes, "rowList", row);
this.handleVisible = true;
},
// 跳转对应交易
onChoose(code, row) {
onChoose (code, row) {
this.routerPush({
path: "/business/" + code,
query: { inr: row.inr, path: code }
......@@ -77,7 +77,7 @@ export default {
this.handleVisible = false;
},
// 保理开立
toTrtopn() {
toTrtopn () {
this.routerPush('/business/fitipn');
},
}
......
......@@ -2,9 +2,9 @@ import Api from '~/service/Api';
import commonFunctions from '~/mixin/commonFunctions.js';
import Utils from "~/utils/index";
export default {
mixins: [commonFunctions],
methods: {
async handleSearch() {
mixins: [commonFunctions],
methods: {
async handleSearch () {
let opndatfrom = this.model.opndatfrom;
if (!opndatfrom || opndatfrom == '') {
this.$notify.error({ title: this.$t('factoring.错误'), message: this.$t('factoring.查询开始日期必输!') });
......@@ -22,7 +22,7 @@ export default {
opndatfrom: moment(opndatfrom).format('YYYY-MM-DD'),
opndatto: moment(opndatto).format('YYYY-MM-DD'),
};
this.model.branch = JSON.parse(sessionStorage.getItem('currentOrg')).departmentnumber
this.model.branch = JSON.parse(sessionStorage.getItem('currentOrg')).departmentNumber
this.load = true;
let rtnmsg = await Api.post("/factoring/trtsel/list", params);
if (rtnmsg.respCode == SUCCESS) {
......@@ -39,7 +39,7 @@ export default {
}
this.load = false;
},
async handleReset() {
async handleReset () {
this.model.sealcrtyp = '';
this.model.opndatfrom = new Date();
this.model.opndatto = new Date();
......@@ -58,32 +58,32 @@ export default {
this.model.searef = '';
},
// pageSize改变
handleSizeChange(val) {
handleSizeChange (val) {
this.pagination.pageNum = 1;
this.pagination.pageSize = val;
this.handleSearch();
},
// 页码改变
handleCurrentChange(val) {
handleCurrentChange (val) {
this.pagination.pageNum = val;
this.handleSearch();
},
// 获取处理按钮
getButtons(row) {
getButtons (row) {
this.$set(this.codes, "rowList", row);
this.handleVisible = true;
},
// 跳转对应交易
onChoose(code, row) {
onChoose (code, row) {
this.routerPush({
path: "/business/" + code,
query: { inr: row.inr}
query: { inr: row.inr }
});
this.handleVisible = false;
},
// 保理开立
toTrtopn() {
toTrtopn () {
this.routerPush('/business/lmtreg');
},
}
}
}
\ No newline at end of file
......@@ -2,9 +2,9 @@ import Api from '~/service/Api';
import commonFunctions from '~/mixin/commonFunctions.js';
import Utils from "~/utils/index";
export default {
mixins: [commonFunctions],
methods: {
async handleSearch() {
mixins: [commonFunctions],
methods: {
async handleSearch () {
let opndatfrom = this.model.opndatfrom;
if (!opndatfrom || opndatfrom == '') {
this.$notify.error({ title: this.$t('factoring.错误'), message: this.$t('factoring.查询开始日期必输!') });
......@@ -22,7 +22,7 @@ export default {
opndatfrom: moment(opndatfrom).format('YYYY-MM-DD'),
opndatto: moment(opndatto).format('YYYY-MM-DD'),
};
this.model.branch = JSON.parse(sessionStorage.getItem('currentOrg')).departmentnumber
this.model.branch = JSON.parse(sessionStorage.getItem('currentOrg')).departmentNumber
this.load = true;
let rtnmsg = await Api.post("/factoring/trtsel/list", params);
if (rtnmsg.respCode == SUCCESS) {
......@@ -39,7 +39,7 @@ export default {
}
this.load = false;
},
async handleReset() {
async handleReset () {
this.model.sealcrtyp = '';
this.model.opndatfrom = new Date();
this.model.opndatto = new Date();
......@@ -58,32 +58,32 @@ export default {
this.model.searef = '';
},
// pageSize改变
handleSizeChange(val) {
handleSizeChange (val) {
this.pagination.pageNum = 1;
this.pagination.pageSize = val;
this.handleSearch();
},
// 页码改变
handleCurrentChange(val) {
handleCurrentChange (val) {
this.pagination.pageNum = val;
this.handleSearch();
},
// 获取处理按钮
getButtons(row) {
getButtons (row) {
this.$set(this.codes, "rowList", row);
this.handleVisible = true;
},
// 跳转对应交易
onChoose(code, row) {
onChoose (code, row) {
this.routerPush({
path: "/business/" + code,
query: { inr: row.inr}
query: { inr: row.inr }
});
this.handleVisible = false;
},
// 保理开立
toTrtopn() {
toTrtopn () {
this.routerPush('/business/lmtrig');
},
}
}
}
\ No newline at end of file
......@@ -2,9 +2,9 @@ import Api from '~/service/Api';
import commonFunctions from '~/mixin/commonFunctions.js';
import Utils from "~/utils/index";
export default {
mixins: [commonFunctions],
methods: {
async handleSearch() {
mixins: [commonFunctions],
methods: {
async handleSearch () {
let opndatfrom = this.model.opndatfrom;
if (!opndatfrom || opndatfrom == '') {
this.$notify.error({ title: this.$t('factoring.错误'), message: this.$t('factoring.查询开始日期必输!') });
......@@ -22,7 +22,7 @@ export default {
opndatfrom: moment(opndatfrom).format('YYYY-MM-DD'),
opndatto: moment(opndatto).format('YYYY-MM-DD'),
};
this.model.branch = JSON.parse(sessionStorage.getItem('currentOrg')).departmentnumber
this.model.branch = JSON.parse(sessionStorage.getItem('currentOrg')).departmentNumber
this.load = true;
let rtnmsg = await Api.post("/factoring/trtsel/list", params);
if (rtnmsg.respCode == SUCCESS) {
......@@ -39,7 +39,7 @@ export default {
}
this.load = false;
},
async handleReset() {
async handleReset () {
this.model.sealcrtyp = '';
this.model.opndatfrom = new Date();
this.model.opndatto = new Date();
......@@ -58,32 +58,32 @@ export default {
this.model.searef = '';
},
// pageSize改变
handleSizeChange(val) {
handleSizeChange (val) {
this.pagination.pageNum = 1;
this.pagination.pageSize = val;
this.handleSearch();
},
// 页码改变
handleCurrentChange(val) {
handleCurrentChange (val) {
this.pagination.pageNum = val;
this.handleSearch();
},
// 获取处理按钮
getButtons(row) {
getButtons (row) {
this.$set(this.codes, "rowList", row);
this.handleVisible = true;
},
// 跳转对应交易
onChoose(code, row) {
onChoose (code, row) {
this.routerPush({
path: "/business/" + code,
query: { inr: row.inr}
query: { inr: row.inr }
});
this.handleVisible = false;
},
// 保理开立
toTrtopn() {
toTrtopn () {
this.routerPush('/business/lrtepn');
},
}
}
}
\ No newline at end of file
......@@ -2,9 +2,9 @@ import Api from '~/service/Api';
import commonFunctions from '~/mixin/commonFunctions.js';
import Utils from "~/utils/index";
export default {
mixins: [commonFunctions],
methods: {
async handleSearch() {
mixins: [commonFunctions],
methods: {
async handleSearch () {
let opndatfrom = this.model.opndatfrom;
if (!opndatfrom || opndatfrom == '') {
this.$notify.error({ title: this.$t('factoring.错误'), message: this.$t('factoring.查询开始日期必输!') });
......@@ -22,7 +22,7 @@ export default {
opndatfrom: moment(opndatfrom).format('YYYY-MM-DD'),
opndatto: moment(opndatto).format('YYYY-MM-DD'),
};
this.model.branch = JSON.parse(sessionStorage.getItem('currentOrg')).departmentnumber
this.model.branch = JSON.parse(sessionStorage.getItem('currentOrg')).departmentNumber
this.load = true;
let rtnmsg = await Api.post("/factoring/trtsel/list", params);
if (rtnmsg.respCode == SUCCESS) {
......@@ -39,7 +39,7 @@ export default {
}
this.load = false;
},
async handleReset() {
async handleReset () {
this.model.sealcrtyp = '';
this.model.opndatfrom = new Date();
this.model.opndatto = new Date();
......@@ -58,32 +58,32 @@ export default {
this.model.searef = '';
},
// pageSize改变
handleSizeChange(val) {
handleSizeChange (val) {
this.pagination.pageNum = 1;
this.pagination.pageSize = val;
this.handleSearch();
},
// 页码改变
handleCurrentChange(val) {
handleCurrentChange (val) {
this.pagination.pageNum = val;
this.handleSearch();
},
// 获取处理按钮
getButtons(row) {
getButtons (row) {
this.$set(this.codes, "rowList", row);
this.handleVisible = true;
},
// 跳转对应交易
onChoose(code, row) {
onChoose (code, row) {
this.routerPush({
path: "/business/" + code,
query: { inr: row.inr}
query: { inr: row.inr }
});
this.handleVisible = false;
},
// 保理开立
toTrtopn() {
toTrtopn () {
this.routerPush('/business/lrtipn');
},
}
}
}
\ No newline at end of file
......@@ -238,7 +238,7 @@ export default {
if (this.type=="edit") {
let data={
// "orgBch":this.$store.state.UserContext.currentOrg.departmentNumber,
"orgBch":JSON.parse(sessionStorage.getItem('currentOrg')).departmentnumber,
"orgBch":JSON.parse(sessionStorage.getItem('currentOrg')).departmentNumber,
"orgNo": this.model.extkey
}
Api.post('/manager/pty/checkZXbanForExtkeyByEcif0930',data).then(res => {
......
......@@ -47,7 +47,7 @@
<!--新增/重置/查询按钮-->
<c-col :span="24">
<span style="float: left">
<el-button type="primary" size="small" v-if="showInsertBtn" :disabled="true" @click="ptyAdd">新增</el-button>
<el-button type="primary" size="small" v-if="showInsertBtn" @click="ptyAdd">新增</el-button>
</span>
<span style="float: right">
<el-button size="small" @click="handleReset">重置</el-button>
......@@ -399,7 +399,7 @@ export default {
let data={
// "orgBch":this.$store.state.UserContext.currentOrg.departmentNumber,
"orgBch":JSON.parse(sessionStorage.getItem('currentOrg')).departmentnumber,
"orgBch":JSON.parse(sessionStorage.getItem('currentOrg')).departmentNumber,
"ptyInr": ptyinr
};
await Api.post('/manager/pty/checkZXbanForExtkeyBySSTF',data).then(res => {
......@@ -427,11 +427,11 @@ export default {
let data={
// "orgBch":this.$store.state.UserContext.currentOrg.departmentNumber,
"orgBch":JSON.parse(sessionStorage.getItem('currentOrg')).departmentnumber,
"orgBch":JSON.parse(sessionStorage.getItem('currentOrg')).departmentNumber,
"orgNo": extkey
};
console.log("===========")
console.log(sessionStorage.currentOrg.departmentnumber)
console.log(JSON.parse(sessionStorage.getItem('currentOrg')).departmentNumber)
await Api.post('/manager/pty/checkZXbanForExtkeyByEcif0930',data).then(res => {
if (res.respCode == SUCCESS) {
......
......@@ -489,7 +489,7 @@ export default {
this.updateCurrentOrg(data.currentOrg);
//缓存角色
this.updateCurRole(data.curRole);
sessionStorage.setItem('departmentnumber', data.currentOrg.departmentnumber)
sessionStorage.setItem('departmentNumber', data.currentOrg.departmentNumber)
this.updateAccbch(data.accbch);
// 缓存国结usr表用户信息
this.updateUsr(data.usr);
......@@ -581,13 +581,13 @@ export default {
let orgObj = this.header.orgList.find(item => item.id === param)
let roleObj = this.header.roleTypeList.find(item => item.key === this.header.curRole.id+"")
this.initRoleList(orgObj);
if(this.header.roleList && this.header.roleList.length>0 && ((orgObj.departmentnumber==="1000" && roleObj.value!=="HEAD")
||(orgObj.departmentnumber!=="1000" && roleObj.value==="HEAD"))){
if(this.header.roleList && this.header.roleList.length>0 && ((orgObj.departmentNumber==="1000" && roleObj.value!=="HEAD")
||(orgObj.departmentNumber!=="1000" && roleObj.value==="HEAD"))){
this.changeRoles(this.header.roleList[0].id);
sessionStorage.setItem('curRole', JSON.stringify(this.header.roleList[0]));
}
if(this.header.roleList && this.header.roleList.length===0 ) {
if (orgObj.departmentnumber === "1000") {
if (orgObj.departmentNumber === "1000") {
this.$notify({title: "失败", message: "请先维护总行机构角色!", type: "error",});
} else {
this.$notify({title: "失败", message: "请先维护分行机构角色!", type: "error",});
......
import Api from "~/service/Api"
export default {
async getOrgTree() {
this.queryLoading=true;
console.log(sessionStorage.getItem("currentOrg").departmentnumber, 222)
async getOrgTree () {
this.queryLoading = true;
console.log(sessionStorage.getItem("currentOrg").departmentNumber, 222)
let params = {
rootBranch: JSON.parse(sessionStorage.getItem("currentOrg")).departmentNumber
}
......@@ -14,11 +14,11 @@ export default {
this.expandedKeys.push(item.branch);
});
this.queryLoading=false;
this.queryLoading = false;
}
},
//获取机构详情
async getJgDetails(data) {
async getJgDetails (data) {
let params = {
id: data.id
}
......
import Api from "~/service/Api"
// 列表分页查询权限档次信息
export function queryByPage(data) {
return Api.post("/auzlvl/listPagingInfo", data);
export function queryByPage (data) {
return Api.post("/manager/auzlvl/listPagingInfo", data);
}
// 保存权限档次信息
export function saveInfo(data){
return Api.post("/auzlvl/saveInfo",data);
export function saveInfo (data) {
return Api.post("/manager/auzlvl/saveInfo", data);
}
// 查看权限档次信息
export function getInfo(data){
return Api.post("/auzlvl/getInfo",data);
export function getInfo (data) {
return Api.post("/manager/auzlvl/getInfo", data);
}
// 删除权限档次信息
export function deleteInfo(data){
return Api.post("/auzlvl/deleteInfo",data);
export function deleteInfo (data) {
return Api.post("/manager/auzlvl/deleteInfo", data);
}
// 批量删除权限档次信息
export function batchDelete(data){
return Api.post("/auzlvl/batchDelete",data);
export function batchDelete (data) {
return Api.post("/manager/auzlvl/batchDelete", data);
}
// 获取机构列表
export function listBch(){
return Api.post("/auzlvl/listBch");
export function listBch () {
return Api.post("/manager/auzlvl/listBch");
}
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