Commit edc52a55 authored by zqm's avatar zqm

1.解决bug29317,修改开表逻辑

parent a0e3cda7
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-07-09 17:03:14 * @Date: 2021-07-09 17:03:14
* @LastEditTime: 2022-04-15 15:48:42 * @LastEditTime: 2022-04-18 09:23:59
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \taxFormToolFramework\src\components\inTablemodal.vue * @FilePath: \taxFormToolFramework\src\components\inTablemodal.vue
...@@ -110,16 +110,16 @@ export default { ...@@ -110,16 +110,16 @@ export default {
obj.content = "你单位是否属于从事再生资源回收的增值税一般纳税人?" obj.content = "你单位是否属于从事再生资源回收的增值税一般纳税人?"
} }
var delFlag = false;//todo 优化 状态会被覆盖 var delFlag = false;//todo 优化 状态会被覆盖
if (bbDm == "10102_014" || bbDm == "10101_052") { if (bbDm == "10102_014" || bbDm == "10101_052" || bbDm == "10101_017") {
delFlag = _self.popupAssign('init', bbDm, obj.index) delFlag = _self.popupAssign('init', bbDm, obj.index)
} }
if (!["", undefined, null].includes(obj.openFormula)) { if (!["", undefined, null].includes(obj.openFormula) && !delFlag) {
var formulaFlag = tableData.getPromiseResult(obj.openFormula) var formulaFlag = tableData.getPromiseResult(obj.openFormula)
delFlag = !formulaFlag delFlag = !formulaFlag
} }
if (selectList.length > 0) { if (selectList.length > 0) {
var selectObj = Enumerable.From(selectList).Where(function (val) { return val.frameId == obj.index }).ToArray()[0] var selectObj = Enumerable.From(selectList).Where(function (val) { return val.frameId == obj.index }).ToArray()[0]
if (!["", undefined, null].includes(selectObj)) { if (!["", undefined, null].includes(selectObj) && !delFlag) {
delFlag = true delFlag = true
} }
} }
......
...@@ -45,6 +45,23 @@ export default { ...@@ -45,6 +45,23 @@ export default {
return false return false
} }
} }
} else if (bbdm == "10101_017") {
if (frameId == "18b6cbd1-4d7f-4fdc-a757-dfd7fb4e5ddb") {
//bug29317 保存状态下,不该再弹出下面系统提示
var menuList = this.$store.state.data.menuList;
var defaultMenu = this.$store.state.data.defaultMenu;
var menu = {}
menuList.forEach(element => {
if (element.bbDm + '_' + element.detailPcdm == defaultMenu) {
menu = element
}
});
if (menu.verificationState != "empty") {
return true
} else {
return false
}
}
} }
} else if (type == 'cell') { } else if (type == 'cell') {
if (bbdm == "10102_009" || bbdm == "10101_022") { if (bbdm == "10102_009" || bbdm == "10101_022") {
......
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