Merge remote-tracking branch 'origin/master'

wxjy-wxjy-service/src/main/java/cn/gov/customs/wxjy/analyze/pojo/Entry.java

@@ -221,7 +221,7 @@ public class Entry implements Serializable {
   private String checkFlag;
 
   // 查验关区：4位
-  @Excel(name = "是否查验",dictType = "affiliation_customs_info",sort=45)
+  @Excel(name = "查验关区",dictType = "affiliation_customs_info",sort=45)
   private String checkCustomsCode;
 
   // 查验指令下达时间：来源CI_CHECK_MAN_WORK_HEAD(对接物流辅助系统进口理货时间和指令下达时间哪个晚哪个就是下发时间)

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

@@ -617,6 +617,17 @@ const allColumnConfigs: ColumnConfig[] = [
     groupTitle: '报关单信息',
     defaultVisible: false
   },
+  {
+    key: 'profVerifyFlag',
+    property: 'profVerifyFlag',
+    label: '是否专业审单',
+    width: 110,
+    groupKey: 'entry',
+    groupTitle: '报关单信息',
+    defaultVisible: false,
+    isDict: true,
+    dictKey: 'yes_no'
+  },
   {
     key: 'noteS',
     property: 'noteS',
@@ -705,17 +716,6 @@ const allColumnConfigs: ColumnConfig[] = [
     isDict: true,
     dictKey: 'proc_idea'
   },
-  {
-    key: 'profVerifyFlag',
-    property: 'profVerifyFlag',
-    label: '是否专业审单',
-    width: 110,
-    groupKey: 'inspection',
-    groupTitle: '查验信息',
-    defaultVisible: false,
-    isDict: true,
-    dictKey: 'yes_no'
-  },
 
   // 商品信息组
   {

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

@@ -617,6 +617,17 @@ const allColumnConfigs: ColumnConfig[] = [
     groupTitle: '报关单信息',
     defaultVisible: false
   },
+  {
+    key: 'profVerifyFlag',
+    property: 'profVerifyFlag',
+    label: '是否专业审单',
+    width: 110,
+    groupKey: 'entry',
+    groupTitle: '报关单信息',
+    defaultVisible: false,
+    isDict: true,
+    dictKey: 'yes_no'
+  },
   {
     key: 'noteS',
     property: 'noteS',
@@ -705,17 +716,6 @@ const allColumnConfigs: ColumnConfig[] = [
     isDict: true,
     dictKey: 'proc_idea'
   },
-  {
-    key: 'profVerifyFlag',
-    property: 'profVerifyFlag',
-    label: '是否专业审单',
-    width: 110,
-    groupKey: 'inspection',
-    groupTitle: '查验信息',
-    defaultVisible: false,
-    isDict: true,
-    dictKey: 'yes_no'
-  },
 
   // 商品信息组
   {