|
@@ -370,7 +370,7 @@ const getExcelHtml = async (item, index) => {
|
|
|
const {id} = baseData.value
|
|
|
console.log(nodeIdvaluedata.value, 'nodeIdvaluedata.value');
|
|
|
const {error, code, data} = await dataApi.getExcelHtml({
|
|
|
- id: id || nodeIdvaluedata.value,
|
|
|
+ id: id || nodeIdvaluedata.value||newaddId.value,
|
|
|
primaryKeyId: pkeyIds
|
|
|
}, false)
|
|
|
const resData = isString(data) ? data || '' : ''
|
|
@@ -480,7 +480,7 @@ const getBussDataInfo = async (item, index) => {
|
|
|
if (pkeyIds) {
|
|
|
const {id} = baseData.value
|
|
|
const {error, code, data} = await dataApi.getBussDataInfo({
|
|
|
- id: id || nodeIdvaluedata.value,
|
|
|
+ id: id || nodeIdvaluedata.value||newaddId.value,
|
|
|
pkeyId: pkeyIds,
|
|
|
contractId: contractId
|
|
|
}, false)
|
|
@@ -634,10 +634,11 @@ const tableFormSaveClick = async (item, index) => {
|
|
|
await getBussPdfInfo(item)
|
|
|
} else {
|
|
|
//返回
|
|
|
- toBackClick()
|
|
|
+ // toBackClick()
|
|
|
+ await getBussPdfInfo(item)
|
|
|
}
|
|
|
|
|
|
- renewData()
|
|
|
+ renewData(newaddId.value)
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -645,7 +646,7 @@ const tableFormSaveClick = async (item, index) => {
|
|
|
window?.$message?.warning('已上报的资料,不允许保存。')
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+const newaddId=ref('')
|
|
|
//保存表单数据
|
|
|
const saveExcelBussData = async (item, index, showTip = true) => {
|
|
|
if (!getObjVal(formRegExpJson.value)) {
|
|
@@ -653,7 +654,12 @@ const saveExcelBussData = async (item, index, showTip = true) => {
|
|
|
const InitObj = getFormDataInit(item)
|
|
|
baseData.value.tableType = tabTypeKeyInfo.value
|
|
|
console.log(baseData.value.tableType, ' baseData.value.tableType');
|
|
|
- const {error, code} = await dataApi.saveExcelBussData({
|
|
|
+
|
|
|
+ if(newaddId.value.length>0){
|
|
|
+ baseData.value.id=newaddId.value
|
|
|
+ }
|
|
|
+ console.log(baseData.value,'baseData.value');
|
|
|
+ const {error, code,data} = await dataApi.saveExcelBussData({
|
|
|
...baseData.value,
|
|
|
isBatchSave: 0,
|
|
|
dataInfo: {
|
|
@@ -664,6 +670,7 @@ const saveExcelBussData = async (item, index, showTip = true) => {
|
|
|
tableFormSaveLoading.value = false
|
|
|
if (!error && code === 200) {
|
|
|
if (showTip) window?.$message?.success('保存成功')
|
|
|
+ newaddId.value=data
|
|
|
return true
|
|
|
} else {
|
|
|
return false
|
|
@@ -680,7 +687,7 @@ const getBussPdfInfo = async ({pKeyId}, showTip = true) => {
|
|
|
if (pkeyIds) {
|
|
|
const {id} = baseData.value
|
|
|
const {error, code, data} = await dataApi.getBussPdf({
|
|
|
- id: id,
|
|
|
+ id: id.length>0?id: newaddId.value,
|
|
|
pKeyId: pkeyIds
|
|
|
}, false)
|
|
|
if (!error && code === 200) {
|
|
@@ -711,7 +718,7 @@ const delClick = async ({pKeyId}) => {
|
|
|
})
|
|
|
if (!error && code === 200) {
|
|
|
window?.$message?.success('操作成功')
|
|
|
- renewData()
|
|
|
+ renewData(id)
|
|
|
delClickLoading.value = false
|
|
|
} else {
|
|
|
delClickLoading.value = false
|
|
@@ -766,7 +773,7 @@ const copeBussTab = async (pkeyIds) => {
|
|
|
})
|
|
|
if (!error && code === 200) {
|
|
|
window?.$message?.success('操作成功')
|
|
|
- renewData()
|
|
|
+ renewData(id)
|
|
|
chageOrinData()
|
|
|
}
|
|
|
copyClickLoading.value = false
|
|
@@ -786,7 +793,7 @@ const hideClick = async ({pKeyId, isBussShow}) => {
|
|
|
})
|
|
|
if (!error && code === 200) {
|
|
|
window?.$message?.success('操作成功')
|
|
|
- renewData()
|
|
|
+ renewData(id)
|
|
|
changeisHide(pkeyIds, isBussShow)
|
|
|
}
|
|
|
} else {
|
|
@@ -854,11 +861,12 @@ const getBussFileList = async (pkeyId) => {
|
|
|
|
|
|
//上传文件
|
|
|
const uploadChange = async ({type}) => {
|
|
|
+ const {id} = baseData.value
|
|
|
if (type === 'success') {
|
|
|
uploadModal.value = false
|
|
|
- renewData()
|
|
|
+ renewData(id)
|
|
|
} else if (type === 'del') {
|
|
|
- renewData()
|
|
|
+ renewData(id)
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1270,8 +1278,8 @@ const getOffsetTop = (key = '') => {
|
|
|
}
|
|
|
|
|
|
//通知数据更新
|
|
|
-const renewData = () => {
|
|
|
- emit('renew')
|
|
|
+const renewData = (newaddId) => {
|
|
|
+ emit('renew',newaddId)
|
|
|
ActiveKey.value = ''
|
|
|
}
|
|
|
const changeisHide = (pKeyId, isBussShow) => {
|