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) {
 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.pageIndex 当前页码
  * @param data.pageSize 分页最大数据量
  * @param data.pageSize 分页最大数据量
  */
  */
-export function searchExportSummaryList(data){
+export function searchExportSummaryList(data) {
   return request({
   return request({
-    url: '/bus-customer/exportSummary/exportSummaryList',
-    method: 'post',
+    url: "/bus-customer/exportSummary/exportSummaryList",
+    method: "post",
     data: data,
     data: data,
-  })
+  });
 }
 }
 
 
 /**
 /**
  * 查询汇总回执
  * 查询汇总回执
  * @param data.copNo 企业唯一编号
  * @param data.copNo 企业唯一编号
  */
  */
-export function getExportSummaryReceiptData(data){
+export function getExportSummaryReceiptData(data) {
   return request({
   return request({
-    url: '/bus-customer/exportSummary/receipt/' + data.copNo,
-    method: 'get',
-  })
+    url: "/bus-customer/exportSummary/receipt/" + data.copNo,
+    method: "get",
+  });
 }
 }
 
 
 /**
 /**
  * 获取汇总申请单详情
  * 获取汇总申请单详情
  * @param data.id 汇总申请单id
  * @param data.id 汇总申请单id
  */
  */
-export function getExportSummaryDetail(data){
+export function getExportSummaryDetail(data) {
   return request({
   return request({
-    url: '/bus-customer/exportSummary/exportSummaryDetail/' + data.id,
-    method: 'get',
-  })
+    url: "/bus-customer/exportSummary/exportSummaryDetail/" + data.id,
+    method: "get",
+  });
 }
 }
 
 
-
 /**
 /**
  * 汇总申报
  * 汇总申报
  * @param data
  * @param data
  * @returns {*}
  * @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({
   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')
             : $t('portEntry.emptyText')
         "
         "
-        height="350px"
-        maxHeight="500px"
+        :height="tableHeight + 'px'"
+        :maxHeight="tableHeight + 'px'"
         rowKey="id"
         rowKey="id"
       >
       >
       </Table>
       </Table>
@@ -90,6 +90,7 @@ export default {
   data() {
   data() {
     return {
     return {
       tableLoading: false,
       tableLoading: false,
+      tableHeight: 350,
     };
     };
   },
   },
   computed: {
   computed: {
@@ -97,7 +98,17 @@ export default {
       return this.$store.state.viewOption.loadingDatas;
       return this.$store.state.viewOption.loadingDatas;
     },
     },
   },
   },
+  mounted() {
+    this.calculateTableHeight();
+    window.addEventListener("resize", this.calculateTableHeight);
+  },
+  beforeDestroy() {
+    window.removeEventListener("resize", this.calculateTableHeight);
+  },
   methods: {
   methods: {
+    calculateTableHeight() {
+      this.tableHeight = window.innerHeight - 300;
+    },
     //弹框关闭
     //弹框关闭
     popoverClose() {
     popoverClose() {
       this.$emit("popoverClose");
       this.$emit("popoverClose");

 <template>
 <template>
-                <div style="height: 100%;">
+  <div style="height: 100%">
     <el-form
     <el-form
       class="fedexFormStyle fedexRowEditFormStyle"
       class="fedexFormStyle fedexRowEditFormStyle"
       ref="editRowForm"
       ref="editRowForm"
@@ -116,7 +116,10 @@
           </Formitem>
           </Formitem>
         </el-col>
         </el-col>
         <el-col :span="4">
         <el-col :span="4">
-                        <Formitem label="目的国(地区)代码" prop="destinationCountryRegionCode">
+          <Formitem
+            label="目的国(地区)代码"
+            prop="destinationCountryRegionCode"
+          >
             <el-select
             <el-select
               type="text"
               type="text"
               id="inputInner--destinationCountryRegionCode"
               id="inputInner--destinationCountryRegionCode"
@@ -182,6 +185,22 @@
       </el-row>
       </el-row>
       <el-row :gutter="5">
       <el-row :gutter="5">
         <el-col :span="4">
         <el-col :span="4">
+          <Formitem label="法定计量单位">
+            <el-input
+              class="inputShadow"
+              id="inputInner--unitLegalFirstCode"
+              resize="none"
+              :disabled="true"
+              :value="
+                mapDicDatas(
+                  $store.getters.dict.MEASUREMENT_UNIT,
+                  tableRowformData.unitLegalFirstCode
+                )
+              "
+            ></el-input>
+          </Formitem>
+        </el-col>
+        <el-col :span="4">
           <Formitem label="币制" prop="currency">
           <Formitem label="币制" prop="currency">
             <el-select
             <el-select
               type="text"
               type="text"
@@ -254,28 +273,30 @@
         </el-col>
         </el-col>
       </el-row>
       </el-row>
     </el-form>
     </el-form>
-                    <p class="formRowDataOperate"><a @click="cancelEditRowData">取消</a> <a @click="rowFormDataSave">保存</a></p>
+    <p class="formRowDataOperate">
+      <a @click="cancelEditRowData">取消</a>
+      <a @click="rowFormDataSave">保存</a>
+    </p>
   </div>
   </div>
-  </template>
+</template>
 
 
-  <script>
-
-  export default {
+<script>
+export default {
   props: {
   props: {
     rowDatas: {
     rowDatas: {
       type: Object,
       type: Object,
-        default: ()=>({}),
+      default: () => ({}),
     },
     },
   },
   },
   data() {
   data() {
     var checkFractionalPart = (rule, value, callback) => {
     var checkFractionalPart = (rule, value, callback) => {
       if (value < 0) {
       if (value < 0) {
-          callback(new Error('数值不能为负'));
+        callback(new Error("数值不能为负"));
       }
       }
-        if (value !== '' && value !== undefined) {
+      if (value !== "" && value !== undefined) {
         const regex = /^\d{0,14}(\.\d{1,5})?$/;
         const regex = /^\d{0,14}(\.\d{1,5})?$/;
         if (!regex.test(value)) {
         if (!regex.test(value)) {
-            callback(new Error('整数最多14位，小数最多5位'));
+          callback(new Error("整数最多14位，小数最多5位"));
         } else {
         } else {
           callback();
           callback();
         }
         }
@@ -285,108 +306,141 @@
     };
     };
     var checkNegativeNum = (rule, value, callback) => {
     var checkNegativeNum = (rule, value, callback) => {
       if (value < 0) {
       if (value < 0) {
-              callback(new Error('数值不能为负'));
+        callback(new Error("数值不能为负"));
       } else {
       } else {
         callback();
         callback();
       }
       }
     };
     };
     var checkQty = (rule, value, callback) => {
     var checkQty = (rule, value, callback) => {
-        if (!Number.isInteger(value)) {
-          callback(new Error('请输入整数值'));
-        } else {
+      if (value === undefined || value === null || value === "") {
+        callback(new Error("请输入数值"));
+        return;
+      }
+
+      if (isNaN(value)) {
+        callback(new Error("请输入有效的数字"));
+        return;
+      }
+
       if (value < 0) {
       if (value < 0) {
-            callback(new Error('数值不能为负'));
-          } else {
-            const valueStr = value.toString();
-            if (valueStr.length > 14) {
-              callback(new Error('最多14位'));
-            } else {
-              callback();
+        callback(new Error("数值不能为负"));
+        return;
       }
       }
+
+      const valueStr = value.toString();
+
+      const parts = valueStr.split(".");
+      const integerPart = parts[0];
+      const decimalPart = parts[1] || "";
+
+      if (integerPart.length > 14) {
+        callback(new Error("整数部分最多14位"));
+        return;
       }
       }
+
+      if (decimalPart.length > 5) {
+        callback(new Error("小数部分最多5位"));
+        return;
       }
       }
+
+      callback();
     };
     };
     return {
     return {
-        tableRowformData:{},
-        tableRowFormRules:{
+      tableRowformData: {},
+      tableRowFormRules: {
         enterpriseProductCode: [
         enterpriseProductCode: [
-                { required: true, message: '请输入企业商品货号', trigger: 'blur' },
-                { max: 30, message: '长度不能超过30个字符', trigger: 'blur' }
+          { required: true, message: "请输入企业商品货号", trigger: "blur" },
+          { max: 30, message: "长度不能超过30个字符", trigger: "blur" },
         ],
         ],
         enterpriseProductName: [
         enterpriseProductName: [
-                { required: true, message: '请输入企业商品名称', trigger: 'blur' },
-                { max: 250, message: '长度不能超过250个字符', trigger: 'blur' }
+          { required: true, message: "请输入企业商品名称", trigger: "blur" },
+          { max: 250, message: "长度不能超过250个字符", trigger: "blur" },
         ],
         ],
         enterpriseProductDescribe: [
         enterpriseProductDescribe: [
-                { max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' }
+          { max: 1000, message: "长度不能超过1000个字符", trigger: "blur" },
         ],
         ],
         productName: [
         productName: [
-                { required: true, message: '请输入商品名称', trigger: 'blur' },
-                { max: 250, message: '长度不能超过250个字符', trigger: 'blur' }
+          { required: true, message: "请输入商品名称", trigger: "blur" },
+          { max: 250, message: "长度不能超过250个字符", trigger: "blur" },
         ],
         ],
         productCode: [
         productCode: [
-                { required: true, message: '请输入商品编码', trigger: 'blur' },
-                { max: 10, message: '长度不能超过10个字符', trigger: 'blur' }
+          { required: true, message: "请输入商品编码", trigger: "blur" },
+          { max: 10, message: "长度不能超过10个字符", trigger: "blur" },
         ],
         ],
         model: [
         model: [
-                { required: true, message: '请输入规格型号', trigger: 'blur' },
-                { max: 250, message: '长度不能超过250个字符', trigger: 'blur' }
+          { required: true, message: "请输入规格型号", trigger: "blur" },
+          { max: 250, message: "长度不能超过250个字符", trigger: "blur" },
         ],
         ],
         accountBookMaterialNumber: [
         accountBookMaterialNumber: [
-                { max: 30, message: '长度不能超过30个字符', trigger: 'blur' }
+          { max: 30, message: "长度不能超过30个字符", trigger: "blur" },
         ],
         ],
         barCode: [
         barCode: [
-                { max: 50, message: '长度不能超过50个字符', trigger: 'blur' }
+          { max: 50, message: "长度不能超过50个字符", trigger: "blur" },
         ],
         ],
         destinationCountryRegionCode: [
         destinationCountryRegionCode: [
-                { required: true, message: '请选择目的国(地区)代码', trigger: 'change' }
+          {
+            required: true,
+            message: "请选择目的国(地区)代码",
+            trigger: "change",
+          },
         ],
         ],
         unit: [
         unit: [
-                { required: true, message: '请选择计量单位', trigger: 'change' }
+          { required: true, message: "请选择计量单位", trigger: "change" },
         ],
         ],
         qty: [
         qty: [
-                { required: true, message: '请输入数量', trigger: 'blur' },
-                { validator: checkQty, trigger: 'blur' }
+          { required: true, message: "请输入数量", trigger: "blur" },
+          { validator: checkQty, trigger: "blur" },
         ],
         ],
         legalQty: [
         legalQty: [
-                { required: true, message: '请输入法定数量', trigger: 'blur' },
-                { validator: checkFractionalPart, trigger: 'blur' }
+          { required: true, message: "请输入法定数量", trigger: "blur" },
+          { validator: checkFractionalPart, trigger: "blur" },
         ],
         ],
         currency: [
         currency: [
-                { required: true, message: '请选择币制', trigger: 'change' }
+          { required: true, message: "请选择币制", trigger: "change" },
         ],
         ],
         price: [
         price: [
-                { required: true, message: '请输入单价', trigger: 'blur' },
-                { validator: checkNegativeNum, trigger: 'blur' }
+          { required: true, message: "请输入单价", trigger: "blur" },
+          { validator: checkNegativeNum, trigger: "blur" },
         ],
         ],
         totalPrice: [
         totalPrice: [
-                { required: true, message: '请输入总价', trigger: 'blur' },
-                { validator: checkNegativeNum, trigger: 'blur' }
+          { required: true, message: "请输入总价", trigger: "blur" },
+          { validator: checkNegativeNum, trigger: "blur" },
         ],
         ],
         netWeight: [
         netWeight: [
-                { required: true, message: '请输入净重', trigger: 'blur' },
-                { validator: checkFractionalPart, trigger: 'blur' }
+          { required: true, message: "请输入净重", trigger: "blur" },
+          { validator: checkFractionalPart, trigger: "blur" },
         ],
         ],
         remark: [
         remark: [
-                { max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' }
+          { max: 1000, message: "长度不能超过1000个字符", trigger: "blur" },
         ],
         ],
-        }
+      },
     };
     };
   },
   },
   methods: {
   methods: {
-        rowFormDataSave(){
+    mapDicDatas(dicArr, code) {
+      if (code != "" && code) {
+        return dicArr.filter((item) => item.itemCode == code)[0]
+          .itemChineseName;
+      } else {
+        return "";
+      }
+    },
+    rowFormDataSave() {
       this.$refs.editRowForm.validate((valid) => {
       this.$refs.editRowForm.validate((valid) => {
         if (valid) {
         if (valid) {
-                    this.$emit('rowFormDataSave', {gnum: this.rowDatas.row.gnum, tableRowformData: this.tableRowformData})
-                    this.tableRowformData = {}
+          this.$emit("rowFormDataSave", {
+            gnum: this.rowDatas.row.gnum,
+            tableRowformData: this.tableRowformData,
+          });
+          this.tableRowformData = {};
         } else {
         } else {
           return false;
           return false;
         }
         }
-            })
+      });
     },
     },
-      cancelEditRowData(){
-        this.tableRowformData = {}
-        this.$emit('cancelEditRowData',this.rowDatas.row.gnum-1)
+    cancelEditRowData() {
+      this.tableRowformData = {};
+      this.$emit("cancelEditRowData", this.rowDatas.row.gnum - 1);
     },
     },
     // validate() {
     // validate() {
     //    return this.$refs.editRowForm.validate((valid)=>{
     //    return this.$refs.editRowForm.validate((valid)=>{
@@ -404,59 +458,62 @@
         this.$refs.editRowForm.validate((valid) => {
         this.$refs.editRowForm.validate((valid) => {
           if (valid) {
           if (valid) {
             //     console.log("tg2")
             //     console.log("tg2")
-              this.$emit('rowFormDataSave', {gnum: this.rowDatas.row.gnum, tableRowformData: this.tableRowformData})
-              this.tableRowformData = {}
-              this.$emit('updateLastItemValid', true);
+            this.$emit("rowFormDataSave", {
+              gnum: this.rowDatas.row.gnum,
+              tableRowformData: this.tableRowformData,
+            });
+            this.tableRowformData = {};
+            this.$emit("updateLastItemValid", true);
             resolve(true);
             resolve(true);
           } else {
           } else {
             //   console.log("wtg2")
             //   console.log("wtg2")
-              this.$emit('updateLastItemValid', false);
+            this.$emit("updateLastItemValid", false);
             resolve(false);
             resolve(false);
           }
           }
         });
         });
       });
       });
     },
     },
   },
   },
-  };
-  </script>
+};
+</script>
 
 
-  <style lang="scss" scoped>
-      .addNewItem{
+<style lang="scss" scoped>
+.addNewItem {
   display: flex;
   display: flex;
   justify-content: flex-start;
   justify-content: flex-start;
   align-items: center;
   align-items: center;
-    color:#007AB7;
+  color: #007ab7;
   line-height: 38px;
   line-height: 38px;
   cursor: pointer;
   cursor: pointer;
-    i{
+  i {
     margin-right: 3px;
     margin-right: 3px;
   }
   }
-    span{
+  span {
     font-size: 13px;
     font-size: 13px;
     font-weight: 500;
     font-weight: 500;
   }
   }
-  }
-  .formRowDataOperate{
+}
+.formRowDataOperate {
   text-align: center;
   text-align: center;
   padding: 0 20px;
   padding: 0 20px;
-    a{
-        color: #007AB7;
+  a {
+    color: #007ab7;
     font-weight: 600;
     font-weight: 600;
-        &:first-child{
+    &:first-child {
       margin-right: 5px;
       margin-right: 5px;
     }
     }
   }
   }
-  }
-  .fedexRowEditFormStyle .el-form-item{
+}
+.fedexRowEditFormStyle .el-form-item {
   background-color: #ffffff;
   background-color: #ffffff;
-          box-shadow: 0 2px 4px 0 #E5F2F8CC;
-          border-left: 1px solid #E5F2F8CC;
+  box-shadow: 0 2px 4px 0 #e5f2f8cc;
+  border-left: 1px solid #e5f2f8cc;
   //   margin-bottom: 30px;
   //   margin-bottom: 30px;
-  }
-  .fedexRowEditFormStyle .el-form-item:has(.formError){
-    margin-bottom: 25px!important;
-  }
-  .fedexRowEditFormStyle .activeBorder{
-         border-left: 3px solid #007AB7;
-  }
-  </style>
+}
+.fedexRowEditFormStyle .el-form-item:has(.formError) {
+  margin-bottom: 25px !important;
+}
+.fedexRowEditFormStyle .activeBorder {
+  border-left: 3px solid #007ab7;
+}
+</style>

@@ -6,7 +6,7 @@
         <el-button class="entrySaveButton" @click="back">返 回</el-button>
         <el-button class="entrySaveButton" @click="back">返 回</el-button>
       </div>
       </div>
     </div>
     </div>
-      <section :class="{partsHidden:!isFold}">
+    <section :class="{ partsHidden: !isFold }">
       <el-form
       <el-form
         class="fedexFormStyle fedexFormEditStyle"
         class="fedexFormStyle fedexFormEditStyle"
         ref="editForm"
         ref="editForm"
@@ -233,7 +233,6 @@
               ></el-input>
               ></el-input>
             </Formitem>
             </Formitem>
           </el-col>
           </el-col>
-
         </el-row>
         </el-row>
         <el-row :gutter="5">
         <el-row :gutter="5">
           <el-col :span="3">
           <el-col :span="3">
@@ -273,7 +272,8 @@
                 placeholder=""
                 placeholder=""
               >
               >
                 <el-option
                 <el-option
-                    v-for="(item, index) in $store.getters.dict.COUNTRY_REGION_CODE"
+                  v-for="(item, index) in $store.getters.dict
+                    .COUNTRY_REGION_CODE"
                   :key="index"
                   :key="index"
                   :label="item.itemChineseName"
                   :label="item.itemChineseName"
                   :value="item.itemCode"
                   :value="item.itemCode"
@@ -292,7 +292,8 @@
                 placeholder=""
                 placeholder=""
               >
               >
                 <el-option
                 <el-option
-                    v-for="(item, index) in $store.getters.dict.COUNTRY_REGION_CODE"
+                  v-for="(item, index) in $store.getters.dict
+                    .COUNTRY_REGION_CODE"
                   :key="index"
                   :key="index"
                   :label="item.itemChineseName"
                   :label="item.itemChineseName"
                   :value="item.itemCode"
                   :value="item.itemCode"
@@ -364,7 +365,6 @@
               ></el-input>
               ></el-input>
             </Formitem>
             </Formitem>
           </el-col>
           </el-col>
-
         </el-row>
         </el-row>
         <el-row :gutter="5">
         <el-row :gutter="5">
           <el-col :span="3">
           <el-col :span="3">
@@ -479,11 +479,21 @@
       </el-form>
       </el-form>
     </section>
     </section>
     <div class="fold-unfold">
     <div class="fold-unfold">
-         <img v-if="isFold" src="@/assets/images/fold.png" @click="()=>isFold = false" alt="">
-         <img v-if="!isFold" src="@/assets/images/unfold.png" @click="()=>isFold = true" alt="">
+      <img
+        v-if="isFold"
+        src="@/assets/images/fold.png"
+        @click="() => (isFold = false)"
+        alt=""
+      />
+      <img
+        v-if="!isFold"
+        src="@/assets/images/unfold.png"
+        @click="() => (isFold = true)"
+        alt=""
+      />
     </div>
     </div>
     <div class="entryTitle" style="margin-top: 10px">商品明细</div>
     <div class="entryTitle" style="margin-top: 10px">商品明细</div>
-      <section style="position:relative">
+    <section style="position: relative">
       <Table
       <Table
         class="fedexDetialTable fedexSreachTable editableTable"
         class="fedexDetialTable fedexSreachTable editableTable"
         ref="entryTable"
         ref="entryTable"
@@ -506,19 +516,40 @@
           />
           />
         </template>
         </template>
         <template v-slot:destinationCountryRegionCode="scope">
         <template v-slot:destinationCountryRegionCode="scope">
-              <span>{{ mapDicDatas($store.getters.dict.COUNTRY_REGION_CODE, scope.row.destinationCountryRegionCode) }}</span>
+          <span>{{
+            mapDicDatas(
+              $store.getters.dict.COUNTRY_REGION_CODE,
+              scope.row.destinationCountryRegionCode
+            )
+          }}</span>
         </template>
         </template>
         <template v-slot:unit="scope">
         <template v-slot:unit="scope">
-              <span>{{ mapDicDatas($store.getters.dict.MEASUREMENT_UNIT, scope.row.unit) }}</span>
+          <span>{{
+            mapDicDatas($store.getters.dict.MEASUREMENT_UNIT, scope.row.unit)
+          }}</span>
+        </template>
+        <template v-slot:unitLegalFirstCode="scope">
+          <span>{{
+            mapDicDatas(
+              $store.getters.dict.MEASUREMENT_UNIT,
+              scope.row.unitLegalFirstCode
+            )
+          }}</span>
         </template>
         </template>
         <template v-slot:currency="scope">
         <template v-slot:currency="scope">
-              <span>{{ mapCurrencyDatas($store.getters.dict.CURRENCY, scope.row.currency) }}</span>
+          <span>{{
+            mapCurrencyDatas($store.getters.dict.CURRENCY, scope.row.currency)
+          }}</span>
         </template>
         </template>
         <template slot="optionColumn">
         <template slot="optionColumn">
           <el-table-column align="left" label="操作" width="100">
           <el-table-column align="left" label="操作" width="100">
             <template slot-scope="scope">
             <template slot-scope="scope">
-                    <el-button type="text" @click="updateRow(scope.row)"> 修改 </el-button>
-                    <el-button type="text" @click="deleteRow(scope.row)"> 删除 </el-button>
+              <el-button type="text" @click="updateRow(scope.row)">
+                修改
+              </el-button>
+              <el-button type="text" @click="deleteRow(scope.row)">
+                删除
+              </el-button>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
         </template>
         </template>
@@ -533,39 +564,42 @@
         class="entrySaveButton entrySaveButton-background revokeSubmitBtn"
         class="entrySaveButton entrySaveButton-background revokeSubmitBtn"
         type="primary"
         type="primary"
         @click="submitEditedReportDatas"
         @click="submitEditedReportDatas"
-        >保存</el-button>
-        <el-button
-        class="entrySaveButton"
-        @click="back"
-        >返回</el-button>
+        >保存</el-button
+      >
+      <el-button class="entrySaveButton" @click="back">返回</el-button>
     </div>
     </div>
   </div>
   </div>
-  </template>
+</template>
 
 
-  <script>
-  import RowDataEditForm from "./RowDataEditForm.vue";
-  import { getCustomerList, getPortList, getDeclareData, updateDeclareData } from "@/api/declareData-api.js";
-  import { getDictData } from '@/api/system/dict-api.js'
-  import item from "@/layout/components/Sidebar/Item.vue";
-  export default {
+<script>
+import RowDataEditForm from "./RowDataEditForm.vue";
+import {
+  getCustomerList,
+  getPortList,
+  getDeclareData,
+  updateDeclareData,
+} from "@/api/declareData-api.js";
+import { getDictData } from "@/api/system/dict-api.js";
+import item from "@/layout/components/Sidebar/Item.vue";
+export default {
   name: "",
   name: "",
   components: { RowDataEditForm },
   components: { RowDataEditForm },
   data() {
   data() {
     var checkNegativeNum = (rule, value, callback) => {
     var checkNegativeNum = (rule, value, callback) => {
       if (value < 0) {
       if (value < 0) {
-              callback(new Error('数值不能为负'));
+        callback(new Error("数值不能为负"));
       } else {
       } else {
         callback();
         callback();
       }
       }
     };
     };
     var checkInsuredFee = (rule, value, callback) => {
     var checkInsuredFee = (rule, value, callback) => {
       if (value < 0) {
       if (value < 0) {
-          callback(new Error('数值不能为负'));
+        callback(new Error("数值不能为负"));
       }
       }
-        if (value !== '' && value !== undefined) {
+      if (value !== "" && value !== undefined) {
         const regex = /^\d{0,14}(\.\d{1,5})?$/;
         const regex = /^\d{0,14}(\.\d{1,5})?$/;
         if (!regex.test(value)) {
         if (!regex.test(value)) {
-            callback(new Error('整数最多14位，小数最多5位'));
+          callback(new Error("整数最多14位，小数最多5位"));
         } else {
         } else {
           callback();
           callback();
         }
         }
@@ -575,123 +609,119 @@
     };
     };
     var checkPackNo = (rule, value, callback) => {
     var checkPackNo = (rule, value, callback) => {
       if (!Number.isInteger(value)) {
       if (!Number.isInteger(value)) {
-            callback(new Error('请输入整数值'));
+        callback(new Error("请输入整数值"));
       } else {
       } else {
         if (value < 0) {
         if (value < 0) {
-              callback(new Error('数值不能为负'));
+          callback(new Error("数值不能为负"));
         } else {
         } else {
           callback();
           callback();
         }
         }
       }
       }
     };
     };
     return {
     return {
-        ebcDataList:[],
-        declareCustomsDataList:[],
+      ebcDataList: [],
+      declareCustomsDataList: [],
       declareId: null,
       declareId: null,
       formData: {
       formData: {
-          appType:9610
+        appType: 9610,
       },
       },
-        formRules:{
+      formRules: {
         ebccode: [
         ebccode: [
-            { required: true, message: '请选择电商企业', trigger: 'change' },
+          { required: true, message: "请选择电商企业", trigger: "change" },
         ],
         ],
         logisticsCode: [
         logisticsCode: [
-            { required: true, message: '请选择物流企业', trigger: 'change' },
+          { required: true, message: "请选择物流企业", trigger: "change" },
         ],
         ],
         orderNo: [
         orderNo: [
-            { required: true, message: '请输入订单编号', trigger: 'blur' },
-            { max: 60, message: '长度不能超过60个字符', trigger: 'blur' }
+          { required: true, message: "请输入订单编号", trigger: "blur" },
+          { max: 60, message: "长度不能超过60个字符", trigger: "blur" },
         ],
         ],
         logisticsNo: [
         logisticsNo: [
-            { required: true, message: '请输入物流运单编号', trigger: 'blur' },
-            { max: 80, message: '长度不能超过80个字符', trigger: 'blur' }
+          { required: true, message: "请输入物流运单编号", trigger: "blur" },
+          { max: 80, message: "长度不能超过80个字符", trigger: "blur" },
         ],
         ],
         declareCustomsCode: [
         declareCustomsCode: [
-            { required: true, message: '请选择申报地海关', trigger: 'change' }
-          ],
-          exportDate: [
-            {  message: '请选择出口日期', trigger: 'change' }
+          { required: true, message: "请选择申报地海关", trigger: "change" },
         ],
         ],
+        exportDate: [{ message: "请选择出口日期", trigger: "change" }],
         goodsValue: [
         goodsValue: [
-            { required: true, message: '请输入商品金额', trigger: 'blur' }
+          { required: true, message: "请输入商品金额", trigger: "blur" },
         ],
         ],
-          miscellaneousFreight:[
-            { validator: checkNegativeNum, trigger: 'blur' }
+        miscellaneousFreight: [
+          { validator: checkNegativeNum, trigger: "blur" },
         ],
         ],
         currency: [
         currency: [
-            { required: true, message: '请选择币制', trigger: 'change' }
+          { required: true, message: "请选择币制", trigger: "change" },
         ],
         ],
         mainGoodsInfo: [
         mainGoodsInfo: [
-            { required: true, message: '请输入主要物品信息', trigger: 'blur' },
-            { max: 200, message: '长度不能超过200个字符', trigger: 'blur' }
+          { required: true, message: "请输入主要物品信息", trigger: "blur" },
+          { max: 200, message: "长度不能超过200个字符", trigger: "blur" },
         ],
         ],
         flightNumber: [
         flightNumber: [
-            { required: true, message: '请输入航班号', trigger: 'blur' },
-            { max: 32, message: '长度不能超过32个字符', trigger: 'blur' }
+          { required: true, message: "请输入航班号", trigger: "blur" },
+          { max: 32, message: "长度不能超过32个字符", trigger: "blur" },
         ],
         ],
         billno: [
         billno: [
-            { required: true, message: '请输入提运单号', trigger: 'blur' },
-            { max: 37, message: '长度不能超过37个字符', trigger: 'blur' }
+          { required: true, message: "请输入提运单号", trigger: "blur" },
+          { max: 37, message: "长度不能超过37个字符", trigger: "blur" },
         ],
         ],
         totalPackageNo: [
         totalPackageNo: [
-            { max: 37, message: '长度不能超过37个字符', trigger: 'blur' }
+          { max: 37, message: "长度不能超过37个字符", trigger: "blur" },
         ],
         ],
         regulatoryVenueCode: [
         regulatoryVenueCode: [
-            { max: 10, message: '长度不能超过10个字符', trigger: 'blur' }
+          { max: 10, message: "长度不能超过10个字符", trigger: "blur" },
         ],
         ],
         licenseKey: [
         licenseKey: [
-            { max: 19, message: '长度不能超过19个字符', trigger: 'blur' }
+          { max: 19, message: "长度不能超过19个字符", trigger: "blur" },
         ],
         ],
         destinationCountryRegion: [
         destinationCountryRegion: [
-            { required: true, message: '请选择运抵国', trigger: 'change' }
+          { required: true, message: "请选择运抵国", trigger: "change" },
         ],
         ],
         portCode: [
         portCode: [
-            { required: true, message: '请选择运指运港代码', trigger: 'change' }
+          { required: true, message: "请选择运指运港代码", trigger: "change" },
         ],
         ],
         freight: [
         freight: [
-            { required: true, message: '请输入运费', trigger: 'blur' },
-            { validator: checkNegativeNum, trigger: 'blur' }
+          { required: true, message: "请输入运费", trigger: "blur" },
+          { validator: checkNegativeNum, trigger: "blur" },
         ],
         ],
         freightCurrency: [
         freightCurrency: [
-            { required: true, message: '请选择运费币制', trigger: 'change' }
+          { required: true, message: "请选择运费币制", trigger: "change" },
         ],
         ],
         freightTag: [
         freightTag: [
-            { required: true, message: '请选择运费标志', trigger: 'change' }
+          { required: true, message: "请选择运费标志", trigger: "change" },
         ],
         ],
         insuredfee: [
         insuredfee: [
-            { required: true, message: '请输入保费', trigger: 'blur' },
-            { validator: checkInsuredFee, trigger: 'blur' }
+          { required: true, message: "请输入保费", trigger: "blur" },
+          { validator: checkInsuredFee, trigger: "blur" },
         ],
         ],
         insuredfeeCurrency: [
         insuredfeeCurrency: [
-            { required: true, message: '请输入保费币制', trigger: 'blur' }
+          { required: true, message: "请输入保费币制", trigger: "blur" },
         ],
         ],
         insuredfeeTag: [
         insuredfeeTag: [
-            { required: true, message: '请输选择保费标志', trigger: 'change' }
+          { required: true, message: "请输选择保费标志", trigger: "change" },
         ],
         ],
         packageTypeCode: [
         packageTypeCode: [
-            { required: true, message: '请选择包装种类代码', trigger: 'change' }
+          { required: true, message: "请选择包装种类代码", trigger: "change" },
         ],
         ],
         packNo: [
         packNo: [
-            { required: true, message: '请输入件数', trigger: 'blur' },
-            { validator: checkPackNo, trigger: 'blur' }
+          { required: true, message: "请输入件数", trigger: "blur" },
+          { validator: checkPackNo, trigger: "blur" },
         ],
         ],
         weight: [
         weight: [
-            { required: true, message: '请输入毛重', trigger: 'blur' },
-            { validator: checkNegativeNum, trigger: 'blur' }
-          ],
-          netWeight: [
-            { required: true, message: '请输入净重', trigger: 'blur' }
+          { required: true, message: "请输入毛重", trigger: "blur" },
+          { validator: checkNegativeNum, trigger: "blur" },
         ],
         ],
+        netWeight: [{ required: true, message: "请输入净重", trigger: "blur" }],
         remark: [
         remark: [
-            { max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' }
-          ]
+          { max: 1000, message: "长度不能超过1000个字符", trigger: "blur" },
+        ],
       },
       },
       detailData: [],
       detailData: [],
       detialHeaderData: [
       detialHeaderData: [
         {
         {
           value: "rowDataEdit",
           value: "rowDataEdit",
-            expand:true,
-            width:0,
+          expand: true,
+          width: 0,
         },
         },
         {
         {
           name: "企业商品货号",
           name: "企业商品货号",
@@ -722,14 +752,12 @@
           value: "productCode",
           value: "productCode",
           width: "",
           width: "",
           align: "left",
           align: "left",
-
         },
         },
         {
         {
           name: "规格型号",
           name: "规格型号",
           value: "model",
           value: "model",
           width: "",
           width: "",
           align: "left",
           align: "left",
-
         },
         },
         {
         {
           name: "账册备案料号",
           name: "账册备案料号",
@@ -748,14 +776,14 @@
           value: "destinationCountryRegionCode",
           value: "destinationCountryRegionCode",
           width: "",
           width: "",
           align: "left",
           align: "left",
-            slot:true
+          slot: true,
         },
         },
         {
         {
           name: "计量单位",
           name: "计量单位",
           value: "unit",
           value: "unit",
           width: "",
           width: "",
           align: "left",
           align: "left",
-            slot:true
+          slot: true,
         },
         },
         {
         {
           name: "数量",
           name: "数量",
@@ -770,11 +798,18 @@
           align: "left",
           align: "left",
         },
         },
         {
         {
+          name: "法定计量单位",
+          value: "unitLegalFirstCode",
+          width: "",
+          align: "left",
+          slot: true,
+        },
+        {
           name: "币制",
           name: "币制",
           value: "currency",
           value: "currency",
           width: "",
           width: "",
           align: "left",
           align: "left",
-            slot:true
+          slot: true,
         },
         },
         {
         {
           name: "单价",
           name: "单价",
@@ -805,7 +840,7 @@
         entryLoading: false,
         entryLoading: false,
       },
       },
       logtableType: true,
       logtableType: true,
-        expandRowKeys:[],
+      expandRowKeys: [],
       isFold: false,
       isFold: false,
       // 用于保存原始数据
       // 用于保存原始数据
       originalDetailData: {},
       originalDetailData: {},
@@ -817,83 +852,88 @@
   created() {
   created() {
     if (this.$route.params.data) {
     if (this.$route.params.data) {
       this.declareId = this.$route.params.data.declareId;
       this.declareId = this.$route.params.data.declareId;
-        this.queryDeclareData(this.declareId)
-        this.queryCustomerList()
-        this.queryPortList()
+      this.queryDeclareData(this.declareId);
+      this.queryCustomerList();
+      this.queryPortList();
     } else {
     } else {
       this.back();
       this.back();
     }
     }
   },
   },
   beforeRouteLeave(to, from, next) {
   beforeRouteLeave(to, from, next) {
-      if (to.name === 'ReportingData') {
+    if (to.name === "ReportingData") {
       // 设置一个标志表示需要刷新数据
       // 设置一个标志表示需要刷新数据
       to.meta.needsRefresh = true;
       to.meta.needsRefresh = true;
     }
     }
     next();
     next();
   },
   },
   methods: {
   methods: {
-        mapDicDatas(dicArr, code){
-          if (code != "") {
-            return dicArr.filter(item => item.itemCode == code)[0].itemChineseName
+    mapDicDatas(dicArr, code) {
+      if (code != "" && code) {
+        return dicArr.filter((item) => item.itemCode == code)[0]
+          .itemChineseName;
       } else {
       } else {
-            return ''
+        return "";
       }
       }
-
     },
     },
-        mapCurrencyDatas(dicArr, code){
+    mapCurrencyDatas(dicArr, code) {
       if (code != "") {
       if (code != "") {
-            return dicArr.filter(item => item.itemValue == code)[0].itemChineseName
+        return dicArr.filter((item) => item.itemValue == code)[0]
+          .itemChineseName;
       } else {
       } else {
-            return ''
+        return "";
       }
       }
-
     },
     },
     //获取客户下拉列表数据
     //获取客户下拉列表数据
-        queryCustomerList(){
-            getCustomerList().then(res =>{
+    queryCustomerList() {
+      getCustomerList()
+        .then((res) => {
           if (res.code == 200) {
           if (res.code == 200) {
-                 this.ebcDataList = res.data.value
+            this.ebcDataList = res.data.value;
           } else {
           } else {
-                this.ebcDataList = []
+            this.ebcDataList = [];
           }
           }
-
-            }).catch(err =>{
-                console.log(err)
         })
         })
+        .catch((err) => {
+          console.log(err);
+        });
     },
     },
     //获取口岸表数据
     //获取口岸表数据
-        queryPortList(){
-            getPortList().then(res =>{
+    queryPortList() {
+      getPortList()
+        .then((res) => {
           if (res.code == 200) {
           if (res.code == 200) {
-                 this.declareCustomsDataList = res.data.value
+            this.declareCustomsDataList = res.data.value;
           } else {
           } else {
-                this.declareCustomsDataList = []
+            this.declareCustomsDataList = [];
           }
           }
-
-            }).catch(err =>{
-                console.log(err)
         })
         })
+        .catch((err) => {
+          console.log(err);
+        });
     },
     },
     //获取申报数据
     //获取申报数据
     queryDeclareData(declareId) {
     queryDeclareData(declareId) {
-           getDeclareData({declareId}).then(res =>{
+      getDeclareData({ declareId })
+        .then((res) => {
           // console.log(1111, res)
           // console.log(1111, res)
           if (res.code == 200) {
           if (res.code == 200) {
-                 res.data.declare.orderNo = res.data.declare.orderno
-                 this.formData = res.data.declare
-                 this.formData.appType=9610
-                 this.detailData = res.data.product.length ? res.data.product.map((item, index) =>{
-                    item.gnum = index+1
-                    return item
-                 }) : []
+            res.data.declare.orderNo = res.data.declare.orderno;
+            this.formData = res.data.declare;
+            this.formData.appType = 9610;
+            this.detailData = res.data.product.length
+              ? res.data.product.map((item, index) => {
+                  item.gnum = index + 1;
+                  return item;
+                })
+              : [];
           } else {
           } else {
-                this.detailData = []
-                this.formData = {}
+            this.detailData = [];
+            this.formData = {};
           }
           }
-
-            }).catch(err =>{
-                console.log(err)
         })
         })
+        .catch((err) => {
+          console.log(err);
+        });
     },
     },
 
 
     hiddenLogTable() {
     hiddenLogTable() {
@@ -926,33 +966,36 @@
           if (!isValid) {
           if (!isValid) {
             //  console.log(22)
             //  console.log(22)
             this.lastItemValid = false; // 标记上一次新增的 item 未通过校验
             this.lastItemValid = false; // 标记上一次新增的 item 未通过校验
-              this.$message.warning('请先完善新增的商品信息');
+            this.$message.warning("请先完善新增的商品信息");
             return;
             return;
           }
           }
         }
         }
       }
       }
       // 校验通过，允许新增 item
       // 校验通过，允许新增 item
-        let orderNum = this.detailData.at(-1) === undefined ? 1 : this.detailData.at(-1).gnum + 1;
+      let orderNum =
+        this.detailData.at(-1) === undefined
+          ? 1
+          : this.detailData.at(-1).gnum + 1;
       this.detailData.push({
       this.detailData.push({
-          "gnum":orderNum,
-          "accountBookMaterialNumber": "",
-          "barCode": "",
-          "currency": "",
-          "destinationCountryRegionCode": "",
-          "enterpriseProductCode": "",
-          "enterpriseProductDescribe": "",
-          "enterpriseProductName": "",
-          "legalQty": 0,
-          "model": "",
-          "netWeight": 0,
-          "price": 0,
-          "productCode": "",
-          "productName": "",
-          "qty": 0,
-          "remark": "",
-          "totalPrice": 0,
-          "unit": "",
-          "isNew": true // 添加 isNew 标志
+        gnum: orderNum,
+        accountBookMaterialNumber: "",
+        barCode: "",
+        currency: "",
+        destinationCountryRegionCode: "",
+        enterpriseProductCode: "",
+        enterpriseProductDescribe: "",
+        enterpriseProductName: "",
+        legalQty: 0,
+        model: "",
+        netWeight: 0,
+        price: 0,
+        productCode: "",
+        productName: "",
+        qty: 0,
+        remark: "",
+        totalPrice: 0,
+        unit: "",
+        isNew: true, // 添加 isNew 标志
       });
       });
 
 
       this.$nextTick(() => {
       this.$nextTick(() => {
@@ -960,59 +1003,61 @@
         this.lastItemValid = true; // 重置标志位
         this.lastItemValid = true; // 重置标志位
       });
       });
     },
     },
-      updateRow(row){
-        if (this.expandRowKeys.length > 0) return
-        this.expandRowKeys = [row.gnum]
+    updateRow(row) {
+      if (this.expandRowKeys.length > 0) return;
+      this.expandRowKeys = [row.gnum];
       this.currentRowKey = row.gnum; // 设置当前行的 gnum
       this.currentRowKey = row.gnum; // 设置当前行的 gnum
 
 
       // 保存原始数据
       // 保存原始数据
       this.originalDetailData[row.gnum] = { ...row };
       this.originalDetailData[row.gnum] = { ...row };
 
 
-        let obj = {}
+      let obj = {};
       for (let key in row) {
       for (let key in row) {
-            obj[key] = row[key]
+        obj[key] = row[key];
       }
       }
 
 
-        this.$nextTick(()=>{
-            this.$refs.rowEditForm.tableRowformData = obj
+      this.$nextTick(() => {
+        this.$refs.rowEditForm.tableRowformData = obj;
         // const table = this.$refs.entryTable.$el.querySelector('.el-table__body-wrapper');
         // const table = this.$refs.entryTable.$el.querySelector('.el-table__body-wrapper');
         // table.scrollTop = row.gnum*51+10
         // table.scrollTop = row.gnum*51+10
-        })
+      });
     },
     },
-      getTotalNumber(){
+    getTotalNumber() {
       let totalNetWeight = 0;
       let totalNetWeight = 0;
-         let totalGoodsValue = 0
-         for (let i=0; i<this.detailData.length; i++) {
-            totalNetWeight += Number(this.detailData[i].netWeight)
-            totalGoodsValue += Number(this.detailData[i].totalPrice)
+      let totalGoodsValue = 0;
+      for (let i = 0; i < this.detailData.length; i++) {
+        totalNetWeight += Number(this.detailData[i].netWeight);
+        totalGoodsValue += Number(this.detailData[i].totalPrice);
       }
       }
-         this.formData.netWeight = totalNetWeight.toFixed(5)
-         this.formData.goodsValue = totalGoodsValue.toFixed(5)
+      this.formData.netWeight = totalNetWeight.toFixed(5);
+      this.formData.goodsValue = totalGoodsValue.toFixed(5);
     },
     },
-      deleteRow(row){
-        this.detailData = this.detailData.filter(item => item.gnum !=row.gnum).map((item, index) =>{
-            item.gnum = index+1
-            return item
-        })
-        this.$nextTick(()=>{
-          this.getTotalNumber()
-          this.expandRowKeys = []
-          this.detailData.length
+    deleteRow(row) {
+      this.detailData = this.detailData
+        .filter((item) => item.gnum != row.gnum)
+        .map((item, index) => {
+          item.gnum = index + 1;
+          return item;
+        });
+      this.$nextTick(() => {
+        this.getTotalNumber();
+        this.expandRowKeys = [];
+        this.detailData.length;
         this.lastItemValid = this.detailData.length === row.index;
         this.lastItemValid = this.detailData.length === row.index;
-        })
+      });
     },
     },
-      rowFormDataSave(props){
-         this.detailData.map(item =>{
+    rowFormDataSave(props) {
+      this.detailData.map((item) => {
         if (item.gnum == props.gnum) {
         if (item.gnum == props.gnum) {
-               item = Object.assign(item, props.tableRowformData)
-               return item
+          item = Object.assign(item, props.tableRowformData);
+          return item;
         }
         }
-         })
-         this.expandRowKeys = []
-         this.$nextTick(()=>{
+      });
+      this.expandRowKeys = [];
+      this.$nextTick(() => {
         this.lastItemValid = true;
         this.lastItemValid = true;
-          this.getTotalNumber()
-        })
+        this.getTotalNumber();
+      });
     },
     },
     cancelEditRowData(index) {
     cancelEditRowData(index) {
       this.lastItemValid = true; // 重置标志位
       this.lastItemValid = true; // 重置标志位
@@ -1036,40 +1081,39 @@
       this.lastItemValid = isValid;
       this.lastItemValid = isValid;
     },
     },
     //提交更新数据
     //提交更新数据
-      submitEditedReportDatas(){
+    submitEditedReportDatas() {
       this.$refs.editForm.validate((valid) => {
       this.$refs.editForm.validate((valid) => {
         if (valid) {
         if (valid) {
           let data = {
           let data = {
             declare: this.formData,
             declare: this.formData,
-                product: this.detailData
-            }
-        updateDeclareData(data).then(res =>{
+            product: this.detailData,
+          };
+          updateDeclareData(data)
+            .then((res) => {
               if (res.code == 200) {
               if (res.code == 200) {
                 this.msgSuccess("数据更新成功");
                 this.msgSuccess("数据更新成功");
-              this.queryDeclareData(this.declareId)
+                this.queryDeclareData(this.declareId);
                 this.lastItemValid = true;
                 this.lastItemValid = true;
               } else {
               } else {
                 this.alertWarningMsg(res.message);
                 this.alertWarningMsg(res.message);
               }
               }
-
-            }).catch(err =>{
-                console.log(err)
             })
             })
+            .catch((err) => {
+              console.log(err);
+            });
         } else {
         } else {
           return false;
           return false;
         }
         }
       });
       });
     },
     },
     //取消编辑
     //取消编辑
-      cancelEditedReportDatas(){
-
-      }
+    cancelEditedReportDatas() {},
   },
   },
-  };
-  </script>
+};
+</script>
 
 
-  <style scoped lang="scss">
-  .entry {
+<style scoped lang="scss">
+.entry {
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
   padding: 10px;
   padding: 10px;
@@ -1093,49 +1137,49 @@
   .titleBorder {
   .titleBorder {
     border-bottom: 1px solid #333;
     border-bottom: 1px solid #333;
   }
   }
-  }
-  .addNewItem{
+}
+.addNewItem {
   display: flex;
   display: flex;
   justify-content: flex-start;
   justify-content: flex-start;
   align-items: center;
   align-items: center;
-    color:#007AB7;
+  color: #007ab7;
   line-height: 38px;
   line-height: 38px;
-    i{
+  i {
     margin-right: 3px;
     margin-right: 3px;
   }
   }
-    span{
+  span {
     font-size: 13px;
     font-size: 13px;
     font-weight: 500;
     font-weight: 500;
     cursor: pointer;
     cursor: pointer;
   }
   }
-  }
-  .formRowDataOperate{
+}
+.formRowDataOperate {
   text-align: right;
   text-align: right;
   padding: 0 20px;
   padding: 0 20px;
-    a{
-        color: #007AB7;
+  a {
+    color: #007ab7;
     font-weight: 600;
     font-weight: 600;
-        &:first-child{
+    &:first-child {
       margin-right: 5px;
       margin-right: 5px;
     }
     }
   }
   }
-  }
-  .fedexFormEditStyle .el-form-item:has(.formError) {
+}
+.fedexFormEditStyle .el-form-item:has(.formError) {
   margin-bottom: 30px !important;
   margin-bottom: 30px !important;
-  }
-  .fedexFormEditStyle .el-form-item .formError{
-    padding:0 0.9375rem !important;
-  }
-  .partsHidden{
+}
+.fedexFormEditStyle .el-form-item .formError {
+  padding: 0 0.9375rem !important;
+}
+.partsHidden {
   height: 164px;
   height: 164px;
   overflow: hidden;
   overflow: hidden;
-  }
-  .fold-unfold{
+}
+.fold-unfold {
   display: flex;
   display: flex;
   justify-content: center;
   justify-content: center;
-    padding-top:8px;
-    img{
+  padding-top: 8px;
+  img {
     width: 22px;
     width: 22px;
   }
   }
-  }
-  </style>
+}
+</style>

@@ -127,6 +127,25 @@
             </Formitem>
             </Formitem>
           </el-col>
           </el-col>
         </el-row>
         </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>
       </el-form>
     </div>
     </div>
     <div class="dialogOption entrySave">
     <div class="dialogOption entrySave">
@@ -177,6 +196,7 @@ export default {
         declarationUnitCompanyName: "",
         declarationUnitCompanyName: "",
         dxpid: "",
         dxpid: "",
         portCode: "",
         portCode: "",
+        exportPortCode: "",
       },
       },
       rules: {
       rules: {
         portCode: [
         portCode: [
@@ -244,6 +264,13 @@ export default {
             message: "申报单位 (企业名称)不能为空！",
             message: "申报单位 (企业名称)不能为空！",
           },
           },
         ],
         ],
+        exportPortCode: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "汇总申报地海关代码不能为空！",
+          },
+        ],
       },
       },
       loadings: {
       loadings: {
         dialogLoading: false,
         dialogLoading: false,
@@ -348,6 +375,7 @@ export default {
         declarationUnitCompanyName: "",
         declarationUnitCompanyName: "",
         dxpid: "",
         dxpid: "",
         portCode: "",
         portCode: "",
+        exportPortCode: "",
       };
       };
       this.$emit("close");
       this.$emit("close");
     },
     },

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

@@ -9,24 +9,24 @@
     >
     >
       <el-row class="row-border">
       <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">
         <el-col :span="5">
           <Formitem label="预录入编号" prop="preNo">
           <Formitem label="预录入编号" prop="preNo">
@@ -135,7 +135,11 @@
               placeholder=""
               placeholder=""
             >
             >
               <el-option
               <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"
                 :key="index"
                 :label="item.itemChineseName"
                 :label="item.itemChineseName"
                 :value="item.itemValue"
                 :value="item.itemValue"
@@ -144,47 +148,47 @@
           </Formitem>
           </Formitem>
         </el-col>
         </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-row>
     </el-form>
     </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
     <Table
       class="fedexDetialTable fedexSreachTable"
       class="fedexDetialTable fedexSreachTable"
       ref="entryTable"
       ref="entryTable"
@@ -220,7 +224,8 @@
           @popoverClose="popoverClose"
           @popoverClose="popoverClose"
         >
         >
           <div slot="title">
           <div slot="title">
-            <span style="font-weight: 700; color: #515a6e">汇总申请单编号：</span
+            <span style="font-weight: 700; color: #515a6e"
+              >汇总申请单编号：</span
             >{{ scope.row.sumNo }}
             >{{ scope.row.sumNo }}
           </div>
           </div>
           <div slot="buttonLabel">
           <div slot="buttonLabel">
@@ -242,7 +247,7 @@
 <script>
 <script>
 import {
 import {
   searchExportSummaryList,
   searchExportSummaryList,
-  getExportSummaryReceiptData
+  getExportSummaryReceiptData,
 } from "@/api/exportSummary-api";
 } from "@/api/exportSummary-api";
 export default {
 export default {
   name: "ExportBillQuery",
   name: "ExportBillQuery",
@@ -325,7 +330,13 @@ export default {
         },
         },
         {
         {
           name: "收发货人汇总标志",
           name: "收发货人汇总标志",
-          value:"summaryFlag",
+          value: "summaryFlag",
+          width: "",
+          align: "left",
+        },
+        {
+          name: "申报时间",
+          value: "createTime",
           width: "",
           width: "",
           align: "left",
           align: "left",
         },
         },
@@ -443,7 +454,7 @@ export default {
         })
         })
         .finally(() => {
         .finally(() => {
           this.$nextTick(() => {
           this.$nextTick(() => {
-            this.$store.dispatch('setLoadingState', false)
+            this.$store.dispatch("setLoadingState", false);
             this.$refs.returnStatusPopover.tableLoading = false;
             this.$refs.returnStatusPopover.tableLoading = false;
           });
           });
         });
         });

@@ -16,21 +16,21 @@
     >
     >
       <el-row :gutter="5">
       <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">
           <Formitem label="电子口岸编号" prop="preNo">
             <el-input
             <el-input
               type="text"
               type="text"
@@ -62,21 +62,21 @@
             </el-select>
             </el-select>
           </Formitem>
           </Formitem>
         </el-col>
         </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">
           <Formitem label="汇总申请编号" prop="sumNo">
             <el-input
             <el-input
               type="text"
               type="text"
@@ -104,7 +104,7 @@
           </Formitem>
           </Formitem>
         </el-col>
         </el-col>
         <!-- 报关单位名称 -->
         <!-- 报关单位名称 -->
-        <el-col :span="12">
+        <el-col :span="6">
           <Formitem label="报关单位名称" prop="declAgentName">
           <Formitem label="报关单位名称" prop="declAgentName">
             <el-input
             <el-input
               type="text"
               type="text"
@@ -289,9 +289,9 @@
             ></el-input>
             ></el-input>
           </Formitem>
           </Formitem>
         </el-col>
         </el-col>
-        <!-- 入库时间 -->
+        <!-- 入库时间=>申报时间 -->
         <el-col :span="3">
         <el-col :span="3">
-          <Formitem label="入库时间" prop="createTime">
+          <Formitem label="申报时间" prop="createTime">
             <el-input
             <el-input
               type="text"
               type="text"
               class="inputShadow"
               class="inputShadow"

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