|
|
@@ -745,7 +745,7 @@
|
|
|
<div style="display: flex; padding: 15px; gap: 20px;">
|
|
|
<!-- 左侧列 -->
|
|
|
<div style="flex: 1;">
|
|
|
- <div class="text-orange mb-2" style="font-size: 12px;">
|
|
|
+ <div class="mb-2 text-orange" style="font-size: 12px;">
|
|
|
*删除当前表单和所有当前表单复制表单所有的字段数据
|
|
|
</div>
|
|
|
<el-button
|
|
|
@@ -765,7 +765,7 @@
|
|
|
|
|
|
<!-- 右侧列 -->
|
|
|
<div style="flex: 1;">
|
|
|
- <div class="text-orange mb-2" style="font-size: 12px;">
|
|
|
+ <div class="mb-2 text-orange" style="font-size: 12px;">
|
|
|
*删除当前表单所有的字段数据，不影响当前表单复制表单
|
|
|
</div>
|
|
|
<el-button
|
|
|
@@ -1134,7 +1134,7 @@ const setFormDataNum = (datas) => {
|
|
|
|
|
|
//渲染完成
|
|
|
const tableFormRender = (form, item, index) => {
|
|
|
- formDataList.value[index] = form
|
|
|
+ formDataList.value[index] = { ...form, nodeName: item.nodeName }
|
|
|
formDataList.value[index].isCollapseLoad = form.isRenderForm
|
|
|
item.isTableForm = form.isRenderForm
|
|
|
}
|
|
|
@@ -1203,12 +1203,12 @@ const tableFormRightTap = (
|
|
|
)
|
|
|
|
|
|
// 根据clearFormula值添加对应的菜单项
|
|
|
- if (clearFormula == 0) {
|
|
|
+ if (clearFormula === 0) {
|
|
|
tableFormMenu.value.push({
|
|
|
label: '取消公式引用',
|
|
|
key: 'cancelGs',
|
|
|
})
|
|
|
- } else if (clearFormula == 1) {
|
|
|
+ } else if (clearFormula === 1) {
|
|
|
tableFormMenu.value.push({
|
|
|
label: '恢复公式引用',
|
|
|
key: 'addGs',
|
|
|
@@ -1975,7 +1975,7 @@ const tableFormSaveClick = async (item, dragItem = null) => {
|
|
|
const inputTitle = ref('')
|
|
|
const isRemoveForSubTab = ref(null)
|
|
|
const saveExcelBussData = async (
|
|
|
- { pkeyId },
|
|
|
+ { pkeyId, nodeName },
|
|
|
dragItem = null,
|
|
|
showTip = true,
|
|
|
) => {
|
|
|
@@ -1986,8 +1986,8 @@ const saveExcelBussData = async (
|
|
|
const formData = refs?.getFormData()
|
|
|
const { error, code, msg, data } = await wbsApi.saveExcelBussData({
|
|
|
...formData,
|
|
|
+ nodeName,
|
|
|
isRemoveForSubTab:isRemoveForSubTab.value,
|
|
|
-
|
|
|
})
|
|
|
setDragModalLoading(dragItem)
|
|
|
if (!error && code === 200) {
|
|
|
@@ -2055,6 +2055,7 @@ const getFormRef = async (pkeyId) => {
|
|
|
const index = arrIndex(itemRef, 'pkeyId', pkeyId)
|
|
|
if (index === -1) return ''
|
|
|
const obj = getObjValue(itemRef[index])
|
|
|
+
|
|
|
return obj?.ref
|
|
|
}
|
|
|
|
|
|
@@ -2220,7 +2221,7 @@ const getFormData = async () => {
|
|
|
const pkeyId = formArr[i].pkeyId
|
|
|
const refs = await getFormRef(pkeyId)
|
|
|
const form = refs?.getFormData()
|
|
|
- newArr.push({ ...form })
|
|
|
+ newArr.push({ ...form, nodeName: formArr[i].nodeName })
|
|
|
}
|
|
|
console.log('表单数据', newArr)
|
|
|
return newArr
|
|
|
@@ -2563,7 +2564,7 @@ const deviationSaveClick = async ()=>{
|
|
|
}
|
|
|
const { pkeyId } = tableFormItemNode.value
|
|
|
deviationLoading.value = true
|
|
|
- const { error, code, msg, data } = await wbsApi.setDeviationRange(
|
|
|
+ const { error, code, msg } = await wbsApi.setDeviationRange(
|
|
|
{
|
|
|
g8pcfw: deviationModal.value.g8pcfw,
|
|
|
g10pcfw: deviationModal.value.g10pcfw,
|
