feat: 合并代码

@@ -174,6 +174,18 @@ export function getCustomerList(data) {
     },
   });
 }
+// /exportSummary/exportSummaryList
+export function getNewCustomerList(data) {
+  return request({
+    url: "/bus-customer/exportSummary/get/customers",
+    method: "post",
+    data: {
+      pageIndex: 1,
+      pageSize: 1000,
+      ...data,
+    },
+  });
+}
 
 //获取口岸表数据
 export function getPortList(data) {

-import request from '@/utils/request'
+import request from "@/utils/request";
 
 /**
  * 汇总申请单查询
@@ -14,46 +14,56 @@ import request from '@/utils/request'
  * @param data.pageIndex 当前页码
  * @param data.pageSize 分页最大数据量
  */
-export function searchExportSummaryList(data){
+export function searchExportSummaryList(data) {
   return request({
-    url: '/bus-customer/exportSummary/exportSummaryList',
-    method: 'post',
+    url: "/bus-customer/exportSummary/exportSummaryList",
+    method: "post",
     data: data,
-  })
+  });
 }
 
 /**
  * 查询汇总回执
  * @param data.copNo 企业唯一编号
  */
-export function getExportSummaryReceiptData(data){
+export function getExportSummaryReceiptData(data) {
   return request({
-    url: '/bus-customer/exportSummary/receipt/' + data.copNo,
-    method: 'get',
-  })
+    url: "/bus-customer/exportSummary/receipt/" + data.copNo,
+    method: "get",
+  });
 }
 
 /**
  * 获取汇总申请单详情
  * @param data.id 汇总申请单id
  */
-export function getExportSummaryDetail(data){
+export function getExportSummaryDetail(data) {
   return request({
-    url: '/bus-customer/exportSummary/exportSummaryDetail/' + data.id,
-    method: 'get',
-  })
+    url: "/bus-customer/exportSummary/exportSummaryDetail/" + data.id,
+    method: "get",
+  });
 }
 
-
 /**
  * 汇总申报
  * @param data
  * @returns {*}
  */
-export function declareSummaryApplication(data){
+export function declareSummaryApplication(data) {
+  return request({
+    url: "/bus-customer/exportSummary/declare",
+    method: "post",
+    data: data,
+  });
+}
+
+// POST
+// ​/exportSummary​/get​/customers
+// 根据条件获取可以汇总申报的企业
+export function getCustomers(data) {
   return request({
-    url:'/bus-customer/exportSummary/declare',
-    method:'post',
-    data:data
-  })
+    url: "/bus-customer/exportSummary/get/customers",
+    method: "post",
+    data: data,
+  });
 }

@@ -39,8 +39,8 @@
             ? '数据加载中'
             : $t('portEntry.emptyText')
         "
-        height="350px"
-        maxHeight="500px"
+        :height="tableHeight + 'px'"
+        :maxHeight="tableHeight + 'px'"
         rowKey="id"
       >
       </Table>
@@ -90,6 +90,7 @@ export default {
   data() {
     return {
       tableLoading: false,
+      tableHeight: 350,
     };
   },
   computed: {
@@ -97,7 +98,17 @@ export default {
       return this.$store.state.viewOption.loadingDatas;
     },
   },
+  mounted() {
+    this.calculateTableHeight();
+    window.addEventListener("resize", this.calculateTableHeight);
+  },
+  beforeDestroy() {
+    window.removeEventListener("resize", this.calculateTableHeight);
+  },
   methods: {
+    calculateTableHeight() {
+      this.tableHeight = window.innerHeight - 300;
+    },
     //弹框关闭
     popoverClose() {
       this.$emit("popoverClose");

@@ -127,6 +127,25 @@
             </Formitem>
           </el-col>
         </el-row>
+        <el-row :gutter="5">
+          <el-col :span="8">
+            <Formitem
+              label="汇总申报地海关代码"
+              prop="exportPortCode"
+              type="edit"
+            >
+              <el-input
+                type="text"
+                class="inputShadow"
+                id="inputInner-edit-exportPortCode"
+                resize="none"
+                v-model="formData.exportPortCode"
+                clearable
+                placeholder=""
+              ></el-input>
+            </Formitem>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
     <div class="dialogOption entrySave">
@@ -177,6 +196,7 @@ export default {
         declarationUnitCompanyName: "",
         dxpid: "",
         portCode: "",
+        exportPortCode: "",
       },
       rules: {
         portCode: [
@@ -244,6 +264,13 @@ export default {
             message: "申报单位 (企业名称)不能为空！",
           },
         ],
+        exportPortCode: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "汇总申报地海关代码不能为空！",
+          },
+        ],
       },
       loadings: {
         dialogLoading: false,
@@ -348,6 +375,7 @@ export default {
         declarationUnitCompanyName: "",
         dxpid: "",
         portCode: "",
+        exportPortCode: "",
       };
       this.$emit("close");
     },

@@ -255,7 +255,8 @@
       ref="entryTable"
       :data="tableData"
       :headerData="headerData"
-      :height="tableMaxheight"
+      :height="tableMaxheight + 'px'"
+      :maxHeight="tableMaxheight + 'px'"
       :border="true"
       :pagination="true"
       :order="false"
@@ -633,7 +634,7 @@ export default {
         departureLoading: false, // 离境单申报加载状态
       },
       textareaVisible: {},
-      tableMaxheight: null,
+      tableMaxheight: 500,
       outerVisible: false,
       dropdownName: "一键申报",
       dropdownCode: "full",
@@ -645,17 +646,13 @@ export default {
   },
   created() {
     this.search(0);
-    // this.getCancellationReasons()
+    this.calculateTableHeight();
   },
   mounted() {
-    this.tableMaxheight = window.innerHeight - 280;
-    window.addEventListener(
-      "resize",
-      () => {
-        this.tableMaxheight = window.innerHeight - 280;
+    window.addEventListener("resize", this.calculateTableHeight);
   },
-      false
-    );
+  beforeDestroy() {
+    window.removeEventListener("resize", this.calculateTableHeight);
   },
   watch: {
     $route(val, oldval) {
@@ -673,6 +670,9 @@ export default {
     });
   },
   methods: {
+    calculateTableHeight() {
+      this.tableMaxheight = window.innerHeight - 300;
+    },
     //查询申报数据
     search(val) {
       this.loadings.sreachLoading = true;
@@ -886,7 +886,7 @@ export default {
       // }
       this.search(1);
       this.outerVisible = false;
-      this.tableMaxheight = window.innerHeight - 280;
+      this.tableMaxheight = window.innerHeight - 300;
       this.$forceUpdate();
     },
     popoverChange(val) {

@@ -9,24 +9,24 @@
     >
       <el-row class="row-border">
         <!-- 提运单号 -->
-<!--        <el-col :span="5">-->
-<!--          <Formitem label="提运单号" prop="billNo">-->
-<!--            <el-input-->
-<!--              type="text"-->
-<!--              class="inputShadow"-->
-<!--              id="inputInner&#45;&#45;billNo"-->
-<!--              resize="none"-->
-<!--              v-model="sreachFormData.billNo"-->
-<!--              clearable-->
-<!--              placeholder=""-->
-<!--            ></el-input>-->
-<!--&lt;!&ndash;            <FormTextareaInput&ndash;&gt;-->
-<!--&lt;!&ndash;              :formData="sreachFormData"&ndash;&gt;-->
-<!--&lt;!&ndash;              dataKey="billNo"&ndash;&gt;-->
-<!--&lt;!&ndash;              @formChange="formChange"&ndash;&gt;-->
-<!--&lt;!&ndash;            />&ndash;&gt;-->
-<!--          </Formitem>-->
-<!--        </el-col>-->
+        <!--        <el-col :span="5">-->
+        <!--          <Formitem label="提运单号" prop="billNo">-->
+        <!--            <el-input-->
+        <!--              type="text"-->
+        <!--              class="inputShadow"-->
+        <!--              id="inputInner&#45;&#45;billNo"-->
+        <!--              resize="none"-->
+        <!--              v-model="sreachFormData.billNo"-->
+        <!--              clearable-->
+        <!--              placeholder=""-->
+        <!--            ></el-input>-->
+        <!--&lt;!&ndash;            <FormTextareaInput&ndash;&gt;-->
+        <!--&lt;!&ndash;              :formData="sreachFormData"&ndash;&gt;-->
+        <!--&lt;!&ndash;              dataKey="billNo"&ndash;&gt;-->
+        <!--&lt;!&ndash;              @formChange="formChange"&ndash;&gt;-->
+        <!--&lt;!&ndash;            />&ndash;&gt;-->
+        <!--          </Formitem>-->
+        <!--        </el-col>-->
         <!-- 预录入编号 -->
         <el-col :span="5">
           <Formitem label="预录入编号" prop="preNo">
@@ -135,7 +135,11 @@
               placeholder=""
             >
               <el-option
-                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS.filter(fItem => fItem.itemChineseName !== '已提交')"
+                v-for="(
+                  item, index
+                ) in $store.getters.dict.RECEIPT_STATUS.filter(
+                  (fItem) => fItem.itemChineseName !== '已提交'
+                )"
                 :key="index"
                 :label="item.itemChineseName"
                 :value="item.itemValue"
@@ -144,47 +148,47 @@
           </Formitem>
         </el-col>
         <!-- 入库时间 -->
-<!--        <el-col :span="5">-->
-<!--          <Formitem label="入库时间" prop="startTime" :activeType="true">-->
-<!--            <el-date-picker-->
-<!--              class="inputInner&#45;&#45;startTime"-->
-<!--              id="inputInner&#45;&#45;startTime"-->
-<!--              v-model="sreachFormData.startTime"-->
-<!--              type="daterange"-->
-<!--              format="yyyy-MM-dd"-->
-<!--              prefix-icon="none"-->
-<!--              value-format="yyyy-MM-dd"-->
-<!--              range-separator="至"-->
-<!--              @change="dateChange"-->
-<!--            />-->
-<!--          </Formitem>-->
-<!--        </el-col>-->
+        <!--        <el-col :span="5">-->
+        <!--          <Formitem label="入库时间" prop="startTime" :activeType="true">-->
+        <!--            <el-date-picker-->
+        <!--              class="inputInner&#45;&#45;startTime"-->
+        <!--              id="inputInner&#45;&#45;startTime"-->
+        <!--              v-model="sreachFormData.startTime"-->
+        <!--              type="daterange"-->
+        <!--              format="yyyy-MM-dd"-->
+        <!--              prefix-icon="none"-->
+        <!--              value-format="yyyy-MM-dd"-->
+        <!--              range-separator="至"-->
+        <!--              @change="dateChange"-->
+        <!--            />-->
+        <!--          </Formitem>-->
+        <!--        </el-col>-->
         <!-- 报文序号 -->
-<!--        <el-col :span="5">-->
-<!--          <Formitem label="报文序号" prop="msgSeqNo">-->
-<!--            <el-input-->
-<!--              type="text"-->
-<!--              class="inputShadow"-->
-<!--              id="inputInner&#45;&#45;msgSeqNo"-->
-<!--              resize="none"-->
-<!--              v-model="sreachFormData.msgSeqNo"-->
-<!--              clearable-->
-<!--              placeholder=""-->
-<!--            ></el-input>-->
-<!--          </Formitem>-->
-<!--        </el-col>-->
+        <!--        <el-col :span="5">-->
+        <!--          <Formitem label="报文序号" prop="msgSeqNo">-->
+        <!--            <el-input-->
+        <!--              type="text"-->
+        <!--              class="inputShadow"-->
+        <!--              id="inputInner&#45;&#45;msgSeqNo"-->
+        <!--              resize="none"-->
+        <!--              v-model="sreachFormData.msgSeqNo"-->
+        <!--              clearable-->
+        <!--              placeholder=""-->
+        <!--            ></el-input>-->
+        <!--          </Formitem>-->
+        <!--        </el-col>-->
       </el-row>
     </el-form>
-<!--    <div class="optionButton">-->
-<!--      <el-button-->
-<!--        class="entrySaveButton"-->
-<!--        size="small"-->
-<!--        icon="el-icon-download"-->
-<!--        @click="downloadData"-->
-<!--      >-->
-<!--        导出-->
-<!--      </el-button>-->
-<!--    </div>-->
+    <!--    <div class="optionButton">-->
+    <!--      <el-button-->
+    <!--        class="entrySaveButton"-->
+    <!--        size="small"-->
+    <!--        icon="el-icon-download"-->
+    <!--        @click="downloadData"-->
+    <!--      >-->
+    <!--        导出-->
+    <!--      </el-button>-->
+    <!--    </div>-->
     <Table
       class="fedexDetialTable fedexSreachTable"
       ref="entryTable"
@@ -220,7 +224,8 @@
           @popoverClose="popoverClose"
         >
           <div slot="title">
-            <span style="font-weight: 700; color: #515a6e">汇总申请单编号：</span
+            <span style="font-weight: 700; color: #515a6e"
+              >汇总申请单编号：</span
             >{{ scope.row.sumNo }}
           </div>
           <div slot="buttonLabel">
@@ -242,7 +247,7 @@
 <script>
 import {
   searchExportSummaryList,
-  getExportSummaryReceiptData
+  getExportSummaryReceiptData,
 } from "@/api/exportSummary-api";
 export default {
   name: "ExportBillQuery",
@@ -325,7 +330,13 @@ export default {
         },
         {
           name: "收发货人汇总标志",
-          value:"summaryFlag",
+          value: "summaryFlag",
+          width: "",
+          align: "left",
+        },
+        {
+          name: "申报时间",
+          value: "createTime",
           width: "",
           align: "left",
         },
@@ -443,7 +454,7 @@ export default {
         })
         .finally(() => {
           this.$nextTick(() => {
-            this.$store.dispatch('setLoadingState', false)
+            this.$store.dispatch("setLoadingState", false);
             this.$refs.returnStatusPopover.tableLoading = false;
           });
         });

@@ -16,21 +16,21 @@
     >
       <el-row :gutter="5">
         <!-- 提运单号 -->
-<!--        <el-col :span="3">-->
-<!--          <Formitem label="提运单号" prop="billNo">-->
-<!--            <el-input-->
-<!--              type="text"-->
-<!--              class="inputShadow"-->
-<!--              id="inputInner&#45;&#45;billNo"-->
-<!--              resize="none"-->
-<!--              v-model="formData.billNo"-->
-<!--              clearable-->
-<!--              placeholder=""-->
-<!--            ></el-input>-->
-<!--          </Formitem>-->
-<!--        </el-col>-->
+        <!--        <el-col :span="3">-->
+        <!--          <Formitem label="提运单号" prop="billNo">-->
+        <!--            <el-input-->
+        <!--              type="text"-->
+        <!--              class="inputShadow"-->
+        <!--              id="inputInner&#45;&#45;billNo"-->
+        <!--              resize="none"-->
+        <!--              v-model="formData.billNo"-->
+        <!--              clearable-->
+        <!--              placeholder=""-->
+        <!--            ></el-input>-->
+        <!--          </Formitem>-->
+        <!--        </el-col>-->
         <!-- 电子口岸编号 -->
-        <el-col :span="3">
+        <el-col :span="6">
           <Formitem label="电子口岸编号" prop="preNo">
             <el-input
               type="text"
@@ -62,21 +62,21 @@
             </el-select>
           </Formitem>
         </el-col>
-<!--        <el-col :span="3">-->
-<!--          <Formitem label="业务状态" prop="">-->
-<!--            <el-select-->
-<!--              type="text"-->
-<!--              id="inputInner&#45;&#45;appType"-->
-<!--              v-model="formData.businessStatus"-->
-<!--              clearable-->
-<!--              placeholder=""-->
-<!--            >-->
+        <!--        <el-col :span="3">-->
+        <!--          <Formitem label="业务状态" prop="">-->
+        <!--            <el-select-->
+        <!--              type="text"-->
+        <!--              id="inputInner&#45;&#45;appType"-->
+        <!--              v-model="formData.businessStatus"-->
+        <!--              clearable-->
+        <!--              placeholder=""-->
+        <!--            >-->
 
-<!--            </el-select>-->
-<!--          </Formitem>-->
-<!--        </el-col>-->
+        <!--            </el-select>-->
+        <!--          </Formitem>-->
+        <!--        </el-col>-->
         <!-- 汇总申请编号 -->
-        <el-col :span="3">
+        <el-col :span="6">
           <Formitem label="汇总申请编号" prop="sumNo">
             <el-input
               type="text"
@@ -104,7 +104,7 @@
           </Formitem>
         </el-col>
         <!-- 报关单位名称 -->
-        <el-col :span="12">
+        <el-col :span="6">
           <Formitem label="报关单位名称" prop="declAgentName">
             <el-input
               type="text"
@@ -289,9 +289,9 @@
             ></el-input>
           </Formitem>
         </el-col>
-        <!-- 入库时间 -->
+        <!-- 入库时间=>申报时间 -->
         <el-col :span="3">
-          <Formitem label="入库时间" prop="createTime">
+          <Formitem label="申报时间" prop="createTime">
             <el-input
               type="text"
               class="inputShadow"

 <template>
-  <div style="background-color: #FFFFFF;height: 100%">
+  <div style="background-color: #ffffff; height: 100%">
     <div class="title">
-      <div>
-      </div>
-      <div>
-        汇总申报信息
-      </div>
+      <div></div>
+      <div>汇总申报信息</div>
     </div>
     <div class="content">
       <el-form
@@ -26,6 +23,7 @@
                 clearable
                 filterable
                 placeholder=""
+                @change="searchUserData"
               >
                 <el-option
                   v-for="(item, index) in portInfo"
@@ -37,7 +35,7 @@
             </Formitem>
           </el-col>
           <el-col :span="10">
-            <Formitem label="申报地海关" prop="customsCode">
+            <Formitem label="清单申报地海关" prop="customsCode">
               <el-select
                 type="text"
                 id="inputInner--customsCode"
@@ -57,25 +55,6 @@
         </el-row>
         <el-row :gutter="5" type="flex" justify="center">
           <el-col :span="10">
-            <Formitem label="电商企业名称" prop="ebpcode">
-              <el-select
-                type="text"
-                id="inputInner--ebpcode"
-                v-model="formData.ebpcode"
-                clearable
-                filterable
-                placeholder=""
-              >
-                <el-option
-                  v-for="(item, index) in ebcDataList"
-                  :key="index"
-                  :label="item.ecomEntName"
-                  :value="item.ecomEntCode"
-                ></el-option>
-              </el-select>
-            </Formitem>
-          </el-col>
-          <el-col :span="10">
             <Formitem label="申报方式" prop="declareType">
               <el-select
                 type="text"
@@ -93,10 +72,8 @@
               </el-select>
             </Formitem>
           </el-col>
-        </el-row>
-        <el-row :gutter="5" type="flex" justify="center">
           <el-col :span="10">
-            <Formitem label="创建时间" prop="time" :activeType="true">
+            <Formitem label="创建时间" prop="time">
               <el-date-picker
                 class="inputInner--time"
                 id="inputInner--time"
@@ -107,10 +84,32 @@
                 value-format="yyyy-MM-dd"
                 range-separator="至"
                 @change="dateChange"
-                style="background-color: #f2f2f2;"
+                style="background-color: #f2f2f2"
               />
             </Formitem>
           </el-col>
+        </el-row>
+        <el-row :gutter="5" type="flex" justify="center">
+          <el-col :span="10">
+            <Formitem label="电商企业名称" prop="ebpcode">
+              <el-select
+                type="text"
+                id="inputInner--ebpcode"
+                v-model="formData.ebpcode"
+                clearable
+                filterable
+                placeholder=""
+                @focus.stop="getCustomerList"
+              >
+                <el-option
+                  v-for="(item, index) in ebcDataList"
+                  :key="index"
+                  :label="item.ecomEntName"
+                  :value="item.ecomEntCode"
+                ></el-option>
+              </el-select>
+            </Formitem>
+          </el-col>
           <el-col :span="5">
             <Formitem label="发货人汇总" prop="summaryFlag">
               <el-select
@@ -151,75 +150,81 @@
       </el-form>
     </div>
     <div class="entrySave">
-      <el-button
-        class="entrySaveButton"
-        @click="submit"
-      >提交</el-button
-      >
-      <el-button
-        class="entrySaveButton"
-        @click="cancel"
-      >取消</el-button
-      >
+      <el-button class="entrySaveButton" @click="submit">提交</el-button>
+      <el-button class="entrySaveButton" @click="cancel">取消</el-button>
     </div>
   </div>
 </template>
 
 <script>
 import { getCurrUserPortInfo } from "@/api/system/user.js";
-import { getCustomerList} from "@/api/declareData-api.js";
-import { getDictData } from '@/api/system/dict-api.js'
+import { getNewCustomerList } from "@/api/declareData-api.js";
+import { getDictData } from "@/api/system/dict-api.js";
 import { declareSummaryApplication } from "@/api/exportSummary-api.js";
 export default {
   name: "",
   data() {
     return {
-      formRules:{
-        portCode:[
-          { required: true, message: '请选择出口口岸', trigger: 'change' },
+      formRules: {
+        portCode: [
+          { required: true, message: "请选择出口口岸", trigger: "change" },
         ],
-        customsCode:[
-          { required: true, message: '请选择申报地海关', trigger: 'change' },
+        customsCode: [
+          { required: true, message: "请选择申报地海关", trigger: "change" },
         ],
         ebpcode: [
-          { required: true, message: '请选择电商企业', trigger: 'change' },
+          { required: true, message: "请选择电商企业", trigger: "change" },
         ],
         declareType: [
-          { required: true, message: '请选择申报方式', trigger: 'change' },
+          { required: true, message: "请选择申报方式", trigger: "change" },
         ],
         time: [
           {
-            type: 'array',
+            type: "array",
             required: true,
-            message: '请选择完整的日期区间',
-            trigger: 'change'
-          }
+            message: "请选择完整的日期区间",
+            trigger: "change",
+          },
         ],
         summaryFlag: [
-          { required: true, message: '请选择发货人汇总', trigger: 'change' },
+          { required: true, message: "请选择发货人汇总", trigger: "change" },
         ],
         itemNameFlag: [
-          { required: true, message: '请选择商品名汇总', trigger: 'change' },
+          { required: true, message: "请选择商品名汇总", trigger: "change" },
         ],
       },
-      formData:{},
-      portInfo:[],
-      ebcDataList:[],
-      summaryFlag:[],
-      itemNameFlag:[],
-      declareType:[]
+      formData: {
+        portCode: "",
+        customsCode: "",
+        ebpcode: "",
+        declareType: "",
+        time: [],
+        summaryFlag: "",
+        itemNameFlag: "",
+      },
+      portInfo: [],
+      ebcDataList: [],
+      summaryFlag: [],
+      itemNameFlag: [],
+      declareType: [],
     };
   },
   created() {
-    this.getCurrUserPortInfo()
-    this.getCustomerList()
-    this.getSummaryFlag()
-    this.getItemNameFlag()
-    this.getDeclareType()
+    this.getCurrUserPortInfo();
+    this.getCustomerList();
+    this.getSummaryFlag();
+    this.getItemNameFlag();
+  },
+  mounted() {
+    this.getDeclareType();
   },
   methods: {
+    searchUserData(val) {
+      this.formData.customsCode = val;
+      this.formData.ebpcode = "";
+    },
     //获取当前用户的口岸信息
-    getCurrUserPortInfo(){
+    getCurrUserPortInfo() {
       getCurrUserPortInfo()
         .then((res) => {
           if (res.code === "200") {
@@ -231,23 +236,27 @@ export default {
         });
     },
     //获取客户下拉列表数据
-    getCustomerList(){
-      getCustomerList().then(res =>{
+    getCustomerList() {
+      let params = {
+        ...this.formData,
+      };
+      getNewCustomerList(params)
+        .then((res) => {
           if (res.code == 200) {
-          this.ebcDataList = res.data.value
+            this.ebcDataList = res.data;
           } else {
-          this.ebcDataList = []
+            this.ebcDataList = [];
           }
-
-      }).catch(err =>{
-        console.log(err)
         })
+        .catch((err) => {
+          console.log(err);
+        });
     },
     //获取发货人下拉数据
-    getSummaryFlag(){
+    getSummaryFlag() {
       getDictData({
-        doctCode: "SUMMARY_FLAG"
-      }).then(res => {
+        doctCode: "SUMMARY_FLAG",
+      }).then((res) => {
         if (res.code == 200) {
           this.summaryFlag = res.data;
         } else {
@@ -256,10 +265,10 @@ export default {
       });
     },
     //获取发货人下拉数据
-    getItemNameFlag(){
+    getItemNameFlag() {
       getDictData({
-        doctCode: "ITEM_NAME_FLAG"
-      }).then(res => {
+        doctCode: "ITEM_NAME_FLAG",
+      }).then((res) => {
         if (res.code == 200) {
           this.itemNameFlag = res.data;
         } else {
@@ -267,39 +276,51 @@ export default {
         }
       });
     },
-    cancel(){
-      this.$router.push("summaryDataSearch")
+    cancel() {
+      this.$router.push("summaryDataSearch");
     },
-    submit(){
+    submit() {
       this.$refs.editForm.validate((valid) => {
         if (!valid) {
           return;
         }
-        declareSummaryApplication(this.formData).then(response => {
-          if(response.data){
+        declareSummaryApplication(this.formData).then((response) => {
+          if (response.data) {
             this.msgSuccess("汇总申报成功");
-            this.$router.push("summaryDataSearch")
-          }else {
-            this.msgError(response.message)
+            this.$router.push("summaryDataSearch");
+          } else {
+            this.msgError(response.message);
           }
-        })
-      })
+        });
+      });
     },
-    dateChange(val){
-      this.formData.startTime = val[0] + ' 00:00:00'
-      this.formData.endTime = val[1] + ' 23:59:59'
+    dateChange(val) {
+      if (val) {
+        this.formData.startTime = val[0] + " 00:00:00";
+        this.formData.endTime = val[1] + " 23:59:59";
+      } else {
+        this.formData.startTime = "";
+        this.formData.endTime = "";
+        this.formData.time = [];
+      }
+      this.formData.ebpcode = "";
     },
-    getDeclareType(){
+    getDeclareType() {
       getDictData({
-        doctCode: "DECLARE_TYPE"
-      }).then(res => {
+        doctCode: "DECLARE_TYPE",
+      }).then((res) => {
         if (res.code == 200) {
           this.declareType = res.data;
+          console.log(res.data);
+          this.formData.declareType = this.declareType[0].itemValue;
+          this.$nextTick(() => {
+            this.$refs.editForm.clearValidate(["declareType"]);
+          });
         } else {
           this.declareType = [];
         }
       });
-    }
+    },
   },
 };
 </script>
@@ -308,7 +329,7 @@ export default {
 .content {
   margin-top: 50px;
 }
-.title{
+.title {
   font-size: 23px;
   margin-left: 8%;
   padding-top: 2%;