|
@@ -387,7 +387,7 @@ const getSearchNodeTables = async () => {
|
|
} else {
|
|
} else {
|
|
queryNodeStatus()//查询按钮状态
|
|
queryNodeStatus()//查询按钮状态
|
|
const {error, code, data} = await dataApi.searchNodeTables({
|
|
const {error, code, data} = await dataApi.searchNodeTables({
|
|
- id: dataId,
|
|
|
|
|
|
+ id: dataId.length > 0 ? dataId : nodeIdvalue.value,
|
|
projectId: projectId.value,
|
|
projectId: projectId.value,
|
|
contractId: contractId.value,
|
|
contractId: contractId.value,
|
|
primaryKeyId: nodeId,
|
|
primaryKeyId: nodeId,
|
|
@@ -990,14 +990,18 @@ const tableFormSaveClick = async () => {
|
|
|
|
|
|
if (isaddType) { //新增
|
|
if (isaddType) { //新增
|
|
if (setTypes.length > 1) {
|
|
if (setTypes.length > 1) {
|
|
|
|
+ console.log(setTypes.length,'setTypes.length222222');
|
|
FormData = alllistData.value;
|
|
FormData = alllistData.value;
|
|
listItemBaseData.value.tableType = "1,2"
|
|
listItemBaseData.value.tableType = "1,2"
|
|
} else {
|
|
} else {
|
|
-
|
|
|
|
|
|
+ console.log(setTypes.length,'setTypes.length22222255555');
|
|
|
|
+ console.log(afterAdd.value,'afterAdd.value5');
|
|
// FormData = alllistData.value.filter(e => e.type == type);
|
|
// FormData = alllistData.value.filter(e => e.type == type);
|
|
if (!afterAdd.value) {
|
|
if (!afterAdd.value) {
|
|
FormData = alllistData.value.filter(e => e.type == type);
|
|
FormData = alllistData.value.filter(e => e.type == type);
|
|
- } else {
|
|
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ else {
|
|
let filterType = type ? type : tabTypeKey.value
|
|
let filterType = type ? type : tabTypeKey.value
|
|
// FormData =alllistData.value.filter(e => e.type == type);
|
|
// FormData =alllistData.value.filter(e => e.type == type);
|
|
FormData = alllistData.value.filter(e => e.type == filterType);
|
|
FormData = alllistData.value.filter(e => e.type == filterType);
|
|
@@ -1029,8 +1033,11 @@ const tableFormSaveClick = async () => {
|
|
FormData = alllistData.value;
|
|
FormData = alllistData.value;
|
|
|
|
|
|
const info = getStoreValue('test-form')
|
|
const info = getStoreValue('test-form')
|
|
- let recordNo = info.recordNo
|
|
|
|
- let reportNo = info.reportNo
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ let recordNo = info?.recordNo|| tabTypeKey.value==1?listItemBaseData.value.id:''
|
|
|
|
+
|
|
|
|
+ let reportNo = info?.reportNo|| tabTypeKey.value==2?listItemBaseData.value.id:''
|
|
|
|
|
|
//组装type
|
|
//组装type
|
|
if (recordNo === '' && reportNo !== '') {
|
|
if (recordNo === '' && reportNo !== '') {
|
|
@@ -1156,7 +1163,7 @@ const tableFormSaveClick = async () => {
|
|
// alllistData.value.forEach(e => e.oper = false)
|
|
// alllistData.value.forEach(e => e.oper = false)
|
|
alllistData.value = []
|
|
alllistData.value = []
|
|
if (!isaddType) {
|
|
if (!isaddType) {
|
|
- bussPdfsClick(router.currentRoute.value.query.id)
|
|
|
|
|
|
+ bussPdfsClick(router.currentRoute.value.query.id|| listItemBaseData.value.id)
|
|
// toBackClick()
|
|
// toBackClick()
|
|
getSearchNodeTables()
|
|
getSearchNodeTables()
|
|
getSearchNodeTablesall(1)
|
|
getSearchNodeTablesall(1)
|
|
@@ -1168,6 +1175,11 @@ const tableFormSaveClick = async () => {
|
|
getSearchNodeTablesall(1)
|
|
getSearchNodeTablesall(1)
|
|
getSearchNodeTablesall(2)
|
|
getSearchNodeTablesall(2)
|
|
afterAdd.value = true
|
|
afterAdd.value = true
|
|
|
|
+ isaddType=false
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
// toBackClick()
|
|
// toBackClick()
|
|
// setTimeout(() => {
|
|
// setTimeout(() => {
|
|
// window?.location?.reload() //刷新页面
|
|
// window?.location?.reload() //刷新页面
|