危化品查询

wxjy-wxjy-web/src/types/analyze/goodsEntry.ts

@@ -146,8 +146,8 @@ export interface List {
   gname?: string
   gmodel?: string
   qty1?: number
-  rmbPriceList?: number
-  usdPriceList?: number
+  rmbPrice?: number
+  usdPrice?: number
   codeTsShort?: string
   gCertFlag?: string
   ungid?: string

wxjy-wxjy-web/src/views/analyze/GoodsEntry.vue

@@ -65,7 +65,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="隶属海关" prop="customsCode" v-if="state.isSelect">
+        <el-form-item label="隶属海关" prop="customsCode" v-show="state.isSelect">
           <el-select v-model="state.queryData.customsCode"
                      clearable>
             <el-option
@@ -173,15 +173,15 @@
       <el-table-column property="declDate" label="申报时间" sortable width="150">
         <template #default="scope">{{ scope.row.declDate ? dayjs(scope.row.declDate).format('YYYY-MM-DD HH:mm:ss'):'' }}</template>
       </el-table-column>
-      <el-table-column property="declAdvanceFlag" label="是否提前申报" width="80" >
+      <el-table-column property="declAdvanceFlag" label="是否提前申报" width="110" >
         <template #default="scope">
           <dict-tag :options="dict.yes_no" :dictValue="scope.row.declAdvanceFlag"/>
         </template>
       </el-table-column>
-      <el-table-column property="acceptDate" label="自动受理时间" sortable width="150">
+      <el-table-column property="acceptDate" label="自动受理时间" width="150">
         <template #default="scope">{{ scope.row.acceptDate ? dayjs(scope.row.acceptDate).format('YYYY-MM-DD HH:mm:ss'):'' }}</template>
       </el-table-column>
-      <el-table-column property="exInPortDate" label="货物进港时间" sortable width="150">
+      <el-table-column property="exInPortDate" label="货物进港时间" width="150">
         <template #default="scope">{{ scope.row.exInPortDate ? dayjs(scope.row.exInPortDate).format('YYYY-MM-DD HH:mm:ss'):'' }}</template>
       </el-table-column>
       <el-table-column property="consignCode" label="境内收发货人代码" width="130"/>
@@ -190,18 +190,18 @@
       <el-table-column property="frnConsignCode" label="境外收发货人代码" width="130"/>
       <el-table-column property="frnConsignName" label="境外收发货人名称(中文)" :show-overflow-tooltip="true" min-width="200">
       </el-table-column>
-      <el-table-column property="grossWt" label="货运量毛重" width="100"/>
-      <el-table-column property="netWt" label="货运量净重" width="100"/>
+      <el-table-column property="grossWt" label="货运量毛重" width="90"/>
+      <el-table-column property="netWt" label="货运量净重" width="90"/>
       <el-table-column property="rmbPrice" label="货运值人民币(总)" width="130"/>
       <el-table-column property="usdPrice" label="货运值美元(总)" width="130"/>
-      <el-table-column property="orderReceiveDate" label="现场接单时间" sortable width="150">
+      <el-table-column property="orderReceiveDate" label="现场接单时间" width="150">
         <template #default="scope">{{ scope.row.orderReceiveDate ? dayjs(scope.row.orderReceiveDate).format('YYYY-MM-DD HH:mm:ss'):'' }}</template>
       </el-table-column>
-      <el-table-column property="orderReceiveCost" label="接单耗时(小时)" width="130"/>
-      <el-table-column property="certRlsDate" label="单证放行时间" sortable width="150">
+      <el-table-column property="orderReceiveCost" label="接单耗时(小时)" width="120"/>
+      <el-table-column property="certRlsDate" label="单证放行时间" width="150">
         <template #default="scope">{{ scope.row.certRlsDate ? dayjs(scope.row.certRlsDate).format('YYYY-MM-DD HH:mm:ss'):'' }}</template>
       </el-table-column>
-      <el-table-column property="preReleaseDate" label="担保放行时间" sortable width="150">
+      <el-table-column property="preReleaseDate" label="担保放行时间" width="150">
         <template #default="scope">{{ scope.row.preReleaseDate ? dayjs(scope.row.preReleaseDate).format('YYYY-MM-DD HH:mm:ss'):'' }}</template>
       </el-table-column>
       <el-table-column property="agentCode" label="申报单位代码" width="130"/>
@@ -211,32 +211,32 @@
       <el-table-column property="ownerCode" label="生产销售单位代码" width="130"/>
       <el-table-column property="ownerName" label="生产销售单位名称" :show-overflow-tooltip="true" min-width="200">
       </el-table-column>
-      <el-table-column property="examDate" label="转关数据发送时间" sortable width="150">
+      <el-table-column property="examDate" label="转关数据发送时间" width="150">
         <template #default="scope">{{ scope.row.examDate ? dayjs(scope.row.examDate).format('YYYY-MM-DD HH:mm:ss'):'' }}</template>
       </el-table-column>
-      <el-table-column property="checkDate" label="转关数据核销时间" sortable width="150">
+      <el-table-column property="checkDate" label="转关数据核销时间" width="150">
         <template #default="scope">{{ scope.row.checkDate ? dayjs(scope.row.checkDate).format('YYYY-MM-DD HH:mm:ss'):'' }}</template>
       </el-table-column>
       <el-table-column property="releaseDate" label="结关时间" sortable width="150">
         <template #default="scope">{{ scope.row.releaseDate ? dayjs(scope.row.releaseDate).format('YYYY-MM-DD HH:mm:ss'):'' }}</template>
       </el-table-column>
-      <el-table-column property="cuCost" label="海关通关时间(小时)" width="130"/>
-      <el-table-column property="totalCost" label="整体通关时间(小时)" width="130"/>
-      <el-table-column property="beforeDeclCost" label="申报前准备时间(小时)" width="130"/>
-      <el-table-column property="profVerifyFlag" label="是否专业审单" width="80" >
+      <el-table-column property="cuCost" label="海关通关时间(小时)" width="140"/>
+      <el-table-column property="totalCost" label="整体通关时间(小时)" width="140"/>
+      <el-table-column property="beforeDeclCost" label="申报前准备时间(小时)" width="150"/>
+      <el-table-column property="profVerifyFlag" label="是否专业审单" width="110" >
         <template #default="scope">
           <dict-tag :options="dict.yes_no" :dictValue="scope.row.profVerifyFlag"/>
         </template>
       </el-table-column>
-      <el-table-column property="newTwoStepFlag" label="是否新两步申报" width="80" >
+      <el-table-column property="newTwoStepFlag" label="是否新两步申报" width="120" >
         <template #default="scope">
           <dict-tag :options="dict.yes_no" :dictValue="scope.row.newTwoStepFlag"/>
         </template>
       </el-table-column>
-      <el-table-column property="assessStartDate" label="现场验估时间" sortable width="150">
+      <el-table-column property="assessStartDate" label="现场验估时间" width="150">
         <template #default="scope">{{ scope.row.assessStartDate ? dayjs(scope.row.assessStartDate).format('YYYY-MM-DD HH:mm:ss'):'' }}</template>
       </el-table-column>
-      <el-table-column property="assessEndDate" label="验估处置完毕时间" sortable width="150">
+      <el-table-column property="assessEndDate" label="验估处置完毕时间" width="150">
         <template #default="scope">{{ scope.row.assessEndDate ? dayjs(scope.row.assessEndDate).format('YYYY-MM-DD HH:mm:ss'):'' }}</template>
       </el-table-column>
       <el-table-column property="checkFlag" label="是否查验" width="80" >
@@ -249,41 +249,41 @@
           <dict-tag :options="dict.affiliation_customs_info" :dictValue="scope.row.checkCustomsCode"/>
         </template>
       </el-table-column>
-      <el-table-column property="manCreateTime" label="查验指令下达时间" sortable width="150">
+      <el-table-column property="manCreateTime" label="查验指令下达时间" width="150">
         <template #default="scope">{{ scope.row.manCreateTime ? dayjs(scope.row.manCreateTime).format('YYYY-MM-DD HH:mm:ss'):'' }}</template>
       </el-table-column>
       <el-table-column property="manChkTimeStart" label="查验开始时间" sortable width="150">
         <template #default="scope">{{ scope.row.manChkTimeStart ? dayjs(scope.row.manChkTimeStart).format('YYYY-MM-DD HH:mm:ss'):'' }}</template>
       </el-table-column>
-      <el-table-column property="manChkTimeEnd" label="查验结束时间" sortable width="150">
+      <el-table-column property="manChkTimeEnd" label="查验结束时间" width="150">
         <template #default="scope">{{ scope.row.manChkTimeEnd ? dayjs(scope.row.manChkTimeEnd).format('YYYY-MM-DD HH:mm:ss'):'' }}</template>
       </el-table-column>
-      <el-table-column property="manProcResult" label="处理结果" width="100">
+      <el-table-column property="manProcResult" label="处理结果" :show-overflow-tooltip="true" width="80">
         <template #default="scope">
-          <dict-tag :options="dict.affiliation_customs_info" :dictValue="scope.row.manProcResult"/>
+          <dict-tag :options="dict.proc_result" :dictValue="scope.row.manProcResult"/>
         </template>
       </el-table-column>
-      <el-table-column property="manProcIdea" label="处理意见" width="100">
+      <el-table-column property="manProcIdea" label="处理意见" :show-overflow-tooltip="true" width="80">
         <template #default="scope">
-          <dict-tag :options="dict.affiliation_customs_info" :dictValue="scope.row.manProcIdea"/>
+          <dict-tag :options="dict.proc_idea" :dictValue="scope.row.manProcIdea"/>
         </template>
       </el-table-column>
-      <el-table-column property="gno" label="商品项号"  width="60" />
-      <el-table-column property="iqCode" label="检验检疫编码" width="80" />
-      <el-table-column property="codeTs" label="商品编码" width="80" />
+      <el-table-column property="gno" label="商品项号"  width="80" />
+      <el-table-column property="iqCode" label="检验检疫编码" width="120" />
+      <el-table-column property="codeTs" label="商品编码" width="100" />
       <el-table-column property="gname" label="商品名称" :show-overflow-tooltip="true" min-width="120" />
       <el-table-column property="gmodel" label="规格型号" :show-overflow-tooltip="true" min-width="120" />
-      <el-table-column property="qty1" label="第一（法定）数量" width="80" />
+      <el-table-column property="qty1" label="第一(法定)数量" width="120" />
       <el-table-column property="rmbPriceList" label="商品货运值人民币" width="130"/>
       <el-table-column property="usdPriceList" label="商品货运值美元" width="130"/>
-      <el-table-column property="gCertFlag" label="每项商品需要监管证件" width="130"/>
-      <el-table-column property="ungid" label="UN编码" width="130"/>
-      <el-table-column property="ungClassify" label="危包类别" width="130"/>
+      <el-table-column property="gCertFlag" label="每项商品需要监管证件" width="160"/>
+      <el-table-column property="ungid" label="UN编码" width="70"/>
+      <el-table-column property="ungClassify" label="危包类别" width="80"/>
       <el-table-column property="ungGName" label="危险货物名称" :show-overflow-tooltip="true" min-width="120"/>
-      <el-table-column property="productCharCode" label="货物属性代码" width="130"/>
+      <el-table-column property="productCharCode" label="货物属性代码" width="110"/>
       <el-table-column property="goodsType" label="危险品类型" width="130">
         <template #default="scope">
-          <dict-tag :options="dict.goods_type" :dictValue="scope.row.goodsType"/>
+          <dict-tag :options="dict.goods_type" :whole-match="true" :dictValue="scope.row.goodsType"/>
         </template>
       </el-table-column>
     </cacp-complex-table>
@@ -310,6 +310,7 @@ import { useRouter } from 'vue-router'
 import { permissionStatus } from '@/utils/globalPermission'
 import { useDictType } from '@/components/useDict'
 import { useCoreStore } from '@/stores'
+import DictTag from "@/components/DictTag/dictTag.vue";
 const coreStore = useCoreStore()
 
 interface State {

wxjy-wxjy-web/src/views/analyze/GoodsEntryDetail.vue

@@ -13,20 +13,25 @@
             <el-col class="cacp-complex__label--title" :span="2">报关单号</el-col>
             <el-col class="cacp-complex__value--grey01" :span="4">{{ info.entryId }}</el-col>
             <el-col class="cacp-complex__label--title" :span="2">通关模式</el-col>
-            <el-col class="cacp-complex__value--grey01" :span="4">{{ info.passMode }}</el-col>
+            <el-col class="cacp-complex__value--grey01" :span="4">
+              <dict-tag :options="dict.pass_mode" :dictValue="info.passMode"/>
+            </el-col>
             <el-col class="cacp-complex__label--title" :span="2">运输方式</el-col>
             <el-col class="cacp-complex__value--grey01" :span="4">{{ formatTrafMode(info.trafMode) }}</el-col>
             <el-col class="cacp-complex__label--title" :span="2">进出口标记</el-col>
             <el-col class="cacp-complex__value--grey01" :span="4">
-              <dict-tag :options="dict.ie_flag" :value="info.ieFlag"/></el-col>
+              <dict-tag :options="dict.ie_flag" :dictValue="info.ieFlag"/></el-col>
             <el-col class="cacp-complex__label--yellow" :span="2">出入境口岸</el-col>
             <el-col class="cacp-complex__value--yellow01" :span="4">{{ formatIePort(info.iePort) }}</el-col>
             <el-col class="cacp-complex__label--yellow" :span="2">主管海关</el-col>
-            <el-col class="cacp-complex__value--yellow01" :span="4">{{ formatIePort(info.customsCode) }}</el-col>
+            <el-col class="cacp-complex__value--yellow01" :span="4">
+              <dict-tag :options="dict.affiliation_customs_info" :dictValue="info.customsCode"/>
+            </el-col>
             <el-col class="cacp-complex__label--title" :span="2">监管方式</el-col>
             <el-col class="cacp-complex__value--grey01" :span="4">{{ formatTradeMode(info.tradeMode) }}</el-col>
             <el-col class="cacp-complex__label--title" :span="2">报关模式</el-col>
-            <el-col class="cacp-complex__value--grey01" :span="4">{{ info.declMode }}</el-col>
+            <el-col class="cacp-complex__value--grey01" :span="4">
+              <dict-tag :options="dict.decl_mode" :dictValue="info.declMode"/></el-col>
             <el-col class="cacp-complex__label--yellow" :span="2">贸易国别</el-col>
             <el-col class="cacp-complex__value--yellow01" :span="4">{{ formatCountryIso(info.tradeCountry) }}</el-col>
             <el-col class="cacp-complex__label--title" :span="2">申报日期</el-col>
@@ -34,7 +39,8 @@
             <el-col class="cacp-complex__label--title" :span="2">进口日期</el-col>
             <el-col class="cacp-complex__value--grey01" :span="4">{{ info.ieDate ? dayjs(info.ieDate).format('YYYY-MM-DD HH:mm:ss'):'' }}</el-col>
             <el-col class="cacp-complex__label--title" :span="2">是否提前申报</el-col>
-            <el-col class="cacp-complex__value--grey01" :span="4">{{ info.declAdvanceFlag }}</el-col>
+            <el-col class="cacp-complex__value--grey01" :span="4">
+              <dict-tag :options="dict.yes_no" :dictValue="info.declAdvanceFlag"/></el-col>
             <el-col class="cacp-complex__label--title" :span="2">自动受理时间</el-col>
             <el-col class="cacp-complex__value--grey01" :span="4">{{ info.acceptDate ? dayjs(info.acceptDate).format('YYYY-MM-DD HH:mm:ss'):'' }}</el-col>
             <el-col class="cacp-complex__label--title" :span="2">货物进港时间</el-col>
@@ -69,17 +75,21 @@
             <el-col class="cacp-complex__label--yellow" :span="2">申报前准备时间(小时)</el-col>
             <el-col class="cacp-complex__value--yellow01" :span="4">{{ info.beforeDeclCost}}</el-col>
             <el-col class="cacp-complex__label--title" :span="2">是否专业审单</el-col>
-            <el-col class="cacp-complex__value--grey01" :span="4">{{ info.profVerifyFlag }}</el-col>
+            <el-col class="cacp-complex__value--grey01" :span="4">
+              <dict-tag :options="dict.yes_no" :dictValue="info.profVerifyFlag"/></el-col>
             <el-col class="cacp-complex__label--title" :span="2">是否新两步申报</el-col>
-            <el-col class="cacp-complex__value--grey01" :span="4">{{ info.newTwoStepFlag }}</el-col>
+            <el-col class="cacp-complex__value--grey01" :span="4">
+              <dict-tag :options="dict.yes_no" :dictValue="info.newTwoStepFlag"/></el-col>
             <el-col class="cacp-complex__label--title" :span="2">现场验估时间</el-col>
             <el-col class="cacp-complex__value--grey01" :span="4">{{ info.assessStartDate?dayjs(info.assessStartDate).format('YYYY-MM-DD HH:mm:ss'):'' }}</el-col>
             <el-col class="cacp-complex__label--title" :span="2">验估处置完毕时间</el-col>
             <el-col class="cacp-complex__value--grey01" :span="4">{{ info.assessEndDate?dayjs(info.assessEndDate).format('YYYY-MM-DD HH:mm:ss'):'' }}</el-col>
             <el-col class="cacp-complex__label--title" :span="2">是否查验</el-col>
-            <el-col class="cacp-complex__value--grey01" :span="4">{{ info.checkFlag }}</el-col>
+            <el-col class="cacp-complex__value--grey01" :span="4">
+              <dict-tag :options="dict.yes_no" :dictValue="info.checkFlag"/></el-col>
             <el-col class="cacp-complex__label--title" :span="2">查验海关</el-col>
-            <el-col class="cacp-complex__value--grey01" :span="4">{{ formatIePort(info.checkCustomsCode) }}</el-col>
+            <el-col class="cacp-complex__value--grey01" :span="4">
+              <dict-tag :options="dict.affiliation_customs_info" :dictValue="info.checkCustomsCode"/></el-col>
             <el-col class="cacp-complex__label--title" :span="2">查验指令下达时间</el-col>
             <el-col class="cacp-complex__value--grey01" :span="4">{{ info.manCreateTime?dayjs(info.manCreateTime).format('YYYY-MM-DD HH:mm:ss'):'' }}</el-col>
             <el-col class="cacp-complex__label--title" :span="2">查验开始时间</el-col>
@@ -87,9 +97,11 @@
             <el-col class="cacp-complex__label--title" :span="2">查验结束时间</el-col>
             <el-col class="cacp-complex__value--grey01" :span="4">{{ info.manChkTimeEnd?dayjs(info.manChkTimeEnd).format('YYYY-MM-DD HH:mm:ss'):'' }}</el-col>
             <el-col class="cacp-complex__label--title" :span="2">处理结果</el-col>
-            <el-col class="cacp-complex__value--grey01" :span="4">{{info.manProcResult }}</el-col>
+            <el-col class="cacp-complex__value--grey01" :span="4">
+              <dict-tag :options="dict.proc_result" :dictValue="info.manProcResult"/></el-col>
             <el-col class="cacp-complex__label--title" :span="2">处理意见</el-col>
-            <el-col class="cacp-complex__value--grey01" :span="4">{{ info.manProcIdea }}</el-col>
+            <el-col class="cacp-complex__value--grey01" :span="4">
+              <dict-tag :options="dict.proc_idea" :dictValue="info.manProcIdea"/></el-col>
             <el-col class="cacp-complex__label--title" :span="2">毛重</el-col>
             <el-col class="cacp-complex__value--grey01" :span="4">{{ info.grossWt }}</el-col>
             <el-col class="cacp-complex__label--title" :span="2">净重</el-col>
@@ -97,9 +109,9 @@
             <el-col class="cacp-complex__label--title" :span="2">货运值人民币(总)</el-col>
             <el-col class="cacp-complex__value--grey01" :span="4">{{ info.rmbPrice }}</el-col>
             <el-col class="cacp-complex__label--title" :span="2">货运值美元(总)</el-col>
-            <el-col class="cacp-complex__value--grey01" :span="4">{{ info.usdPrice }}</el-col>
+            <el-col class="cacp-complex__value--grey01" :span="10">{{ info.usdPrice }}</el-col>
             <el-col class="cacp-complex__label--yellow" :span="2">备注</el-col>
-            <el-col class="cacp-complex__value--yellow01" :span="10">{{ info.noteS }}</el-col>
+            <el-col class="cacp-complex__value--yellow01" :span="22">{{ info.noteS }}</el-col>
           </el-row>
         </div>
       </template>
@@ -148,33 +160,36 @@
           <el-row>
             <el-col class="cacp-complex__nesting--col" :span="24">
               <el-row class="cacp-complex__nesting--row">
-                <el-col class="cacp-complex__label--title" :span="2">项号</el-col>
+                <el-col class="cacp-complex__label--title" :span="2">商品项号</el-col>
                 <el-col :span="2">{{ rowData.gno }}</el-col>
                 <!-- 第二行 -->
                 <el-col class="cacp-complex__label--title" :span="2">商品编码</el-col>
                 <el-col :span="2">{{ rowData.codeTs }}</el-col>
+                <el-col class="cacp-complex__label--title" :span="2">检验检疫编码</el-col>
+                <el-col :span="2">{{ rowData.iqCode }}</el-col>
                 <el-col class="cacp-complex__label--title" :span="2">商品名称</el-col>
-                <el-col :span="6">{{ rowData.gname }}</el-col>
+                <el-col :span="10">{{ rowData.gname }}</el-col>
                 <el-col class="cacp-complex__label&#45;&#45;title" :span="2">规格型号</el-col>
                 <el-col :span="10">{{ rowData.gmodel }}</el-col>
-                <!-- 第三行 -->
-                <el-col class="cacp-complex__label--title" :span="2">检验检疫编码</el-col>
-                <el-col :span="2">{{ rowData.iqCode }}</el-col>
                 <!-- 第五行 -->
                 <el-col class="cacp-complex__label--title" :span="2">法定第一数量</el-col>
                 <el-col :span="2">{{ rowData.qty1 }}</el-col>
-                <el-col class="cacp-complex__label&#45;&#45;title" :span="2">货物属性</el-col>
-                <el-col :span="2">{{ rowData.productCharCode }}</el-col>
-                <el-col class="cacp-complex__label&#45;&#45;title" :span="2">UN编码</el-col>
-                <el-col :span="2">{{ rowData.ungid }}</el-col>
+                <el-col class="cacp-complex__label&#45;&#45;title" :span="2">货运值人民币</el-col>
+                <el-col :span="2">{{ rowData.rmbPrice }}</el-col>
+                <el-col class="cacp-complex__label&#45;&#45;title" :span="2">货运值美元</el-col>
+                <el-col :span="2">{{ rowData.usdPrice }}</el-col>
+                <el-col class="cacp-complex__label&#45;&#45;title" :span="2">每项商品需要监管证件</el-col>
+                <el-col :span="2">{{ rowData.gCertFlag }}</el-col>
+                <el-col class="cacp-complex__label&#45;&#45;title" :span="2">非危险化学品</el-col>
+                <el-col :span="2"><dict-tag :options="dict.yes_no" :dictValue="rowData.ungFlag"/></el-col>
                 <el-col class="cacp-complex__label&#45;&#45;title" :span="2">危包规格</el-col>
                 <el-col :span="6">{{ rowData.ungModel }}</el-col>
                 <el-col class="cacp-complex__label&#45;&#45;title" :span="2">危险货物名称</el-col>
-                <el-col :span="10">{{ rowData.ungGName }}</el-col>
+                <el-col :span="6">{{ rowData.ungGName }}</el-col>
                 <el-col class="cacp-complex__label&#45;&#45;title" :span="2">危包类别</el-col>
                 <el-col :span="2">{{ rowData.ungClassify }}</el-col>
-                <el-col class="cacp-complex__label&#45;&#45;title" :span="2">货号</el-col>
-                <el-col :span="2">{{ rowData.goodsType }}</el-col>
+                <el-col class="cacp-complex__label&#45;&#45;title" :span="2">危险品类型</el-col>
+                <el-col :span="2"><dict-tag :options="dict.goods_type" :whole-match="true" :dictValue="rowData.goodsType"/></el-col>
               </el-row>
             </el-col>
           </el-row>
@@ -213,6 +228,7 @@ import { useRoute, useRouter } from 'vue-router'
 import dayjs from 'dayjs'
 import { getBaseCodeList } from '@/apis/base/baseCode'
 import {useDictType} from "@/components/useDict";
+import DictTag from "@/components/DictTag/dictTag.vue";
 const currentPage = ref<number>(1)
 const pageSize = ref<number>(100)
 const buttonRef = ref<HTMLElement>()
@@ -220,7 +236,7 @@ const visible = ref<boolean>(false)
 const tipText = ref<string>('')
 const router = useRouter()
 const route = useRoute()
-const { dict } = useDictType('affiliation_customs_info', 'proc_idea', 'proc_result', 'proc_total', 'yes_no', 'decl_mode', 'decl_status', 'ie_flag','goods_type')
+const { dict } = useDictType('affiliation_customs_info', 'proc_idea', 'proc_result', 'yes_no', 'decl_mode', 'pass_mode', 'ie_flag','goods_type')
 
 
 const info = ref<Head>({} as Head)
@@ -232,59 +248,28 @@ const column = [
   {
     label: '商品编号',
     prop: 'codeTs',
-    width: '120px'
+    width: '100px'
   },
   {
-    label: '检验检疫名称',
-    prop: 'iqGName',
-    minWidth: '260px',
-    showOverflow:true
+    label: '检验检疫编码',
+    prop: 'iqCode',
+    width: '120px'
   },
   {
     label: '商品名称',
     prop: 'gname',
-    minWidth: '260px',
+    minWidth: '230px',
     showOverflow:true
   },
   {
     label: '规格型号',
     prop: 'gmodel',
-    width: '130px',
+    width: '260px',
     showOverflow:true
   },
   {
-    label: '申报数量',
-    prop: 'gqty',
-    width: '150px'
-  },
-  {
-    label: '申报计量单位',
-    prop: 'gunit',
-    width: '110px'
-  },
-  {
-    label: '申报单价',
-    prop: 'declPrice',
-    width: '80px'
-  },
-  {
-    label: '币制',
-    prop: 'tradeCurr',
-    width: '80px'
-  },
-  {
-    label: '成交总价',
-    prop: 'tradeTotal',
-    width: '80px'
-  },
-  {
-    label: '原产国(地区)',
-    prop: 'originCountry',
-    width: '110px'
-  },
-  {
-    label: '目的国(地区)',
-    prop: 'destCountry',
+    label: '第一(法定)数量',
+    prop: 'qty1',
     width: '120px'
   },
   {