Browse Source

Merge remote-tracking branch 'origin/dev-frontend'

panqiuyao 8 months ago
parent
commit
dbb95aabf1
1 changed files with 6 additions and 6 deletions
  1. 6 6
      frontend/src/views/Photography/detail.vue

+ 6 - 6
frontend/src/views/Photography/detail.vue

@@ -153,7 +153,7 @@
           <div class="flex bottom between">
             <div style="max-width: 160px;" class="mar-left-20">商品基础资料EXCEL文件选择:</div>
             <div class="flex bottom mar-left-20" style="flex-grow: 1;">
-              <el-input type="textarea" v-model="form.excelFilePath" />
+              <el-input type="textarea" v-model="form.excel_path" />
             </div>
             <el-button class="select-button button--primary1  mar-left-20" type="primary" @click="selectExcel">
               <img src="@/assets/images/Photography/wenjian.png" style="width: 16px; margin-right: 4px;" />
@@ -260,7 +260,7 @@ const form = reactive({
   selectTemplate: {}, //选中的模板
   dataType: '1', // 1: 选择excel文件 2: 系统对接
   logo_path: '', // 主图LOGO
-  excelFilePath: '', // 商品基础资料EXCEL文件选择
+  excel_path: '', // 商品基础资料EXCEL文件选择
 })
 onMounted(() => {
   const goods_art_data = route.query.goods_art_nos
@@ -330,9 +330,9 @@ const generate = async function () {
   })
   const params = {
     goods_art_no: JSON.parse(JSON.stringify(goods_art_nos.value)),
-    logo_path: form.logo_path,
-    temp_name: form.selectTemplate.template_id,
-    excel_path: '',
+    logo_path: form.logo_path || '',
+    temp_name: form.selectTemplate.template_id || '',
+    excel_path: form.dataType == '1' ? form.excel_path : '',
     template_image_order: form.selectTemplate.template_image_order,
     temp_list,
     token,
@@ -437,7 +437,7 @@ function selectExcel() {
     title: "选择基础文件资料"
   });
   clientStore.ipc.on(icpList.utils.openFile, async (event, result) => {
-    form.excelFilePath = result
+    form.excel_path = result
     clientStore.ipc.removeAllListeners(icpList.utils.openFile);
   })
 }