Commit 04361fbc by 袁成

Merge branch 'develop' of ssh://nvwa.jiuqi.com.cn:2222/GFP/RBC/rbc-frontend into develop-yuancheng

parents b0656467 0c586a66
......@@ -112,11 +112,12 @@ export default {
bill.getMasterData().setValue("billCode", response.data.content.billData.billCode);
const id = response.data.content.billData.id;
initIndexZero();//处理上张下张
let curTagId = window.nros.context.getCurrTag();
GMS.vbus.$Message.success("保存成功");
if (param.param && param.param.isApprove) {
GMS.vbus.$emit('change-form-state', { state: ''})
GMS.vbus.$emit('change-form-state', { state: ''},curTagId)
} else {
GMS.vbus.$emit('change-form-state', { state: 'readOnly', billId: id})
GMS.vbus.$emit('change-form-state', { state: 'readOnly', billId: id},curTagId)
}
// GMS.vbus.$emit("saveSuccess", buidData, param);
} else {
......
......@@ -86,7 +86,8 @@ export default {
const id = data.content.billData.id;
minusIndex();//上张下张用
GMS.$hideContainer.$Message.success('提交成功');
GMS.vbus.$emit("workflow-state-change", 90)
let curTagId = window.nros.context.getCurrTag();
GMS.vbus.$emit("workflow-state-change", 90,curTagId);
} else if (code === 201) {
GMS.$hideContainer.$Spin.hide()
data.message && GMS.$hideContainer.$Message.error({
......
......@@ -53,10 +53,6 @@ export default {
}
if (baseDataParamArrayList.length === targetSubTableFieldList.length && targetSubTableFieldList.length > 0) {
this.getCombBaseDataList(baseDataParamArrayList, (baseDataList) => {
let newIndex = context.getSubFocus()
if (oldIndex !== newIndex) {
context.setSubFocus(oldIndex)
}
focusData[sourceBaseDataField.FieldCode]._field_old_value_ = focusData[sourceBaseDataField.FieldCode].value
for (let i = 0; i < targetSubTableFieldList.length; i++) {
focusData[targetSubTableFieldList[i].FieldCode]._field_old_value_ = focusData[targetSubTableFieldList[i].FieldCode].value = baseDataList[i]
......
......@@ -117,6 +117,7 @@ export default {
titleColor: 'black',
Image: "",
imgLoading: 0,
checkLogin: true, // 默认当作已经登录了,因为已经登录的时候不能再进登录页
userData: {
username: "",
password: "",
......@@ -160,6 +161,12 @@ export default {
this.getLoginAssetsInfo();
},
mounted() {
window.GMS.util.nvwa.checkLogin().then(() => {
this.checkLogin = true
this.$Message.error('您已登录,请先注销')
}).catch(() => {
this.checkLogin = false
})
document.addEventListener('keyup', this.onKeyUp)
this.getVerificationCode();
},
......@@ -229,6 +236,10 @@ export default {
},
submit() {
if (this.checkLogin) {
this.$Message.error('您已登录,请先注销')
return
}
this.$refs["userData"].validate((valid) => {
if (valid) {
this.loginLoading = true;
......@@ -307,7 +318,7 @@ export default {
width: 100%;
height: 100%;
background-color: white;
z-index: 2000;
z-index: 100;
}
.login-img-bg {
......
......@@ -57,7 +57,10 @@ export default {
this.$portalAPI.off('on-close-tag', this.checkBillChange)
},
methods: {
changeFormState(param){
changeFormState(param,curTagId){
if(curTagId!=this.curTagId){
return
}
if(param && Object.prototype.toString.call(param)=='[object Object]'){
const { state, billId } = param;
if (billId !== undefined) {
......@@ -70,6 +73,18 @@ export default {
this.init = true;
});
},
changeData(billId,state,curTagId) {
if(curTagId!=this.curTagId){
return
}
this.init = false;
this.$nextTick(() => {
this.type = 'load';
this.state = state;
this.init = true;
this.billId = billId;
});
},
checkBillChange(cb, id) {
if (id != this.curTagId) {
cb(true)
......@@ -110,18 +125,6 @@ export default {
GMS.oldBillDataMap[this.curTagId] = bill.getBuillData()
}, 100);
},
changeData(billId,state,curTagId) {
if(curTagId!=this.curTagId){
return
}
this.init = false;
this.$nextTick(() => {
this.type = 'load';
this.state = state;
this.init = true;
this.billId = billId;
});
},
},
};
</script>
......
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