diff --git a/.env b/.env
index 33e92d4..c84d1c6 100644
--- a/.env
+++ b/.env
@@ -1,9 +1,9 @@
 NODE_ENV=production
 VUE_APP_PREVIEW=true
 # VUE_APP_TYPE = 'customer'
-# VUE_APP_TYPE = 'hechuan'
+VUE_APP_TYPE = 'hechuan'
 # VUE_APP_TYPE = 'yunyingduan'
-VUE_APP_TYPE = 'gangjie'
+# VUE_APP_TYPE = 'gangjie'
 # 打包部署的三个端 客户端customer 和川端hechuan 运营端djy
 
 # 和川大简云正式
@@ -11,8 +11,8 @@ VUE_APP_TYPE = 'gangjie'
 # VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
 
 # 和川大简云测试
-# VUE_APP_API_BASE_URL=http://60.209.125.238:35100
-# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
+VUE_APP_API_BASE_URL=http://60.209.125.238:35100
+VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
 
 # 客户端测试
 # VUE_APP_API_BASE_URL=http://60.209.125.238:30813
@@ -23,8 +23,8 @@ VUE_APP_TYPE = 'gangjie'
 # VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814
 
 # 港捷
-VUE_APP_API_BASE_URL=http://118.190.144.189:5001
-VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001
+# VUE_APP_API_BASE_URL=http://118.190.144.189:5001
+# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001
 
 # 客户端正式
 # VUE_APP_API_BASE_URL=http://118.190.144.189:6001
diff --git a/src/api/modular/main/TaskmanageList.js b/src/api/modular/main/TaskmanageList.js
index 3f244a1..66e1012 100644
--- a/src/api/modular/main/TaskmanageList.js
+++ b/src/api/modular/main/TaskmanageList.js
@@ -583,3 +583,10 @@ export function SendRollingNominationNotice(parameter) {
   })
 }
 
+export function GetInfoByTaskIdNotice(parameter) {
+  return axios({
+    url: '/TaskCautionNotice/GetInfoByTaskId',
+    method: 'get',
+    params: parameter
+  })
+}
\ No newline at end of file
diff --git a/src/router/generator-routers.js b/src/router/generator-routers.js
index 9da35e4..203af20 100644
--- a/src/router/generator-routers.js
+++ b/src/router/generator-routers.js
@@ -67,6 +67,7 @@ const constantRouterComponents = {
   BCModify: () => import('@/views/main/Taskmanage/BCModify/index'),
   vgmDetail: () => import('@/views/main/Taskmanage/vgmDetail/index'),
   cutTime: () => import('@/views/main/Taskmanage/cutTime/index'),
+  cautionNotice: () => import('@/views/main/Taskmanage/cautionNotice/index'),
   draft: () => import('@/views/main/Taskmanage/draft/index'),
   POD_GATEOUT_FULL: () => import('@/views/main/Taskmanage/POD_GATEOUT_FULL/index'),
   POD_DISCHARGE_FULL: () => import('@/views/main/Taskmanage/POD_DISCHARGE_FULL/index'),
@@ -244,6 +245,17 @@ const userAccount = [
     },
     component: 'cutTime'
   },
+  {
+    name: 'cautionNotice',
+    path: '/commontaskmanage/cautionNotice',
+    pid: 0,
+    id: 183110,
+    meta: {
+      title: '重要提醒',
+      show: false
+    },
+    component: 'cautionNotice'
+  },
   {
     name: 'draft',
     path: '/commontaskmanage/draft',
diff --git a/src/views/main/BookingCustomerLedger/list/index.vue b/src/views/main/BookingCustomerLedger/list/index.vue
index 312cf1d..9d7d375 100644
--- a/src/views/main/BookingCustomerLedger/list/index.vue
+++ b/src/views/main/BookingCustomerLedger/list/index.vue
@@ -75,13 +75,22 @@
                         <a-menu slot="overlay">
                           <a-menu-item>
                             <a-upload
-                              :customRequest="customRequest"
+                              :customRequest="e => customRequest(e, 'COSCO')"
                               :showUploadList="false"
                               :multiple="false"
                               name="file">
                               <div class="nav"><i class="iconfont icon-fuzhi"></i>COSCO导入</div>
                             </a-upload>
                           </a-menu-item>
+                          <a-menu-item>
+                            <a-upload
+                              :customRequest="e => customRequest(e, 'EMC')"
+                              :showUploadList="false"
+                              :multiple="false"
+                              name="file">
+                              <div class="nav"><i class="iconfont icon-fuzhi"></i>EMC导入</div>
+                            </a-upload>
+                          </a-menu-item>
                         </a-menu>
                       </a-dropdown>
                     </a-spin>
@@ -955,10 +964,10 @@ export default {
       }
       console.log('== 展开结束 ==', new Date().getTime() - start)
     },
-    customRequest(data) {
+    customRequest(data, type) {
       const formData = new FormData()
       formData.append('file', data.file)
-      formData.append('carrierId', 'COSCO')
+      formData.append('carrierId', type)
       this.importLoad = true
       ImportBookingCurst(formData, (percent) => this.setUploadProcess(percent)).then((res) => {
         if (res.success) {
diff --git a/src/views/main/BookingDjy/detail/index.vue b/src/views/main/BookingDjy/detail/index.vue
index 14f5ee4..3b3a7ce 100644
--- a/src/views/main/BookingDjy/detail/index.vue
+++ b/src/views/main/BookingDjy/detail/index.vue
@@ -541,8 +541,7 @@
                     label="账号"
                     :labelCol="labelCol"
                     :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="reeferf">
+                    has-feedback>
                     <span>{{ details.extendData.Account }}</span>
                   </a-form-model-item>
                 </a-col>
@@ -552,11 +551,30 @@
                     label="密码"
                     :labelCol="labelCol"
                     :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="reeferf">
+                    has-feedback>
                     <span>{{ details.extendData.Password }}</span>
                   </a-form-model-item>
                 </a-col>
+                <a-col :span="4" v-if="details.carrierid==='EMC'">
+                  <a-form-model-item
+                    class="from-label"
+                    label="联系人"
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    has-feedback>
+                    <span>{{ details.extendData.ContactName }}</span>
+                  </a-form-model-item>
+                </a-col>
+                <a-col :span="4" v-if="details.carrierid==='EMC'">
+                  <a-form-model-item
+                    class="from-label"
+                    label="联系电话"
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    has-feedback>
+                    <span>{{ details.extendData.ContactTel }}</span>
+                  </a-form-model-item>
+                </a-col>
               </a-row>
               <a-row>
                 <a-col :span="4">
@@ -565,11 +583,30 @@
                     label="邮箱"
                     :labelCol="labelCol"
                     :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="reeferf">
+                    has-feedback>
                     <span>{{ details.extendData.OpMail }}</span>
                   </a-form-model-item>
                 </a-col>
+                <a-col :span="4" v-if="details.carrierid==='EMC'">
+                  <a-form-model-item
+                    class="from-label"
+                    label="运送方式"
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    has-feedback>
+                    <span>{{ details.extendData.YSFS }}</span>
+                  </a-form-model-item>
+                </a-col>
+                <a-col :span="4" v-if="details.carrierid==='EMC'">
+                  <a-form-model-item
+                    class="from-label"
+                    label="运送形态"
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    has-feedback>
+                    <span>{{ details.extendData.YSXT }}</span>
+                  </a-form-model-item>
+                </a-col>
               </a-row>
             </div>
           </a-row>
@@ -644,7 +681,7 @@ export default {
       textEntryModalVisible: false,
       textEntryModalTitle: '',
       historyData: {},
-      sendLoading:false,
+      sendLoading: false,
       textEntryType: '',
       pkgstotalRes: 0,
       modelTitle: '',
@@ -799,6 +836,9 @@ export default {
           } else {
             res.data.extendData = {}
           }
+          if (res.data.carrierid === 'EMC') {
+            res.data.contractno = res.data.extendData.ContractType + '-' + res.data.contractno
+          }
           this.details = res.data
           if (Object.keys(this.details.files).length > 0) {
             const arr = []
diff --git a/src/views/main/BookingLedger/list/modules/formLabel.vue b/src/views/main/BookingLedger/list/modules/formLabel.vue
index 4c58957..22b1963 100644
--- a/src/views/main/BookingLedger/list/modules/formLabel.vue
+++ b/src/views/main/BookingLedger/list/modules/formLabel.vue
@@ -13,7 +13,7 @@
         @dateChange="dateChangeFun"></datePickerView>
     </template>
     <template v-else-if="labelData.type == 'dateRange'">
-      <div class="picker-box" style="display: flex; padding-right: 2px">
+      <div class="picker-box" style="display: flex; padding-right: 2px;align-items: center;">
         <a-date-picker
           style="min-width: 30px; flex: 1"
           v-model="startValue"
@@ -444,6 +444,8 @@ export default {
           return this.labelData.data
         case 'taskSource':
           return this.labelData.data
+        case 'taskType':
+          return this.labelData.data
         case 'OrgSale':
           return this.dpTreeList
         case 'OrgOp':
diff --git a/src/views/main/Customer/editForm.vue b/src/views/main/Customer/editForm.vue
index 06ce6ed..951aff8 100644
--- a/src/views/main/Customer/editForm.vue
+++ b/src/views/main/Customer/editForm.vue
@@ -452,6 +452,7 @@ export default {
       })
       this.TypeData = this.$options.filters['dictData']('djy_cust_contact_role')
       this.propStringData = this.$options.filters['dictData']('djy_cust_prop')
+      console.log(this.propStringData)
       this.getUserList()
     },
     getUserList(name = '', type) {
diff --git a/src/views/main/Taskmanage/TaskmanageList/index.vue b/src/views/main/Taskmanage/TaskmanageList/index.vue
index 35dbc69..57d5072 100644
--- a/src/views/main/Taskmanage/TaskmanageList/index.vue
+++ b/src/views/main/Taskmanage/TaskmanageList/index.vue
@@ -31,15 +31,18 @@
             <div class="nav-no-data" v-else><i class="iconfont icon-guanli"></i><span>暂无导航数据</span></div>
             <a-tabs v-model="activeNextKey" hide-add size="small" @change="changeNextLevel" v-if="levelNext.length > 0">
               <a-tab-pane v-for="level in levelNext" :key="level.key" :tab="level.name" style="margin-right: 6px">
-                <a-tree show-line :default-expanded-keys="['0-0-0']" :selected-keys="activeTreeKey" @select="onSelect">
+                <a-tree style="color:red" show-line :default-expanded-keys="['0-0-0']" :selected-keys="activeTreeKey" @select="onSelect">
                   <a-icon slot="switcherIcon" type="down" />
                   <a-tree-node key="0-0" title="我的任务">
                     <a-tree-node
                       v-for="(threeLevel, tindex) in levelTree"
                       :key="`0-0-${tindex}`"
-                      :title="`${threeLevel.name}  (${threeLevel.total})`"
+                      :style="{color: threeLevel.key==='CAUTION_NOTICE' ? 'red' : '' }"
                       :show-icon="false"
-                    />
+                    >
+                      <div style="width:80px;word-break: break-all" slot="title" :style="{color: threeLevel.key==='CAUTION_NOTICE' ? 'red' : '' }">
+                        {{ `${threeLevel.name}  (${threeLevel.total})` }}</div>
+                    </a-tree-node>
                   </a-tree-node>
                 </a-tree>
               </a-tab-pane>
@@ -735,21 +738,22 @@ export default {
       }
     },
     getSelectFirst({ form, index, value }) {
-      // const fun = this.emnuSelectApi(form.label)
-      // if (fun) {
-      //   GetParaInfo({ ParaType: fun })
-      //     .then((res) => {
-      //       if (res.success) {
-      //         this.formData[index].dataList = res.data.rows
-      //         this.$refs[`fromlabel-${form.label}`][0].$data.dataList = res.data.rows
-      //       } else {
-      //         this.$message.error(res.message)
-      //       }
-      //     })
-      //     .catch((err) => {
-      //       console.log(err)
-      //     })
-      // }
+      console.log(111)
+      const fun = this.emnuSelectApi(form.label)
+      if (fun) {
+        GetParaInfo({ ParaType: fun })
+          .then((res) => {
+            if (res.success) {
+              this.formData[index].dataList = res.data.rows
+              this.$refs[`fromlabel-${form.label}`][0].$data.dataList = res.data.rows
+            } else {
+              this.$message.error(res.message)
+            }
+          })
+          .catch((err) => {
+            console.log(err)
+          })
+      }
     },
     pressEnterFun() {
       this.tableRefresh()
@@ -1493,6 +1497,9 @@ export default {
       } else if (data.taskType === 'VGM_FEEDBACK') {
         // ROLLING_NOMINATION
         this.$router.push({ path: '/commontaskmanage/vgmDetail', query: { taskPKId: data.pkId, type: 'VGM_FEEDBACK' } })
+      } else if (data.taskType === 'CAUTION_NOTICE') {
+        // ROLLING_NOMINATION
+        this.$router.push({ path: '/commontaskmanage/cautionNotice', query: { taskPKId: data.pkId } })
       } else if (data.taskType === 'VGM_MISSING') {
         // ROLLING_NOMINATION
         this.$router.push({ path: '/commontaskmanage/vgmDetail', query: { taskPKId: data.pkId, type: 'VGM_MISSING' } })
diff --git a/src/views/main/Taskmanage/cautionNotice/index.vue b/src/views/main/Taskmanage/cautionNotice/index.vue
new file mode 100644
index 0000000..61ba7c9
--- /dev/null
+++ b/src/views/main/Taskmanage/cautionNotice/index.vue
@@ -0,0 +1,644 @@
+<template>
+  <div class="Main">
+    <a-spin :spinning="spinning">
+      <div class="LeftHead">
+        <p>
+          <a-icon style="color: red;margin-right: 10px;font-size: 16px" type="exclamation-circle" />
+          重要提醒({{ tableList.cautionNoticeTypeName }})
+          -{{ tableList.carrier }} </p>
+        <p>时间：{{ tableList.createTime }}</p>
+      </div>
+      <a-row style="font-weight: bold">
+        <a-col :span="4">
+          提单号：{{ tableList.mblNo }}
+        </a-col>
+        <a-col :span="4">
+          原值：{{ tableList.origVal }}
+        </a-col>
+      </a-row>
+      <a-row style="font-weight: bold">
+        <a-col :span="4">
+          差异内容：{{ tableList.cautionNoticeTypeName }}
+        </a-col>
+        <a-col :span="4">
+          新值：{{ tableList.newVal }}
+        </a-col>
+      </a-row>
+      <a-row style="margin-top: 40px;padding-left: 120px" type="flex"  :gutter="16">
+        <a-col>
+          <a-button type="primary" @click="OpenUser">
+            转移任务
+          </a-button>
+        </a-col>
+        <a-col>
+          <a-button type="primary" @click="FnCompleteTask">
+            完成任务
+          </a-button>
+        </a-col>
+        <a-col>
+          <a-button type="danger" @click="FnCancelTask">
+            取消任务
+          </a-button>
+        </a-col>
+      </a-row>
+    </a-spin>
+    <a-modal v-model="visible" title="生成方式选择" @ok="handleOk" width="40%">
+      <a-radio-group default-value="GEN_BOOKING_SLOT" v-model="CreateData.generateMethod">
+        <a-radio value="GEN_BOOKING_SLOT">
+          直接生成舱位和订舱
+        </a-radio>
+        <a-radio value="GEN_BOOKING">
+          只生成订舱
+        </a-radio>
+        <a-radio value="GEN_SLOT">
+          只生成舱位
+        </a-radio>
+        <a-radio value="GEN_EXIST_BOOKING">
+          匹配已有订舱
+        </a-radio>
+      </a-radio-group>
+      <p class="modaltitle">订舱录入</p>
+      <a-form class="Editing">
+        <a-row>
+          <a-col :span="16">
+            <a-form-item label="委托单位：" :label-col="formItemLayout.labelCol3" :wrapper-col="formItemLayout.wrapperCol3">
+              <a-select
+                show-search
+                v-model="CreateData.customerId"
+                :default-active-first-option="false"
+                :show-arrow="false"
+                :filter-option="false"
+                :not-found-content="null"
+                @search="SearchCustomer"
+                @change="ChangeCustomer">
+                <a-select-option v-for="(item, index) in CustomerList" :key="index" :value="item.id">
+                  {{ item.shortName }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="联系人：" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
+              <a-select
+                show-search
+                v-model="CreateData.customerContactId"
+                :default-active-first-option="false"
+                :show-arrow="false"
+                :filter-option="false"
+                :not-found-content="null"
+                @search="SearchUser"
+                @change="ChangeCustomerList">
+                <a-select-option v-for="item in customerByList" :key="item.id" :value="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="销售：" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
+              <a-select
+                show-search
+                v-model="CreateData.saleId"
+                :default-active-first-option="false"
+                :show-arrow="false"
+                :filter-option="false"
+                :not-found-content="null"
+                @search="SearchUser"
+                @change="e => {
+                  ChangeUser(e, 'saleName')
+                }
+                ">
+                <a-select-option v-for="item in UserList" :key="item.id" :value="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="操作：" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
+              <a-select
+                show-search
+                v-model="CreateData.opId"
+                :default-active-first-option="false"
+                :show-arrow="false"
+                :filter-option="false"
+                :not-found-content="null"
+                @search="SearchUser"
+                @change="e => {
+                  ChangeUser(e, 'opName')
+                }
+                ">
+                <a-select-option v-for="item in UserList" :key="item.id" :value="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="单证：" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
+              <a-select
+                show-search
+                v-model="CreateData.docId"
+                :default-active-first-option="false"
+                :show-arrow="false"
+                :filter-option="false"
+                :not-found-content="null"
+                @search="SearchUser"
+                @change="e => {
+                  ChangeUser(e, 'docName')
+                }
+                ">
+                <a-select-option v-for="item in UserList" :key="item.id" :value="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="航线操作：" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
+              <a-select
+                show-search
+                v-model="CreateData.routeID"
+                :default-active-first-option="false"
+                :show-arrow="false"
+                :filter-option="false"
+                :not-found-content="null"
+                @search="SearchUser"
+                @change="e => {
+                  ChangeUser(e, 'route')
+                }
+                ">
+                <a-select-option v-for="item in UserList" :key="item.id" :value="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="航线管理：" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
+              <a-select
+                show-search
+                v-model="CreateData.lineManageID"
+                :default-active-first-option="false"
+                :show-arrow="false"
+                :filter-option="false"
+                :not-found-content="null"
+                @search="SearchUser"
+                @change="e => {
+                  ChangeUser(e, 'lineManage')
+                }
+                ">
+                <a-select-option v-for="item in UserList" :key="item.id" :value="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="16">
+            <a-form-item label="操作备注：" :label-col="formItemLayout.labelCol3" :wrapper-col="formItemLayout.wrapperCol3">
+              <a-input v-model="CreateData.czRemark" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="16">
+            <a-form-item label="申请箱使：" :label-col="formItemLayout.labelCol3" :wrapper-col="formItemLayout.wrapperCol3">
+              <a-input v-model="CreateData.shenQingXiangShi" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="16">
+            <a-form-item label="服务项目：" :label-col="formItemLayout.labelCol3" :wrapper-col="formItemLayout.wrapperCol3">
+              <div class="content">
+                <div
+                  class="items"
+                  v-for="(serive, sindex) in bookingServiceItem"
+                  :key="sindex"
+                  :class="{ active: serive.isYield }"
+                  @click="saveService(serive)">
+                  {{ serive.serviceProjectName }}
+                </div>
+              </div>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-modal>
+    <a-modal v-model="UserVisible" title="转移任务" @ok="UserhandleOk">
+      <a-form>
+        <a-form-item label="接收人：" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1">
+          <a-select
+            show-search
+            v-model="UserId"
+            :default-active-first-option="false"
+            :show-arrow="false"
+            :filter-option="false"
+            :not-found-content="null"
+            @search="SearchUser">
+            <a-select-option v-for="item in UserList" :key="item.id" :value="item.id">
+              {{ item.name }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+      </a-form>
+    </a-modal>
+    <a-modal v-model="compareResultFlag" :footer="null">
+      <div v-for="(item, index) in compareResultList" :key="index">
+        <span> {{ item.fieldName }}：{{ item.reqVal }}</span>
+        <span style="margin: 0 10px;">变更为</span>
+        <span v-html="item.mergeHtml"></span>
+      </div>
+    </a-modal>
+  </div>
+</template>
+<script>
+import {
+  CutDateGetInfoByTaskId,
+  TransferTask,
+  CreateBookingAndSlot,
+  TaskManageBCSendEmai1,
+  CompleteTask,
+  CancelTaskBC,
+  GetInfoByTaskIdNotice
+} from '@/api/modular/main/TaskmanageList'
+import { mapGetters } from 'vuex'
+import { DjyCustomerSuggest, GetSysUserPage, DjyCustomerContacts } from '@/api/modular/main/BookingLedger'
+export default {
+  data() {
+    return {
+      CustomerList: [],
+      CreateData: {},
+      UserId: '',
+      value: '',
+      type: '',
+      customerByList: [],
+      columns: [
+        {
+          dataIndex: 'mblNo',
+          title: '提单号',
+          key: 'mblNo',
+          align: 'center'
+        },
+        {
+          title: '船名/航次',
+          dataIndex: 'vessel',
+          key: 'vessel',
+          align: 'center',
+          scopedSlots: { customRender: 'vessel' }
+        },
+        {
+          title: '样单截止时间',
+          dataIndex: 'siCutDateTxt',
+          key: 'siCutDateTxt',
+          align: 'center'
+        },
+        {
+          title: '开港时间',
+          dataIndex: 'cyOpenDateTxt',
+          key: 'cyOpenDateTxt',
+          align: 'center'
+        },
+        {
+          title: '截港时间',
+          dataIndex: 'cyCutoffTimeTxt',
+          key: 'cyCutoffTimeTxt',
+          align: 'center'
+        },
+        {
+          title: '舱单-入港清单截止时间',
+          dataIndex: 'manifestCutDateTxt',
+          key: 'manifestCutDateTxt',
+          align: 'center'
+        },
+        {
+          title: 'MDGF提交截止时间',
+          dataIndex: 'mdgfCutDateTxt',
+          key: 'mdgfCutDateTxt',
+          align: 'center'
+        },
+        {
+          title: 'VGM截止时间',
+          dataIndex: 'vgmCutoffTimeTxt',
+          key: 'vgmCutoffTimeTxt',
+          align: 'center'
+        },
+        {
+          title: '海关放行截止时间',
+          dataIndex: 'closingDateTxt',
+          key: 'closingDateTxt',
+          align: 'center'
+        },
+        {
+          title: '已发通知',
+          dataIndex: 'bookingId',
+          key: 'bookingId',
+          align: 'center',
+          scopedSlots: { customRender: 'bookingId' }
+        },
+        {
+          title: '订舱',
+          dataIndex: 'bookingId1',
+          key: 'bookingId1',
+          align: 'center'
+        }
+      ],
+      compareResultFlag: false,
+      formItemLayout: {
+        labelCol1: { span: 6 },
+        wrapperCol1: { span: 18 },
+        labelCol2: { span: 8 },
+        wrapperCol2: { span: 16 },
+        labelCol3: { span: 4 },
+        wrapperCol3: { span: 20 },
+        labelCol4: { span: 8 },
+        wrapperCol4: { span: 16 },
+        labelCol5: { span: 14 },
+        wrapperCol5: { span: 10 },
+        labelCol6: { span: 8 },
+        wrapperCol6: { span: 16 }
+      },
+      visible: false,
+      UserVisible: false,
+      isPdf: '',
+      compareResultList: [],
+      href: '',
+      carrier: '',
+      time: '',
+      spinning: false,
+      tableList: [],
+      bookingServiceItem: [],
+      pdfUrl: '',
+      UserList: [],
+      fileCategory: 'BC_MODIFY'
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'userInfo'
+    ])
+  },
+  watch: {
+    '$route': {
+      immediate: true,
+      handler(newValue, oldValue) {
+        if (newValue.path === '/commontaskmanage/cautionNotice') {
+          this.getList()
+        }
+      }
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    SearchCustomer(e) {
+      DjyCustomerSuggest({ keyword: e, type: 'consignor' }).then(res => {
+        this.CustomerList = res.data.rows
+      })
+    },
+    OpenUser() {
+      this.UserId = ''
+      this.UserVisible = true
+    },
+    ChangeCustomer(e) {
+      this.CustomerList.forEach(item => {
+        if (item.id == e) {
+          this.CreateData.customerName = item.shortName
+        }
+      })
+      DjyCustomerContacts({ customerId: e }).then(res => {
+        if (res.success) {
+          this.customerByList = res.data
+        } else {
+          this.$message.error(res.message)
+        }
+      })
+    },
+    ChangeCustomerList(e) {
+      this.customerByList.forEach(item => {
+        if (item.id == e) {
+          this.CreateData.customerContactName = item.name
+        }
+      })
+    },
+    handleSendMail() {
+      TaskManageBCSendEmai1({ taskPKId: this.$route.query.taskPKId }).then(res => {
+        if (res.data.succ) {
+          this.$message.success(res.data.msg)
+        } else {
+          this.$message.error(res.data.msg)
+        }
+      })
+    },
+    FnCancelTask() {
+      const ApiData = {
+        taskPKId: this.$route.query.taskPKId
+      }
+      CancelTaskBC(ApiData).then(res => {
+        if (res.data.succ) {
+          this.$message.success(res.data.msg)
+        } else {
+          this.$message.error(res.data.msg)
+        }
+      })
+    },
+    SearchUser(e) {
+      GetSysUserPage({ name: e }).then(res => {
+        this.UserList = res.data
+      })
+    },
+    ChangeUser(e, Tname) {
+      this.UserList.forEach(item => {
+        if (item.id == e) {
+          console.log(e)
+          this.CreateData[Tname] = item.name
+        }
+      })
+    },
+    saveService(data) {
+      data.isYield = !data.isYield
+    },
+    FnCompleteTask() {
+      const ApiData = [this.$route.query.taskPKId]
+      CompleteTask(ApiData).then(res => {
+        if (res.data.succ) {
+          this.$message.success(res.data.msg)
+        } else {
+          this.$message.error(res.data.msg)
+        }
+      })
+    },
+    getList() {
+      this.spinning = true
+      const ApiData = {
+        taskPKId: this.$route.query.taskPKId
+      }
+      GetInfoByTaskIdNotice(ApiData).then(res => {
+        if (res.success) {
+          this.tableList = res.data
+          if (res.data.length > 0) {
+            this.time = res.data[0].noticeDate
+            this.carrier = res.data[0].carrier
+          }
+
+          this.$forceUpdate()
+        } else {
+          this.$message.error(res.success)
+        }
+        this.spinning = false
+      })
+    },
+    handleOk() {
+      const projectList = []
+      this.bookingServiceItem.forEach(item => {
+        if (item.isYield) {
+          projectList.push(item.serviceProjectCode)
+        }
+      })
+
+      const ApiData = {
+        bcTaskId: this.$route.query.taskPKId,
+        // bcPkId: '',
+        // slotId: '',
+        projectList,
+        ...this.CreateData
+      }
+      console.log(ApiData)
+      CreateBookingAndSlot(ApiData).then(res => {
+        if (res.data.succ) {
+          this.visible = false
+          this.$message.success(res.data.msg)
+        } else {
+          this.$message.error(res.data.msg)
+        }
+      })
+    },
+    UserhandleOk() {
+      const ApiData = {
+        taskPKId: this.$route.query.taskPKId,
+        userId: this.UserId
+      }
+      TransferTask(ApiData).then(res => {
+        if (res.data.succ) {
+          this.UserVisible = false
+          this.$message.success(res.data.msg)
+        } else {
+          this.$message.error(res.data.msg)
+        }
+      })
+      this.UserVisible = false
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+@import url('../../BookingLedger/detail/style/rightContent.less');
+
+.point {
+  height: 10px;
+  width: 10px;
+  border-radius: 50%;
+  margin: 0 auto;
+  background: green;
+}
+
+.modaltitle {
+  border-bottom: 1px solid #000;
+  width: 5rem;
+  padding: 0.2rem 0.5rem;
+  margin-top: 1rem;
+}
+
+.icon-chuanfanguanli-chuanfanshenqing {
+  color: '#02A7F0';
+}
+
+.Main {
+  width: 100%;
+  background: white;
+  height: 100vh;
+  padding: 0 20px;
+
+  .LeftHead {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    padding: 8px;
+    margin-bottom: 16px;
+    border-bottom: 1px solid #000;
+
+    p {
+      margin: 0;
+
+      &:nth-child(1) {
+        font-weight: bold;
+      }
+    }
+  }
+
+  .title {
+    margin-top: 10px;
+  }
+
+  .CsSee {
+    color: #02a7f3;
+    text-decoration: underline;
+    cursor: pointer;
+  }
+
+  .LeftBottomBox {
+    .unitBox {
+      width: 100%;
+      display: flex;
+
+      .unit {
+        text-align: center;
+        line-height: 30px;
+        height: 30px;
+        // background: rgba(255, 255, 128, 1);
+        // border: 1px solid rgba(170, 10, 0, 1);
+        border-radius: 3px;
+        box-shadow: none;
+        // font-weight: bold;
+        // color: #62a10398;
+        margin: 0.5rem;
+        padding: 0 0.3rem;
+
+        .iconfont {
+          margin-right: 0.3rem;
+        }
+      }
+    }
+  }
+
+  .rightBox {
+
+    // margin-top: 37px;
+    .rightBoxRadio {
+      margin-bottom: 15px;
+    }
+  }
+
+  /deep/.Editing {
+    .ant-form-item {
+      margin: 0 !important;
+      line-height: 1.5 !important;
+
+      .ant-form-item-label {
+        line-height: 1.5 !important;
+      }
+
+      .ant-form-item-control {
+        line-height: 1.5 !important;
+      }
+    }
+  }
+}
+</style>