Browse Source

模板导入修复

zhouxingyu 1 day ago
parent
commit
193c1e3513

+ 17 - 6
src/views/saleCode/saleInterfaceSync/SaleInterfaceSync.data.ts

@@ -94,13 +94,13 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'closeInfo'
    },
-   
+
    {
     title: '同步信息',
     align:"center",
     dataIndex: 'syncInfo'
    },
-   
+
    // {
    //  title: '内容',
    //  align:"center",
@@ -219,6 +219,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'buyerEmail'
    },
+  {
+    title: '询价备注',
+    align: "center",
+    dataIndex:'inquiryNotes'
+  },
    {
     title: '获取日期',
     align:"center",
@@ -358,7 +363,7 @@ export const formSchema: FormSchema[] = [
     component: 'DatePicker',
     componentProps:{
       valueFormat: 'YYYY-MM-DD'
-    },    
+    },
   },
   {
     label: '建议截止日期',
@@ -366,7 +371,7 @@ export const formSchema: FormSchema[] = [
     component: 'DatePicker',
     componentProps:{
       valueFormat: 'YYYY-MM-DD'
-    },    
+    },
   },
   {
     label: '提交日期',
@@ -463,7 +468,12 @@ export const formSchema: FormSchema[] = [
     field: 'status',
     component: 'Input',
     dynamicDisabled:true
-    
+
+  },
+  {
+    label: '询价备注',
+    field: 'inquiryNotes',
+    component: 'Input',
   },
 	// TODO 主键隐藏字段,目前写死为ID
 	{
@@ -532,7 +542,7 @@ export const saleInterfaceItemColumns: JVxeColumn[] = [
     //   placeholder: '请输入${title}',
     //   defaultValue:'',
     // },
-    
+
     {
       title: 'number',
       key: 'number',
@@ -637,6 +647,7 @@ export const superQuerySchema = {
   buyerFax: {title: 'buyerFax',order: 31,view: 'text', type: 'string',},
   buyerEmail: {title: 'buyerEmail',order: 32,view: 'text', type: 'string',},
   status: {title: 'status',order: 33,view: 'text', type: 'string',},
+  inquiryNotes: {title: '询价备注',order: 33,view: 'text', type: 'string',},
   //子表高级查询
   saleInterfaceItem: {
     title: '询价单-接口同步-子表',

+ 17 - 17
src/views/saleCode/saleInterfaceSync/SaleInterfaceSyncList.vue

@@ -11,7 +11,7 @@
        <!-- <j-upload-button type="primary" v-auth="'saleCode:sale_interface_sync:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls"
           >导入</j-upload-button
         > -->
-        
+
         <a-dropdown >
           <template #overlay>
             <a-menu>
@@ -52,7 +52,7 @@
             <Icon icon="mdi:chevron-down" />
           </a-button>
         </a-dropdown>
-        
+
         <!-- 高级查询 -->
         <!-- <super-query :config="superQueryConfig" @search="handleSuperQuery" /> -->
         <!-- 获取接口数据 -->
@@ -85,7 +85,7 @@
             <Icon icon="mdi:chevron-down" />
           </a-button>
         </a-dropdown>
-       
+
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -150,17 +150,17 @@
   import { columns, searchFormSchema, superQuerySchema } from './SaleInterfaceSync.data';
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl
   , getData
-  , getSyncOrder 
-  , submitBatch 
-  , returnSubmitBatch 
+  , getSyncOrder
+  , submitBatch
+  , returnSubmitBatch
   , submitClose } from './SaleInterfaceSync.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import { message } from 'ant-design-vue';
-  
+
   import { useMethods } from '/@/hooks/system/useMethods';
   import { useUserStore } from '/@/store/modules/user';
   import { useMessage } from '/@/hooks/web/useMessage';
-  
+
   const { handleExportXls, handleImportXls } = useMethods();
   const { createConfirm } = useMessage();
   const queryParam = reactive<any>({});
@@ -402,12 +402,12 @@
     closeVisiable.value = true;
   };
   const handleSyncOk = () => {
-    
+
     syncFormRef.value.validate().then(() => {
-      
+
       message.info('数据信息获取中,请稍后!');
       syncVisiable.value = false;
-      
+
       getData(syncForm.value).then((res) => {
         syncVisiable.value = false;
         handleSuccess();
@@ -431,24 +431,24 @@
       },
     });
   };
-  
-  
+
+
   /**
    * 批量关闭事件
    */
   async function batchSubmitClose() {
-    
-    
+
+
     if (selectedRowKeys.value.length == 0) {
       message.warning('请选择数据');
     } else {
       var ids = selectedRowKeys.value.join(',');
-  
+
       closeFormRef.value.validate().then(() => {
          submitClose({ ids: ids,closeInfo:closeForm.value.closeInfo}, handleSuccess);
          closeVisiable.value = false;
       });
-      
+
      // await submitClose({ ids: ids }, handleSuccess);
     }
   //   // await submitClose({ ids: selectedRowKeys.value }, handleSuccess);