修改

src/views/desk/wbs/create-new-excel.vue

@@ -3,18 +3,18 @@
         v-model="isShow"
         is-footer-center
         :title="modelTitle"
-        @close="dialogClose"
-        @save="saveFormAndElementHandle"
         widths="56rem"
         :loading="submitLoading"
+        @close="dialogClose"
+        @save="saveFormAndElementHandle"
     >
         <el-form
+            v-if="!tableId"
             ref="formRef"
             :model="formModel"
             :rules="formRules"
             label-position="top"
             label-width="auto"
-            v-if="!tableId"
         >
             <el-row :gutter="60">
                 <el-col :span="12">
@@ -74,10 +74,10 @@
                 >
                     <template #content>
                         <div class="text-sm text-red">
-                            1.元素名称不能为空<br />
-                            2.数据类型不能为空<br />
-                            3.元素长度不能为空<br />
-                            4.编辑元素信息请谨慎操作<br />
+                            1.元素名称不能为空<br>
+                            2.数据类型不能为空<br>
+                            3.元素长度不能为空<br>
+                            4.编辑元素信息请谨慎操作<br>
                         </div>
                     </template>
                     <el-button
@@ -93,50 +93,53 @@
 
             <template #extra>
                 <el-button
+                    v-if="type != 0"
                     size="small"
                     type="success"
                     @click="addRowClick"
-                    v-if="type != 0"
-                    >新增</el-button
                 >
+                    新增
+                </el-button>
                 <el-button
+                    v-if="!tableId"
                     size="small"
                     type="primary"
                     @click="uploadClick"
-                    v-if="!tableId"
-                    >快捷导入</el-button
                 >
+                    快捷导入
+                </el-button>
                 <el-button
+                    v-if="!tableId"
                     size="small"
                     type="warning"
-                    v-if="!tableId"
-                    @click="downLoadFile"
                     :loading="downloadLoading"
-                    >下载导入模板</el-button
+                    @click="downLoadFile"
                 >
+                    下载导入模板
+                </el-button>
             </template>
             <hc-search-input
+                v-if="tableId"
                 v-model="queryValue"
+                class="mb-4 w-100"
                 @search="getEditEleList"
-                class="w-100 mb-4"
-                v-if="tableId"
             />
-            <hc-table :column="tableColumn" :datas="editEleList">
+            <hc-table v-loading="tableLoading" :column="tableColumn" :datas="editEleList">
                 <template #eName="{ row }">
                     <hc-table-input v-model="row.eName" />
                 </template>
                 <template #eType="{ row }">
                     <el-select
                         v-model="row.eType"
-                        @change="setDefaultLength(row)"
                         placeholder="请选择"
+                        @change="setDefaultLength(row)"
                     >
                         <el-option
                             v-for="item in dataTypeList"
                             :key="item.id"
                             :label="item.label"
                             :value="item.value"
-                        ></el-option>
+                        />
                     </el-select>
                 </template>
                 <template #eLength="{ row }">
@@ -149,17 +152,17 @@
                             :popper-append-to-body="false"
                             placeholder="请选择"
                         >
-                            <el-option :key="1" label="-" value="-"></el-option>
-                            <el-option :key="2" label=">" value=">"></el-option>
-                            <el-option :key="3" label="<" value="<"></el-option>
-                            <el-option :key="4" label="≥" value="≥"></el-option>
-                            <el-option :key="5" label="≤" value="≤"></el-option>
-                            <el-option :key="6" label="±" value="±"></el-option>
+                            <el-option :key="1" label="-" value="-" />
+                            <el-option :key="2" label=">" value=">" />
+                            <el-option :key="3" label="<" value="<" />
+                            <el-option :key="4" label="≥" value="≥" />
+                            <el-option :key="5" label="≤" value="≤" />
+                            <el-option :key="6" label="±" value="±" />
                             <el-option
                                 :key="7"
                                 label="【】"
                                 value="【】"
-                            ></el-option>
+                            />
                         </el-select>
                         <hc-table-input v-model="row.deviation" />
                     </div>
@@ -167,37 +170,40 @@
                 <template #eInspectionMethod="{ row }">
                     <hc-table-input v-model="row.eInspectionMethod" />
                 </template>
-                <template #dynamicDict="{ row }" v-if="tableId">
+                <template v-if="tableId" #dynamicDict="{ row }">
                     <el-select v-model="row.dynamicDict" placeholder="请选择">
                         <el-option
                             v-for="item in dynamicDictList"
                             :key="item.id"
                             :label="item.label"
                             :value="item.value"
-                        ></el-option>
+                        />
                     </el-select>
                 </template>
                 <template #action="{ row, index }">
                     <el-link
+                        v-if="row.id"
                         type="danger"
                         @click="rowDelClick(row, index)"
-                        v-if="row.id"
-                        >删除</el-link
                     >
+                        删除
+                    </el-link>
                     <div v-else>
                         <el-link
                             v-if="tableId"
                             type="primary"
-                            @click="addSaveClick(row, index)"
                             :loading="addSaveLoading"
-                            >保存</el-link
+                            @click="addSaveClick(row, index)"
                         >
+                            保存
+                        </el-link>
                         <el-link
                             type="danger"
-                            @click="rowDelClick(row, index)"
                             :loading="rowDelLoading"
-                            >删除</el-link
+                            @click="rowDelClick(row, index)"
                         >
+                            删除
+                        </el-link>
                     </div>
                 </template>
             </hc-table>
@@ -216,17 +222,19 @@
                 <el-button
                     size="small"
                     type="primary"
-                    @click="downLoadFile"
                     :loading="downloadLoading"
-                    >下载导入模板</el-button
+                    @click="downLoadFile"
                 >
+                    下载导入模板
+                </el-button>
                 <el-button
                     size="small"
                     type="primary"
-                    @click="importModalClick"
                     :loading="uploadsLoading"
-                    >本地上传</el-button
+                    @click="importModalClick"
                 >
+                    本地上传
+                </el-button>
             </template>
             <hc-table :column="fileTableColumn" :datas="fileTableData">
                 <template #elementAllowDeviation="{ row }">
@@ -236,17 +244,17 @@
                             :popper-append-to-body="false"
                             placeholder="请选择"
                         >
-                            <el-option :key="1" label="-" value="-"></el-option>
-                            <el-option :key="2" label=">" value=">"></el-option>
-                            <el-option :key="3" label="<" value="<"></el-option>
-                            <el-option :key="4" label="≥" value="≥"></el-option>
-                            <el-option :key="5" label="≤" value="≤"></el-option>
-                            <el-option :key="6" label="±" value="±"></el-option>
+                            <el-option :key="1" label="-" value="-" />
+                            <el-option :key="2" label=">" value=">" />
+                            <el-option :key="3" label="<" value="<" />
+                            <el-option :key="4" label="≥" value="≥" />
+                            <el-option :key="5" label="≤" value="≤" />
+                            <el-option :key="6" label="±" value="±" />
                             <el-option
                                 :key="7"
                                 label="【】"
                                 value="【】"
-                            ></el-option>
+                            />
                         </el-select>
                         <hc-table-input v-model="row.elementAllowDeviation" />
                     </div>
@@ -255,15 +263,14 @@
         </hc-card-item>
     </hc-dialog>
 </template>
+
 <script setup>
-import { ref, watch } from "vue";
-import { getDictionaryData } from "~src/utils/tools";
-import mainApi from "~api/wbs/wbsforelement";
-import { useAppStore } from "~src/store";
-import { HcUploadFileApi, HcDelMsg } from "hc-vue3-ui";
-import { formValidate, getArrValue, downloadBlob } from "js-fast-way";
-const store = useAppStore();
-const userInfo = ref(store.getUserInfo);
+import { ref, watch } from 'vue'
+import { getDictionaryData } from '~src/utils/tools'
+import mainApi from '~api/wbs/wbsforelement'
+import { useAppStore } from '~src/store'
+import { HcDelMsg, HcUploadFileApi } from 'hc-vue3-ui'
+import { downloadBlob, formValidate, getArrValue } from 'js-fast-way'
 const props = defineProps({
     ownerTypeList: {
         type: Array,
@@ -275,7 +282,7 @@ const props = defineProps({
     },
     wid: {
         type: [String, Number],
-        default: "",
+        default: '',
     },
     node: {
         type: Object,
@@ -283,58 +290,63 @@ const props = defineProps({
     },
     title: {
         type: String,
-        default: "",
+        default: '',
     },
     tableId: {
         type: String,
-        default: "",
+        default: '',
     },
     initTableName: {
         type: String,
-        default: "",
+        default: '',
     },
 
     initTableId: {
         type: String,
-        default: "",
+        default: '',
     },
     eKey: {
         type: String,
-        default: "",
+        default: '',
     },
     type: {
         type: [String, Number],
 
-        default: "1", //私有wbs为0，公共wbs为1
+        default: '1', //私有wbs为0，公共wbs为1
+    },
+    isAdd:{
+        type: Boolean,
+        default: true,
     },
-});
+})
 //事件
-const emit = defineEmits(["close"]);
+const emit = defineEmits(['close'])
+const store = useAppStore()
+const userInfo = ref(store.getUserInfo)
 //双向绑定
 // eslint-disable-next-line no-undef
-const isShow = defineModel("modelValue", {
+const isShow = defineModel('modelValue', {
     default: false,
-});
+})
 //监听显示
 watch(isShow, (val) => {
     if (val) {
-        getDataTypelist();
-        getDynamicDictList();
-    } else {
-        emit("close");
-    }
-});
+        getDataTypelist()
+        getDynamicDictList()
+    } 
+})
 
-const ownerTypeList = ref(props.ownerTypeList);
-const tableTypelist = ref(props.tableTypelist);
-const wbsId = ref(props.wid);
-const node = ref(props.node);
-const modelTitle = ref(props.title);
-const tableId = ref(props.tableId);
-const initTableName = ref(props.initTableName);
-const initTableId = ref(props.initTableId);
-const eKey = ref(props.eKey);
-const type = ref(props.type);
+const ownerTypeList = ref(props.ownerTypeList)
+const tableTypelist = ref(props.tableTypelist)
+const wbsId = ref(props.wid)
+const node = ref(props.node)
+const modelTitle = ref(props.title)
+const tableId = ref(props.tableId)
+const initTableName = ref(props.initTableName)
+const initTableId = ref(props.initTableId)
+const eKey = ref(props.eKey)
+const type = ref(props.type)
+const isAdd = ref(props.isAdd)
 //监听数据
 watch(
     () => [
@@ -348,124 +360,139 @@ watch(
         props.initTableId,
         props.eKey,
         props.type,
+        props.isAdd,
     ],
-    ([own, table, wbsid, nodeInfo, til, tid, tname, itid, ekey, tpe]) => {
-        ownerTypeList.value = own;
-        tableTypelist.value = table;
-        wbsId.value = wbsid;
-        node.value = nodeInfo;
-        modelTitle.value = til;
-        tableId.value = tid;
-        initTableName.value = tname;
-        initTableId.value = itid;
-        eKey.value = ekey;
-        type.value = tpe;
+    ([own, table, wbsid, nodeInfo, til, tid, tname, itid, ekey, tpe, add]) => {
+        ownerTypeList.value = own
+        tableTypelist.value = table
+        wbsId.value = wbsid
+        node.value = nodeInfo
+        modelTitle.value = til
+        tableId.value = tid
+        initTableName.value = tname
+        initTableId.value = itid
+        eKey.value = ekey
+        type.value = tpe
+        isAdd.value = add
     },
-    { deep: true }
-);
+    { deep: true },
+)
 watch(
     tableId,
     (val) => {
-        console.log(val, "val11111111");
-
         if (val) {
-            getEditEleList();
+            getEditEleList()
+      
+        } else {
+            editEleList.value = []
+       
+        }
+    },
+    { deep: true },
+)
+watch(
+    isAdd,
+    (val) => {
+        if (!val ) {
             if (type.value === 0) {
                 tableColumn.value = [
-                    { key: "eName", name: "元素名称", width: 150 },
+                    { key: 'eName', name: '元素名称', width: 150 },
 
-                    { key: "dynamicDict", name: "动态字典" },
-                ];
+                    { key: 'dynamicDict', name: '动态字典' },
+                ]
             } else {
                 tableColumn.value = [
-                    { key: "eName", name: "元素名称", width: 150 },
-                    { key: "eType", name: "数据类型", width: 120 },
-                    { key: "eLength", name: "长度" },
-                    { key: "eAllowDeviation", name: "允许偏差值", width: 180 },
-                    { key: "eInspectionMethod", name: "检查方法和频率" },
-                    { key: "dynamicDict", name: "动态字典" },
-                    { key: "action", name: "操作", width: 80, align: "center" },
-                ];
+                    { key: 'eName', name: '元素名称', width: 150 },
+                    { key: 'eType', name: '数据类型', width: 120 },
+                    { key: 'eLength', name: '长度' },
+                    { key: 'eAllowDeviation', name: '允许偏差值', width: 180 },
+                    { key: 'eInspectionMethod', name: '检查方法和频率' },
+                    { key: 'dynamicDict', name: '动态字典' },
+                    { key: 'action', name: '操作', width: 80, align: 'center' },
+                ]
             }
         } else {
-            editEleList.value = [];
+            editEleList.value = []
             tableColumn.value = [
-                { key: "eName", name: "元素名称", width: 150 },
-                { key: "eType", name: "数据类型", width: 120 },
-                { key: "eLength", name: "长度" },
-                { key: "eAllowDeviation", name: "允许偏差值", width: 180 },
-                { key: "eInspectionMethod", name: "检查方法和频率" },
-                { key: "action", name: "操作", width: 80, align: "center" },
-            ];
+                { key: 'eName', name: '元素名称', width: 150 },
+                { key: 'eType', name: '数据类型', width: 120 },
+                { key: 'eLength', name: '长度' },
+                { key: 'eAllowDeviation', name: '允许偏差值', width: 180 },
+                { key: 'eInspectionMethod', name: '检查方法和频率' },
+                { key: 'action', name: '操作', width: 80, align: 'center' },
+            ]
         }
     },
-    { deep: true }
-);
+    { deep: true },
+)
 //表单
-const formRef = ref(null);
+const formRef = ref(null)
 const formRules = {
     tableName: {
         required: true,
-        trigger: "blur",
-        message: "请输入表单名称",
+        trigger: 'blur',
+        message: '请输入表单名称',
     },
     tableType: {
         required: true,
-        trigger: "blur",
-        message: "请选择表单类型",
+        trigger: 'blur',
+        message: '请选择表单类型',
     },
     tableOwner: {
         required: true,
-        trigger: "blur",
-        message: "请选择所属方",
+        trigger: 'blur',
+        message: '请选择所属方',
     },
     wid: {
         type: [String, Number],
-        default: "",
+        default: '',
     },
-};
+}
 
-const formModel = ref({});
-const editVisible = ref(false);
+const formModel = ref({})
+const editVisible = ref(false)
 const tableColumn = ref([
-    { key: "eName", name: "元素名称", width: 150 },
-    { key: "eType", name: "数据类型", width: 120 },
-    { key: "eLength", name: "长度" },
-    { key: "eAllowDeviation", name: "允许偏差值", width: 180 },
-    { key: "eInspectionMethod", name: "检查方法和频率" },
-    { key: "action", name: "操作", width: 80, align: "center" },
-]);
-const editEleList = ref([]);
-const queryValue = ref("");
+    { key: 'eName', name: '元素名称', width: 150 },
+    { key: 'eType', name: '数据类型', width: 120 },
+    { key: 'eLength', name: '长度' },
+    { key: 'eAllowDeviation', name: '允许偏差值', width: 180 },
+    { key: 'eInspectionMethod', name: '检查方法和频率' },
+    { key: 'action', name: '操作', width: 80, align: 'center' },
+])
+const editEleList = ref([])
+const queryValue = ref('')
+const tableLoading = ref(false)
 
 const getEditEleList = async () => {
+    tableLoading.value = true
     const { data } = await mainApi.getTableElements({
         id: tableId.value,
         search: queryValue.value,
         type: type.value,
-    });
-    editEleList.value = getArrValue(data);
-    const eleReg = /(-|>|<|≥|≤|±|【】)?([^≥≤±【】]*)/;
+    })
+    tableLoading.value = false
+    editEleList.value = getArrValue(data)
+    const eleReg = /(-|>|<|≥|≤|±|【】)?([^≥≤±【】]*)/
     editEleList.value.forEach((element) => {
-        eleReg.exec(element.eAllowDeviation);
-        element.allow = RegExp.$1 ? RegExp.$1 : "";
-        element.deviation = RegExp.$2 ? RegExp.$2 : "";
-    });
-};
-const dataTypeList = ref([]);
+        eleReg.exec(element.eAllowDeviation)
+        element.allow = RegExp.$1 ? RegExp.$1 : ''
+        element.deviation = RegExp.$2 ? RegExp.$2 : ''
+    })
+}
+const dataTypeList = ref([])
 const getDataTypelist = async () => {
     if (dataTypeList.value.length > 1) {
-        return;
+        return
     }
-    dataTypeList.value = await getDictionaryData("data_type", false);
-};
-const dynamicDictList = ref([]); //动态字典列表
+    dataTypeList.value = await getDictionaryData('data_type', false)
+}
+const dynamicDictList = ref([]) //动态字典列表
 const getDynamicDictList = async () => {
     if (dynamicDictList.value.length > 1) {
-        return;
+        return
     }
-    dynamicDictList.value = await getDictionaryData("land_field_dict", false);
-};
+    dynamicDictList.value = await getDictionaryData('land_field_dict', false)
+}
 const setDefaultLength = (row) => {
     const dataTypeDefaultMap = {
         1: 250, //字符串
@@ -475,183 +502,183 @@ const setDefaultLength = (row) => {
         5: 50, //数值
         6: 50, //签名
         7: 100, //文件
-    };
-    row.eLength = dataTypeDefaultMap[row.eType];
-};
-const rowDelLoading = ref(false);
+    }
+    row.eLength = dataTypeDefaultMap[row.eType]
+}
+const rowDelLoading = ref(false)
 const rowDelClick = async (row, index) => {
     if (!row.id) {
-        editEleList.value.splice(index, 1);
+        editEleList.value.splice(index, 1)
     } else {
         HcDelMsg(async (resolve) => {
             //发起请求
-            rowDelLoading.value = true;
+            rowDelLoading.value = true
             const { isRes } = await mainApi.removeElement({
                 ids: row.id,
                 initTableName: initTableName.value,
                 eKey: row.ekey,
-            });
-            resolve(); //关闭弹窗
-            if (!isRes) return;
-            window?.$message?.success("操作成功");
-        });
+            })
+            resolve() //关闭弹窗
+            if (!isRes) return
+            window?.$message?.success('操作成功')
+        })
     }
-};
+}
 const addRowClick = () => {
-    editEleList.value.push({});
-};
-const addSaveLoading = ref(false);
+    editEleList.value.push({})
+}
+const addSaveLoading = ref(false)
 const addSaveClick = async (row) => {
     if (!row.eName) {
-        window.$message.warning("请填写元素名称");
-        return;
+        window.$message.warning('请填写元素名称')
+        return
     }
     if (!row.eType) {
-        window.$message.warning("请选择数据类型");
-        return;
+        window.$message.warning('请选择数据类型')
+        return
     }
 
-    row.eAllowDeviation =
-        (row.allow ? row.allow : "") + (row.deviation ? row.deviation : "");
-    row.fId = initTableId.value;
-    row.initTableName = initTableName.value;
+    row.eAllowDeviation
+        = (row.allow ? row.allow : '') + (row.deviation ? row.deviation : '')
+    row.fId = initTableId.value
+    row.initTableName = initTableName.value
     if (!row.eLength) {
-        window.$message.warning("请填写长度");
-        return;
+        window.$message.warning('请填写长度')
+        return
     }
-    addSaveLoading.value = true;
-    const { error, code, data } = await mainApi.saveElement(row);
-    addSaveLoading.value = false;
+    addSaveLoading.value = true
+    const { error, code, data } = await mainApi.saveElement(row)
+    addSaveLoading.value = false
     if (!error && code === 200) {
-        window?.$message?.success("操作成功");
-        row.id = data.id;
-        row.ekey = data.ekey;
+        window?.$message?.success('操作成功')
+        row.id = data.id
+        row.ekey = data.ekey
     }
-};
-const submitLoading = ref(false);
+}
+const submitLoading = ref(false)
 
 const saveFormAndElementHandle = async () => {
     if (!tableId.value) {
-        const formRes = await formValidate(formRef.value);
-        if (!formRes) return false;
+        const formRes = await formValidate(formRef.value)
+        if (!formRes) return false
     }
 
-    formModel.value.wbsId = wbsId.value;
-    formModel.value.tenantId = userInfo.value.tenant_id;
-    formModel.value.nodeType = -1;
-    formModel.value.type = 2; //	'1'节点 '2'表
-    formModel.value.parentId = node.value.id;
-    formModel.value.nodeName = node.value.nodeName;
+    formModel.value.wbsId = wbsId.value
+    formModel.value.tenantId = userInfo.value.tenant_id
+    formModel.value.nodeType = -1
+    formModel.value.type = 2 //	'1'节点 '2'表
+    formModel.value.parentId = node.value.id
+    formModel.value.nodeName = node.value.nodeName
     for (let i = 0; i < editEleList.value.length; i++) {
         if (tableId.value) {
             if (!editEleList.value[i].id) {
-                window.$message.warning("请先将新增的元素点击保存");
-                return;
+                window.$message.warning('请先将新增的元素点击保存')
+                return
             }
         }
 
         if (!editEleList.value[i].eName) {
-            window.$message.warning("请填写第" + (i + 1) + "条元素名称");
-            return;
+            window.$message.warning('请填写第' + (i + 1) + '条元素名称')
+            return
         }
         if (!editEleList.value[i].eType) {
-            window.$message.warning("请选择第" + (i + 1) + "条数据类型");
-            return;
+            window.$message.warning('请选择第' + (i + 1) + '条数据类型')
+            return
         }
         if (!editEleList.value[i].eLength) {
-            window.$message.warning("请填写第" + (i + 1) + "条数据长度");
-            return;
+            window.$message.warning('请填写第' + (i + 1) + '条数据长度')
+            return
         }
     }
     if (editEleList.value.length > 0) {
         editEleList.value.forEach((element) => {
-            element.eAllowDeviation =
-                (element.allow ? element.allow : "") +
-                (element.deviation ? element.deviation : "");
-        });
-        submitLoading.value = true;
-        formModel.value.elementList = editEleList;
+            element.eAllowDeviation
+                = (element.allow ? element.allow : '')
+                + (element.deviation ? element.deviation : '')
+        })
+        submitLoading.value = true
+        formModel.value.elementList = editEleList
 
         if (!tableId.value) {
             const { error, code } = await mainApi.saveFormAndElement({
                 ...formModel.value,
-            });
-            submitLoading.value = false;
+            })
+            submitLoading.value = false
             if (!error && code === 200) {
-                window?.$message?.success("操作成功");
-                dialogClose();
+                window?.$message?.success('操作成功')
+                dialogClose()
             }
         } else {
-            const { error, code } = await mainApi.updateBatchElements(
+            const { error, code, msg } = await mainApi.updateBatchElements(
                 editEleList.value,
-                initTableName.value
-            );
-            submitLoading.value = false;
+                initTableName.value,
+            )
+            submitLoading.value = false
             if (!error && code === 200) {
-                window?.$message?.success("操作成功");
-                dialogClose();
-            }
+                window?.$message?.success('操作成功')
+                dialogClose()
+            } 
         }
     } else {
-        window.$message.warning("请填写完整元素表信息");
+        window.$message.warning('请填写完整元素表信息')
     }
-};
+}
 //关闭弹窗
 const dialogClose = () => {
-    isShow.value = false;
-    emit("close");
-};
-const fileModal = ref(false);
+    isShow.value = false
+    emit('close')
+}
+const fileModal = ref(false)
 const uploadClick = () => {
-    fileModal.value = true;
-    fileTableData.value = [];
-};
+    fileModal.value = true
+    fileTableData.value = []
+}
 const fileTableColumn = [
-    { key: "elementName", name: "元素名称" },
-    { key: "elementType", name: "数据类型" },
-    { key: "elementLength", name: "长度" },
-    { key: "elementAllowDeviation", name: "允许偏差值" },
-    { key: "elementInspectionMethod", name: "检查方法和频率" },
-];
-const fileTableData = ref([]);
-const downloadLoading = ref(false);
+    { key: 'elementName', name: '元素名称' },
+    { key: 'elementType', name: '数据类型' },
+    { key: 'elementLength', name: '长度' },
+    { key: 'elementAllowDeviation', name: '允许偏差值' },
+    { key: 'elementInspectionMethod', name: '检查方法和频率' },
+]
+const fileTableData = ref([])
+const downloadLoading = ref(false)
 const downLoadFile = async () => {
-    downloadLoading.value = true;
-    const { error, disposition, res } = await mainApi.getExportTem();
+    downloadLoading.value = true
+    const { error, disposition, res } = await mainApi.getExportTem()
     //处理数据
-    downloadLoading.value = false;
+    downloadLoading.value = false
     if (!error) {
         if (disposition) {
-            downloadBlob(res, disposition);
+            downloadBlob(res, disposition)
         } else {
-            window.$message?.error("数据异常");
+            window.$message?.error('数据异常')
         }
     }
-};
-const uploadsLoading = ref(false);
+}
+const uploadsLoading = ref(false)
 const importModalClick = () => {
     HcUploadFileApi({
         multiple: false,
-        url: "/api/blade-manager/wbsFormElement/import-wbsElement",
-        target: "/api/blade-manager/wbsFormElement/import-wbsElement",
+        url: '/api/blade-manager/wbsFormElement/import-wbsElement',
+        target: '/api/blade-manager/wbsFormElement/import-wbsElement',
         progress: () => {
-            uploadsLoading.value = true;
+            uploadsLoading.value = true
         },
         success: (file, res) => {
-            fileTableData.value = getArrValue(res.data);
+            fileTableData.value = getArrValue(res.data)
         },
         error: (file) => {
-            uploadsLoading.value = false;
-            window.$message.error(`${file.name} 上传失败`);
+            uploadsLoading.value = false
+            window.$message.error(`${file.name} 上传失败`)
         },
         finish: () => {
-            uploadsLoading.value = false;
-            window.$message.success("上传完成");
+            uploadsLoading.value = false
+            window.$message.success('上传完成')
         },
-    });
-};
+    })
+}
 const saveFileImport = () => {
-    fileModal.value = false;
+    fileModal.value = false
     fileTableData.value.forEach((ele) => {
         editEleList.value.push({
             eName: ele.elementName,
@@ -659,7 +686,7 @@ const saveFileImport = () => {
             eName: ele.elementInspectionMethod,
             eLength: ele.elementLength,
             eType: ele.elementType,
-        });
-    });
-};
+        })
+    })
+}
 </script>

src/views/desk/wbs/drawer-wbs.vue

@@ -260,6 +260,7 @@
             :init-table-name="initTableName"
             :init-table-id="initTableId"
             :e-key="eKey"
+            :is-add="isAddType"
             @close="createClose"
         />
         <!-- 编辑元素表信息 -->
@@ -708,8 +709,10 @@ const tableId = ref('')
 const initTableName = ref('')
 const initTableId = ref('')
 const eKey = ref('')
-const editRowClick = (row) => {
+const editRowClick = async (row) => {
+    await nextTick()
     isCreateShow.value = true
+    isAddType.value = false
     modalTitle.value = row.tableName + '元素编辑'
     tableId.value = row.id
     initTableName.value = row.initTableName
@@ -729,16 +732,21 @@ const rowDelClick = async (row) => {
 //创建新的元素表
 const isCreateShow = ref(false)
 const modalTitle = ref('创建新的元素表')
-const createClose = () => {
+const isAddType = ref(false)
+const createClose = async () => {
+ 
+    // getTableData()
+  
     isCreateShow.value = false
-    getTableData()
 }
-const createNew = () => {
+const createNew = async () => {
     const { id } = nodeInfo.value
     tableId.value = ''
     if (id) {
+        await nextTick()
         isCreateShow.value = true
         modalTitle.value = '创建新的元素表'
+        isAddType.value = true
         tableId.value = ''
     } else {
         window.$message.warning('请先选择在哪个节点下创建表')

src/views/desk/wbs/element/edit-element.vue

@@ -2,12 +2,12 @@
     <hc-dialog
         v-model="isShow"
         is-footer-center
-        title="元素编辑"
-        @close="dialogClose"
-        @save="saveFormAndElementHandle"
+        title="元素编辑11111111"
         widths="56rem"
         :loading="submitLoading"
-        isTable
+        is-table
+        @close="dialogClose"
+        @save="saveFormAndElementHandle"
     >
         <hc-card-item>
             <template #header>
@@ -18,10 +18,10 @@
                 >
                     <template #content>
                         <div class="text-sm text-red">
-                            1.元素名称不能为空<br />
-                            2.数据类型不能为空<br />
-                            3.元素长度不能为空<br />
-                            4.编辑元素信息请谨慎操作<br />
+                            1.元素名称不能为空<br>
+                            2.数据类型不能为空<br>
+                            3.元素长度不能为空<br>
+                            4.编辑元素信息请谨慎操作<br>
                         </div>
                     </template>
                     <el-button
@@ -36,31 +36,31 @@
             </template>
 
             <template #extra>
-                <el-button size="small" type="success" @click="addRowClick"
-                    >新增</el-button
-                >
+                <el-button size="small" type="success" @click="addRowClick">
+                    新增
+                </el-button>
             </template>
             <hc-search-input
                 v-model="queryValue"
+                class="mb-4 w-100"
                 @search="getEditEleList"
-                class="w-100 mb-4"
             />
-            <hc-table :column="tableColumn" :datas="editEleList">
+            <hc-table :column="tableColumn" :datas="editEleList" :loading="tableLoading">
                 <template #eName="{ row }">
                     <hc-table-input v-model="row.eName" />
                 </template>
                 <template #eType="{ row }">
                     <el-select
                         v-model="row.eType"
-                        @change="setDefaultLength(row)"
                         placeholder="请选择"
+                        @change="setDefaultLength(row)"
                     >
                         <el-option
                             v-for="item in dataTypeList"
                             :key="item.id"
                             :label="item.label"
                             :value="item.value"
-                        ></el-option>
+                        />
                     </el-select>
                 </template>
                 <template #eLength="{ row }">
@@ -73,17 +73,17 @@
                             :popper-append-to-body="false"
                             placeholder="请选择"
                         >
-                            <el-option :key="1" label="-" value="-"></el-option>
-                            <el-option :key="2" label=">" value=">"></el-option>
-                            <el-option :key="3" label="<" value="<"></el-option>
-                            <el-option :key="4" label="≥" value="≥"></el-option>
-                            <el-option :key="5" label="≤" value="≤"></el-option>
-                            <el-option :key="6" label="±" value="±"></el-option>
+                            <el-option :key="1" label="-" value="-" />
+                            <el-option :key="2" label=">" value=">" />
+                            <el-option :key="3" label="<" value="<" />
+                            <el-option :key="4" label="≥" value="≥" />
+                            <el-option :key="5" label="≤" value="≤" />
+                            <el-option :key="6" label="±" value="±" />
                             <el-option
                                 :key="7"
                                 label="【】"
                                 value="【】"
-                            ></el-option>
+                            />
                         </el-select>
                         <hc-table-input v-model="row.deviation" />
                     </div>
@@ -94,105 +94,112 @@
 
                 <template #action="{ row, index }">
                     <el-link
+                        v-if="row.id"
                         type="danger"
                         @click="rowDelClick(row, index)"
-                        v-if="row.id"
-                        >删除</el-link
                     >
+                        删除
+                    </el-link>
                     <div v-else>
                         <el-link
                             type="primary"
-                            @click="addSaveClick(row, index)"
                             :loading="addSaveLoading"
-                            >保存</el-link
+                            @click="addSaveClick(row, index)"
                         >
+                            保存
+                        </el-link>
                         <el-link
                             type="danger"
-                            @click="rowDelClick(row, index)"
                             :loading="rowDelLoading"
-                            >删除</el-link
+                            @click="rowDelClick(row, index)"
                         >
+                            删除
+                        </el-link>
                     </div>
                 </template>
             </hc-table>
         </hc-card-item>
     </hc-dialog>
 </template>
+
 <script setup>
-import { ref, watch } from "vue";
-import { getDictionaryData } from "~src/utils/tools";
-import mainApi from "~api/wbs/wbsforelement";
-import treeApi from "~api/wbs/tree";
+import { ref, watch } from 'vue'
+import { getDictionaryData } from '~src/utils/tools'
+import mainApi from '~api/wbs/wbsforelement'
+import treeApi from '~api/wbs/tree'
 
-import { getArrValue } from "js-fast-way";
+import { getArrValue } from 'js-fast-way'
 
 const props = defineProps({
     info: {
         type: Object,
         default: () => {},
     },
-});
+})
 //事件
-const emit = defineEmits(["close"]);
+const emit = defineEmits(['close'])
 //双向绑定
 // eslint-disable-next-line no-undef
-const isShow = defineModel("modelValue", {
+const isShow = defineModel('modelValue', {
     default: false,
-});
+})
 //监听显示
 watch(isShow, (val) => {
     if (val) {
-        getDataTypelist();
-        getEditEleList();
+        getDataTypelist()
+        getEditEleList()
     } else {
-        emit("close");
+        emit('close')
     }
-});
+})
 
-const info = ref(props.info);
+const info = ref(props.info)
 
 //监听数据
 watch(
     () => [props.info],
     ([infoData]) => {
-        info.value = infoData;
+        info.value = infoData
     },
-    { deep: true }
-);
+    { deep: true },
+)
 
-const formModel = ref({});
-const editVisible = ref(false);
+const formModel = ref({})
+const editVisible = ref(false)
 const tableColumn = ref([
-    { key: "eName", name: "元素名称", width: 150 },
-    { key: "eType", name: "数据类型", width: 120 },
-    { key: "eLength", name: "长度" },
-    { key: "eAllowDeviation", name: "允许偏差值", width: 180 },
-    { key: "eInspectionMethod", name: "检查方法和频率" },
-    { key: "action", name: "操作", width: 80, align: "center" },
-]);
-const editEleList = ref([]);
-const queryValue = ref("");
+    { key: 'eName', name: '元素名称', width: 150 },
+    { key: 'eType', name: '数据类型', width: 120 },
+    { key: 'eLength', name: '长度' },
+    { key: 'eAllowDeviation', name: '允许偏差值', width: 180 },
+    { key: 'eInspectionMethod', name: '检查方法和频率' },
+    { key: 'action', name: '操作', width: 80, align: 'center' },
+])
+const editEleList = ref([])
+const tableLoading = ref(false)
+const queryValue = ref('')
 
 const getEditEleList = async () => {
+    tableLoading.value = true
     const { data } = await treeApi.selectPrivateFormElements({
         id: info.value?.id,
-        eName: queryValue.value || "",
-    });
-    editEleList.value = getArrValue(data);
-    const eleReg = /(-|>|<|≥|≤|±|【】)?([^≥≤±【】]*)/;
+        eName: queryValue.value || '',
+    })
+    tableLoading.value = false
+    editEleList.value = getArrValue(data)
+    const eleReg = /(-|>|<|≥|≤|±|【】)?([^≥≤±【】]*)/
     editEleList.value.forEach((element) => {
-        eleReg.exec(element.eAllowDeviation);
-        element.allow = RegExp.$1 ? RegExp.$1 : "";
-        element.deviation = RegExp.$2 ? RegExp.$2 : "";
-    });
-};
-const dataTypeList = ref([]);
+        eleReg.exec(element.eAllowDeviation)
+        element.allow = RegExp.$1 ? RegExp.$1 : ''
+        element.deviation = RegExp.$2 ? RegExp.$2 : ''
+    })
+}
+const dataTypeList = ref([])
 const getDataTypelist = async () => {
     if (dataTypeList.value.length > 1) {
-        return;
+        return
     }
-    dataTypeList.value = await getDictionaryData("data_type", false);
-};
+    dataTypeList.value = await getDictionaryData('data_type', false)
+}
 
 const setDefaultLength = (row) => {
     const dataTypeDefaultMap = {
@@ -203,106 +210,106 @@ const setDefaultLength = (row) => {
         5: 50, //数值
         6: 50, //签名
         7: 100, //文件
-    };
-    row.eLength = dataTypeDefaultMap[row.eType];
-};
-const rowDelLoading = ref(false);
+    }
+    row.eLength = dataTypeDefaultMap[row.eType]
+}
+const rowDelLoading = ref(false)
 const rowDelClick = async (row, index) => {
     if (!row.id) {
-        editEleList.value.splice(index, 1);
+        editEleList.value.splice(index, 1)
     } else {
         HcDelMsg(async (resolve) => {
             //发起请求
-            rowDelLoading.value = true;
+            rowDelLoading.value = true
             const { isRes } = await mainApi.removeElement({
                 ids: row.id,
                 initTableName: info.value?.initTableName,
                 eKey: row.ekey,
-            });
-            resolve(); //关闭弹窗
-            if (!isRes) return;
-            window?.$message?.success("操作成功");
-            getEditEleList();
-        });
+            })
+            resolve() //关闭弹窗
+            if (!isRes) return
+            window?.$message?.success('操作成功')
+            getEditEleList()
+        })
     }
-};
+}
 const addRowClick = () => {
-    editEleList.value.push({});
-};
+    editEleList.value.push({})
+}
 
-const addSaveLoading = ref(false);
+const addSaveLoading = ref(false)
 const addSaveClick = async (row) => {
     if (!row.eName) {
-        window.$message.warning("请填写元素名称");
-        return;
+        window.$message.warning('请填写元素名称')
+        return
     }
     if (!row.eType) {
-        window.$message.warning("请选择数据类型");
-        return;
+        window.$message.warning('请选择数据类型')
+        return
     }
 
-    row.eAllowDeviation =
-        (row.allow ? row.allow : "") + (row.deviation ? row.deviation : "");
-    row.fId = info.value.initTableId;
-    row.initTableName = info.value.initTableName;
+    row.eAllowDeviation
+        = (row.allow ? row.allow : '') + (row.deviation ? row.deviation : '')
+    row.fId = info.value.initTableId
+    row.initTableName = info.value.initTableName
     if (!row.eLength) {
-        window.$message.warning("请填写长度");
-        return;
+        window.$message.warning('请填写长度')
+        return
     }
-    addSaveLoading.value = true;
-    const { error, code, data } = await mainApi.saveElement(row);
-    addSaveLoading.value = false;
+    addSaveLoading.value = true
+    const { error, code, data } = await mainApi.saveElement(row)
+    addSaveLoading.value = false
     if (!error && code === 200) {
-        window?.$message?.success("操作成功");
-        row.id = data.id;
-        row.ekey = data.ekey;
+        window?.$message?.success('操作成功')
+        row.id = data.id
+        row.ekey = data.ekey
     }
-};
-const submitLoading = ref(false);
+}
+const submitLoading = ref(false)
 
 const saveFormAndElementHandle = async () => {
     for (let i = 0; i < editEleList.value.length; i++) {
         if (!editEleList.value[i].id) {
-            window.$message.warning("请先将新增的元素点击保存");
-            return;
+            window.$message.warning('请先将新增的元素点击保存')
+            return
         }
 
         if (!editEleList.value[i].eName) {
-            window.$message.warning("请填写第" + (i + 1) + "条元素名称");
-            return;
+            window.$message.warning('请填写第' + (i + 1) + '条元素名称')
+            return
         }
         if (!editEleList.value[i].eType) {
-            window.$message.warning("请选择第" + (i + 1) + "条数据类型");
-            return;
+            window.$message.warning('请选择第' + (i + 1) + '条数据类型')
+            return
         }
         if (!editEleList.value[i].eLength) {
-            window.$message.warning("请填写第" + (i + 1) + "条数据长度");
-            return;
+            window.$message.warning('请填写第' + (i + 1) + '条数据长度')
+            return
         }
     }
     if (editEleList.value.length > 0) {
         editEleList.value.forEach((element) => {
-            element.eAllowDeviation =
-                (element.allow ? element.allow : "") +
-                (element.deviation ? element.deviation : "");
-        });
-        submitLoading.value = true;
+            element.eAllowDeviation
+                = (element.allow ? element.allow : '')
+                + (element.deviation ? element.deviation : '')
+        })
+        submitLoading.value = true
         const { error, code } = await mainApi.updateBatchElements(
             editEleList.value,
-            info.value.initTableName
-        );
-        submitLoading.value = false;
+            info.value.initTableName,
+        )
+        submitLoading.value = false
         if (!error && code === 200) {
-            window?.$message?.success("操作成功");
-            dialogClose();
+            window?.$message?.success('操作成功')
+            dialogClose()
         }
     } else {
-        window.$message.warning("请填写完整元素表信息");
+        window.$message.warning('请填写完整元素表信息')
     }
-};
+}
 //关闭弹窗
 const dialogClose = () => {
-    isShow.value = false;
-    emit("close");
-};
+    isShow.value = false
+    emit('close')
+}
 </script>

src/views/project/list/wbs-tree.vue

@@ -172,7 +172,7 @@
         <createNewExcel
             v-model="isCreateShow" :e-key="eKey" :init-table-id="initTableId" :init-table-name="initTableName"
             :node="treeItem" :owner-type-list="ownerTypeList" :table-id="tableId" :table-typelist="tableTypelist"
-            :title="modalTitle" :type="0" :wid="wbsId" @close="createClose"
+            :title="modalTitle" :type="0" :wid="wbsId" :is-add="isAddType" @close="createClose"
         />
 
         <!-- 分配WBS -->
@@ -996,7 +996,9 @@ const previewClick = (row) => {
 //创建新的元素表
 const isCreateShow = ref(false)
 const modalTitle = ref('创建新的元素表')
-const createClose = () => {
+const isAddType = ref(true)
+const createClose = async () => {
+
     isCreateShow.value = false
     getInfoTableData()
 }
@@ -1004,9 +1006,12 @@ const initTableName = ref('')
 const initTableId = ref('')
 const eKey = ref('')
 const tableId = ref('')
-const handleEdit = (row) => {
+const handleEdit = async (row) => {
+    await nextTick()
     isCreateShow.value = true
+    isAddType.value = false
     modalTitle.value = row.tableName + '元素编辑'
+    isAddType.value = false
     tableId.value = row.pkeyId
     initTableName.value = row.initTableName
     initTableId.value = row.initTableId