diff --git a/src/api/emis/emisWaybillDeclareAttachment.js b/src/api/emis/emisWaybillDeclareAttachment.js
new file mode 100644
index 00000000..5c4995cf
--- /dev/null
+++ b/src/api/emis/emisWaybillDeclareAttachment.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询申报附件列表
+export function listEmisWaybillDeclareAttachment(query) {
+  return request({
+    url: '/emis/emisWaybillDeclareAttachment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询申报附件详细
+export function getEmisWaybillDeclareAttachment(id) {
+  return request({
+    url: '/emis/emisWaybillDeclareAttachment/' + id,
+    method: 'get'
+  })
+}
+
+// 新增申报附件
+export function addEmisWaybillDeclareAttachment(data) {
+  return request({
+    url: '/emis/emisWaybillDeclareAttachment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改申报附件
+export function updateEmisWaybillDeclareAttachment(data) {
+  return request({
+    url: '/emis/emisWaybillDeclareAttachment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除申报附件
+export function delEmisWaybillDeclareAttachment(id) {
+  return request({
+    url: '/emis/emisWaybillDeclareAttachment/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/emis/emisWaybillDeclareGoods.js b/src/api/emis/emisWaybillDeclareGoods.js
new file mode 100644
index 00000000..768be548
--- /dev/null
+++ b/src/api/emis/emisWaybillDeclareGoods.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询申报物品列表
+export function listEmisWaybillDeclareGoods(query) {
+  return request({
+    url: '/emis/emisWaybillDeclareGoods/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询申报物品详细
+export function getEmisWaybillDeclareGoods(id) {
+  return request({
+    url: '/emis/emisWaybillDeclareGoods/' + id,
+    method: 'get'
+  })
+}
+
+// 新增申报物品
+export function addEmisWaybillDeclareGoods(data) {
+  return request({
+    url: '/emis/emisWaybillDeclareGoods',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改申报物品
+export function updateEmisWaybillDeclareGoods(data) {
+  return request({
+    url: '/emis/emisWaybillDeclareGoods',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除申报物品
+export function delEmisWaybillDeclareGoods(id) {
+  return request({
+    url: '/emis/emisWaybillDeclareGoods/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/views/emis/emisWaybillDeclareAttachment/emisWaybillDeclareAttachmentForm.vue b/src/views/emis/emisWaybillDeclareAttachment/emisWaybillDeclareAttachmentForm.vue
new file mode 100644
index 00000000..e79c7344
--- /dev/null
+++ b/src/views/emis/emisWaybillDeclareAttachment/emisWaybillDeclareAttachmentForm.vue
@@ -0,0 +1,195 @@
+<template>
+  <div >
+       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+         <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+          <el-col :span="24">
+            <el-form-item label="运单号" prop="billCode">
+              <el-input v-model="form.billCode" placeholder="请输入运单号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="附件类型" prop="attachType">
+              <el-input v-model="form.attachType" placeholder="请输入附件类型" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="文件名称" prop="fileName">
+              <el-input v-model="form.fileName" placeholder="请输入文件名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="文件地址" prop="fileUrl">
+              <el-input v-model="form.fileUrl" placeholder="请输入文件地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="文件大小KB" prop="fileSiez">
+              <el-input v-model="form.fileSiez" placeholder="请输入文件大小KB" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="文件描述" prop="fileDesc">
+              <el-input v-model="form.fileDesc" placeholder="请输入文件描述" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="排序" prop="orderNum">
+              <el-input v-model="form.orderNum" placeholder="请输入排序" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="数据来源" prop="dataFrom">
+              <el-input v-model="form.dataFrom" placeholder="请输入数据来源" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="审核状态" prop="blAudit">
+              <el-input v-model="form.blAudit" placeholder="请输入审核状态" />
+            </el-form-item>
+          </el-col>
+        <el-col :span="24">
+            <el-form-item label="审核日期" prop="auditDate">
+              <el-date-picker clearable
+                v-model="form.auditDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择审核日期">
+              </el-date-picker>
+            </el-form-item>
+        </el-col>
+          <el-col :span="24">
+            <el-form-item label="审核人" prop="auditManCode">
+              <el-input v-model="form.auditManCode" placeholder="请输入审核人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="审核站点" prop="auditSiteCode">
+              <el-input v-model="form.auditSiteCode" placeholder="请输入审核站点" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="审核异常原因" prop="auditNote">
+              <el-input v-model="form.auditNote" placeholder="请输入审核异常原因" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="录单备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入录单备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div style="text-align: center;margin-bottom: 10px;">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    
+  </div>
+</template>
+
+<script>
+import { listEmisWaybillDeclareAttachment, getEmisWaybillDeclareAttachment, delEmisWaybillDeclareAttachment, addEmisWaybillDeclareAttachment, updateEmisWaybillDeclareAttachment } from "@/api/emis/emisWaybillDeclareAttachment";
+
+export default {
+  name: "emisWaybillDeclareAttachmentForm",
+  props:{
+    id:{
+        type:Number
+    }
+  },
+  components: {  },
+  dicts: [
+  ],
+  data() {
+    return {
+      emisWaybillDeclareAttachmentOptions: [],
+      // 遮罩层
+      loading: true,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "id不能为空", trigger: "blur" }
+        ],
+        delFlag: [
+          { required: true, message: "删除标志（0代表存在不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+   watch: {
+      "id": {
+        handler (newValue, oldValue) {
+          this.id = newValue;
+          this.initData();
+        },
+        deep: true
+      }
+  },
+  created() {
+    this.initData();
+  },
+
+  methods: {
+    initData() {
+       
+        if(this.id !=null) {
+          this.loading = true;
+          getEmisWaybillDeclareAttachment(this.id).then(response => {
+            this.form = response.data;
+            this.loading = false;
+          });
+        }else{
+            this.reset();
+        }
+        // this.getTreeselect();
+    },
+    // 取消按钮
+    cancel() {
+      this.reset();
+      this.$emit("on-cancel");
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        waybillId: null,
+        billCode: null,
+        attachType: null,
+        fileName: null,
+        fileUrl: null,
+        fileSiez: null,
+        fileDesc: null,
+        orderNum: null,
+        dataFrom: null,
+        blAudit: null,
+        auditDate: null,
+        auditManCode: null,
+        auditSiteCode: null,
+        auditNote: null,
+        remark: null,
+      };
+      this.resetForm("form");
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateEmisWaybillDeclareAttachment(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.$emit("on-changed");
+            });
+          } else {
+            addEmisWaybillDeclareAttachment(this.form).then(response => {
+               this.$modal.msgSuccess("新增成功");
+               this.$emit("on-changed");
+            });
+          }
+        }
+      });
+    },
+  }
+};
+</script>
diff --git a/src/views/emis/emisWaybillDeclareAttachment/index.vue b/src/views/emis/emisWaybillDeclareAttachment/index.vue
new file mode 100644
index 00000000..f911fa3b
--- /dev/null
+++ b/src/views/emis/emisWaybillDeclareAttachment/index.vue
@@ -0,0 +1,498 @@
+<template>
+  <div class="app-container">
+    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+   
+      <el-form-item label="" prop="billCode">
+        <el-input
+          v-model="queryParams.billCode"
+          :placeholder="$t('运单号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="attachType">
+        <el-input
+          v-model="queryParams.attachType"
+          :placeholder="$t('附件类型')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="fileName">
+        <el-input
+          v-model="queryParams.fileName"
+          :placeholder="$t('文件名称')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="fileUrl">
+        <el-input
+          v-model="queryParams.fileUrl"
+          :placeholder="$t('文件地址')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="fileSiez">
+        <el-input
+          v-model="queryParams.fileSiez"
+          :placeholder="$t('文件大小KB')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="fileDesc">
+        <el-input
+          v-model="queryParams.fileDesc"
+          :placeholder="$t('文件描述')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="orderNum">
+        <el-input
+          v-model="queryParams.orderNum"
+          :placeholder="$t('排序')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="dataFrom">
+        <el-input
+          v-model="queryParams.dataFrom"
+          :placeholder="$t('数据来源')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="blAudit">
+        <el-input
+          v-model="queryParams.blAudit"
+          :placeholder="$t('审核状态')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="auditDate">
+        <el-date-picker clearable
+          v-model="queryParams.auditDate"
+          type="date"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          :placeholder="$t('审核日期')">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="" prop="auditManCode">
+        <el-input
+          v-model="queryParams.auditManCode"
+          :placeholder="$t('审核人')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="auditSiteCode">
+        <el-input
+          v-model="queryParams.auditSiteCode"
+          :placeholder="$t('审核站点')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="auditNote">
+        <el-input
+          v-model="queryParams.auditNote"
+          :placeholder="$t('审核异常原因')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          :placeholder="$t('录单备注')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="delFlag">
+        <el-input
+          v-model="queryParams.delFlag"
+          :placeholder="$t('删除标志（0代表存在')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+    </SearchForm>
+
+   
+    <XdTable v-loading="loading" 
+           border stripe
+           size="small"
+           :data="emisWaybillDeclareAttachmentList"
+           :showSearch.sync="showSearch"
+           :queryParams="queryParams"
+           :total="total"
+           @queryTable="getList"
+           @selection-change="handleSelectionChange"
+           @sort-change="handleSortChange"
+           >
+      
+      <div slot="toolbar">
+        <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                  v-hasPermi="['emis:emisWaybillDeclareAttachment:add']"
+                >新增</el-button>
+              </el-col>
+              <!-- 
+              <el-col :span="1.5">
+                <el-button
+                  type="success"
+                  plain
+                  icon="el-icon-edit"
+                  size="mini"
+                  :disabled="single"
+                  @click="handleUpdate"
+                  v-hasPermi="['emis:emisWaybillDeclareAttachment:edit']"
+                >修改</el-button>
+              </el-col> -->
+              <el-col :span="1.5">
+                <el-button
+                  type="danger"
+                  plain
+                  icon="el-icon-delete"
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleDelete"
+                  v-hasPermi="['emis:emisWaybillDeclareAttachment:remove']"
+                >删除</el-button>
+              </el-col>
+              <!-- <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  v-hasPermi="['emis:emisWaybillDeclareAttachment:export']"
+                >导出</el-button>
+              </el-col> -->
+          </el-row>
+      </div>
+      
+      <el-table-column type="selection" width="55" align="center" />
+      <!--
+      <el-table-column label="序号" align="center" min-width="60">
+             <template slot-scope="scope">
+                <span v-text="getIndex(scope.$index)"> </span>
+             </template>
+      </el-table-column>
+       
+       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
+        <template slot-scope="scope">
+            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
+         </template>
+      </el-table-column>
+
+      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
+            <template slot-scope="scope">
+              <div v-if="scope.row.settleStatus == 0" style="color:red;">
+                    <span class="el-tag el-tag--info">未结算</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 10" style="color:red;">
+                <span class="el-tag">待确认</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 11" style="color:green;">
+                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 20" >
+                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 21" style="color:green;">
+                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 40" style="color:red;">
+                <span class="el-tag el-tag--danger">已拒绝</span>
+              </div>
+            </template>
+          </el-table-column>
+      -->
+
+      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
+      <el-table-column :label="$t('附件类型')" align="center" prop="attachType" min-width="100" />
+      <el-table-column :label="$t('文件名称')" align="center" prop="fileName" min-width="100" />
+      <el-table-column :label="$t('文件地址')" align="center" prop="fileUrl" min-width="100" />
+      <el-table-column :label="$t('文件大小KB')" align="center" prop="fileSiez" min-width="100" />
+      <el-table-column :label="$t('文件描述')" align="center" prop="fileDesc" min-width="100" />
+      <el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" />
+      <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
+      <el-table-column :label="$t('审核状态')" align="center" prop="blAudit" min-width="100" />
+      <el-table-column :label="$t('审核日期')" align="center" prop="auditDate" min-width="100" />
+      <el-table-column :label="$t('审核人')" align="center" prop="auditManCode" min-width="100" />
+      <el-table-column :label="$t('审核站点')" align="center" prop="auditSiteCode" min-width="100" />
+      <el-table-column :label="$t('审核异常原因')" align="center" prop="auditNote" min-width="100" />
+      <el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="100" />
+      <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['emis:emisWaybillDeclareAttachment:edit']"
+          >修改</el-button>
+          <!-- 
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['emis:emisWaybillDeclareAttachment:remove']"
+          >删除</el-button> -->
+        </template>
+      </el-table-column>
+    </XdTable>
+
+    <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
+      <emisWaybillDeclareAttachmentForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWaybillDeclareAttachmentForm>
+    </el-dialog>
+    
+
+    <!--
+    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
+        <emisWaybillDeclareAttachmentView :id="id" ></EmisWaybillDeclareAttachmentView>
+    </el-dialog>
+    -->
+
+  </div>
+</template>
+
+<script>
+import { listEmisWaybillDeclareAttachment, getEmisWaybillDeclareAttachment, delEmisWaybillDeclareAttachment, addEmisWaybillDeclareAttachment, updateEmisWaybillDeclareAttachment } from "@/api/emis/emisWaybillDeclareAttachment";
+import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
+// import emisWaybillDeclareAttachmentView from '@/views/emis/emisWaybillDeclareAttachment/emisWaybillDeclareAttachmentView';
+import emisWaybillDeclareAttachmentForm from '@/views/emis/emisWaybillDeclareAttachment/emisWaybillDeclareAttachmentForm';
+
+export default {
+  name: "emisWaybillDeclareAttachment",
+  components: { elDateSimplePicker,emisWaybillDeclareAttachmentForm },
+  dicts: [
+  ],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 创建时间搜索
+      dateTimeRange:[],
+      // 总条数
+      total: 0,
+      // 申报附件表格数据
+      emisWaybillDeclareAttachmentList: [],
+    
+      currentId:null,
+      openForm: false,
+      titleForm: "",
+
+      // 弹出展示层
+      id:null,
+      titleView:"",
+      openView: false,
+      // 更新网点时间范围
+      daterangeAuditDate: [],
+      // 更新网点时间范围
+      daterangeCreateTime: [],
+      // 更新网点时间范围
+      daterangeUpdateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        billCode: null,
+        attachType: null,
+        fileName: null,
+        fileUrl: null,
+        fileSiez: null,
+        fileDesc: null,
+        orderNum: null,
+        dataFrom: null,
+        blAudit: null,
+        auditDate: null,
+        auditManCode: null,
+        auditSiteCode: null,
+        auditNote: null,
+        remark: null,
+        delFlag: null,
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询申报附件列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeAuditDate && '' != this.daterangeAuditDate) {
+        this.queryParams.params["beginAuditDate"] = this.daterangeAuditDate[0];
+        this.queryParams.params["endAuditDate"] = this.daterangeAuditDate[1];
+      }
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
+        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
+        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
+      }
+      listEmisWaybillDeclareAttachment(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+        this.emisWaybillDeclareAttachmentList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    // 排序 查询字段是表格中字段名字 动态取值排序顺序
+    handleSortChange(column) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.currentId=null;
+      this.openForm= true;
+      this.titleForm = "新增";
+    },
+    handleShowMoreInput(){
+      this.moreInputVisible = !this.moreInputVisible;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+       this.currentId= row.id;
+       this.openForm = true;
+       this.titleForm = "修改";
+    },
+    handleView(row) {
+       this.id=row.id;
+       this.titleView="查看";
+       this.openView=true;
+    //   this.router.push({ path: '/emis/emisWaybillDeclareAttachment/viewDetail', query: { id: row.id }})
+    },
+    handleFormChanged(){
+        this.openForm = false;
+        this.getList();
+    },
+    cancelForm(){
+      this.openForm = false;
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除').then(function() {
+        return delEmisWaybillDeclareAttachment(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+    //   this.download('emis/emisWaybillDeclareAttachment/export', {
+    //     ...this.queryParams
+    //   }, `emisWaybillDeclareAttachment_${new Date().getTime()}.xlsx`)
+     const loadingInstance = this.$loading({
+            text: '正在导出...'
+        })
+       var qParam = {...this.queryParams};
+       qParam.pageNum=1;
+       qParam.pageSize=5000;
+
+       listEmisWaybillDeclareAttachment(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
+        this.downloadLoading = false
+        if (response.code === 200) {
+                const curList = response.rows
+                import('@/vendor/Export2Excel').then(excel => {
+                  const tHeader = ['id','运单id','运单号','附件类型','文件名称','文件地址','文件大小KB','文件描述','排序','数据来源','审核状态','审核日期','审核人','审核站点','审核异常原因','录单备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建网点','更新网点',];
+                  const filterVal = ['id','waybillId','billCode','attachType','fileName','fileUrl','fileSiez','fileDesc','orderNum','dataFrom','blAudit','auditDate','auditManCode','auditSiteCode','auditNote','remark','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
+                  const data = this.formatJson(filterVal, curList, response.rows)
+                  excel.export_json_to_excel({
+                    header: tHeader,
+                    data,
+                    filename: '申报附件',
+                    autoWidth: true
+                  })
+                  loadingInstance.close()
+                })
+        }
+      });
+    },
+    formatJson(filterVal, jsonData, resData) {
+      let index = 0
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'index') {
+          return ++index
+        }
+        if (j === 'status') {
+          var statusStr='xxx'
+          if(v[j] == 10){
+              statusStr='xxx'
+          }
+          return statusStr;
+        }
+        return v[j]
+      }))
+    },
+    /** 列索引函数  */
+    getIndex($index) {
+          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+    },
+    /** 时间搜索响应函数 */
+    dateTimeChange(value){
+        this.dateTimeRange=value;
+    },
+  }
+};
+</script>
+
+<style scoped>
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+</style>
diff --git a/src/views/emis/emisWaybillDeclareGoods/emisWaybillDeclareGoodsForm.vue b/src/views/emis/emisWaybillDeclareGoods/emisWaybillDeclareGoodsForm.vue
new file mode 100644
index 00000000..bc4f8cdc
--- /dev/null
+++ b/src/views/emis/emisWaybillDeclareGoods/emisWaybillDeclareGoodsForm.vue
@@ -0,0 +1,276 @@
+<template>
+  <div >
+       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+         <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+          <el-col :span="24">
+            <el-form-item label="运单编号" prop="billCode">
+              <el-input v-model="form.billCode" placeholder="请输入运单编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="货物编码" prop="goodsCode">
+              <el-input v-model="form.goodsCode" placeholder="请输入货物编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="货物名称" prop="goodsName">
+              <el-input v-model="form.goodsName" placeholder="请输入货物名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="规格型号" prop="goodsModel">
+              <el-input v-model="form.goodsModel" placeholder="请输入规格型号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="毛重" prop="grossWeight">
+              <el-input v-model="form.grossWeight" placeholder="请输入毛重" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="净重" prop="netWeight">
+              <el-input v-model="form.netWeight" placeholder="请输入净重" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="实际数量" prop="cargoQty">
+              <el-input v-model="form.cargoQty" placeholder="请输入实际数量" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="异常数量" prop="abnormalQty">
+              <el-input v-model="form.abnormalQty" placeholder="请输入异常数量" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="单位" prop="unit">
+              <el-input v-model="form.unit" placeholder="请输入单位" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="重量" prop="weight">
+              <el-input v-model="form.weight" placeholder="请输入重量" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="申报单价" prop="price">
+              <el-input v-model="form.price" placeholder="请输入申报单价" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="申报币种" prop="currency">
+              <el-input v-model="form.currency" placeholder="请输入申报币种" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="原产国" prop="nationArea">
+              <el-input v-model="form.nationArea" placeholder="请输入原产国" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="行邮税号" prop="taxNo">
+              <el-input v-model="form.taxNo" placeholder="请输入行邮税号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="海关编码" prop="hscode">
+              <el-input v-model="form.hscode" placeholder="请输入海关编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="品牌" prop="brand">
+              <el-input v-model="form.brand" placeholder="请输入品牌" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="材质" prop="material">
+              <el-input v-model="form.material" placeholder="请输入材质" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model="form.purpose" placeholder="请输入用途" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="成分" prop="ingredients">
+              <el-input v-model="form.ingredients" placeholder="请输入成分" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="厂家" prop="manufacturer">
+              <el-input v-model="form.manufacturer" placeholder="请输入厂家" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="供应商" prop="supplier">
+              <el-input v-model="form.supplier" placeholder="请输入供应商" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="功能" prop="function">
+              <el-input v-model="form.function" placeholder="请输入功能" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="长" prop="length">
+              <el-input v-model="form.length" placeholder="请输入长" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="高" prop="height">
+              <el-input v-model="form.height" placeholder="请输入高" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="体积" prop="volume">
+              <el-input v-model="form.volume" placeholder="请输入体积" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="条码" prop="barcode">
+              <el-input v-model="form.barcode" placeholder="请输入条码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="排序" prop="orderNum">
+              <el-input v-model="form.orderNum" placeholder="请输入排序" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div style="text-align: center;margin-bottom: 10px;">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    
+  </div>
+</template>
+
+<script>
+import { listEmisWaybillDeclareGoods, getEmisWaybillDeclareGoods, delEmisWaybillDeclareGoods, addEmisWaybillDeclareGoods, updateEmisWaybillDeclareGoods } from "@/api/emis/emisWaybillDeclareGoods";
+
+export default {
+  name: "emisWaybillDeclareGoodsForm",
+  props:{
+    id:{
+        type:Number
+    }
+  },
+  components: {  },
+  dicts: [
+  ],
+  data() {
+    return {
+      emisWaybillDeclareGoodsOptions: [],
+      // 遮罩层
+      loading: true,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "id不能为空", trigger: "blur" }
+        ],
+        delFlag: [
+          { required: true, message: "删除标志（0代表存在不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+   watch: {
+      "id": {
+        handler (newValue, oldValue) {
+          this.id = newValue;
+          this.initData();
+        },
+        deep: true
+      }
+  },
+  created() {
+    this.initData();
+  },
+
+  methods: {
+    initData() {
+       
+        if(this.id !=null) {
+          this.loading = true;
+          getEmisWaybillDeclareGoods(this.id).then(response => {
+            this.form = response.data;
+            this.loading = false;
+          });
+        }else{
+            this.reset();
+        }
+        // this.getTreeselect();
+    },
+    // 取消按钮
+    cancel() {
+      this.reset();
+      this.$emit("on-cancel");
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        waybillId: null,
+        billCode: null,
+        goodsCode: null,
+        goodsName: null,
+        goodsModel: null,
+        grossWeight: null,
+        netWeight: null,
+        cargoQty: null,
+        abnormalQty: null,
+        unit: null,
+        weight: null,
+        price: null,
+        currency: null,
+        nationArea: null,
+        taxNo: null,
+        hscode: null,
+        brand: null,
+        material: null,
+        purpose: null,
+        ingredients: null,
+        manufacturer: null,
+        supplier: null,
+        function: null,
+        length: null,
+        width: null,
+        height: null,
+        volume: null,
+        barcode: null,
+        extraData: null,
+        orderNum: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateEmisWaybillDeclareGoods(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.$emit("on-changed");
+            });
+          } else {
+            addEmisWaybillDeclareGoods(this.form).then(response => {
+               this.$modal.msgSuccess("新增成功");
+               this.$emit("on-changed");
+            });
+          }
+        }
+      });
+    },
+  }
+};
+</script>
diff --git a/src/views/emis/emisWaybillDeclareGoods/index.vue b/src/views/emis/emisWaybillDeclareGoods/index.vue
new file mode 100644
index 00000000..1a3da27e
--- /dev/null
+++ b/src/views/emis/emisWaybillDeclareGoods/index.vue
@@ -0,0 +1,632 @@
+<template>
+  <div class="app-container">
+    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+   
+      <el-form-item label="" prop="billCode">
+        <el-input
+          v-model="queryParams.billCode"
+          :placeholder="$t('运单编号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="goodsCode">
+        <el-input
+          v-model="queryParams.goodsCode"
+          :placeholder="$t('货物编码')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="goodsName">
+        <el-input
+          v-model="queryParams.goodsName"
+          :placeholder="$t('货物名称')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="goodsModel">
+        <el-input
+          v-model="queryParams.goodsModel"
+          :placeholder="$t('规格型号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="grossWeight">
+        <el-input
+          v-model="queryParams.grossWeight"
+          :placeholder="$t('毛重')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="netWeight">
+        <el-input
+          v-model="queryParams.netWeight"
+          :placeholder="$t('净重')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="cargoQty">
+        <el-input
+          v-model="queryParams.cargoQty"
+          :placeholder="$t('实际数量')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="abnormalQty">
+        <el-input
+          v-model="queryParams.abnormalQty"
+          :placeholder="$t('异常数量')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="unit">
+        <el-input
+          v-model="queryParams.unit"
+          :placeholder="$t('单位')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="weight">
+        <el-input
+          v-model="queryParams.weight"
+          :placeholder="$t('重量')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="price">
+        <el-input
+          v-model="queryParams.price"
+          :placeholder="$t('申报单价')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="currency">
+        <el-input
+          v-model="queryParams.currency"
+          :placeholder="$t('申报币种')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="nationArea">
+        <el-input
+          v-model="queryParams.nationArea"
+          :placeholder="$t('原产国')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="taxNo">
+        <el-input
+          v-model="queryParams.taxNo"
+          :placeholder="$t('行邮税号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="hscode">
+        <el-input
+          v-model="queryParams.hscode"
+          :placeholder="$t('海关编码')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="brand">
+        <el-input
+          v-model="queryParams.brand"
+          :placeholder="$t('品牌')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="material">
+        <el-input
+          v-model="queryParams.material"
+          :placeholder="$t('材质')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="purpose">
+        <el-input
+          v-model="queryParams.purpose"
+          :placeholder="$t('用途')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="ingredients">
+        <el-input
+          v-model="queryParams.ingredients"
+          :placeholder="$t('成分')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="manufacturer">
+        <el-input
+          v-model="queryParams.manufacturer"
+          :placeholder="$t('厂家')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="supplier">
+        <el-input
+          v-model="queryParams.supplier"
+          :placeholder="$t('供应商')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="function">
+        <el-input
+          v-model="queryParams.function"
+          :placeholder="$t('功能')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="length">
+        <el-input
+          v-model="queryParams.length"
+          :placeholder="$t('长')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="height">
+        <el-input
+          v-model="queryParams.height"
+          :placeholder="$t('高')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="volume">
+        <el-input
+          v-model="queryParams.volume"
+          :placeholder="$t('体积')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="barcode">
+        <el-input
+          v-model="queryParams.barcode"
+          :placeholder="$t('条码')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="orderNum">
+        <el-input
+          v-model="queryParams.orderNum"
+          :placeholder="$t('排序')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="delFlag">
+        <el-input
+          v-model="queryParams.delFlag"
+          :placeholder="$t('删除标志（0代表存在')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          :placeholder="$t('备注')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+    </SearchForm>
+
+   
+    <XdTable v-loading="loading" 
+           border stripe
+           size="small"
+           :data="emisWaybillDeclareGoodsList"
+           :showSearch.sync="showSearch"
+           :queryParams="queryParams"
+           :total="total"
+           @queryTable="getList"
+           @selection-change="handleSelectionChange"
+           @sort-change="handleSortChange"
+           >
+      
+      <div slot="toolbar">
+        <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                  v-hasPermi="['emis:emisWaybillDeclareGoods:add']"
+                >新增</el-button>
+              </el-col>
+              <!-- 
+              <el-col :span="1.5">
+                <el-button
+                  type="success"
+                  plain
+                  icon="el-icon-edit"
+                  size="mini"
+                  :disabled="single"
+                  @click="handleUpdate"
+                  v-hasPermi="['emis:emisWaybillDeclareGoods:edit']"
+                >修改</el-button>
+              </el-col> -->
+              <el-col :span="1.5">
+                <el-button
+                  type="danger"
+                  plain
+                  icon="el-icon-delete"
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleDelete"
+                  v-hasPermi="['emis:emisWaybillDeclareGoods:remove']"
+                >删除</el-button>
+              </el-col>
+              <!-- <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  v-hasPermi="['emis:emisWaybillDeclareGoods:export']"
+                >导出</el-button>
+              </el-col> -->
+          </el-row>
+      </div>
+      
+      <el-table-column type="selection" width="55" align="center" />
+      <!--
+      <el-table-column label="序号" align="center" min-width="60">
+             <template slot-scope="scope">
+                <span v-text="getIndex(scope.$index)"> </span>
+             </template>
+      </el-table-column>
+       
+       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
+        <template slot-scope="scope">
+            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
+         </template>
+      </el-table-column>
+
+      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
+            <template slot-scope="scope">
+              <div v-if="scope.row.settleStatus == 0" style="color:red;">
+                    <span class="el-tag el-tag--info">未结算</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 10" style="color:red;">
+                <span class="el-tag">待确认</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 11" style="color:green;">
+                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 20" >
+                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 21" style="color:green;">
+                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 40" style="color:red;">
+                <span class="el-tag el-tag--danger">已拒绝</span>
+              </div>
+            </template>
+          </el-table-column>
+      -->
+
+      <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="100" />
+      <el-table-column :label="$t('货物编码')" align="center" prop="goodsCode" min-width="100" />
+      <el-table-column :label="$t('货物名称')" align="center" prop="goodsName" min-width="100" />
+      <el-table-column :label="$t('规格型号')" align="center" prop="goodsModel" min-width="100" />
+      <el-table-column :label="$t('毛重')" align="center" prop="grossWeight" min-width="100" />
+      <el-table-column :label="$t('净重')" align="center" prop="netWeight" min-width="100" />
+      <el-table-column :label="$t('实际数量')" align="center" prop="cargoQty" min-width="100" />
+      <el-table-column :label="$t('异常数量')" align="center" prop="abnormalQty" min-width="100" />
+      <el-table-column :label="$t('单位')" align="center" prop="unit" min-width="100" />
+      <el-table-column :label="$t('重量')" align="center" prop="weight" min-width="100" />
+      <el-table-column :label="$t('申报单价')" align="center" prop="price" min-width="100" />
+      <el-table-column :label="$t('申报币种')" align="center" prop="currency" min-width="100" />
+      <el-table-column :label="$t('原产国')" align="center" prop="nationArea" min-width="100" />
+      <el-table-column :label="$t('行邮税号')" align="center" prop="taxNo" min-width="100" />
+      <el-table-column :label="$t('海关编码')" align="center" prop="hscode" min-width="100" />
+      <el-table-column :label="$t('品牌')" align="center" prop="brand" min-width="100" />
+      <el-table-column :label="$t('材质')" align="center" prop="material" min-width="100" />
+      <el-table-column :label="$t('用途')" align="center" prop="purpose" min-width="100" />
+      <el-table-column :label="$t('成分')" align="center" prop="ingredients" min-width="100" />
+      <el-table-column :label="$t('厂家')" align="center" prop="manufacturer" min-width="100" />
+      <el-table-column :label="$t('供应商')" align="center" prop="supplier" min-width="100" />
+      <el-table-column :label="$t('功能')" align="center" prop="function" min-width="100" />
+      <el-table-column :label="$t('长')" align="center" prop="length" min-width="100" />
+      <el-table-column :label="$t('高')" align="center" prop="height" min-width="100" />
+      <el-table-column :label="$t('体积')" align="center" prop="volume" min-width="100" />
+      <el-table-column :label="$t('条码')" align="center" prop="barcode" min-width="100" />
+      <el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" />
+      <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
+      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['emis:emisWaybillDeclareGoods:edit']"
+          >修改</el-button>
+          <!-- 
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['emis:emisWaybillDeclareGoods:remove']"
+          >删除</el-button> -->
+        </template>
+      </el-table-column>
+    </XdTable>
+
+    <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
+      <emisWaybillDeclareGoodsForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWaybillDeclareGoodsForm>
+    </el-dialog>
+    
+
+    <!--
+    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
+        <emisWaybillDeclareGoodsView :id="id" ></EmisWaybillDeclareGoodsView>
+    </el-dialog>
+    -->
+
+  </div>
+</template>
+
+<script>
+import { listEmisWaybillDeclareGoods, getEmisWaybillDeclareGoods, delEmisWaybillDeclareGoods, addEmisWaybillDeclareGoods, updateEmisWaybillDeclareGoods } from "@/api/emis/emisWaybillDeclareGoods";
+import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
+// import emisWaybillDeclareGoodsView from '@/views/emis/emisWaybillDeclareGoods/emisWaybillDeclareGoodsView';
+import emisWaybillDeclareGoodsForm from '@/views/emis/emisWaybillDeclareGoods/emisWaybillDeclareGoodsForm';
+
+export default {
+  name: "emisWaybillDeclareGoods",
+  components: { elDateSimplePicker,emisWaybillDeclareGoodsForm },
+  dicts: [
+  ],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 创建时间搜索
+      dateTimeRange:[],
+      // 总条数
+      total: 0,
+      // 申报物品表格数据
+      emisWaybillDeclareGoodsList: [],
+    
+      currentId:null,
+      openForm: false,
+      titleForm: "",
+
+      // 弹出展示层
+      id:null,
+      titleView:"",
+      openView: false,
+      // 备注时间范围
+      daterangeCreateTime: [],
+      // 备注时间范围
+      daterangeUpdateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        billCode: null,
+        goodsCode: null,
+        goodsName: null,
+        goodsModel: null,
+        grossWeight: null,
+        netWeight: null,
+        cargoQty: null,
+        abnormalQty: null,
+        unit: null,
+        weight: null,
+        price: null,
+        currency: null,
+        nationArea: null,
+        taxNo: null,
+        hscode: null,
+        brand: null,
+        material: null,
+        purpose: null,
+        ingredients: null,
+        manufacturer: null,
+        supplier: null,
+        function: null,
+        length: null,
+        height: null,
+        volume: null,
+        barcode: null,
+        orderNum: null,
+        delFlag: null,
+        remark: null
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询申报物品列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
+        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
+        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
+      }
+      listEmisWaybillDeclareGoods(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+        this.emisWaybillDeclareGoodsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    // 排序 查询字段是表格中字段名字 动态取值排序顺序
+    handleSortChange(column) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.currentId=null;
+      this.openForm= true;
+      this.titleForm = "新增";
+    },
+    handleShowMoreInput(){
+      this.moreInputVisible = !this.moreInputVisible;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+       this.currentId= row.id;
+       this.openForm = true;
+       this.titleForm = "修改";
+    },
+    handleView(row) {
+       this.id=row.id;
+       this.titleView="查看";
+       this.openView=true;
+    //   this.router.push({ path: '/emis/emisWaybillDeclareGoods/viewDetail', query: { id: row.id }})
+    },
+    handleFormChanged(){
+        this.openForm = false;
+        this.getList();
+    },
+    cancelForm(){
+      this.openForm = false;
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除').then(function() {
+        return delEmisWaybillDeclareGoods(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+    //   this.download('emis/emisWaybillDeclareGoods/export', {
+    //     ...this.queryParams
+    //   }, `emisWaybillDeclareGoods_${new Date().getTime()}.xlsx`)
+     const loadingInstance = this.$loading({
+            text: '正在导出...'
+        })
+       var qParam = {...this.queryParams};
+       qParam.pageNum=1;
+       qParam.pageSize=5000;
+
+       listEmisWaybillDeclareGoods(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
+        this.downloadLoading = false
+        if (response.code === 200) {
+                const curList = response.rows
+                import('@/vendor/Export2Excel').then(excel => {
+                  const tHeader = ['id','运单id','运单编号','货物编码','货物名称','规格型号','毛重','净重','实际数量','异常数量','单位','重量','申报单价','申报币种','原产国','行邮税号','海关编码','品牌','材质','用途','成分','厂家','供应商','功能','长','宽','高','体积','条码','附加信息','排序','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','备注',];
+                  const filterVal = ['id','waybillId','billCode','goodsCode','goodsName','goodsModel','grossWeight','netWeight','cargoQty','abnormalQty','unit','weight','price','currency','nationArea','taxNo','hscode','brand','material','purpose','ingredients','manufacturer','supplier','function','length','width','height','volume','barcode','extraData','orderNum','delFlag','createBy','createTime','updateBy','updateTime','remark',];
+                  const data = this.formatJson(filterVal, curList, response.rows)
+                  excel.export_json_to_excel({
+                    header: tHeader,
+                    data,
+                    filename: '申报物品',
+                    autoWidth: true
+                  })
+                  loadingInstance.close()
+                })
+        }
+      });
+    },
+    formatJson(filterVal, jsonData, resData) {
+      let index = 0
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'index') {
+          return ++index
+        }
+        if (j === 'status') {
+          var statusStr='xxx'
+          if(v[j] == 10){
+              statusStr='xxx'
+          }
+          return statusStr;
+        }
+        return v[j]
+      }))
+    },
+    /** 列索引函数  */
+    getIndex($index) {
+          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+    },
+    /** 时间搜索响应函数 */
+    dateTimeChange(value){
+        this.dateTimeRange=value;
+    },
+  }
+};
+</script>
+
+<style scoped>
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+</style>