diff --git a/src/api/ecss/ecss.js b/src/api/ecss/ecss.js
index 8297d68..7177bdb 100644
--- a/src/api/ecss/ecss.js
+++ b/src/api/ecss/ecss.js
@@ -101,4 +101,6 @@ export const deleteWalMartOrder= data => createAPI(`/ecss/coDel/deleteWalMartOrd
 
 export const saveWalMartOrderByExcel = data => createAPI(`/ecss/coDel/saveWalMartOrderByExcel`,'post',data)
 
+export const getPropertiesListByDeclaration = data => createAPI(`/ecss/coDel/getPropertiesListByDeclaration`,'post',data)
+
 
diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue
index 0e89779..6a0a4e6 100644
--- a/src/views/modules/ecss/codelnotifyConfirm.vue
+++ b/src/views/modules/ecss/codelnotifyConfirm.vue
@@ -2130,6 +2130,7 @@
           buNo:this.currentRow.buNo,
           delNo:this.currentRow.delNo,
           cmcInvoice:this.currentRow.cmcInvoice,
+          walMartOrderFlag:this.currentRow.walMartOrderFlag
         }
         this.$nextTick(() => {
           this.$refs.palletUploadExcel.init(inData)
diff --git a/src/views/modules/ecss/declaration.vue b/src/views/modules/ecss/declaration.vue
index 2cc18d1..7e9ad19 100644
--- a/src/views/modules/ecss/declaration.vue
+++ b/src/views/modules/ecss/declaration.vue
@@ -51,6 +51,9 @@
       <el-form-item label=" ">
         <el-button @click="exportGoodsList()" type="primary" style="margin-left: 2px">{{'导出出口货物委托书'}}</el-button>
       </el-form-item>
+<!--      <el-form-item label=" ">
+        <el-button @click="exportContract()" type="primary" style="margin-left: 2px">{{'导出合同'}}</el-button>
+      </el-form-item>-->
     </el-form>
 
     <el-table
@@ -134,7 +137,7 @@
         </el-table>
       </el-tab-pane>
     </el-tabs>
-    <el-dialog title="导出报关要素" :close-on-click-modal="false" v-drag :visible.sync="brandTypeFlag" width="300px">
+    <el-dialog title="导出报关要素" :close-on-click-modal="false" v-drag :visible.sync="brandTypeFlag" width="400px">
       <el-form label-position="top"  style="margin-left: 7px;margin-top: 10px;">
         <el-row :gutter="20">
           <el-col :span="24">
@@ -146,11 +149,42 @@
           <el-col :span="24">
             <el-form-item :label="'品名类型'" >
               <el-radio v-model="hsCodeDescType" label="Y">中文</el-radio>
-              <el-radio v-model="hsCodeDescType" label="N">英文</el-radio>
+              <el-radio style="margin-left: 102px;" v-model="hsCodeDescType" label="N">英文</el-radio>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
+      <el-table v-show="currentRow.buNo==='02-Hardtag' || currentRow.buNo==='04-MHM'"
+        :height="240"
+                :data="propertiesList"
+                stripe
+                highlight-current-row
+                border :row-style="{ height: '30px' }"
+                style="width: 100%;">
+        <el-table-column
+          prop="hsCode"
+          header-align="center"
+          align="center"
+          label="HS Code">
+        </el-table-column>
+        <el-table-column
+          prop="hsCodeDesc"
+          header-align="center"
+          align="center"
+          label="品名">
+        </el-table-column>
+        <el-table-column
+          prop="ehundred"
+          header-align="center"
+          align="center"
+          label="品牌">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.brand" placeholder="请选择"  style="width: 150px">
+              <el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.availableList" :key="key"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
         <el-button type="primary" @click="downloadDeclarationElements()">确定</el-button>
         <el-button type="primary" @click="brandTypeFlag=false">关闭</el-button>
@@ -298,11 +332,11 @@
               <el-radio v-model="exportPaking.hsCodeDescType" label="N">英文</el-radio>
             </el-form-item>
           </el-col>
-          <el-col :span="12" >
+<!--          <el-col :span="12" >
             <el-form-item :label="''" >
               <el-checkbox v-model="exportPaking.boxChange">显示箱数零头</el-checkbox>
             </el-form-item>
-          </el-col>
+          </el-col>-->
           <el-col :span="12" >
             <el-form-item :label="''" >
               <el-checkbox v-model="exportPaking.goodsLabel">货物明细</el-checkbox>
@@ -323,6 +357,11 @@
               <el-input v-model="exportPaking.shippingMark"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12" v-show="currentRow.buNo==='01-Label' || currentRow.buNo==='03-RFID'">
+            <el-form-item :label="'制造地'" >
+              <el-input  v-model="exportPaking.origin"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="12" v-show="currentRow.buNo==='01-Label' || currentRow.buNo==='03-RFID'">
             <el-form-item :label="'栈板重量参数'" >
               <el-input  v-model="exportPaking.palletWeight"></el-input>
@@ -348,11 +387,6 @@
               <el-input :disabled="!exportPaking.packaging" v-model="exportPaking.kgs"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-show="currentRow.buNo==='01-Label' || currentRow.buNo==='03-RFID'">
-            <el-form-item :label="'制造地'" >
-              <el-input  v-model="exportPaking.origin"></el-input>
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
       <el-table v-show="currentRow.buNo==='03-RFID'"
@@ -498,7 +532,8 @@
     downloadDeclarationElements,
     getNotifyPartDetail,
     getCustomerInfo,
-    searchTemplateList
+    searchTemplateList,
+    getPropertiesListByDeclaration
   }from "@/api/ecss/ecss.js"
   import {EventBus} from "../../../main";
   import ExportUtil from "@/utils/export";
@@ -514,6 +549,7 @@
         templateList:[],
         customerInfoList:[],
         notifyPartDetailList:[],
+        propertiesList:[],
         currentRow:{},
         exportGoodsFlag:false,
         exportGoods:{
@@ -1576,8 +1612,17 @@
           return
         }
         this.brandType='境外品牌（其他）'
-        //this.hsCodeDescType=''
         this.brandTypeFlag = true
+        if (this.currentRow.buNo==='02-Hardtag' || this.currentRow.buNo==='04-MHM') {
+          this.currentRow.brand='品牌'
+          getPropertiesListByDeclaration(this.currentRow).then(({data}) => {
+            if (data && data.code == 0) {
+              this.propertiesList = data.rows
+            } else {
+              this.propertiesList = [];
+            }
+          });
+        }
       },
       chooseHsCodeDescType() {
         if (!this.currentRow || !this.currentRow.buNo) {
@@ -1699,6 +1744,10 @@
         exportParam.delNo = this.currentRow.delNo
         exportParam.brandType = this.brandType
         exportParam.hsCodeDescType=this.hsCodeDescType
+        if (this.propertiesList.length>0) {
+          this.currentRow.brand='品牌'
+          exportParam.propertiesList = this.propertiesList
+        }
         let error;
         ExportUtil.export(
           "/ecss/coDel/downloadDeclarationElements",
@@ -1790,6 +1839,21 @@
         this.exportGoodsFlag = false;
         this.searchTable()
       },
+      exportContract(){
+        if (!this.currentRow || !this.currentRow.buNo) {
+          this.$message.warning('请选择报关单！')
+          return
+        }
+        let exportParam=this.exportGoods
+        exportParam.declarationNo = this.currentRow.declarationNo
+        exportParam.site = this.currentRow.site
+        exportParam.delNo = this.currentRow.delNo
+        ExportUtil.export(
+          "/ecss/coDel/downloadContract",
+          exportParam, this.currentRow.declarationNo+"合同.xlsx"
+        );
+        this.searchTable()
+      },
       getCustomerInfo() {
         getCustomerInfo(this.currentRow).then(({data}) => {
           //区分请求成功和失败的状况
diff --git a/src/views/modules/ecss/ecssTemplate.vue b/src/views/modules/ecss/ecssTemplate.vue
index 3065e9d..8f98e61 100644
--- a/src/views/modules/ecss/ecssTemplate.vue
+++ b/src/views/modules/ecss/ecssTemplate.vue
@@ -129,11 +129,11 @@
               <el-checkbox v-model="addModel.so">SO</el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-show="addModel.type=='箱单'">
+<!--          <el-col :span="12" v-show="addModel.type=='箱单'">
             <el-form-item :label="''" >
               <el-checkbox v-model="addModel.boxChange">显示箱数零头</el-checkbox>
             </el-form-item>
-          </el-col>
+          </el-col>-->
           <el-col :span="12" >
             <el-form-item :label="''" >
               <el-checkbox v-model="addModel.goodsLabel">货物明细</el-checkbox>
diff --git a/src/views/modules/ecss/pallet_upload_excel.vue b/src/views/modules/ecss/pallet_upload_excel.vue
index 4f2fd2d..4d0d032 100644
--- a/src/views/modules/ecss/pallet_upload_excel.vue
+++ b/src/views/modules/ecss/pallet_upload_excel.vue
@@ -17,7 +17,21 @@
             <el-input v-model="pageData.cmcInvoice" disabled style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item label=" ">
-            <el-button type="primary" @click="downloadFile()">下载文件模板</el-button>
+            <download-excel
+              :fields="fields()"
+              :data="exportData"
+              type="xls"
+              :name="exportName"
+              :header="exportHeader"
+              :footer="exportFooter"
+              :fetch="createExportData"
+              :before-generate="startDownload"
+              :before-finish="finishDownload"
+              worksheet="导出信息"
+              class="el-button el-button--primary el-button--medium">
+              {{ '导出模版' }}
+            </download-excel>
+<!--            <el-button type="primary" @click="downloadFile()">下载文件模板</el-button>-->
           </el-form-item>
         </el-row>
         <el-row>
@@ -40,7 +54,7 @@
 
 <script>
   import {queryFileId} from "@/api/qc/qc.js"
-  import {saveCoDelPalletDataByExcel} from '@/api/ecss/ecss.js'
+  import {saveCoDelPalletDataByExcel,searchEcssCoDelNotifyDetail} from '@/api/ecss/ecss.js'
   import {downLoadObjectFile} from '@/api/eam/eam_object_list.js'
   import {getBuList}from  '@/api/factory/site.js'
   export default {
@@ -57,8 +71,75 @@
           delNo:'',
           cmcInvoice:'',
           createBy: this.$store.state.user.name,
-
         },
+        // 导出 start
+        exportData: [],
+        exportName: '装箱数据导入模版',
+        exportHeader: [""],
+        exportFooter: [],
+        // 导出 end
+        columnList1: [
+          {
+            columnProp: "seqNo",
+            columnLabel: "序号",
+          },
+          {
+            columnProp: "cmcInvoice",
+            columnLabel: "发票号",
+          },
+          {
+            columnProp: "seqNo",
+            columnLabel: "托盘号/箱号",
+          },
+          {
+            columnProp: "customerPO",
+            columnLabel: "PO",
+          },
+          {
+            columnProp: "pn",
+            columnLabel: "PN",
+          },
+          {
+            columnProp: "qty",
+            columnLabel: "数量",
+          },
+          {
+            columnProp: "seqNo",
+            columnLabel: "箱数",
+          },
+          {
+            columnProp: "seqNo",
+            columnLabel: "Rolls",
+          },
+          {
+            columnProp: "seqNo",
+            columnLabel: "托数",
+          },
+          {
+            columnProp: "seqNo",
+            columnLabel: "长(M)",
+          },
+          {
+            columnProp: "seqNo",
+            columnLabel: "宽(M)",
+          },
+          {
+            columnProp: "seqNo",
+            columnLabel: "高(M)",
+          },
+          {
+            columnProp: "seqNo",
+            columnLabel: "体积",
+          },
+          {
+            columnProp: "seqNo",
+            columnLabel: "毛重",
+          },
+          {
+            columnProp: "seqNo",
+            columnLabel: "净重",
+          },
+        ],
       }
     },
     methods: {
@@ -80,6 +161,7 @@
           buNo: inData.buNo,
           delNo: inData.delNo,
           cmcInvoice: inData.cmcInvoice,
+          walMartOrderFlag: inData.walMartOrderFlag,
           createBy: this.$store.state.user.name,
         }
         // 打开页面
@@ -126,6 +208,7 @@
         formData.append("buNo",this.pageData.buNo)
         formData.append("site",this.pageData.site)
         formData.append("delNo",this.pageData.delNo)
+        formData.append("walMartOrderFlag",this.pageData.walMartOrderFlag)
         formData.append("username",this.$store.state.user.name)
         formData.append("file", this.fileList[0].raw)
         // formData.append("createBy", this.pageData.createBy)
@@ -181,6 +264,43 @@
           document.body.removeChild(linkNode)
         })
       },
+
+      //导出excel
+      async createExportData() {
+        let searchData={
+          site: this.pageData.site,
+          buNo: this.pageData.buNo,
+          delNo: this.pageData.delNo,
+          cmcInvoice: this.pageData.cmcInvoice,
+          createBy: this.$store.state.user.name,
+        }
+        await searchEcssCoDelNotifyDetail(searchData).then(({data}) => {
+          this.exportList= data.rows
+          this.exportList.forEach(o => o.cmcInvoice=this.pageData.cmcInvoice);
+        })
+
+        return this.exportList;
+      },
+      startDownload() {
+        //  this.exportData = this.dataList
+
+      },
+      finishDownload() {
+      },
+      fields() {
+        let json = "{"
+        this.columnList1.forEach((item, index) => {
+          if (index == this.columnList1.length - 1) {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+          } else {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+          }
+        })
+        json += "}"
+        let s = eval("(" + json + ")")
+
+        return s
+      },
     }
   }
 </script>
diff --git a/src/views/modules/ecss/walmart_upload_excel.vue b/src/views/modules/ecss/walmart_upload_excel.vue
index 92579c0..cb2c182 100644
--- a/src/views/modules/ecss/walmart_upload_excel.vue
+++ b/src/views/modules/ecss/walmart_upload_excel.vue
@@ -108,7 +108,11 @@
         formData.append("file", this.fileList[0].raw)
         saveWalMartOrderByExcel(formData).then(({data}) => {
           if (data.code === 0) {
-            this.$message.success(data.msg)
+            if (data.errorMsg) {
+              this.$message.warning(data.errorMsg)
+            } else {
+              this.$message.success(data.msg)
+            }
             // 关闭窗口并刷新页面
             this.closeDialog()
           } else {