diff --git a/src/views/main/BookingCustomerLedger/list/index.vue b/src/views/main/BookingCustomerLedger/list/index.vue
index 75d3a5a..56076e0 100644
--- a/src/views/main/BookingCustomerLedger/list/index.vue
+++ b/src/views/main/BookingCustomerLedger/list/index.vue
@@ -1237,6 +1237,10 @@ export default {
       this.$router.push({ name: 'BookingCustomerDetail', query: { id: pkIdArr[0], isCopy: true } })
     },
     addSubmit() {
+      if (this.carrierRadio === '') {
+                this.$message.warning('请选择船公司')
+                return false
+            }
       this.addNum = Math.round(Math.random() * 1000)
       this.$router.push({ name: 'BookingCustomerDetail', query: { addNum: this.addNum, carrierid: this.carrierRadio } })
       this.addVisible = false
diff --git a/src/views/main/BookingGangjie/detail/modules/basicInfo.vue b/src/views/main/BookingGangjie/detail/modules/basicInfo.vue
index 298199d..e977eb7 100644
--- a/src/views/main/BookingGangjie/detail/modules/basicInfo.vue
+++ b/src/views/main/BookingGangjie/detail/modules/basicInfo.vue
@@ -1093,7 +1093,7 @@ export default {
             this.customerContactsData = res.data.contacts
           })
           this.djyCustomerContacts()
-          BookingOrderContactPage({ id: this.details.customerid, BookingId: this.$route.query.id, pageSize: 999 }).then(
+          BookingOrderContactPage({ id: this.details.customerid, BookingId: this.$route.query.id ? this.$route.query.id : '', pageSize: 999 }).then(
             (res) => {
               console.log(res)
               res.data.rows.forEach((item) => {
diff --git a/src/views/main/Taskmanage/TaskmanageList/index.vue b/src/views/main/Taskmanage/TaskmanageList/index.vue
index 76263b3..2d95477 100644
--- a/src/views/main/Taskmanage/TaskmanageList/index.vue
+++ b/src/views/main/Taskmanage/TaskmanageList/index.vue
@@ -40,7 +40,7 @@
                       :style="{color: threeLevel.key==='CAUTION_NOTICE' ? 'red' : '' }"
                       :show-icon="false"
                     >
-                      <div  slot="title" :style="{color: threeLevel.key==='CAUTION_NOTICE' ? 'red' : '' }">
+                      <div slot="title" :style="{color: threeLevel.key==='CAUTION_NOTICE' ? 'red' : '' }">
                         {{ `${threeLevel.name}  (${threeLevel.total})` }}</div>
                     </a-tree-node>
                   </a-tree-node>
@@ -228,9 +228,9 @@
                   >
                     <span class="tab-btn"> <a-icon type="redo" :style="{ fontSize: '16px' }" /> 刷新 </span>
                   </a-popconfirm>
-                  <span class="tab-btn" @click="tableHeaderEdit">
+                  <!-- <span class="tab-btn" @click="tableHeaderEdit">
                     <a-icon type="setting" :style="{ fontSize: '14px' }" />
-                  </span>
+                  </span> -->
                 </div>
               </template>
             </vxe-toolbar>
@@ -245,18 +245,104 @@
               <template #status="{ row }">
                 <span>{{ selectStatus(row.status) }}</span>
               </template>
+              <template #iS_EXCEPT="{ row }">
+                <span v-if="row.iS_EXCEPT==1">异常</span>
+                <span v-if="row.iS_EXCEPT==0">未异常</span>
+              </template>
+              <template #iS_COMPLETE="{ row }">
+                <span v-if="row.iS_COMPLETE==1">已完成</span>
+                <span v-if="row.iS_COMPLETE==0">未完成</span>
+              </template>
+              <template #iS_PUBLIC="{ row }">
+                <span v-if="row.iS_PUBLIC==1">公共</span>
+                <span v-if="row.iS_PUBLIC==0">非公共</span>
+              </template>
+              <template #iS_SET_AUTO_EMAIL="{ row }">
+                <span v-if="row.iS_SET_AUTO_EMAIL==1">是</span>
+                <span v-if="row.iS_SET_AUTO_EMAIL==0">否</span>
+              </template>
+              <template #iS_DONGSH_RECV="{ row }">
+                <span v-if="row.iS_DONGSH_RECV==1">是</span>
+                <span v-if="row.iS_DONGSH_RECV==0">否</span>
+              </template>
+              <template #iS_DONGSH_RESULT="{ row }">
+                <span v-if="row.iS_DONGSH_RESULT==1">是</span>
+                <span v-if="row.iS_DONGSH_RESULT==0">否</span>
+              </template>
+              <template #iS_WEEK_DIFF="{ row }">
+                <span v-if="row.iS_WEEK_DIFF==1">是</span>
+                <span v-if="row.iS_WEEK_DIFF==0">否</span>
+              </template>
+              <template #iS_PRICE_DATE_DIFF="{ row }">
+                <span v-if="row.iS_PRICE_DATE_DIFF==1">是</span>
+                <span v-if="row.iS_PRICE_DATE_DIFF==0">否</span>
+              </template>
+              <template #iS_TRANSFER="{ row }">
+                <span v-if="row.iS_TRANSFER==1">是</span>
+                <span v-if="row.iS_TRANSFER==0">否</span>
+              </template>
+              <template #iS_CUT_DATE_ADVANCED="{ row }">
+                <span v-if="row.iS_CUT_DATE_ADVANCED==1">是</span>
+                <span v-if="row.iS_CUT_DATE_ADVANCED==0">否</span>
+              </template>
+              <template #iS_UPDATE_BOOKING="{ row }">
+                <span v-if="row.iS_UPDATE_BOOKING==1">是</span>
+                <span v-if="row.iS_UPDATE_BOOKING==0">否</span>
+              </template>
+              <template #iS_SEND_EMAIL="{ row }">
+                <span v-if="row.iS_SEND_EMAIL==1">已发送</span>
+                <span v-if="row.iS_SEND_EMAIL==0">未发送</span>
+              </template>
+              <template #iS_CHANGE="{ row }">
+                <span v-if="row.iS_CHANGE==1">已发送</span>
+                <span v-if="row.iS_CHANGE==0">未发送</span>
+              </template>
+              <template #iS_EMAIL_SEND="{ row }">
+                <span v-if="row.iS_EMAIL_SEND==1">已推送</span>
+                <span v-if="row.iS_EMAIL_SEND==0">未推送</span>
+              </template>
+              <template #procesS_STATUS="{ row }">
+                <span v-if="row.procesS_STATUS=='TEMP'">待处理</span>
+                <span v-if="row.procesS_STATUS=='SUCC'">处理成功</span>
+                <span v-if="row.procesS_STATUS=='FAILURE'">失败</span>
+              </template>
+              <template #cautioN_NOTICE_TYPE="{ row }">
+                <span v-if="row.cautioN_NOTICE_TYPE=='WeekAt'">计费周差异</span>
+                <span v-if="row.cautioN_NOTICE_TYPE=='PriceCalcDate'">计费日期差异</span>
+                <span v-if="row.cautioN_NOTICE_TYPE=='ChangeTransfer'">直达转为中转</span>
+                <span v-if="row.cautioN_NOTICE_TYPE=='ChangeVesselVoyno'">船名航次变化</span>
+                <span v-if="row.cautioN_NOTICE_TYPE=='VGMCutDateAdvanced'">VGM截止时间提前</span>
+                <span v-if="row.cautioN_NOTICE_TYPE=='SICutDateAdvanced'">SI截止时间提前</span>
+              </template>
+              <template #ouT_BUSI_TYPE="{ row }">
+                <span v-if="row.ouT_BUSI_TYPE==' SPLIT'">已拆单</span>
+                <span v-else>未拆单</span>
+              </template>
+              <template #sI_SUBTYPE="{ row }">
+                <span v-if="row.sI_SUBTYPE=='BOOK_ORDER'">订舱</span>
+                <span v-if="row.sI_SUBTYPE=='MAIL_RECV'">邮件接受</span>
+              </template>
+              <template #plaN_TYPE="{ row }">
+                <span v-if="row.plaN_TYPE=='Rolling'">预甩货</span>
+                <span v-if="row.plaN_TYPE=='Transfer'">中专预甩</span>
+              </template>
+              <template #busI_TYPE="{ row }">
+                <span v-if="row.busI_TYPE=='BookingConfirmation'">订舱</span>
+                <span v-if="row.busI_TYPE=='BookingAmendment'">订舱变更</span>
+                <span v-if="row.busI_TYPE=='BookingCancellation'">订舱取消</span>
+              </template>
               <template #truckName="{ row }">
                 <a-icon @click="handleOpen(row)" style="cursor: pointer;" type="edit" />
-                {{ row.truckName }}
+                {{ row.trucK_NAME }}
               </template>
               <template #taskType="{ row }">
-                <span>{{ filterType(row.taskType) }}</span>
+                <span>{{ filterType(row.tasK_TYPE) }}</span>
               </template>
               <template #taskScource="{ row }">
-                <span>{{ filterScource(row.taskSource) }}</span>
+                <span>{{ filterScource(row.tasK_SOURCE) }}</span>
               </template>
               <template #taskTitle="{ row }">
-                <span class="task-tit" @click="changePage(row)">{{ row.taskTitle }}</span>
+                <span class="task-tit" @click="changePage(row)">{{ row.tasK_TITLE }}</span>
               </template>
               <template #operate="{ row }">
                 <vxe-button class="operate-btn" type="text" icon="vxe-icon-edit" @click="changePage(row)"></vxe-button>
@@ -588,6 +674,7 @@ export default {
       },
       // 页数计算
       paperCalcVisible: false,
+      taskTypeColumeList: [],
       paperCalcRes: [],
       paperCalcColumns: [
         {
@@ -833,7 +920,7 @@ export default {
     },
     getConfigUser(isInit = false) {
       const query = {
-        typeArr: ['task_list_cond', 'task_list_column', 'task_list_page']
+        typeArr: ['task_list_cond', 'task_list_page']
       }
       DjyUserConfigMulti(this.$qs.stringify(query, { arrayFormat: 'repeat' })).then(res => {
         const $data = {}
@@ -842,9 +929,6 @@ export default {
             case 'task_list_cond':
               this.$set($data, 'task_list_cond', item)
               break
-            case 'task_list_column':
-              this.$set($data, 'task_list_column', item)
-              break
             case 'task_list_page':
               this.setPageSize(item)
               break
@@ -856,11 +940,26 @@ export default {
         } else {
           this.setFormData({}, false, true)
         }
-        if (Object.keys($data).includes('task_list_column')) {
-          this.setTableList($data.task_list_column)
-        } else {
-          this.setTableList({})
-        }
+        // if (Object.keys($data).includes('task_list_column')) {
+        //   this.setTableList($data.task_list_column)
+        // } else {
+        //   this.setTableList({})
+        // }
+      })
+      const query1 = {
+        typeArr: ['basic', 'SI_FEEDBACK', 'BC', 'PER_BILL', 'TRUCK_DISPATCH', 'CUT_MODIFY', 'ROLLING_NOMINATION', 'DRAFT', 'POD_DISCHARGE_FULL', 'CAUTION_NOTICE', 'ROUTE_CUT_CHANGE']
+      }
+      DjyUserConfigMulti(this.$qs.stringify(query1, { arrayFormat: 'repeat' })).then(res => {
+         if (res.data.length > 0) {
+            const arr = []
+            res.data.forEach(item => {
+              arr.push({
+                list: JSON.parse(item.configJson),
+                type: item.type
+              })
+            })
+            this.taskTypeColumeList = arr
+         }
       })
     },
     setFormData(data, isReset = false, isInit = false) {
@@ -1129,12 +1228,9 @@ export default {
         return false
       }
       const indexArr = selectedKeys[0].split('-')
-      console.log(indexArr)
       if (indexArr.length > 2) {
         const key = this.levelTree[indexArr[2]].actionKey
         const action = key.split('#')
-        console.log('=== activeTreeKey ===', this.activeTreeKey)
-        console.log('选择', indexArr[2], key)
         this.taskType = action[2]
         this.form.setFieldsValue({
           taskCategory: action[0],
@@ -1143,6 +1239,24 @@ export default {
         })
         this.formRes.taskCategory = action[0]
         this.formRes.taskType = action[2]
+        let columnsArr1 = []
+        let columnsArr2 = []
+        this.taskTypeColumeList.forEach(item => {
+          if (item.type === action[2]) {
+            columnsArr1 = item.list
+          }
+          if (item.type === 'basic') {
+            columnsArr2 = item.list
+          }
+        })
+        if (columnsArr1.length === 0 && columnsArr2.length === 0) {
+          this.gridOptions.columns = JSON.parse(JSON.stringify(initData.columns))
+        } else {
+          const arr = columnsArr2.concat(columnsArr1)
+          arr.push({ field: 'operate', title: '操作', width: 100, noDraggable: true, slots: { default: 'operate' }, fixed: 'right', resizable: false })
+          arr.unshift({ type: 'checkbox', width: 60, noDraggable: true })
+          this.gridOptions.columns = arr
+        }
         this.init({
           taskCategory: action[0],
           status: action[1],
@@ -1530,13 +1644,17 @@ export default {
       const res = this.taskTypeList.filter((item, index) => {
         return item.code === val
       })
-      return res[0].name
+      if (res.length > 0) {
+        return res[0].name
+      }
     },
     filterScource(val) {
       const res = this.sourceList.filter((item, index) => {
         return item.code === val
       })
-      return res[0].name
+      if (res.length > 0) {
+        return res[0].name
+      }
     },
     cancelFun() {},
     // 取消
diff --git a/src/views/main/Taskmanage/TaskmanageList/modules/initData.js b/src/views/main/Taskmanage/TaskmanageList/modules/initData.js
index add878c..7442397 100644
--- a/src/views/main/Taskmanage/TaskmanageList/modules/initData.js
+++ b/src/views/main/Taskmanage/TaskmanageList/modules/initData.js
@@ -1,23 +1,23 @@
 export default {
   columns: [
     { type: 'checkbox', width: 60, noDraggable: true },
-    { field: 'taskType', width: 100, title: '任务类型', showHeaderOverflow: true, sortable: true, slots: { default: 'taskType' } },
-    { field: 'taskTitle', width: 200, title: '任务标题', showHeaderOverflow: true, sortable: true, slots: { default: 'taskTitle' } },
+    { field: 'tasK_TYPE', width: 100, title: '任务类型', showHeaderOverflow: true, sortable: true, slots: { default: 'taskType' } },
+    { field: 'tasK_TITLE', width: 200, title: '任务标题', showHeaderOverflow: true, sortable: true, slots: { default: 'taskTitle' } },
     { field: 'etd', width: 180, title: '开船日期', showHeaderOverflow: true, sortable: true },
-    { field: 'vesselVoyno', width: 180, title: '船名/航次', showHeaderOverflow: true, sortable: true },
-    { field: 'mblNo', width: 120, title: '提单号', showHeaderOverflow: true, sortable: true },
-    { field: 'yardName', width: 100, title: '场站', showHeaderOverflow: true, sortable: true },
-    { field: 'contaInfo', width: 100, title: '箱型箱量', showHeaderOverflow: true, sortable: true },
-    { field: 'taskReqUserName', width: 100, title: '操作名称', showHeaderOverflow: true, sortable: true },
-    { field: 'carrierId', width: 100, title: '船公司', showHeaderOverflow: true, sortable: true },
-    { field: 'truckName', width: 100, title: '车队', showHeaderOverflow: true, sortable: true },
-    { field: 'customerName', width: 100, title: '委托单位', showHeaderOverflow: true, sortable: true },
+    { field: 'vesseL_VOYNO', width: 180, title: '船名/航次', showHeaderOverflow: true, sortable: true },
+    { field: 'mbL_NO', width: 120, title: '提单号', showHeaderOverflow: true, sortable: true },
+    { field: 'yarD_NAME', width: 100, title: '场站', showHeaderOverflow: true, sortable: true },
+    { field: 'contA_INFO', width: 100, title: '箱型箱量', showHeaderOverflow: true, sortable: true },
+    { field: 'tasK_REQ_USERNAME', width: 100, title: '操作名称', showHeaderOverflow: true, sortable: true },
+    { field: 'carrieR_ID', width: 100, title: '船公司', showHeaderOverflow: true, sortable: true },
+    { field: 'trucK_NAME', width: 100, title: '车队', showHeaderOverflow: true, sortable: true },
+    { field: 'customeR_NAME', width: 100, title: '委托单位', showHeaderOverflow: true, sortable: true },
     { field: 'createdTime', width: 180, title: '接收时间', showHeaderOverflow: true, sortable: true },
     { field: 'status', width: 100, title: '任务状态', showHeaderOverflow: true, sortable: true, slots: { default: 'status' } },
-    { field: 'taskNo', width: 150, title: '任务流水号', showHeaderOverflow: true, sortable: true },
-    { field: 'taskSource', width: 100, title: '任务来源', showHeaderOverflow: true, sortable: true, slots: { default: 'taskScource' } },
+    { field: 'tasK_NO', width: 150, title: '任务流水号', showHeaderOverflow: true, sortable: true },
+    { field: 'tasK_SOURCE', width: 100, title: '任务来源', showHeaderOverflow: true, sortable: true, slots: { default: 'taskScource' } },
     { field: 'createdUserName', width: 100, title: '接收人', showHeaderOverflow: true, sortable: true },
-    { field: 'complateDealName', width: 100, title: '完成方式', showHeaderOverflow: true, sortable: true },
+    { field: 'completE_DEAL_NAME', width: 100, title: '完成方式', showHeaderOverflow: true, sortable: true },
     { field: 'operate', title: '操作', width: 100, noDraggable: true, slots: { default: 'operate' }, fixed: 'right', resizable: false }
   ],
   columnsAllData: [
diff --git a/src/views/main/ruleTemp/detail.vue b/src/views/main/ruleTemp/detail.vue
index 3fdd8f8..96e2adc 100644
--- a/src/views/main/ruleTemp/detail.vue
+++ b/src/views/main/ruleTemp/detail.vue
@@ -344,7 +344,6 @@ export default {
       deep: true,
       immediate: true,
       handler(val) {
-        console.log(this.$route.path)
         if (this.$route.path === '/ruleTemp/detail') {
           if (this.$route.query.type === 'add') {
             this.form = {
@@ -375,6 +374,10 @@ export default {
             ]
             this.suggestList = []
             this.usreList = []
+            if (this.$route.query.carrierid) {
+              this.form.carrierId = this.$route.query.carrierid
+              this.form.carrier = this.$route.query.carrier
+            }
           }
           if (this.$route.query.type === 'edit') {
             this.suggestList = []
diff --git a/src/views/main/ruleTemp/index.vue b/src/views/main/ruleTemp/index.vue
index cc9779a..5b50b60 100644
--- a/src/views/main/ruleTemp/index.vue
+++ b/src/views/main/ruleTemp/index.vue
@@ -39,7 +39,10 @@
               <a-row>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="订舱账号">
-                    <a-input size="small" placeholder="请输入订舱账号" v-model="queryParam.BookingAccount" />
+                    <a-input
+                      size="small"
+                      placeholder="请输入订舱账号"
+                      v-model="queryParam.BookingAccount" />
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -105,7 +108,7 @@
         </template>
       </vxe-grid>
     </a-card>
-    <a-modal :maskClosable="false" :width="800" :visible="addVisible" @ok="addSubmit" @cancel="addCancel">
+    <a-modal :maskClosable="false" :width="800" :visible="addVisible" @ok="addSubmit" @cancel="addVisible=false">
       <a-radio-group class="group-label-box" v-model="carrierRadio">
         <a-radio value="COSCO">中远海运 <img class="radio-logo" src="../../../assets/logo/COSCO.png" /></a-radio>
         <a-radio value="EMC">长荣<img class="radio-logo" src="../../../assets/logo/EMC.png" /></a-radio>
@@ -133,11 +136,23 @@ export default {
             vesselData: [],
             carrierData: [],
             TypeData: [],
+            carrierRadio: '',
             // 高级搜索 展开/关闭
             advanced: false,
             loading: false,
             setVisible: false,
+            addVisible: false,
             setVisible1: false,
+            carrierDataList: [
+                {
+                    name: '中远海运',
+                    code: 'COSCO'
+                },
+                {
+                    name: '长荣',
+                    code: 'EMC'
+                }
+            ],
             queryParam: {
                 PageNo: 1,
                 PageSize: 10,
@@ -304,7 +319,21 @@ export default {
             this.$router.push({ name: 'ruleTempDetail', query: { type: 'copy', id: pkIdArr[0] } })
         },
         handleAdd() {
-            this.$router.push({ name: 'ruleTempDetail', query: { type: 'add' } })
+            this.addVisible = true
+        },
+        addSubmit() {
+            if (this.carrierRadio === '') {
+                this.$message.warning('请选择船公司')
+                return false
+            }
+            let name = ''
+            this.carrierDataList.forEach(item => {
+                if (item.code === this.carrierRadio) {
+                    name = item.name
+                }
+            })
+            this.$router.push({ name: 'ruleTempDetail', query: { type: 'add', carrierid: this.carrierRadio, carrier: name } })
+            this.addVisible = false
         },
         filterOption(input, option) {
             return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
@@ -493,4 +522,5 @@ button {
         }
     }
 }
+@import url('../BookingLedger/list/list.less');
 </style>
diff --git a/src/views/main/taskCustom/data.json b/src/views/main/taskCustom/data.json
index 2ea7731..3244ed7 100644
--- a/src/views/main/taskCustom/data.json
+++ b/src/views/main/taskCustom/data.json
@@ -1,188 +1,313 @@
 [
     {
-        "type":"基础",
+        "type":"basic",
+        "title":"基础信息",
         "list":[
-            { "title":"任务流水号","field":"taskNo","width": 100  },
-            { "title":"任务类型","field":"taskNo","width": 100  },
-            { "title":"任务来源","field":"taskNo","width": 100  },
-            { "title":"状态","field":"taskNo","width": 100  },
-            { "title":"任务标题","field":"taskNo","width": 100  },
-            { "title":"任务描述","field":"taskNo","width": 100  },
-            { "title":"外业务编号","field":"taskNo","width": 100  },
-            { "title":"外业务类型","field":"taskNo","width": 100  },
-            { "title":"基础业务类型","field":"taskNo","width": 100  },
-            { "title":"船公司代号","field":"taskNo","width": 100  },
-            { "title":"主单号","field":"taskNo","width": 100  },
-            { "title":"备注","field":"taskNo","width": 100  },
-            { "title":"是否异常","field":"taskNo","width": 100  },
-            { "title":"是否公共","field":"taskNo","width": 100  },
-            { "title":"是否完成","field":"taskNo","width": 100  },
-            { "title":"任务启动时间","field":"taskNo","width": 100  },
-            { "title":"任务完成时间","field":"taskNo","width": 100  },
-            { "title":"反馈结果","field":"taskNo","width": 100  },
-            { "title":"开船日期","field":"taskNo","width": 100  },
-            { "title":"任务完成方式","field":"taskNo","width": 100  },
-            { "title":"签单方式","field":"taskNo","width": 100  },
-            { "title":"发送方代码","field":"taskNo","width": 100  },
-            { "title":"发送方名称","field":"taskNo","width": 100  },
-            { "title":"任务请求人","field":"taskNo","width": 100  },
-            { "title":"箱型箱量","field":"taskNo","width": 100  },
-            { "title":"船名航次","field":"taskNo","width": 100  },
-            { "title":"场站","field":"taskNo","width": 100  },
-            { "title":"车队名称","field":"taskNo","width": 100  },
-            { "title":"委托客户","field":"taskNo","width": 100  },
-            { "title":"要求到达时间","field":"taskNo","width": 100  },
-            { "title":"创建时间","field":"taskNo","width": 100  },
-            { "title":"修改时间","field":"taskNo","width": 100  },
-            { "title":"创建人","field":"taskNo","width": 100  },
-            { "title":"修改人","field":"taskNo","width": 100  },
-            { "title":"实际操作人","field":"taskNo","width": 100  },
-            { "title":"批次统计","field":"taskNo","width": 100  }
-
-        ]
+            {"field":"tasK_NO","title":"任务流水号","width":150},
+            {"field":"tasK_TYPE","title":"任务类型","width":100,"slots": { "default": "taskType" }},
+            {"field":"tasK_SOURCE","title":"任务来源","width":100,"slots": { "default": "taskScource" }},
+            {"field":"statuS_NAME","title":"状态","width":100,"slots": { "default": "status" }},
+            {"field":"tasK_TITLE","title":"任务标题","width":200,"slots": { "default": "taskTitle" }},
+            {"field":"tasK_DESP","title":"任务描述","width":100},
+            {"field":"ouT_BUSI_NO","title":"外业务编号","width":120},
+            {"field":"ouT_BUSI_TYPE","title":"外业务类型","width":120,"slots": { "default": "ouT_BUSI_TYPE" }},
+            {"field":"tasK_BASE_TYPE","title":"基础业务类型","width":120},
+            {"field":"carrieR_ID","title":"船公司代号","width":100},
+            {"field":"mbL_NO","title":"主单号","width":100},
+            {"field":"remark","title":"备注","width":100},
+            {"field":"iS_EXCEPT","title":"是否异常","width":100,"slots": { "default": "iS_EXCEPT" }},
+            {"field":"iS_PUBLIC","title":"是否公共","width":100,"slots": { "default": "iS_PUBLIC" }},
+            {"field":"iS_COMPLETE","title":"是否完成","width":100,"slots": { "default": "iS_COMPLETE" }},
+            {"field":"begiN_DATE","title":"任务启动时间","width":120},
+            {"field":"completE_DATE","title":"任务完成时间","width":120},
+            {"field":"resulT_NOTE","title":"反馈结果","width":100},
+            {"field":"etd","title":"开船日期","width":100},
+            {"field":"completE_DEAL_NAME","title":"任务完成方式","width":120},
+            {"field":"issuE_TYPE_NAME","title":"签单方式","width":100},
+            {"field":"tasK_REQ_USERNAME","title":"任务请求人","width":100},
+            {"field":"contA_INFO","title":"箱型箱量","width":100},
+            {"field":"vesseL_VOYNO","title":"船名航次","width":100},
+            {"field":"yarD_NAME","title":"场站","width":100},
+            {"field":"trucK_NAME","title":"车队名称","width":100},
+            {"field":"customeR_NAME","title":"委托客户","width":100},
+            {"field":"needArriveTime","title":"要求到达时间","width":120},
+            {"field":"realUserName","title":"实际操作人","width":100},
+            {"field":"batcH_STATIC","title":"批次统计","width":100},
+            {"field":"systeM_NAME","title":"平台名称","width":100}
+            ]
     },
     {
-        "type":"SI反馈入库",
+        "type":"SI_FEEDBACK",
+        "title":"SI反馈入库",
         "list":[
-            { "title":"船公司","field":"taskNo","width": 100  },
-            { "title":"提取签单方式","field":"taskNo","width": 100  },
-            { "title":"通知接收时间","field":"taskNo","width": 100  },
-            { "title":"签单方式","field":"taskNo","width": 100  },
-            { "title":"截单上传时间","field":"taskNo","width": 100  },
-            { "title":"提单份数","field":"taskNo","width": 100  },
-            { "title":"放单方式","field":"taskNo","width": 100  },
-            { "title":"是否拆单","field":"taskNo","width": 100  },
-            { "title":"发货人","field":"taskNo","width": 100  },
-            { "title":"收货人","field":"taskNo","width": 100  },
-            { "title":"通知人","field":"taskNo","width": 100  },
-            { "title":"第二通知人","field":"taskNo","width": 100  },
-            { "title":"订舱方","field":"taskNo","width": 100  },
-            { "title":"唛头","field":"taskNo","width": 100  },
-            { "title":"HS代码","field":"taskNo","width": 100  },
-            { "title":"货描","field":"taskNo","width": 100  },
-            { "title":"件数","field":"taskNo","width": 100  },
-            { "title":"包装","field":"taskNo","width": 100  },
-            { "title":"毛重","field":"taskNo","width": 100  },
-            { "title":"尺码","field":"taskNo","width": 100  },
-            { "title":"船名","field":"taskNo","width": 100  },
-            { "title":"海关航次","field":"taskNo","width": 100  },
-            { "title":"商品名称","field":"taskNo","width": 100  },
-            { "title":"收货地代码","field":"taskNo","width": 100  },
-            { "title":"收货地","field":"taskNo","width": 100  },
-            { "title":"起运港代码","field":"taskNo","width": 100  },
-            { "title":"起运港","field":"taskNo","width": 100  },
-            { "title":"卸货港代码","field":"taskNo","width": 100  },
-            { "title":"卸货港","field":"taskNo","width": 100  },
-            { "title":"交货地代码","field":"taskNo","width": 100  },
-            { "title":"交货地","field":"taskNo","width": 100  },
-            { "title":"处理状态","field":"taskNo","width": 100  },
-            { "title":"自动更新订舱","field":"taskNo","width": 100  },
-            { "title":"处理结果","field":"taskNo","width": 100  },
-            { "title":"处理时间","field":"taskNo","width": 100  },
-            { "title":"比对差异数量","field":"taskNo","width": 100  },
-            { "title":"是否已更新订舱","field":"taskNo","width": 100  },
-            { "title":"更新订舱时间","field":"taskNo","width": 100  }
+            { "title":"船公司","field":"carrieR_ID","width": 100  },
+            { "title":"提取签单方式","field":"takE_ISSUETYPE_NAME","width": 120  },
+            { "title":"通知接收时间","field":"noticE_DATE","width": 120  },
+            { "title":"签单方式","field":"issuetype","width": 100  },
+            { "title":"截单上传时间","field":"submitteD_DATE","width": 120  },
+            { "title":"提单份数","field":"billoF_NUM","width": 100  },
+            { "title":"放单方式","field":"releasE_INSTRUCTION","width": 100  },
+            { "title":"是否拆单","field":"sI_SUBTYPE","width": 100,"slots": { "default": "sI_SUBTYPE" }  },
+            { "title":"发货人","field":"shipper","width": 100  },
+            { "title":"收货人","field":"consignee","width": 100  },
+            { "title":"通知人","field":"notifyparty","width": 100  },
+            { "title":"第二通知人","field":"notifypartY2","width": 100  },
+            { "title":"订舱方","field":"transporT_RECEIVER","width": 100  },
+            { "title":"唛头","field":"marks","width": 100  },
+            { "title":"HS代码","field":"hscode","width": 100  },
+            { "title":"货描","field":"description","width": 100  },
+            { "title":"件数","field":"pkgs","width": 100  },
+            { "title":"包装","field":"kindpkgs","width": 100  },
+            { "title":"毛重","field":"kgs","width": 100  },
+            { "title":"尺码","field":"cbm","width": 100  },
+            { "title":"船名","field":"vessel","width": 100  },
+            { "title":"海关航次","field":"voyno","width": 100  },
+            { "title":"商品名称","field":"commodity","width": 100  },
+            { "title":"收货地代码","field":"placereceiptid","width": 100  },
+            { "title":"收货地","field":"placereceipt","width": 100  },
+            { "title":"起运港代码","field":"portloadid","width": 100  },
+            { "title":"起运港","field":"portload","width": 100  },
+            { "title":"卸货港代码","field":"portdischargeid","width": 100  },
+            { "title":"卸货港","field":"portdischarge","width": 100  },
+            { "title":"交货地代码","field":"placedeliveryid","width": 100  },
+            { "title":"交货地","field":"placedelivery","width": 100  },
+            { "title":"处理状态","field":"procesS_STATUS","width": 100  },
+            { "title":"自动更新订舱","field":"iS_SET_AUTO_UPD_BOOKING","width": 120  },
+            { "title":"处理结果","field":"procesS_RESULT","width": 100  },
+            { "title":"处理时间","field":"procesS_DATE","width": 100  },
+            { "title":"比对差异数量","field":"difF_NUM","width": 120  },
+            { "title":"是否已更新订舱","field":"iS_UPDATE_BOOKING","width": 140,"slots": { "default": "iS_UPDATE_BOOKING" }  },
+            { "title":"更新订舱时间","field":"updatE_BOOKING_DATE","width": 140  }
         ]
     },
     {
         "type":"BC",
+        "title":"BC任务",
+        "list":[
+            { "title":"订舱单位","field":"bookinG_PARTY","width": 100  },
+            { "title":"业务类型","field":"busI_TYPE","width": 100,"slots": { "default": "busI_TYPE" }  },
+            { "title":"发货人","field":"shipper","width": 100  },
+            { "title":"收货人","field":"consignee","width": 100  },
+            { "title":"通知人","field":"notifyparty","width": 100  },
+            { "title":"BC更新次数","field":"bC_MODIFY_TIMES","width": 120  },
+            { "title":"BC更新时间","field":"bC_MODIFY_DATE","width": 120  },
+            { "title":"主单号","field":"mbL_NO","width": 100  },
+            { "title":"船名","field":"vessel","width": 100  },
+            { "title":"航次","field":"voyno","width": 100  },
+            { "title":"船公司","field":"carrier","width": 100  },
+            { "title":"收货地","field":"placereceipt","width": 100  },
+            { "title":"装货港","field":"portload","width": 100  },
+            { "title":"截关时间","field":"closinG_DATE","width": 100  },
+            { "title":"截VGM时间","field":"vgM_CUTOFF_TIME","width": 100  },
+            { "title":"ETA","field":"eta","width": 100  },
+            { "title":"ETD","field":"etd","width": 100  },
+            { "title":"卸货港","field":"portdischarge","width": 100  },
+            { "title":"交货地","field":"placedelivery","width": 100  },
+            { "title":"目的港ETA","field":"poD_ETA","width": 100  },
+            { "title":"装运方式","field":"shippinG_METHOD","width": 100  },
+            { "title":"运输条款","field":"service","width": 100  },
+            { "title":"港前运输形态","field":"pretranS_MODE","width": 100  },
+            { "title":"品名","field":"description","width": 100  },
+            { "title":"签单地点","field":"issueplace","width": 100  },
+            { "title":"集港码头","field":"collectioN_TERMINAL","width": 100  },
+            { "title":"约号","field":"contractno","width": 100  },
+            { "title":"预付地点","field":"prepardat","width": 100  },
+            { "title":"船代","field":"shiP_AGENT","width": 100  },
+            { "title":"场站","field":"yard","width": 100  },
+            { "title":"场站联系人","field":"yarD_CONTACT_USR","width": 100  },
+            { "title":"场站联系电话","field":"yarD_CONTACT_TEL","width": 100  },
+            { "title":"截单时间","field":"cuT_SINGLE_TIME","width": 100  },
+            { "title":"一代客服姓名","field":"fsT_CUSTOMER_SER_USRNAME","width": 120  },
+            { "title":"一代客服电话","field":"fsT_CUSTOMER_SER_TEL","width": 120  },
+            { "title":"一代客服邮箱","field":"fsT_CUSTOMER_SER_EMAIL","width": 120  },
+            { "title":"备注1","field":"remarK1","width": 100  },
+            { "title":"截港时间","field":"cY_CUTOFF_TIME","width": 100  },
+            { "title":"状态","field":"status","width": 100  },
+            { "title":"最后对应时间","field":"lasT_TOBOOKING_DATE","width": 120  },
+            { "title":"来源邮箱","field":"froM_EMAIL","width": 100  },
+            { "title":"接收邮箱","field":"recV_EMAIL","width": 100  },
+            { "title":"船公司","field":"carrierid","width": 100  },
+            { "title":"航线代码","field":"lanecode","width": 100  },
+            { "title":"航线名称","field":"lanename","width": 100  },
+            { "title":"承运方式","field":"carriagE_TYPE_NAME","width": 100  },
+            { "title":"订舱方式","field":"bookinG_SLOT_TYPE_NAME","width": 100  },
+            { "title":"箱型箱量","field":"ctN_STAT","width": 100  },
+            { "title":"所在周数","field":"weeK_AT","width": 100  },
+            { "title":"箱使天数","field":"detensioN_FREE_DAYS","width": 100  },
+            { "title":"样单截止日期","field":"sI_CUT_DATE","width": 120  },
+            { "title":"舱单截止时间","field":"manifesT_CUT_DATE","width": 120  },
+            { "title":"MDGF提交截止时间","field":"mdgF_CUT_DATE","width": 140  },
+            { "title":"中转港1","field":"transfeR_PORT_1","width": 100  },
+            { "title":"中转港2","field":"transfeR_PORT_2","width": 100  },
+            { "title":"二程船名","field":"seconD_VESSEL","width": 100  },
+            { "title":"二程航次","field":"seconD_VOYNO","width": 100  },
+            { "title":"二程ETD","field":"seconD_ETD","width": 100  },
+            { "title":"二程ETA","field":"seconD_ETA","width": 100  },
+            { "title":"订舱确认时间","field":"bookinG_COMFIRM_DATE","width": 120  },
+            { "title":"批次号","field":"batcH_NO","width": 100  },
+            { "title":"样单截止日期","field":"custoM_SI_CUT_DATE","width": 120  },
+            { "title":"自动转发邮件","field":"iS_SET_AUTO_EMAIL","width": 120,"slots": { "default": "iS_SET_AUTO_EMAIL" }  },
+            { "title":"已发送邮件","field":"iS_SEND_EMAIL","width": 100,"slots": { "default": "iS_SEND_EMAIL" }  },
+            { "title":"比对差异数量","field":"difF_NUM","width": 100  },
+            { "title":"邮件接收人","field":"autO_SEND_USER","width": 100  },
+            { "title":"处理状态","field":"procesS_STATUS","width": 100,"slots": { "default": "procesS_STATUS" }  },
+            { "title":"处理结果","field":"procesS_RESULT","width": 100  },
+            { "title":"处理时间","field":"procesS_DATE","width": 100  },
+            { "title":"计费日期","field":"pricE_CALCULATION_DATE","width": 100  }
+        ]
+    },
+    {
+        "title":"单票账单",
+        "type":"PER_BILL",
+        "list":[
+            { "title":"发票号","field":"invoicE_NO","width": 100  },
+            { "title":"取消号","field":"canceL_NO","width": 100  },
+            { "title":"合计金额","field":"totaL_AMOUNT","width": 100  },
+            { "title":"东胜接收","field":"iS_DONGSH_RECV","width": 100,"slots": { "default": "iS_DONGSH_RECV" }  },
+            { "title":"东胜接收回执 ","field":"iS_DONGSH_RESULT","width": 120,"slots": { "default": "iS_DONGSH_RESULT" }  },
+            { "title":"东胜接收时间","field":"dongsH_RECV_TIME","width": 120  },
+            { "title":"东胜回执时间","field":"dongsH_RESULT_TIME","width": 120  },
+            { "title":"东胜反馈原因","field":"dongsH_RECV_REASON","width": 120  }
+        ]
+    },
+    {
+        "title":"派车任务",
+        "type":"TRUCK_DISPATCH",
         "list":[
-            { "title":"订舱单位","field":"taskNo","width": 100  },
-            { "title":"业务类型","field":"taskNo","width": 100  },
-            { "title":"发货人","field":"taskNo","width": 100  },
-            { "title":"收货人","field":"taskNo","width": 100  },
-            { "title":"通知人","field":"taskNo","width": 100  },
-            { "title":"BC更新次数","field":"taskNo","width": 100  },
-            { "title":"BC更新时间","field":"taskNo","width": 100  },
-            { "title":"主单号","field":"taskNo","width": 100  },
-            { "title":"船名","field":"taskNo","width": 100  },
-            { "title":"航次","field":"taskNo","width": 100  },
-            { "title":"船公司","field":"taskNo","width": 100  },
-            { "title":"收货地","field":"taskNo","width": 100  },
-            { "title":"装货港","field":"taskNo","width": 100  },
-            { "title":"截关时间","field":"taskNo","width": 100  },
-            { "title":"截VGM时间","field":"taskNo","width": 100  },
-            { "title":"ETA","field":"taskNo","width": 100  },
-            { "title":"ETD","field":"taskNo","width": 100  },
-            { "title":"卸货港","field":"taskNo","width": 100  },
-            { "title":"交货地","field":"taskNo","width": 100  },
-            { "title":"目的港ETA","field":"taskNo","width": 100  },
-            { "title":"装运方式","field":"taskNo","width": 100  },
-            { "title":"运输条款","field":"taskNo","width": 100  },
-            { "title":"港前运输形态","field":"taskNo","width": 100  },
-            { "title":"品名","field":"taskNo","width": 100  },
-            { "title":"签单地点","field":"taskNo","width": 100  },
-            { "title":"集港码头","field":"taskNo","width": 100  },
-            { "title":"约号","field":"taskNo","width": 100  },
-            { "title":"预付地点","field":"taskNo","width": 100  },
-            { "title":"船代","field":"taskNo","width": 100  },
-            { "title":"场站","field":"taskNo","width": 100  },
-            { "title":"场站联系人","field":"taskNo","width": 100  },
-            { "title":"场站联系电话","field":"taskNo","width": 100  },
-            { "title":"截单时间","field":"taskNo","width": 100  },
-            { "title":"一代客服姓名","field":"taskNo","width": 100  },
-            { "title":"一代客服电话","field":"taskNo","width": 100  },
-            { "title":"一代客服邮箱","field":"taskNo","width": 100  },
-            { "title":"备注1","field":"taskNo","width": 100  },
-            { "title":"截港时间","field":"taskNo","width": 100  },
-            { "title":"状态","field":"taskNo","width": 100  },
-            { "title":"最后对应时间","field":"taskNo","width": 100  },
-            { "title":"来源邮箱","field":"taskNo","width": 100  },
-            { "title":"接收邮箱","field":"taskNo","width": 100  },
-            { "title":"船公司","field":"taskNo","width": 100  },
-            { "title":"航线代码","field":"taskNo","width": 100  },
-            { "title":"航线名称","field":"taskNo","width": 100  },
-            { "title":"承运方式","field":"taskNo","width": 100  },
-            { "title":"订舱方式","field":"taskNo","width": 100  },
-            { "title":"箱型箱量","field":"taskNo","width": 100  },
-            { "title":"所在周数","field":"taskNo","width": 100  },
-            { "title":"箱使天数","field":"taskNo","width": 100  },
-            { "title":"样单截止日期","field":"taskNo","width": 100  },
-            { "title":"舱单截止时间","field":"taskNo","width": 100  },
-            { "title":"MDGF提交截止时间","field":"taskNo","width": 100  },
-            { "title":"中转港1","field":"taskNo","width": 100  },
-            { "title":"中转港2","field":"taskNo","width": 100  },
-            { "title":"二程船名","field":"taskNo","width": 100  },
-            { "title":"二程航次","field":"taskNo","width": 100  },
-            { "title":"二程ETD","field":"taskNo","width": 100  },
-            { "title":"二程ETA","field":"taskNo","width": 100  },
-            { "title":"订舱确认时间","field":"taskNo","width": 100  },
-            { "title":"批次号","field":"taskNo","width": 100  },
-            { "title":"客户样单截止日期","field":"taskNo","width": 100  },
-            { "title":"是否自动转发邮件","field":"taskNo","width": 100  },
-            { "title":"是否已发送邮件","field":"taskNo","width": 100  },
-            { "title":"比对差异数量","field":"taskNo","width": 100  },
-            { "title":"邮件接收人","field":"taskNo","width": 100  },
-            { "title":"处理状态","field":"taskNo","width": 100  },
-            { "title":"处理结果","field":"taskNo","width": 100  },
-            { "title":"处理时间","field":"taskNo","width": 100  },
-            { "title":"计费日期","field":"taskNo","width": 100  }
+            {"field":"truckCode","title":"车队代码","width":"100"},
+            {"field":"truckName","title":"车队名称","width":"100"},
+            {"field":"toName","title":"TO","width":"100"},
+            {"field":"attn","title":"ATTN","width":"100"},
+            {"field":"attnTel","title":"ATTN电话","width":"100"},
+            {"field":"attnMail","title":"ATTN邮箱","width":"100"},
+            {"field":"attnFax","title":"ATTN传真","width":"100"},
+            {"field":"fromName","title":"FROM","width":"100"},
+            {"field":"fromTel","title":"FROM座机","width":"100"},
+            {"field":"fromMail","title":"FROM邮箱","width":"100"},
+            {"field":"fromMobile","title":"FROM手机号","width":"100"},
+            {"field":"fromFax","title":"FROM传真","width":"100"},
+            {"field":"kgs","title":"吨数","width":"100"},
+            {"field":"fee","title":"陆运费","width":"100"},
+            {"field":"payMethodName","title":"支付方式","width":"100"},
+            {"field":"truckTime","title":"派车日期","width":"100"},
+            {"field":"yardid","title":"提箱场站ID","width":"100"},
+            {"field":"yard","title":"提箱场站","width":"100"},
+            {"field":"yardcontract","title":"场站联系人","width":"100"},
+            {"field":"yardcontracttel","title":"场站联系人电话","width":"140"},
+            {"field":"factoryCode","title":"工厂代码","width":"100"},
+            {"field":"factoryName","title":"工厂名称","width":"100"},
+            {"field":"factoryContact","title":"工厂联系人","width":"100"},
+            {"field":"factoryTel","title":"工厂联系电话","width":"120"},
+            {"field":"returnTime","title":"返场时间","width":"100"},
+            {"field":"inYard","title":"入货场站","width":"100"},
+            {"field":"inYardContact","title":"入货联系人","width":"100"},
+            {"field":"inYardContractTel","title":"入货联系人电话","width":"100"},
+            {"field":"needArriveTime","title":"要求到达时间","width":"100"},
+            {"field":"closingTime","title":"截港日期","width":"100"},
+            {"field":"pickUpTime","title":"提货日期","width":"100"},
+            {"field":"isGuaJi","title":"是否挂机","width":"100"},
+            {"field":"status","title":"状态","width":"100"},
+            {"field":"attention","title":"注意事项","width":"100"},
+            {"field":"remark","title":"备注","width":"100"},
+            {"field":"dispatcherName","title":"调度名称","width":"100"},
+            {"field":"truckFlowNo","title":"派车流水号","width":"100"},
+            {"field":"taskNo","title":"任务流水号","width":"100"},
+            {"field":"vessel","title":"船名","width":"100"},
+            {"field":"voyNo","title":"航次","width":"100"},
+            {"field":"mblNo","title":"提单号","width":"100"},
+            {"field":"cntrTotal","title":"箱型箱量","width":"100"},
+            {"field":"factoryAddr","title":"工厂地址","width":"100"}
         ]
     },
     {
-        "type":"单票账单",
+        "title":"任务截止时间变更通知",
+        "type":"CUT_MODIFY",
         "list":[
-            { "title":"发票号","field":"taskNo","width": 100  },
-            { "title":"取消号","field":"taskNo","width": 100  },
-            { "title":"合计金额","field":"taskNo","width": 100  },
-            { "title":"东胜接收","field":"taskNo","width": 100  },
-            { "title":"东胜接收回执 ","field":"taskNo","width": 100  },
-            { "title":"东胜接收时间","field":"taskNo","width": 100  },
-            { "title":"东胜回执时间","field":"taskNo","width": 100  },
-            { "title":"东胜反馈原因","field":"taskNo","width": 100  }
+            {"field":"carrier","title":"船公司","width":"100"},
+            {"field":"vessel","title":"船名","width":"100"},
+            {"field":"voyno","title":"航次","width":"100"},
+            {"field":"noticE_DATE","title":"通知接收时间","width":"120"}
         ]
     },
     {
-        "type":"单票账单",
+        "title":"Rolling Nomination(预甩货通知)",
+        "type":"ROLLING_NOMINATION",
         "list":[
-            { "title":"发票号","field":"taskNo","width": 100  },
-            { "title":"取消号","field":"taskNo","width": 100  },
-            { "title":"合计金额","field":"taskNo","width": 100  },
-            { "title":"东胜接收","field":"taskNo","width": 100  },
-            { "title":"东胜接收回执 ","field":"taskNo","width": 100  },
-            { "title":"东胜接收时间","field":"taskNo","width": 100  },
-            { "title":"东胜回执时间","field":"taskNo","width": 100  },
-            { "title":"东胜反馈原因","field":"taskNo","width": 100  }
+            {"field":"plaN_TYPE","title":"计划类型","width":"100","slots": { "default": "plaN_TYPE" }},
+            {"field":"batcH_NO","title":"批次号","width":"100"},
+            {"field":"carrierid","title":"船公司代号","width":"100"},
+            {"field":"carrier","title":"船公司","width":"100"},
+            {"field":"confirM_DEAD_LINE","title":"最后确认期限日期","width":"150"},
+            {"field":"reaD_CREATE_TIME","title":"解析生成日期","width":"120"},
+            {"field":"rolL_DOUBLE_REMARK","title":"含有二甩声明备注","width":"150"},
+            {"field":"plaN_TXT","title":"预甩计划详情","width":"100"},
+            {"field":"remark","title":"备注","width":"100"},
+            {"field":"tasK_BATCH_TOTAL","title":"任务批次明细合计","width":"150"},
+            {"field":"tasK_BATCH_PER_TOTAL","title":"任务批次单票合计","width":"150"}
         ]
+    },
+    {
+        "title":"DRAFT转发客户",
+        "type":"DRAFT",
+        "list":[
+            {"field":"carrier","title":"船公司","width":"100"},
+            {"field":"mbL_NO","title":"主单号","width":"100"},
+            {"field":"iS_CHANGE","title":"已发消息提醒","width":"120","slots": { "default": "iS_CHANGE" }},
+            {"field":"iS_EMAIL_SEND","title":"是否邮件推送","width":"120","slots": { "default": "iS_EMAIL_SEND" }},
+            {"field":"senD_EMAIL_DATE","title":"邮件推送时间","width":"120"},
+            {"field":"noticE_DATE","title":"通知接收时间","width":"120"}
+        ]
+    },
+    {
+        "title":"任务目的港未提货",
+        "type":"POD_DISCHARGE_FULL",
+        "list":[
+            {"field":"noticE_TYPE_NAME","title":"通知类型","width":"100"},
+            {"field":"mbL_NO","title":"主单号","width":"100"},
+            {"field":"carrier","title":"船公司","width":"100"},
+            {"field":"noticE_DATE","title":"通知接收时间","width":"120"}
+        ]
+    },
+    {
+        "title":"重要提醒",
+        "type":"CAUTION_NOTICE",
+        "list":[
+            {"field":"sourcE_SYSTEM","title":"来源系统","width":"100"},
+            {"field":"sourcE_BUSI_TYPENAME","title":"来源业务类型","width":"120"},
+            {"field":"notifY_CONTENT","title":"通知内容","width":"100"},
+            {"field":"mbL_NO","title":"提单号","width":"100"},
+            {"field":"carrier","title":"船公司","width":"100"},
+            {"field":"cautioN_NOTICE_TYPE","title":"通知差异类型","width":"120","slots": { "default": "plaN_TYPE" }},
+            {"field":"iS_WEEK_DIFF","title":"计费周差异","width":"100","slots": { "default": "iS_WEEK_DIFF" }},
+            {"field":"iS_PRICE_DATE_DIFF","title":"计费日差异","width":"100","slots": { "default": "iS_PRICE_DATE_DIFF" }},
+            {"field":"iS_TRANSFER","title":"转为中转","width":"100","slots": { "default": "iS_TRANSFER" }},
+            {"field":"iS_VESSEL_CHANGE","title":"船名变化","width":"100","slots": { "default": "iS_VESSEL_CHANGE" }},
+            {"field":"iS_CUT_DATE_ADVANCED","title":"截止时间提前","width":"120","slots": { "default": "iS_CUT_DATE_ADVANCED" }},
+            {"field":"olD_VAL","title":"原始值","width":"100"},
+            {"field":"neW_VAL","title":"修改值","width":"100"}
+            ]
+    },
+    {
+        "title":"航线船舶截止时间调整的通知",
+        "type":"ROUTE_CUT_CHANGE",
+        "list":[
+            {"field":"vessel","title":"船名","width":"100"},
+            {"field":"voyno","title":"航次","width":"100"},
+            {"field":"carrier","title":"船公司","width":"100"},
+            {"field":"reaD_PORTLOAD","title":"装货港提取","width":"100"},
+            {"field":"oriG_ETD","title":"原ETD","width":"100"},
+            {"field":"mdgF_CUT_DATE","title":"MDGF提交截止时间","width":"200"},
+            {"field":"eta","title":"ETA","width":"100"},
+            {"field":"etd","title":"ETD","width":"100"},
+            {"field":"sI_CUT_DATE","title":"样单截止日期","width":"150"},
+            {"field":"tM_SHIFT_CUT_DATE","title":"码头移箱截止时间","width":"150"},
+            {"field":"vgM_CUTOFF_TIME","title":"截VGM时间","width":"100"},
+            {"field":"cY_CUT_DATE","title":"截港/场站收据截止","width":"200"},
+            {"field":"routE_CODE","title":"航线代码","width":"100"},
+            {"field":"emaiL_SUBJECT","title":"邮件对应标题","width":"100"},
+            {"field":"week","title":"周数","width":"100"},
+            {"field":"portloadid","title":"装货港代码","width":"100"},
+            {"field":"portload","title":"装货港","width":"100"}
+            ]
     }
 ]
\ No newline at end of file
diff --git a/src/views/main/taskCustom/index.vue b/src/views/main/taskCustom/index.vue
index 8b42d39..ff6e6bf 100644
--- a/src/views/main/taskCustom/index.vue
+++ b/src/views/main/taskCustom/index.vue
@@ -1,23 +1,71 @@
 <template>
   <a-card :bordered="false">
-    <draggable v-model="Data[0].list" animation="300">
-      <a-row v-for="(item,index) in Data[0].list" :key="index">
-        <a-col :span="24" >
-          <a-checkbox v-model="item.checked">{{ item.title }}</a-checkbox>
-        </a-col>
-      </a-row>
-    </draggable>
+    <div class="main">
+      <div class="left">
+        <div class="title">
+          <span>基础信息</span> <a-button size="small" type="primary" @click="handleSaveBasic">保存</a-button>
+        </div>
+        <a-spin :spinning="loading">
+          <draggable v-model="basicList" animation="300">
+            <a-row style="margin-bottom: 5px;" v-for="(item, index) in basicList" :key="index">
+              <a-col :span="24">
+                <a-checkbox v-model="item.checked">{{ item.title }}</a-checkbox>
+              </a-col>
+            </a-row>
+          </draggable>
+        </a-spin>
+      </div>
+      <div class="right">
+        <div class="title">
+          <span>{{ title }}</span> <a-button size="small" type="primary" @click="handleSave">保存</a-button>
+        </div>
+        <div>
+          <a-select style="width: 270px;margin-bottom: 10px;" size="small" @change="handleChange" v-model="taskType">
+            <a-select-option value="SI_FEEDBACK">SI反馈入库</a-select-option>
+            <a-select-option value="BC">BC任务</a-select-option>
+            <a-select-option value="PER_BILL">单票账单</a-select-option>
+            <a-select-option value="TRUCK_DISPATCH">派车任务</a-select-option>
+            <a-select-option value="CUT_MODIFY">任务截止时间变更通知</a-select-option>
+            <a-select-option value="ROLLING_NOMINATION">Rolling Nomination(预甩货通知)</a-select-option>
+            <a-select-option value="DRAFT">DRAFT转发客户</a-select-option>
+            <a-select-option value="POD_DISCHARGE_FULL">任务目的港未提货</a-select-option>
+            <a-select-option value="CAUTION_NOTICE">重要提醒</a-select-option>
+            <a-select-option value="ROUTE_CUT_CHANGE">航线船舶截止时间调整的通知</a-select-option>
+          </a-select>
+        </div>
+        <a-spin :spinning="loading1">
+          <draggable v-model="taskList" animation="300">
+            <a-row style="margin-bottom: 5px;" v-for="(item, index) in taskList" :key="index">
+              <a-col :span="24">
+                <a-checkbox v-model="item.checked">{{ item.title }}</a-checkbox>
+              </a-col>
+            </a-row>
+          </draggable>
+        </a-spin>
+      </div>
+      <div style="margin-left: 150px;">
+        <a-alert message="上下拖动进行排序" type="info" />
+      </div>
+    </div>
   </a-card>
 </template>
 
 <script>
 import Data from './data.json'
 import draggable from 'vuedraggable'
+import { DjyUserConfigAdd } from '@/api/modular/main/DjyUserConfig'
+import { DjyUserConfigMulti } from '@/api/modular/main/BookingLedger'
 export default {
   data() {
     return {
       Data,
       WebData: [],
+      taskType: 'SI_FEEDBACK',
+      title: 'SI反馈入库',
+      taskList: [],
+      loading: false,
+      basicList: [],
+      loading1: false,
       priorityList: []
     }
   },
@@ -25,13 +73,137 @@ export default {
     draggable
   },
   mounted() {
-    console.log(Data)
+    this.Data.forEach(item => {
+      if (item.type === this.taskType) {
+        this.taskList = item.list
+      }
+    })
+    this.getList()
   },
-
   methods: {
-
+    handleChange(val) {
+      this.Data.forEach(item => {
+        if (item.type === val) {
+          this.title = item.title
+        }
+      })
+      this.funSearchTask(val)
+    },
+    funSearchTask(type) {
+      const query = {
+        typeArr: [type]
+      }
+      this.loading1 = true
+      DjyUserConfigMulti(this.$qs.stringify(query, { arrayFormat: 'repeat' })).then((res) => {
+        this.loading1 = false
+        if (res.data.length === 0) {
+          this.Data.forEach(item => {
+            if (item.type === type) {
+              this.taskList = item.list
+            }
+          })
+        } else {
+          const arr = JSON.parse(res.data[0].configJson)
+          this.taskList = arr.concat(this.funSetArrary(arr, this.taskList))
+        }
+      })
+    },
+    handleSave() {
+      const arr = []
+      this.taskList.forEach(item => {
+        if (item.checked) {
+          arr.push(item)
+        }
+      })
+      this.loading1 = true
+      DjyUserConfigAdd({
+        type: this.taskType,
+        configJson: JSON.stringify(arr)
+      }).then((res) => {
+        this.$message.success('保存成功')
+        this.loading1 = false
+      })
+    },
+    getList() {
+      const query = {
+        typeArr: ['basic', 'SI_FEEDBACK']
+      }
+      this.loading = true
+      this.loading1 = true
+      DjyUserConfigMulti(this.$qs.stringify(query, { arrayFormat: 'repeat' })).then((res) => {
+        let basicArr = []
+        let siArr = []
+        res.data.forEach(item => {
+          if (item.type === 'basic') {
+            basicArr = JSON.parse(item.configJson)
+          }
+          if (item.type === 'SI_FEEDBACK') {
+            siArr = JSON.parse(item.configJson)
+          }
+        })
+        this.basicList = basicArr.concat(this.funSetArrary(basicArr, this.Data[0].list))
+        this.taskList = siArr.concat(this.funSetArrary(siArr, this.Data[1].list))
+        this.$forceUpdate()
+        this.loading = false
+        this.loading1 = false
+      })
+    },
+    funSetArrary(arr1, arr2) {
+      for (let i = 0; i < arr2.length; i++) {
+          const element2 = arr2[i];
+          let found = false;
+          for (let j = 0; j < arr1.length; j++) {
+            const element1 = arr1[j];
+            if (element1.field === element2.field) {
+              found = true;
+              break;
+            }
+          }
+          if (found) {
+            arr2.splice(i, 1);
+            i--;
+          }
+        }
+        return arr2
+    },
+    handleSaveBasic() {
+      const arr = []
+      this.basicList.forEach(item => {
+        if (item.checked) {
+          arr.push(item)
+        }
+      })
+      this.loading = true
+      DjyUserConfigAdd({
+        type: 'basic',
+        configJson: JSON.stringify(arr)
+      }).then((res) => {
+        this.$message.success('保存成功')
+        this.loading = false
+      })
+    }
   }
 }
 </script>
 
-<style scoped lang="less"></style>
+<style scoped lang="less">
+.main {
+  display: flex;
+  padding-left: 100px;
+
+  .title {
+    margin-bottom: 10px;
+
+    span {
+      font-size: 18px;
+      font-weight: bold;
+      color: black;
+      margin-right: 20px;
+    }
+  }
+
+  .left {
+    margin-right: 150px;
+  }
+}
+</style>