Bläddra i källkod

修改数据模板,和数据浏览excel没有更新的问题。

jxq 3 månader sedan
förälder
incheckning
17b75bde40

+ 10 - 5
src/views/modules/data-manager/data-manager.vue

@@ -98,14 +98,16 @@ const onSearchTestingData = async () => {
 
 // 预览魔板
 const previewExcel = (code) => {
+  excelData.value = null;
   previewExcelTemplateData({
     excelFormId: currentTemplate.value?.id || null,
     productCode: code,
   }).then((res) => {
-    excelData.value = null;
-    if (res?.data?.excelData) {
-      excelData.value = JSON.parse(res.data.excelData);
-    }
+    nextTick(() => {
+      if (res?.data?.excelData) {
+        excelData.value = JSON.parse(res.data.excelData);
+      }
+    });
   });
 };
 
@@ -153,7 +155,10 @@ onMounted(() => {
         </el-form-item>
 
         <el-form-item label="产品编号" prop="productCode">
-          <el-input v-model="formData.productCode"></el-input>
+          <el-input
+            v-model="formData.productCode"
+            placeholder="输入产品编号并搜索可以筛选结果"
+          ></el-input>
         </el-form-item>
       </el-form>
       <div class="blue-btn" style="width: 100%" @click="onSearchTestingData">

+ 25 - 21
src/views/modules/report-template/report-template.vue

@@ -20,23 +20,25 @@ const currentTemplate = ref(null);
 const refreshTemplate = ref(true);
 const onSelectTemplate = (tem) => {
   refreshTemplate.value = false;
-  refreshTemplate.value = true;
-
-  currentTemplate.value = tem;
-  temsDrawerVisible.value = false;
-
-  formData.engineeringId = tem.engineeringId;
-  formData.formName = tem.formName;
-  formData.productCode = tem.productCode;
-  // 如果有值 并且是json字符串 则解析
-  excelData.value = null;
-  if (tem.excelData) {
-    excelData.value = JSON.parse(tem.excelData);
-  }
-  console.log("返回的exccel数据", excelData.value);
-  getProductCodeListById(formData.engineeringId).then((res) => {
-    codeAllList.value = res.data;
-    codeList.value = codeAllList.value;
+
+  nextTick(() => {
+    currentTemplate.value = tem;
+    temsDrawerVisible.value = false;
+
+    formData.engineeringId = tem.engineeringId;
+    formData.formName = tem.formName;
+    formData.productCode = tem.productCode;
+    // 如果有值 并且是json字符串 则解析
+    excelData.value = null;
+    if (tem.excelData) {
+      excelData.value = JSON.parse(tem.excelData);
+    }
+    refreshTemplate.value = true;
+    console.log("返回的exccel数据", excelData.value);
+    getProductCodeListById(formData.engineeringId).then((res) => {
+      codeAllList.value = res.data;
+      codeList.value = codeAllList.value;
+    });
   });
 };
 const onOpenTemplate = () => {
@@ -138,10 +140,12 @@ const onSaveTemplate = async () => {
     let result = await saveExcelTemplate(p);
   }
 
-  formRef.value && formRef.value.resetFields();
-  currentTemplate.value = null;
-
-  excelData.value = null;
+  // 清空右侧数据和excel数据
+  // formRef.value && formRef.value.resetFields();
+  // currentTemplate.value = null;
+  //
+  // excelData.value = null;
+  // refreshTemplate.value = false;
   ElMessage.success("保存成功");
 };