diff --git a/src/views/modules/ecss/codelnotifyTX.vue b/src/views/modules/ecss/codelnotifyTX.vue
index cb75a41..76e6e61 100644
--- a/src/views/modules/ecss/codelnotifyTX.vue
+++ b/src/views/modules/ecss/codelnotifyTX.vue
@@ -152,11 +152,11 @@
             fixed="left"
             header-align="center"
             align="center"
-            width="100" v-if="currentRow.notifyStatus!=='订单取消' && (currentRow.buNo==='01-Label' || currentRow.buNo==='03-RFID')"
+            width="100" v-if="currentRow.notifyStatus!=='订单取消'"
             label="操作" >
             <template slot-scope="scope">
               <a v-if="currentRow.notifyStatus!=='订单取消'&& scope.row.qty!==0" type="text" size="small" @click="openUpdateDetailModel(scope.row)">修改</a>
-              <a v-if="currentRow.notifyStatus!=='订单取消' && scope.row.qty!==0" style="color: red" type="text" size="small" @click="deleteDelDetail(scope.row)">取消</a>
+<!--              <a v-if="currentRow.notifyStatus!=='订单取消' && scope.row.qty!==0" style="color: red" type="text" size="small" @click="deleteDelDetail(scope.row)">取消</a>-->
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/modules/ecss/declaration.vue b/src/views/modules/ecss/declaration.vue
index 7d400ea..8fb9f02 100644
--- a/src/views/modules/ecss/declaration.vue
+++ b/src/views/modules/ecss/declaration.vue
@@ -416,6 +416,158 @@
       </el-footer>
     </el-dialog>
 
+    <el-dialog title="一键导出" :close-on-click-modal="false" style="top: -85px" v-drag :visible.sync="exportAllYBFlag" :width="'740px'">
+      <el-form label-position="top"  style="margin-left: 7px;margin-top: 5px;margin-bottom: 5px">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'合同协议号'" >
+              <el-input v-model="exportHeader.contractNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'运输方式'" >
+              <el-input v-model="exportHeader.transportMode" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'运抵国'" >
+              <el-input v-model="exportHeader.arrivalCountry" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'贸易国'" >
+              <el-input v-model="exportHeader.tradeCountry" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" style="margin-top: 5px">
+          <div class="custom-divider"><span class="text" style="left: 22%">报关要素</span></div>
+          <!--          报关要素-->
+          <el-col :span="12">
+            <el-form-item :label="'品牌'" >
+              <el-radio v-model="brandType" label="境外品牌（其他）">境外品牌（其他）</el-radio>
+              <el-radio v-model="brandType" label="无品牌">无品牌</el-radio>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="'品名类型'" >
+              <el-radio v-model="hsCodeDescType" label="Y">中文</el-radio>
+              <el-radio style="margin-left: 50px;" v-model="hsCodeDescType" label="N">英文</el-radio>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <div class="custom-divider">
+            <span class="text">
+              发票
+              <a v-if="!exportInvoice.templateName" href="#" @click="openTemplate('发票')" style="margin-left: 10px; color: #0130ff; text-decoration: none;">模版</a>
+              <a v-else href="#" @click="openTemplate('发票')" style="margin-left: 10px; color: #0130ff; text-decoration: none;">{{exportInvoice.templateName}}</a>
+            </span>
+          </div>
+          <!--         发票-->
+          <el-col :span="4" >
+            <el-form-item :label="' '" >
+              <el-checkbox v-model="exportInvoice.hsCodeFlag">Hs Code</el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20" style="">
+            <el-form-item :label="'发票备注'" >
+              <el-input type="textarea" :rows="2" v-model="exportInvoice.fpremark"></el-input>
+            </el-form-item>
+          </el-col>
+          <!--         箱单-->
+        </el-row>
+        <el-row :gutter="20" style="margin-top: 30px">
+          <div class="custom-divider">
+            <span class="text">
+              箱单
+              <a v-if="!exportPaking.templateName" href="#" @click="openTemplate('箱单')" style="margin-left: 10px; color: #0130ff; text-decoration: none;">模版</a>
+              <a v-else href="#" @click="openTemplate('箱单')" style="margin-left: 10px; color: #0130ff; text-decoration: none;">{{exportPaking.templateName}}</a>
+            </span>
+          </div>
+          <el-col :span="8">
+            <el-form-item :label="'Non-reusable plastic packaging'" >
+              <el-checkbox v-model="exportPaking.packaging"></el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="'plastic packaging'" >
+              <el-input :disabled="!exportPaking.packaging" v-model="exportPaking.kgs"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="'Shipping Mark'" >
+              <el-input v-model="exportPaking.shippingMark"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" style="">
+            <el-form-item :label="'箱单备注'" >
+              <el-input type="textarea" :rows="2" v-model="exportPaking.xdremark"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+<!--        <el-row :gutter="20" style="margin-top: 30px">
+          &lt;!&ndash;         出口货物委托书&ndash;&gt;
+          <div class="custom-divider"><span class="text" style="left: 25%">出口货物委托书</span></div>
+          <el-col :span="8">
+            <el-form-item :label="'贸易方式'" >
+              <el-input v-model="exportGoods.salesMethod"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="'货物产地'" >
+              <el-input  v-model="exportGoods.madeArea"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="'发货港'" >
+              <el-input v-model="exportGoods.sendPort"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-show="hasMexicoShippingMarkBu()">
+            <el-form-item :label="'墨西哥唛头'" >
+              <el-checkbox v-model="exportGoods.mexicoShippingMarkFlag"></el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16" v-show="hasPickupAddressBu()">
+            <el-form-item :label="'提货地址'" >
+              <el-select v-model="exportGoods.pickupAddressValue"
+                         clearable
+                         filterable
+                         placeholder="请选择提货地址"
+                         style="width: 100%">
+                <el-option
+                  v-for="(item, index) in pickupAddressList"
+                  :key="item.buNo + '-' + index"
+                  :label="buildPickupAddressText(item)"
+                  :value="buildPickupAddressText(item)">
+                  <div style="white-space: normal; line-height: 16px; padding: 4px 0;">
+                    <div>{{ item.company }}</div>
+                    <div v-if="item.description" style="color: #909399;">{{ item.description }}</div>
+                  </div>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="'唛头'" >
+              <el-input type="textarea" :rows="3" v-model="exportGoods.voyage"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item :label="'发货人'" >
+              <el-input type="textarea"
+                        :rows="4" v-model="exportGoods.shipper"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>-->
+      </el-form>
+      <el-footer style="height:40px;margin-top: 40px;text-align:center">
+        <el-button type="primary" @click="exportAll()">导出Excel</el-button>
+        <el-button type="success" @click="exportAllPdf()">导出PDF</el-button>
+        <el-button type="info" @click="exportAllYBFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
 
     <el-dialog title="导出报关要素" :close-on-click-modal="false" v-drag :visible.sync="brandTypeFlag"
                :width="(currentRow.buNo==='02-Hardtag' || currentRow.buNo==='04-MHM')?'600px':'300px'">
@@ -876,6 +1028,7 @@
       return {
         bizhi:'',
         exportAllFlag:false,
+        exportAllYBFlag:false,
         templateFlag:false,
         templateData:{
           type:'',
@@ -2299,6 +2452,7 @@
           exportParam, this.currentRow.cmcInvoice+" "+this.currentRow.destination+"-"+this.currentRow.shippingMode+".xlsx"
         );
         this.exportAllFlag = false
+        this.exportAllYBFlag = false
         this.searchTable()
       },
 
@@ -2470,8 +2624,17 @@
           if (this.packageUnit==='箱') {
             this.exportPaking.kgs=0.1
           }
+          if (this.currentRow.buNo==='05-Alpha' || this.currentRow.buNo==='04-MHM') {
+            this.exportPaking.kgs=3
+          } else if (this.currentRow.buNo==='02-Hardtag'){
+            this.exportPaking.kgs=5.4
+          }
           this.exportPaking.shippingMark=this.exportHeader.contractNo
-        this.exportAllFlag = true
+          if (this.currentRow.buNo==='03-RFID' || this.currentRow.buNo==='01-Label') {
+            this.exportAllFlag = true
+          } else {
+            this.exportAllYBFlag = true
+          }
         } finally {
           this.exportAllLoading = false
         }
@@ -2523,6 +2686,7 @@
           exportParam, this.currentRow.cmcInvoice+" "+this.currentRow.destination+"-"+this.currentRow.shippingMode+".pdf"
         );
         this.exportAllFlag = false
+        this.exportAllYBFlag = false
         this.searchTable()
       },