diff --git a/.env b/.env
index 33e92d4..ce55dd7 100644
--- a/.env
+++ b/.env
@@ -2,8 +2,8 @@ NODE_ENV=production
 VUE_APP_PREVIEW=true
 # VUE_APP_TYPE = 'customer'
 # VUE_APP_TYPE = 'hechuan'
-# VUE_APP_TYPE = 'yunyingduan'
-VUE_APP_TYPE = 'gangjie'
+VUE_APP_TYPE = 'yunyingduan'
+# VUE_APP_TYPE = 'gangjie'
 # 打包部署的三个端 客户端customer 和川端hechuan 运营端djy
 
 # 和川大简云正式
@@ -23,13 +23,13 @@ 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
 # VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001
 
 # 运营端正式
-# VUE_APP_API_BASE_URL=http://118.190.144.189:6002
-# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002
\ No newline at end of file
+VUE_APP_API_BASE_URL=http://118.190.144.189:6002
+VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002
\ No newline at end of file
diff --git a/.env.development b/.env.development
index cf7bf3e..78c2215 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,14 @@
 NODE_ENV=development
 VUE_APP_PREVIEW=true
-# VUE_APP_TYPE = 'customer'
-VUE_APP_TYPE = 'hechuan'
+VUE_APP_TYPE = 'customer'
+# VUE_APP_TYPE = 'hechuan'
 # VUE_APP_TYPE = 'yunyingduan'
 # VUE_APP_TYPE = 'gangjie'
 # 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan
 
 # 和川大简云正式
-VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
-VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
+# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
+# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
 
 # 和川大简云测试
 # VUE_APP_API_BASE_URL=http://60.209.125.238:35100
@@ -34,5 +34,5 @@ VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
 # VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002
 
 # 客户端正式
-# VUE_APP_API_BASE_URL=http://118.190.144.189:6001
-# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001
\ No newline at end of file
+VUE_APP_API_BASE_URL=http://118.190.144.189:6001
+VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 2866da7..46179f2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6389,6 +6389,16 @@
         }
       }
     },
+    "define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "requires": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      }
+    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npm.taobao.org/define-properties/download/define-properties-1.1.3.tgz",
@@ -6991,6 +7001,43 @@
         }
       }
     },
+    "es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "requires": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "dependencies": {
+        "function-bind": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+        },
+        "get-intrinsic": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+          "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+          "requires": {
+            "es-errors": "^1.3.0",
+            "function-bind": "^1.1.2",
+            "has-proto": "^1.0.1",
+            "has-symbols": "^1.0.3",
+            "hasown": "^2.0.0"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+        }
+      }
+    },
+    "es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
+    },
     "es-to-primitive": {
       "version": "1.2.1",
       "resolved": "https://registry.npm.taobao.org/es-to-primitive/download/es-to-primitive-1.2.1.tgz",
@@ -8541,6 +8588,38 @@
         "delegate": "^3.1.2"
       }
     },
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "requires": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "dependencies": {
+        "function-bind": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+        },
+        "get-intrinsic": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+          "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+          "requires": {
+            "es-errors": "^1.3.0",
+            "function-bind": "^1.1.2",
+            "has-proto": "^1.0.1",
+            "has-symbols": "^1.0.3",
+            "hasown": "^2.0.0"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+        }
+      }
+    },
     "graceful-fs": {
       "version": "4.2.4",
       "resolved": "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.4.tgz",
@@ -8612,6 +8691,19 @@
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true
     },
+    "has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "requires": {
+        "es-define-property": "^1.0.0"
+      }
+    },
+    "has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q=="
+    },
     "has-symbols": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.1.tgz",
@@ -8700,6 +8792,21 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
+    "hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "requires": {
+        "function-bind": "^1.1.2"
+      },
+      "dependencies": {
+        "function-bind": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+        }
+      }
+    },
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npm.taobao.org/he/download/he-1.2.0.tgz",
@@ -14470,9 +14577,12 @@
       "dev": true
     },
     "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz?cache=0&sync_timestamp=1610598174727&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fqs%2Fdownload%2Fqs-6.5.2.tgz",
-      "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY="
+      "version": "6.12.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz",
+      "integrity": "sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==",
+      "requires": {
+        "side-channel": "^1.0.6"
+      }
     },
     "query-string": {
       "version": "4.3.4",
@@ -14888,6 +14998,13 @@
         "tough-cookie": "~2.5.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.5.3",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+          "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
+        }
       }
     },
     "request-promise-core": {
@@ -15455,6 +15572,43 @@
       "resolved": "https://registry.npm.taobao.org/set-blocking/download/set-blocking-2.0.0.tgz",
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
+    "set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "requires": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "dependencies": {
+        "function-bind": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+        },
+        "get-intrinsic": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+          "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+          "requires": {
+            "es-errors": "^1.3.0",
+            "function-bind": "^1.1.2",
+            "has-proto": "^1.0.1",
+            "has-symbols": "^1.0.3",
+            "hasown": "^2.0.0"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+        }
+      }
+    },
     "set-value": {
       "version": "2.0.1",
       "resolved": "https://registry.npm.taobao.org/set-value/download/set-value-2.0.1.tgz",
@@ -15552,6 +15706,58 @@
       "integrity": "sha1-1rkYHBpI05cyTISHHvvPxz/AZUs=",
       "dev": true
     },
+    "side-channel": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "requires": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "dependencies": {
+        "call-bind": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+          "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+          "requires": {
+            "es-define-property": "^1.0.0",
+            "es-errors": "^1.3.0",
+            "function-bind": "^1.1.2",
+            "get-intrinsic": "^1.2.4",
+            "set-function-length": "^1.2.1"
+          }
+        },
+        "function-bind": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+        },
+        "get-intrinsic": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+          "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+          "requires": {
+            "es-errors": "^1.3.0",
+            "function-bind": "^1.1.2",
+            "has-proto": "^1.0.1",
+            "has-symbols": "^1.0.3",
+            "hasown": "^2.0.0"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+        },
+        "object-inspect": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+          "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
+        }
+      }
+    },
     "sigmund": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/sigmund/download/sigmund-1.0.1.tgz",
diff --git a/src/api/modular/main/TaskmanageList.js b/src/api/modular/main/TaskmanageList.js
index 514a9a9..6c0973a 100644
--- a/src/api/modular/main/TaskmanageList.js
+++ b/src/api/modular/main/TaskmanageList.js
@@ -318,7 +318,7 @@ export function DownloadFile(parameter) {
     url: '/TaskManageBC/DownloadFile',
     method: 'get',
     params: parameter,
-    responseType: 'arraybuffer'
+    responseType: 'blob'
   })
 }
 export function TransferTask(parameter) {
diff --git a/src/views/main/BookingCustomerLedger/detail/index.vue b/src/views/main/BookingCustomerLedger/detail/index.vue
index 80047b6..a395426 100644
--- a/src/views/main/BookingCustomerLedger/detail/index.vue
+++ b/src/views/main/BookingCustomerLedger/detail/index.vue
@@ -825,8 +825,8 @@
                   :labelCol="{ span: 2 }"
                   :wrapperCol="{ span: 22 }"
                   has-feedback
-                  prop="czRemark">
-                  <a-input size="small" v-model="details.czRemark" />
+                  prop="soremark">
+                  <a-input size="small" v-model="details.soremark" />
                 </a-form-model-item>
               </a-col>
             </a-row>
diff --git a/src/views/main/BookingLedger/detail/components/autoView.vue b/src/views/main/BookingLedger/detail/components/autoView.vue
index 9f5a7de..771921c 100644
--- a/src/views/main/BookingLedger/detail/components/autoView.vue
+++ b/src/views/main/BookingLedger/detail/components/autoView.vue
@@ -218,7 +218,6 @@ export default {
         } else {
           this.dataSourceList = data
         }
-        console.log(this.dataSourceList)
       })
     },
     handleChangeFirst(e) {
@@ -239,7 +238,22 @@ export default {
       // 	this.dataSourceList = this.bookingInitData[`${this.type}InitList`]
       // 	return false
       // }
-      this.handleChange(e)
+      // this.handleChange(e)
+      this.inLoading = true
+      Object.keys(this.searchQuery).map((item, index) => {
+          if (['Title', 'KeyWord', 'SearchValue', 'name', 'keyword', 'queryItem', 'Name'].includes(item)) {
+            this.searchQuery[item] = ''
+          }
+        })
+      this.dataSourceList = []
+      this.getFromSelectData(this.emnuCompleteApi(this.searchApi), this.searchQuery).then(data => {
+        this.inLoading = false
+        if (data.rows) {
+          this.dataSourceList = data.rows
+        } else {
+          this.dataSourceList = data
+        }
+      })
     },
     getSelectBlur(e) {
       console.log(e)
diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue
index 2f27e5f..de700ac 100644
--- a/src/views/main/BookingLedger/detail/index.vue
+++ b/src/views/main/BookingLedger/detail/index.vue
@@ -1518,9 +1518,10 @@ export default {
       this.$refs.cargoInfo.$refs.cargoFrom.validate(valid => {
         cargoFrom = valid
       })
+      console.log(this.bookingDetails)
       if (!this.bookingDetails.contractno) {
+        console.log(this.bookingDetails.contractno)
         this.$message.error('保存失败，运费协议号未填写')
-        console.log(this.bookingDetails)
         return false
       }
       if (!basicFrom && mailingFrom && cargoFrom) {
diff --git a/src/views/main/BookingLedger/list/components/inputView.vue b/src/views/main/BookingLedger/list/components/inputView.vue
index 4369cbe..3c5dffc 100644
--- a/src/views/main/BookingLedger/list/components/inputView.vue
+++ b/src/views/main/BookingLedger/list/components/inputView.vue
@@ -9,6 +9,7 @@
       :disabled="ishd"
       :placeholder="placeholder"
       @blur="inputBlur"
+      @keyup.enter="pressEnter"
       @change="inputChange"
     />
     <a-icon type="close-circle" theme="filled" class="ant-input-suffix input-icon" @click="clearInput" v-if="value"/>
@@ -59,6 +60,12 @@ export default {
         value: this.value
       })
     },
+    pressEnter(){
+      this.$emit('handlePressEnter', {
+        type: this.type,
+        value: this.value
+      })
+    },
     inputChange(e) {
       if (e.type === 'click' && !this.value) {
         this.$emit('getInputChange', {
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index 9248403..942a5ea 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -25,6 +25,7 @@
                           :formIndex="findex"
                           @change="formChange"
                           @pressEnter="pressEnterFun"
+                          @handlePressEnter="pressEnterFun"
                           @getCompleteList="getCompleteListFun"
                           @selectFirst="getSelectFirst"
                         ></formLabel>
diff --git a/src/views/main/BookingLedger/list/modules/formLabel.vue b/src/views/main/BookingLedger/list/modules/formLabel.vue
index 22b1963..fc5761d 100644
--- a/src/views/main/BookingLedger/list/modules/formLabel.vue
+++ b/src/views/main/BookingLedger/list/modules/formLabel.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="from-label">
     <template v-if="labelData.type == 'input'">
-      <inputView ref="inputView" :type="labelData.label" :parentVal="value" @getInputChange="inputChange" />
+      <inputView ref="inputView" :type="labelData.label" :parentVal="value" @handlePressEnter="pressEnter" @getInputChange="inputChange" />
     </template>
     <template v-else-if="labelData.type == 'date'">
       <datePickerView
@@ -248,6 +248,13 @@ export default {
         value: data.value
       })
     },
+    pressEnter(data) {
+      this.$emit('change', {
+        form: this.labelData,
+        value: data.value
+      })
+      this.$emit('handlePressEnter')
+    },
     changeDate(data) {
       this.$emit('change', {
         form: this.labelData,
diff --git a/src/views/main/CabinInventory/index.vue b/src/views/main/CabinInventory/index.vue
index 93edfb6..6278ec6 100644
--- a/src/views/main/CabinInventory/index.vue
+++ b/src/views/main/CabinInventory/index.vue
@@ -6,12 +6,12 @@
           <a-row>
             <a-col :span="4">
               <a-form-item label="船名">
-                <a-input v-model="form.vessel" allow-clear placeholder="请输入船名" />
+                <a-input @pressEnter="getList" v-model="form.vessel" allow-clear placeholder="请输入船名" />
               </a-form-item>
             </a-col>
             <a-col :span="4">
               <a-form-item label="航次">
-                <a-input v-model="form.voyno" allow-clear placeholder="请输入航次" />
+                <a-input @pressEnter="getList" v-model="form.voyno" allow-clear placeholder="请输入航次" />
               </a-form-item>
             </a-col>
             <a-col :span="4">
@@ -26,7 +26,7 @@
             </a-col>
             <a-col :span="4">
               <a-form-item label="装货港">
-                <a-input v-model="form.PORTLOAD" allow-clear placeholder="请输入装货港" />
+                <a-input @pressEnter="getList" v-model="form.PORTLOAD" allow-clear placeholder="请输入装货港" />
               </a-form-item>
             </a-col>
             <a-col :span="4">
@@ -39,7 +39,7 @@
           <a-row>
             <a-col :span="4">
               <a-form-item label="船公司">
-                <a-input v-model="form.carrier" allow-clear placeholder="请输入船公司" />
+                <a-input @pressEnter="getList" v-model="form.carrier" allow-clear placeholder="请输入船公司" />
               </a-form-item>
             </a-col>
             <a-col :span="4">
@@ -62,7 +62,7 @@
             </a-col>
             <a-col :span="4">
               <a-form-item label="卸货港">
-                <a-input v-model="form.PORTDISCHARGE" allow-clear placeholder="请输入卸货港" />
+                <a-input @pressEnter="getList" v-model="form.PORTDISCHARGE" allow-clear placeholder="请输入卸货港" />
               </a-form-item>
             </a-col>
             <a-col :span="4">
diff --git a/src/views/main/CabinManagement/index.vue b/src/views/main/CabinManagement/index.vue
index 9a7395e..4ef54aa 100644
--- a/src/views/main/CabinManagement/index.vue
+++ b/src/views/main/CabinManagement/index.vue
@@ -26,22 +26,22 @@
             </a-col>
             <a-col :span="4">
               <a-form-item label="船名">
-                <a-input v-model="form.VESSEL" allow-clear placeholder="请输入船名" />
+                <a-input @pressEnter="getList" v-model="form.VESSEL" allow-clear placeholder="请输入船名" />
               </a-form-item>
             </a-col>
             <a-col :span="4">
               <a-form-item label="航次">
-                <a-input v-model="form.VOYNO" allow-clear placeholder="请输入航次" />
+                <a-input @pressEnter="getList" v-model="form.VOYNO" allow-clear placeholder="请输入航次" />
               </a-form-item>
             </a-col>
             <a-col :span="4">
               <a-form-item label="装货港">
-                <a-input v-model="form.PORTLOAD" allow-clear placeholder="请输入装货港" />
+                <a-input @pressEnter="getList" v-model="form.PORTLOAD" allow-clear placeholder="请输入装货港" />
               </a-form-item>
             </a-col>
             <a-col :span="3">
               <a-form-item label="卸货港">
-                <a-input v-model="form.PORTDISCHARGE" allow-clear placeholder="请输入卸货港" />
+                <a-input @pressEnter="getList" v-model="form.PORTDISCHARGE" allow-clear placeholder="请输入卸货港" />
               </a-form-item>
             </a-col>
             <a-col :span="1">
@@ -74,24 +74,24 @@
             </a-col>
             <a-col :span="4">
               <a-form-item label="创建人">
-                <a-input v-model="form.createdUserName" allow-clear placeholder="请输入创建人" />
+                <a-input @pressEnter="getList" v-model="form.createdUserName" allow-clear placeholder="请输入创建人" />
               </a-form-item>
             </a-col>
             <a-col :span="3">
               <a-form-item label="更新人">
-                <a-input v-model="form.updatedUserName" allow-clear placeholder="请输入更新人" />
+                <a-input @pressEnter="getList" v-model="form.updatedUserName" allow-clear placeholder="请输入更新人" />
               </a-form-item>
             </a-col>
           </a-row>
           <a-row>
             <a-col :span="4">
               <a-form-item label="船公司">
-                <a-input v-model="form.CARRIER" allow-clear placeholder="请输入船公司" />
+                <a-input @pressEnter="getList" v-model="form.CARRIER" allow-clear placeholder="请输入船公司" />
               </a-form-item>
             </a-col>
             <a-col :span="4">
               <a-form-item label="合约号">
-                <a-input v-model="form.CONTRACT_NO" allow-clear placeholder="请输入合约号" />
+                <a-input @pressEnter="getList" v-model="form.CONTRACT_NO" allow-clear placeholder="请输入合约号" />
               </a-form-item>
             </a-col>
             <a-col :span="4">
@@ -146,12 +146,12 @@
           <a-row>
             <a-col :span="4">
               <a-form-item label="航线名称">
-                <a-input v-model="form.LANENAME" allow-clear placeholder="请输入航线名称" />
+                <a-input @pressEnter="getList" v-model="form.LANENAME" allow-clear placeholder="请输入航线名称" />
               </a-form-item>
             </a-col>
             <a-col :span="4">
               <a-form-item label="Week">
-                <a-input-number style="width:100%" v-model="form.week_at" allow-clear placeholder="请输入Week" />
+                <a-input-number @pressEnter="getList" style="width:100%" v-model="form.week_at" allow-clear placeholder="请输入Week" />
               </a-form-item>
             </a-col>
             <a-col :span="4">
@@ -290,11 +290,22 @@
     </a-card>
     <a-modal width="800px" @ok="handleSubmitLabel" v-model="visible" title="分配标签" @cancel="visible = false">
       <a-spin :spinning="labelLoad">
-        <a-select mode="multiple" style="width: 80%" :filter-option="filterOption" v-model="labelIdArray">
+        <!-- <a-select mode="multiple" style="width: 80%" :filter-option="filterOption" v-model="labelIdArray">
           <a-select-option v-for="(item, i) in labelList" :key="i" :value="item.id">
             {{ item.name }}
           </a-select-option>
-        </a-select>
+        </a-select> -->
+        <div class="content">
+          <div
+            class="items"
+            v-for="(serive, sindex) in labelList"
+            :key="sindex"
+            @click="handleClickLable(sindex)"
+            :class="{ active: serive.isActive }">
+            {{ serive.name }}
+          </div>
+        </div>
+
       </a-spin>
     </a-modal>
     <generation ref="generation"></generation>
@@ -1087,10 +1098,17 @@ export default {
       const pkIdArr = select.map((item, index) => {
         return item.id
       })
+      const arr = []
+      this.labelList.forEach(item=>{
+        if(item.isActive){
+          arr.push(item.id)
+        }
+      })
       const data = {
-        labelIdArray: this.labelIdArray,
+        labelIdArray: arr,
         businessIdArray: pkIdArr
       }
+      this.labelLoad = true
       BookingLabelBind(data).then(res => {
         if (res.success) {
           this.$message.success('分配成功')
@@ -1099,6 +1117,7 @@ export default {
         } else {
           this.$message.error(res.message)
         }
+        this.labelLoad = false
       })
     },
     customRequest(data) {
@@ -1130,7 +1149,7 @@ export default {
         this.getList()
       })
     },
-    cellClickEvent({ rowIndex, column }) {
+    cellClickEvent({ row,rowIndex, column }) {
       if (column.field === 'labelList') {
         this.$refs.table.clearCheckboxRow()
         this.$refs.table.toggleCheckboxRow(this.loadData[rowIndex])
@@ -1139,6 +1158,14 @@ export default {
         this.labelLoad = true
         BookingLabelList({ scope: 1 }).then(res => {
           this.labelList = res.data
+          this.labelList.forEach(item=>{
+            item.isActive = false
+            row.labelList.forEach(ite=>{
+              if(item.id===ite.id){
+                item.isActive = true
+              }
+            })
+          })
           this.labelLoad = false
         })
       }
@@ -1240,6 +1267,10 @@ export default {
         this.CustomerList = res.data.rows
       })
     },
+    handleClickLable(index){
+      this.$set(this.labelList[index], 'isActive', !this.labelList[index].isActive)
+      this.$forceUpdate()
+    },
     handleLabel() {
       const select = this.$refs.table.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
@@ -1253,6 +1284,9 @@ export default {
       this.labelIdArray = []
       this.labelLoad = true
       BookingLabelList({ scope: 1 }).then(res => {
+        res.data.forEach(item=>{
+          item.isActive = false
+        })
         this.labelList = res.data
         this.labelLoad = false
       })
@@ -1563,4 +1597,62 @@ button {
 /deep/ .ant-form-item {
   margin-bottom: 0px !important;
 }
+.content {
+    max-height: 300px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    width: 100%;
+    &::-webkit-scrollbar {
+      width: 0 !important;
+    }
+    .items {
+      display: inline-block;
+      height: 28px;
+      line-height: 26px;
+      border: 1px dashed #ccc;
+      border-radius: 4px;
+      padding: 0 10px;
+      margin-top: 10px;
+      margin-right: 10px;
+      font-size: 13px;
+      cursor: pointer;
+      position: relative;
+      .edit{
+        width: 17px;
+        height: 17px;
+        border-radius: 0 3px 0 0;
+        background: #c9c9c9;
+        display: none;
+        position: absolute;
+        right: -1px;
+        top: -1px;
+        text-align: center;
+        line-height: 17px;
+      }
+      &:hover {
+
+        border: 1px dashed @primary-color;
+        position: relative;
+        &::before {
+          width: 100%;
+          height: 100%;
+          content: '';
+          background: @primary-color;
+          opacity: 0.08;
+          position: absolute;
+          top: 0;
+          left: 0;
+          border-radius: 4px;
+        }
+        .edit{
+          display: block;
+        }
+      }
+      &.active {
+        background: @primary-color;
+        border: 1px dashed @primary-color;
+        color: #fff;
+      }
+    }
+  }
 </style>
diff --git a/src/views/main/CommondbCodeIssueTypeList/index.vue b/src/views/main/CommondbCodeIssueTypeList/index.vue
index ac04292..c2399d1 100644
--- a/src/views/main/CommondbCodeIssueTypeList/index.vue
+++ b/src/views/main/CommondbCodeIssueTypeList/index.vue
@@ -24,6 +24,15 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="船公司">
+                    <a-select v-model="queryParam.carrierCode" show-search :filter-option="filterOption">
+                  <a-select-option v-for="(item, index) in carrierList" :key="index" :value="item.code">
+                  {{ item.cnName}} / {{ item.enName}}
+                </a-select-option>
+                </a-select>
+                  </a-form-item>
+                </a-col>
               </a-row>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -90,7 +99,7 @@
   </div>
 </template>
 <script>
-import { mapActions } from 'vuex'
+import { mapActions,mapGetters } from 'vuex'
 import { CommondbPageList } from '@/api/modular/main/CommondbCodeIssueTypeList'
 import { commondbModules, commondbCarrierlist } from '@/api/modular/main/ShippingCompanyMapping'
 import addForm from './addForm.vue'
@@ -167,6 +176,11 @@ export default {
   mounted() {
     this.init()
   },
+  computed: {
+    ...mapGetters([
+      'carrierList',
+    ])
+  },
   methods: {
     ...mapActions(['setIssuetypeList']),
     FnModule(data) {
@@ -208,6 +222,11 @@ export default {
         this.carrierCodeData = res.data
       })
     },
+    filterOption(input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      );
+    },
     FnGetData() {
       this.loading = true
       CommondbPageList(this.queryParam).then(res => {
diff --git a/src/views/main/CommondbCtnlist/index.vue b/src/views/main/CommondbCtnlist/index.vue
index 13fca2a..d80e340 100644
--- a/src/views/main/CommondbCtnlist/index.vue
+++ b/src/views/main/CommondbCtnlist/index.vue
@@ -24,6 +24,14 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="船公司">
+                    <a-select v-model="queryParam.carrierCode" show-search :filter-option="filterOption">
+                  <a-select-option v-for="(item, index) in carrierList" :key="index" :value="item.code">{{ item.cnName
+                  }}/ {{ item.enName}}</a-select-option>
+                </a-select>
+                  </a-form-item>
+                </a-col>
               </a-row>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -89,6 +97,7 @@
 <script>
 import { CommondbPageMappingctnlist, commondbCtn } from '@/api/modular/main/CommondbCtnlist'
 import { commondbModules, commondbCarrierlist } from '@/api/modular/main/ShippingCompanyMapping'
+import { mapGetters } from 'vuex'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
 export default {
@@ -163,6 +172,11 @@ export default {
   mounted() {
     this.init()
   },
+  computed: {
+        ...mapGetters([
+            'carrierList'
+        ])
+    },
   methods: {
     handlePageChange1({ currentPage, pageSize }) {
       this.queryParam.PageNo = currentPage
@@ -210,6 +224,11 @@ export default {
     toggleAdvanced() {
       this.advanced = !this.advanced
     },
+    filterOption(input, option) {
+            return (
+                option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            );
+        },
     init() {
       Object.assign(this.$data, this.$options.data())
       this.ColumnsQuery = this.columns
diff --git a/src/views/main/CommondbFrtlist/index.vue b/src/views/main/CommondbFrtlist/index.vue
index 3687193..5f40070 100644
--- a/src/views/main/CommondbFrtlist/index.vue
+++ b/src/views/main/CommondbFrtlist/index.vue
@@ -24,6 +24,14 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="船公司">
+                    <a-select v-model="queryParam.carrierCode" show-search :filter-option="filterOption">
+                  <a-select-option v-for="(item, index) in carrierList" :key="index" :value="item.code">{{ item.cnName
+                  }}/ {{ item.enName}}</a-select-option>
+                </a-select>
+                  </a-form-item>
+                </a-col>
               </a-row>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -91,6 +99,7 @@ import { CommondbPageMappingfrtlist, commondbFrt } from '@/api/modular/main/Comm
 import { commondbModules, commondbCarrierlist } from '@/api/modular/main/ShippingCompanyMapping'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
+import { mapGetters } from 'vuex'
 export default {
   components: {
     addForm,
@@ -163,6 +172,11 @@ export default {
   mounted() {
     this.init()
   },
+  computed: {
+        ...mapGetters([
+            'carrierList'
+        ])
+    },
   methods: {
     handlePageChange1({ currentPage, pageSize }) {
       this.queryParam.PageNo = currentPage
@@ -184,6 +198,11 @@ export default {
       })
       return RData
     },
+    filterOption(input, option) {
+            return (
+                option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            );
+        },
     FncarrierCode(data) {
       console.log(data)
       let RData = ''
diff --git a/src/views/main/CommondbPackage/index.vue b/src/views/main/CommondbPackage/index.vue
index 81dd94c..7407c27 100644
--- a/src/views/main/CommondbPackage/index.vue
+++ b/src/views/main/CommondbPackage/index.vue
@@ -24,6 +24,14 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="船公司">
+                    <a-select v-model="queryParam.carrierCode" show-search :filter-option="filterOption">
+                  <a-select-option v-for="(item, index) in carrierList" :key="index" :value="item.code">{{ item.cnName
+                  }}/ {{ item.enName}}</a-select-option>
+                </a-select>
+                  </a-form-item>
+                </a-col>
               </a-row>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -89,6 +97,7 @@
 <script>
 import { CommondbPageMappingpackage, commondbPackage } from '@/api/modular/main/CommondbPackage'
 import { commondbModules, commondbCarrierlist } from '@/api/modular/main/ShippingCompanyMapping'
+import { mapGetters } from 'vuex'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
 export default {
@@ -163,6 +172,11 @@ export default {
   mounted() {
     this.init()
   },
+  computed: {
+        ...mapGetters([
+            'carrierList'
+        ])
+    },
   methods: {
     handlePageChange1({ currentPage, pageSize }) {
       this.queryParam.PageNo = currentPage
@@ -175,6 +189,11 @@ export default {
         console.log(this.CodeData)
       })
     },
+    filterOption(input, option) {
+            return (
+                option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            );
+        },
     FnCode(data) {
       let RData = ''
       this.CodeData.forEach(item => {
diff --git a/src/views/main/CommondbPortlist/index.vue b/src/views/main/CommondbPortlist/index.vue
index 6ad3bb7..9a97d07 100644
--- a/src/views/main/CommondbPortlist/index.vue
+++ b/src/views/main/CommondbPortlist/index.vue
@@ -24,6 +24,14 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="船公司">
+                    <a-select v-model="queryParam.carrierCode" show-search :filter-option="filterOption">
+                  <a-select-option v-for="(item, index) in carrierList" :key="index" :value="item.code">{{ item.cnName
+                  }}/ {{ item.enName}}</a-select-option>
+                </a-select>
+                  </a-form-item>
+                </a-col>
               </a-row>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -91,6 +99,7 @@ import { CommondbPageMappingportlist, commondbPortlist } from '@/api/modular/mai
 import { CommondbPageList } from '@/api/modular/main/CommondbPort'
 import { commondbModules, commondbCarrierlist } from '@/api/modular/main/ShippingCompanyMapping'
 import addForm from './addForm.vue'
+import { mapGetters } from 'vuex'
 import editForm from './editForm.vue'
 export default {
   components: {
@@ -164,6 +173,11 @@ export default {
   mounted() {
     this.init()
   },
+  computed: {
+        ...mapGetters([
+            'carrierList'
+        ])
+    },
   methods: {
     handlePageChange1({ currentPage, pageSize }) {
       this.queryParam.PageNo = currentPage
@@ -181,6 +195,11 @@ export default {
       })
       return RData
     },
+    filterOption(input, option) {
+            return (
+                option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            );
+        },
     FncarrierCode(data) {
       let RData = ''
       this.carrierCodeData.forEach(item => {
diff --git a/src/views/main/CommondbPortloadlist/index.vue b/src/views/main/CommondbPortloadlist/index.vue
index 3bc783f..b0955fc 100644
--- a/src/views/main/CommondbPortloadlist/index.vue
+++ b/src/views/main/CommondbPortloadlist/index.vue
@@ -24,6 +24,14 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="船公司">
+                    <a-select v-model="queryParam.carrierCode" show-search :filter-option="filterOption">
+                  <a-select-option v-for="(item, index) in carrierList" :key="index" :value="item.code">{{ item.cnName
+                  }}/ {{ item.enName}}</a-select-option>
+                </a-select>
+                  </a-form-item>
+                </a-col>
               </a-row>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -89,6 +97,7 @@
 <script>
 import { CommondbPageMappingportloadlist, commondbPortloadlist } from '@/api/modular/main/CommondbPortloadlist'
 import { commondbModules, commondbCarrierlist } from '@/api/modular/main/ShippingCompanyMapping'
+import { mapGetters } from 'vuex'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
 export default {
@@ -163,12 +172,22 @@ export default {
   mounted() {
     this.init()
   },
+  computed: {
+        ...mapGetters([
+            'carrierList'
+        ])
+    },
   methods: {
     handlePageChange1({ currentPage, pageSize }) {
       this.queryParam.PageNo = currentPage
       this.queryParam.PageSize = pageSize
       this.FnGetData()
     },
+    filterOption(input, option) {
+            return (
+                option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            );
+        },
     handleSearch(data) {
       commondbPortloadlist({ Name: data }).then(res => {
         this.WCodeData = res.data
diff --git a/src/views/main/CommondbService/index.vue b/src/views/main/CommondbService/index.vue
index 67d5c22..344f054 100644
--- a/src/views/main/CommondbService/index.vue
+++ b/src/views/main/CommondbService/index.vue
@@ -24,6 +24,14 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="船公司">
+                    <a-select v-model="queryParam.carrierCode" show-search :filter-option="filterOption">
+                  <a-select-option v-for="(item, index) in carrierList" :key="index" :value="item.code">{{ item.cnName
+                  }}/ {{ item.enName}}</a-select-option>
+                </a-select>
+                  </a-form-item>
+                </a-col>
               </a-row>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -88,6 +96,7 @@
 </template>
 <script>
 import { CommondbPageMappingservice, commondbService } from '@/api/modular/main/CommondbService'
+import { mapGetters } from 'vuex'
 import { commondbModules, commondbCarrierlist } from '@/api/modular/main/ShippingCompanyMapping'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
@@ -163,12 +172,22 @@ export default {
   mounted() {
     this.init()
   },
+  computed: {
+        ...mapGetters([
+            'carrierList'
+        ])
+    },
   methods: {
     handlePageChange1({ currentPage, pageSize }) {
       this.queryParam.PageNo = currentPage
       this.queryParam.PageSize = pageSize
       this.FnGetData()
     },
+    filterOption(input, option) {
+            return (
+                option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            );
+        },
     handleSearch(data) {
       commondbService({ Name: data }).then(res => {
         this.WCodeData = res.data
diff --git a/src/views/main/CommondbYardlist/index.vue b/src/views/main/CommondbYardlist/index.vue
index 4836b7e..7afd3d0 100644
--- a/src/views/main/CommondbYardlist/index.vue
+++ b/src/views/main/CommondbYardlist/index.vue
@@ -24,6 +24,14 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="船公司">
+                    <a-select v-model="queryParam.carrierCode" show-search :filter-option="filterOption">
+                  <a-select-option v-for="(item, index) in carrierList" :key="index" :value="item.code">{{ item.cnName
+                  }}/ {{ item.enName}}</a-select-option>
+                </a-select>
+                  </a-form-item>
+                </a-col>
               </a-row>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -89,6 +97,7 @@
 import { CommondbPageMappingyardlist, commondbYardlist } from '@/api/modular/main/CommondbYardlist'
 import { commondbModules } from '@/api/modular/main/ShippingCompanyMapping'
 import addForm from './addForm.vue'
+import { mapGetters } from 'vuex'
 import editForm from './editForm.vue'
 export default {
   components: {
@@ -161,6 +170,11 @@ export default {
   mounted() {
     this.init()
   },
+  computed: {
+        ...mapGetters([
+            'carrierList'
+        ])
+    },
   methods: {
     handlePageChange1({ currentPage, pageSize }) {
       this.queryParam.PageNo = currentPage
@@ -182,6 +196,11 @@ export default {
       })
       return RData
     },
+    filterOption(input, option) {
+            return (
+                option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            );
+        },
     FnModule(data) {
       let RData = ''
       this.ModulesData.forEach((item) => {
diff --git a/src/views/main/Taskmanage/BcFileDetail/Editing.vue b/src/views/main/Taskmanage/BcFileDetail/Editing.vue
index 5918074..959baca 100644
--- a/src/views/main/Taskmanage/BcFileDetail/Editing.vue
+++ b/src/views/main/Taskmanage/BcFileDetail/Editing.vue
@@ -288,11 +288,15 @@
           </a-form>
         </a-col>
         <a-col :span="pdfUrl ? 13 : 0" class="rightBox">
-          <a-radio-group v-model="fileCategory" button-style="solid" @change="ChangeFileRadio" class="rightBoxRadio">
+        <div style="display: flex;align-items: center;margin-bottom: 15px;">
+          <a-radio-group v-model="fileCategory" button-style="solid" @change="ChangeFileRadio" >
             <a-radio-button value="BC">BC文件</a-radio-button>
             <a-radio-button value="BC_NOTICE">BC更改文件</a-radio-button>
           </a-radio-group>
-          <iframe width="100%" height="690" frameborder="0" scrolling="auto" :src="pdfUrl"></iframe>
+          <span style="margin:0 20px;font-size: 16px;font-weight: bold;color: black" >{{ pdfName }}</span>
+          <a-button type="primary" @click="handleDownPdf" >下载pdf文件</a-button>
+        </div>
+          <iframe  name="custom-iframe-name" width="100%" height="690" frameborder="0" scrolling="auto" :src="pdfUrl"></iframe>
         </a-col>
       </a-row>
     </a-spin>
@@ -372,6 +376,8 @@ export default {
       spinning: false,
       bookingServiceItem: [],
       pdfUrl: '',
+      pdfName:'',
+      pdfRes:{},
       UserList: [],
       fileCategory: 'BC'
     }
@@ -440,9 +446,15 @@ export default {
         ApiData.fileCategory = this.fileCategory
       }
       DownloadFile(ApiData).then(res => {
-        console.log(res, res.data)
-        if (res.byteLength > 150) {
-          this.pdfUrl = window.URL.createObjectURL(new Blob([res], { type: 'application/pdf;charset=utf-8' }))
+        this.pdfRes = res
+        var contentDisposition = res.headers['content-disposition']
+        var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
+        var result = patt.exec(contentDisposition)
+        var filename = result[1]
+        var reg = /^["](.*)["]$/g
+        this.pdfName = decodeURI(filename.replace(reg, '$1'))
+        if (res.data.size > 150) {
+          this.pdfUrl = window.URL.createObjectURL(new Blob([res.data], { type: 'application/pdf;charset=utf-8' }))
         }
         this.spinning = false
       })
@@ -496,6 +508,23 @@ export default {
         }
       })
     },
+    handleDownPdf(){
+      var blob = new Blob([this.pdfRes.data], { type: 'application/octet-stream;charset=UTF-8' })
+        var contentDisposition = this.pdfRes.headers['content-disposition']
+        var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
+        var result = patt.exec(contentDisposition)
+        var filename = result[1]
+        var downloadElement = document.createElement('a')
+        var href = window.URL.createObjectURL(blob) // 创建下载的链接
+        var reg = /^["](.*)["]$/g
+        downloadElement.style.display = 'none'
+        downloadElement.href = href
+        downloadElement.download = decodeURI(filename.replace(reg, '$1')) // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href)
+    },
     FnSee() {
       this.$router.push({ path: '/BookingDetail?id=' + this.form.bookingOrderId })
     },
diff --git a/src/views/main/Taskmanage/TaskmanageList/index.vue b/src/views/main/Taskmanage/TaskmanageList/index.vue
index f82c544..76263b3 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,104 +245,18 @@
               <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.trucK_NAME }}
+                {{ row.truckName }}
               </template>
               <template #taskType="{ row }">
-                <span>{{ filterType(row.tasK_TYPE) }}</span>
+                <span>{{ filterType(row.taskType) }}</span>
               </template>
               <template #taskScource="{ row }">
-                <span>{{ filterScource(row.tasK_SOURCE) }}</span>
+                <span>{{ filterScource(row.taskSource) }}</span>
               </template>
               <template #taskTitle="{ row }">
-                <span class="task-tit" @click="changePage(row)">{{ row.tasK_TITLE }}</span>
+                <span class="task-tit" @click="changePage(row)">{{ row.taskTitle }}</span>
               </template>
               <template #operate="{ row }">
                 <vxe-button class="operate-btn" type="text" icon="vxe-icon-edit" @click="changePage(row)"></vxe-button>
@@ -567,11 +481,11 @@ export default {
           if (this.saveNeedCar !== null && this.saveNeedCar !== '') {
             let index = 0
             this.gridOptions.data.forEach((ite, inde) => {
-              if (ite.pK_ID === this.saveNeedCar) {
+              if (ite.pkId === this.saveNeedCar) {
                 index = inde
               }
             })
-            GetTaskManagePage({ pK_ID: this.saveNeedCar })
+            GetTaskManagePage({ pkId: this.saveNeedCar })
               .then(res => {
                 if (res.success) {
                   this.$set(this.gridOptions.data, index, res.data.items[0])
@@ -674,7 +588,6 @@ export default {
       },
       // 页数计算
       paperCalcVisible: false,
-      taskTypeColumeList: [],
       paperCalcRes: [],
       paperCalcColumns: [
         {
@@ -740,7 +653,7 @@ export default {
     },
     handleSaveSend() {
       const data = {
-        taskPKId: this.editRow.pK_ID,
+        taskPKId: this.editRow.pkId,
         truckId: this.selectCar,
         truckCode: this.selectCarCode,
         truckName: this.selectCarName,
@@ -764,7 +677,7 @@ export default {
     },
     handleChangeCar() {
       const data = {
-        taskPKId: this.editRow.pK_ID,
+        taskPKId: this.editRow.pkId,
         truckId: this.selectCar,
         truckCode: this.selectCarCode,
         truckName: this.selectCarName,
@@ -920,7 +833,7 @@ export default {
     },
     getConfigUser(isInit = false) {
       const query = {
-        typeArr: ['task_list_cond', 'task_list_page']
+        typeArr: ['task_list_cond', 'task_list_column', 'task_list_page']
       }
       DjyUserConfigMulti(this.$qs.stringify(query, { arrayFormat: 'repeat' })).then(res => {
         const $data = {}
@@ -929,6 +842,9 @@ 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
@@ -940,26 +856,11 @@ export default {
         } else {
           this.setFormData({}, false, true)
         }
-        // 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
-         }
+        if (Object.keys($data).includes('task_list_column')) {
+          this.setTableList($data.task_list_column)
+        } else {
+          this.setTableList({})
+        }
       })
     },
     setFormData(data, isReset = false, isInit = false) {
@@ -1123,7 +1024,7 @@ export default {
     FnPrint() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.pkId
       })
       if (pkIdArr.length != 1) {
         this.$message.error('请仅选择一条数据')
@@ -1142,7 +1043,7 @@ export default {
     FnSendCar() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.pkId
       })
       if (pkIdArr.length === 0) {
         this.$message.error('请选择数据')
@@ -1183,7 +1084,7 @@ export default {
     CancelSendCar() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.pkId
       })
       if (pkIdArr.length === 0) {
         this.$message.error('请选择数据')
@@ -1224,14 +1125,16 @@ export default {
       this.activeTreeKey = selectedKeys
       if (selectedKeys.length === 0) {
         this.gridOptions.loading = true
-        this.formRes.taskType = ''
         this.init()
         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],
@@ -1240,24 +1143,6 @@ 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],
@@ -1282,7 +1167,6 @@ export default {
       this.activeTreeKey = []
     },
     init(queryParam = {}) {
-      console.log(queryParam)
       this.gridOptions.pagerConfig = {
         total: 0,
         currentPage: 1,
@@ -1559,114 +1443,107 @@ export default {
     },
     changePage(data) {
       console.log(data)
-      if (data.tasK_TYPE === 'VGM_COMPARE') {
+      if (data.taskType === 'VGM_COMPARE') {
         // VGM比对查看页面
         this.$router.push({
           path: '/commontaskmanage/TaskVgmContrast',
-          query: { taskPKId: data.pK_ID, type: data.status }
+          query: { taskPKId: data.pkId, type: data.status }
         })
-      } else if (data.tasK_TYPE === 'INVOICE_BILL_MAIL') {
+      } else if (data.taskType === 'INVOICE_BILL_MAIL') {
         // 航次账单查看
-        this.$router.push({ path: '/commontaskmanage/VoyageBill', query: { taskPKId: data.pK_ID } })
-      } else if (data.tasK_TYPE === 'PER_BILL') {
+        this.$router.push({ path: '/commontaskmanage/VoyageBill', query: { taskPKId: data.pkId } })
+      } else if (data.taskType === 'PER_BILL') {
         // 单票账单查看
-        this.$router.push({ path: '/commontaskmanage/singleTicket', query: { taskPKId: data.pK_ID } })
-      } else if (data.tasK_TYPE === 'CHANGE_SHIP') {
+        this.$router.push({ path: '/commontaskmanage/singleTicket', query: { taskPKId: data.pkId } })
+      } else if (data.taskType === 'CHANGE_SHIP') {
         // 换船通知查看
-        this.$router.push({ path: '/commontaskmanage/TaskChangeShip', query: { taskPKId: data.pK_ID, type: 'change' } })
-      } else if (data.tasK_TYPE === 'ABORT_CHANGE_SHIP') {
+        this.$router.push({ path: '/commontaskmanage/TaskChangeShip', query: { taskPKId: data.pkId, type: 'change' } })
+      } else if (data.taskType === 'ABORT_CHANGE_SHIP') {
         // 取消换船通知查看
         this.$router.push({
           path: '/commontaskmanage/TaskChangeShip',
-          query: { taskPKId: data.pK_ID, type: 'abortChange' }
+          query: { taskPKId: data.pkId, type: 'abortChange' }
         })
-      } else if (data.tasK_TYPE === 'ORIGINAL_LOST') {
+      } else if (data.taskType === 'ORIGINAL_LOST') {
         // 正本缺失查看
-        this.$router.push({ path: '/commontaskmanage/TaskOriginalLost', query: { taskPKId: data.pK_ID } })
-      } else if (data.tasK_TYPE === 'SHIPPING_ORDER') {
+        this.$router.push({ path: '/commontaskmanage/TaskOriginalLost', query: { taskPKId: data.pkId } })
+      } else if (data.taskType === 'SHIPPING_ORDER') {
         // 订舱详情查看
-        this.$router.push({ path: '/commontaskmanage/BookingDetails', query: { taskPKId: data.pK_ID } })
-      } else if (data.tasK_TYPE === 'SI_FEEDBACK') {
+        this.$router.push({ path: '/commontaskmanage/BookingDetails', query: { taskPKId: data.pkId } })
+      } else if (data.taskType === 'SI_FEEDBACK') {
         // 订舱详情编辑
-        this.$router.push({ path: '/commontaskmanage/TaskmanageDetail', query: { taskPKId: data.pK_ID } })
-      } else if (data.tasK_TYPE === 'TRUCK_DISPATCH') {
+        this.$router.push({ path: '/commontaskmanage/TaskmanageDetail', query: { taskPKId: data.pkId } })
+      } else if (data.taskType === 'TRUCK_DISPATCH') {
         // 派车编辑
-        // this.$router.push({ path: '/commontaskmanage/TaskmanageDetail', query: { taskPKId: data.pK_ID } })
+        // this.$router.push({ path: '/commontaskmanage/TaskmanageDetail', query: { taskPKId: data.pkId } })
         this.$router.push({
           name: 'SendCarAdd',
           query: {
             type: 'Edit',
-            taskPKId: data.pK_ID
+            taskPKId: data.pkId
           }
         })
-      } else if (data.tasK_TYPE === 'BC') {
+      } else if (data.taskType === 'BC') {
         // BC详情
-        // this.$router.push({ path: '/commontaskmanage/BcFileDetail', query: { taskPKId: data.pK_ID } })
+        // this.$router.push({ path: '/commontaskmanage/BcFileDetail', query: { taskPKId: data.pkId } })
         // BC编辑
-        this.$router.push({ path: '/commontaskmanage/BcEditing', query: { taskPKId: data.pK_ID } })
-      } else if (data.tasK_TYPE === 'BC_MODIFY') {
+        this.$router.push({ path: '/commontaskmanage/BcEditing', query: { taskPKId: data.pkId } })
+      } else if (data.taskType === 'BC_MODIFY') {
         // BC变更
-        this.$router.push({ path: '/commontaskmanage/BCModify', query: { taskPKId: data.pK_ID } })
-      } else if (data.tasK_TYPE === 'CANCELLATION') {
+        this.$router.push({ path: '/commontaskmanage/BCModify', query: { taskPKId: data.pkId } })
+      } else if (data.taskType === 'CANCELLATION') {
         // Cancellation
-        this.$router.push({ path: '/commontaskmanage/Cancellation', query: { taskPKId: data.pK_ID } })
-      } else if (data.tasK_TYPE === 'ROLLING_NOMINATION') {
-        // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/rollingNomination', query: { taskPKId: data.pK_ID } })
-      } else if (data.tasK_TYPE === 'VGM_FEEDBACK') {
+        this.$router.push({ path: '/commontaskmanage/Cancellation', query: { taskPKId: data.pkId } })
+      } else if (data.taskType === 'ROLLING_NOMINATION') {
         // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/vgmDetail', query: { taskPKId: data.pK_ID, type: 'VGM_FEEDBACK' } })
-      } else if (data.tasK_TYPE === 'CAUTION_NOTICE') {
+        this.$router.push({ path: '/commontaskmanage/rollingNomination', query: { taskPKId: data.pkId } })
+      } else if (data.taskType === 'VGM_FEEDBACK') {
         // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/cautionNotice', query: { taskPKId: data.pK_ID } })
-      } else if (data.tasK_TYPE === 'VGM_MISSING') {
+        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/vgmDetail', query: { taskPKId: data.pK_ID, type: 'VGM_MISSING' } })
-      } else if (data.tasK_TYPE === 'CUT_MODIFY') {
+        this.$router.push({ path: '/commontaskmanage/cautionNotice', query: { taskPKId: data.pkId } })
+      } else if (data.taskType === 'VGM_MISSING') {
         // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/cutTime', query: { taskPKId: data.pK_ID } })
-      } else if (data.tasK_TYPE === 'POD_DISCHARGE_FULL') {
+        this.$router.push({ path: '/commontaskmanage/vgmDetail', query: { taskPKId: data.pkId, type: 'VGM_MISSING' } })
+      } else if (data.taskType === 'CUT_MODIFY') {
         // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/POD_DISCHARGE_FULL', query: { taskPKId: data.pK_ID } })
-      } else if (data.tasK_TYPE === 'TRNAS_PLAN_HAS_CHANGE') {
+        this.$router.push({ path: '/commontaskmanage/cutTime', query: { taskPKId: data.pkId } })
+      } else if (data.taskType === 'POD_DISCHARGE_FULL') {
         // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/trnasPlan', query: { taskPKId: data.pK_ID } })
-      } else if (data.tasK_TYPE === 'DRAFT') {
+        this.$router.push({ path: '/commontaskmanage/POD_DISCHARGE_FULL', query: { taskPKId: data.pkId } })
+      } else if (data.taskType === 'DRAFT') {
         // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/draft', query: { taskPKId: data.pK_ID } })
-      } else if (data.tasK_TYPE === 'ROUTE_CUT_CHANGE') {
+        this.$router.push({ path: '/commontaskmanage/draft', query: { taskPKId: data.pkId } })
+      } else if (data.taskType === 'ROUTE_CUT_CHANGE') {
         // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/cutChange', query: { taskPKId: data.pK_ID } })
-      } else if (data.tasK_TYPE === 'POD_GATEOUT_FULL') {
+        this.$router.push({ path: '/commontaskmanage/cutChange', query: { taskPKId: data.pkId } })
+      } else if (data.taskType === 'POD_GATEOUT_FULL') {
         // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/POD_GATEOUT_FULL', query: { taskPKId: data.pK_ID } })
+        this.$router.push({ path: '/commontaskmanage/POD_GATEOUT_FULL', query: { taskPKId: data.pkId } })
       } else {
         // 订舱详情查看
-        this.$router.push({ path: '/commontaskmanage/BookingDetails', query: { taskPKId: data.pK_ID } })
+        this.$router.push({ path: '/commontaskmanage/BookingDetails', query: { taskPKId: data.pkId } })
       }
     },
     filterType(val) {
       const res = this.taskTypeList.filter((item, index) => {
         return item.code === val
       })
-      if (res.length > 0) {
-        return res[0].name
-      }
+      return res[0].name
     },
     filterScource(val) {
       const res = this.sourceList.filter((item, index) => {
         return item.code === val
       })
-      if (res.length > 0) {
-        return res[0].name
-      }
+      return res[0].name
     },
     cancelFun() {},
     // 取消
     removeFun() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.pkId
       })
       console.log('当前选中', pkIdArr)
       if (pkIdArr.length === 0) {
@@ -1692,7 +1569,7 @@ export default {
     submitFun() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.pkId
       })
       console.log('当前选中', pkIdArr)
       if (pkIdArr.length === 0) {
@@ -1718,7 +1595,7 @@ export default {
     downloadFun() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.pkId
       })
       console.log('当前选中', pkIdArr)
       if (pkIdArr.length === 0) {
@@ -1761,7 +1638,7 @@ export default {
       // 未找到接口
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.pkId
       })
       if (pkIdArr.length === 0) {
         this.$message.error('请选择数据')
@@ -1784,7 +1661,7 @@ export default {
     SendEmailFun() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.pkId
       })
       console.log('当前选中', pkIdArr)
       if (pkIdArr.length === 0) {
@@ -1827,7 +1704,7 @@ export default {
     laraPaperCalc() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.pkId
       })
       if (pkIdArr.length === 0) {
         this.$message.error('请选择数据')
@@ -1855,7 +1732,7 @@ export default {
     copyPrintFun() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.pkId
       })
       if (pkIdArr.length === 0) {
         this.$message.error('请选择数据')
@@ -1895,7 +1772,7 @@ export default {
     copyDownloadFun() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.pkId
       })
       if (pkIdArr.length === 0) {
         this.$message.error('请选择数据')
@@ -1935,7 +1812,7 @@ export default {
     printBatchFun() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.pkId
       })
       if (pkIdArr.length === 0) {
         this.$message.error('请选择数据')
@@ -1969,7 +1846,7 @@ export default {
     laraPaperRegistFun() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.pkId
       })
       if (pkIdArr.length === 0) {
         this.$message.error('请选择数据')
@@ -1985,7 +1862,7 @@ export default {
     },
     taskDownloadFun(data) {
       // 非DRAFT 任务类型下，接口报错。
-      this.DownloadTaskAttach(data.pK_ID, data.taskTitle)
+      this.DownloadTaskAttach(data.pkId, data.taskTitle)
     }
     // onDownloadErrClose() {
     //   console.log('关闭')
diff --git a/src/views/main/Taskmanage/TaskmanageList/modules/initData.js b/src/views/main/Taskmanage/TaskmanageList/modules/initData.js
index 7442397..add878c 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: '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: 'taskType', width: 100, title: '任务类型', showHeaderOverflow: true, sortable: true, slots: { default: 'taskType' } },
+    { field: 'taskTitle', width: 200, title: '任务标题', showHeaderOverflow: true, sortable: true, slots: { default: 'taskTitle' } },
     { field: 'etd', width: 180, 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: '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: 'createdTime', width: 180, title: '接收时间', showHeaderOverflow: true, sortable: true },
     { field: 'status', width: 100, title: '任务状态', showHeaderOverflow: true, sortable: true, slots: { default: 'status' } },
-    { field: 'tasK_NO', width: 150, title: '任务流水号', showHeaderOverflow: true, sortable: true },
-    { field: 'tasK_SOURCE', width: 100, title: '任务来源', showHeaderOverflow: true, sortable: true, slots: { default: 'taskScource' } },
+    { field: 'taskNo', width: 150, title: '任务流水号', showHeaderOverflow: true, sortable: true },
+    { field: 'taskSource', width: 100, title: '任务来源', showHeaderOverflow: true, sortable: true, slots: { default: 'taskScource' } },
     { field: 'createdUserName', width: 100, title: '接收人', showHeaderOverflow: true, sortable: true },
-    { field: 'completE_DEAL_NAME', width: 100, title: '完成方式', showHeaderOverflow: true, sortable: true },
+    { field: 'complateDealName', 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 99e4e97..1b0d37e 100644
--- a/src/views/main/ruleTemp/detail.vue
+++ b/src/views/main/ruleTemp/detail.vue
@@ -6,7 +6,7 @@
         <a-button type="primary" @click="handleSave">保存</a-button>
       </div>
       <a-form-model :model="form" :label-col="labelCol" :wrapper-col="wrapperCol">
-        <a-row>
+        <a-row v-if="form.carrierId!='EMC'">
           <a-col :span="6">
             <a-form-model-item class="strong" label="客户名称">
               <a-select
@@ -42,23 +42,41 @@
             </a-form-model-item>
           </a-col>
         </a-row>
-        <a-row v-if="form.carrierId!='EMC'">
+        <a-row v-if="form.carrierId=='EMC'">
           <a-col :span="6">
-            <a-form-model-item class="strong" label="船公司">
+            <a-form-model-item class="strong" label="客户名称">
               <a-select
-                v-model="form.carrierId"
+                v-model="form.custCode"
                 style="width: 100%"
                 show-search
-                :filter-option="filterOption"
+                :filter-option="false"
                 size="small"
-                @change="handleChangeCarrier">
+                :not-found-content="fetching ? undefined : null"
+                @focus="handleSearchFirst"
+                @search="handleSearch"
+                @change="handleChange">
                 <a-spin v-if="fetching" slot="notFoundContent" size="small" />
-                <a-select-option v-for="item in carrierList" :key="item.code">
-                  {{ item.cnName }} / {{ item.code }}
+                <a-select-option v-for="(item,index) in suggestList" :key="item.codeName">
+                  {{ item.shortName }}
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-model-item class="strong" label="用户名">
+              <a-select size="small" v-model="form.userId" style="width: 100%" @change="handleChangeUser">
+                <a-spin v-if="fetching" slot="notFoundContent" size="small" />
+                <a-select-option v-for="item in usreList" :key="item.id">
+                  {{ item.name }}
                 </a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
+          <a-col :span="6">
+            <a-form-model-item class="strong" label="模板名称">
+              <a-input size="small" v-model="form.templateName" />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="6">
             <a-form-model-item class="strong" label="模板类型">
               <a-select v-model="form.category" style="width: 100%" show-search size="small">
@@ -68,13 +86,16 @@
               </a-select>
             </a-form-model-item>
           </a-col>
+
+        </a-row>
+        <a-row v-if="form.carrierId=='EMC'">
           <a-col :span="6">
             <a-form-model-item class="strong" label="是否启用模板">
               <a-checkbox style="margin-left: 20px;" v-model="form.isEnable"></a-checkbox>
             </a-form-model-item>
           </a-col>
         </a-row>
-        <a-row v-if="form.carrierId=='EMC'">
+        <a-row v-if="form.carrierId!='EMC'">
           <a-col :span="6">
             <a-form-model-item class="strong" label="船公司">
               <a-select
@@ -100,17 +121,13 @@
               </a-select>
             </a-form-model-item>
           </a-col>
-          <a-col :span="6">
-            <a-form-model-item class="strong" label="是否接受订舱通知">
-              <a-checkbox style="margin-left: 20px;" v-model="form.notifyNext"></a-checkbox>
-            </a-form-model-item>
-          </a-col>
           <a-col :span="6">
             <a-form-model-item class="strong" label="是否启用模板">
               <a-checkbox style="margin-left: 20px;" v-model="form.isEnable"></a-checkbox>
             </a-form-model-item>
           </a-col>
         </a-row>
+
         <a-row v-if="form.carrierId!='EMC'">
           <a-col :span="6">
             <a-form-model-item class="strong" label="合约号">
@@ -123,57 +140,7 @@
             </a-form-model-item>
           </a-col>
         </a-row>
-        <a-row v-if="form.carrierId=='EMC'">
-          <a-col :span="6">
-            <a-form-model-item class="strong" label="合约">
-              <a-select allowClear v-model="form.contractType" style="width: 30%;margin-right: 5%" show-search size="small">
-                <a-select-option value="SC">SC</a-select-option>
-                <a-select-option value="HT">HT</a-select-option>
-                <a-select-option value="LT">LT</a-select-option>
-                <a-select-option value="SQ">SQ</a-select-option>
-                <a-select-option value="RS">RS</a-select-option>
-                <a-select-option value="LM">LM</a-select-option>
-              </a-select>
-              <a-input size="small" style="width: 60%" v-model="form.contractNO" placeholder="约号">
-              </a-input></a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-model-item class="strong" label="签约方">
-              <a-select allowClear v-model="form.signType" style="width: 100%;" show-search size="small">
-                <a-select-option value="shipper">shipper</a-select-option>
-                <a-select-option value="party">party</a-select-option>
-                <a-select-option value="forwarder">forwarder</a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-model-item class="strong" label="订舱网点">
-              <a-input size="small" v-model="form.cancelAddr" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-model-item class="strong" label="提单签发地">
-              <a-input size="small" v-model="form.billSignLoc" />
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-        <a-row v-if="form.carrierId=='EMC'">
-          <a-col :span="6">
-            <a-form-model-item class="strong" label="订舱账号">
-              <a-input size="small" v-model="form.bookingAccount" placeholder="订舱账号" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-model-item class="strong" label="内参号">
-              <a-input size="small" v-model="form.customerInnerCode" placeholder="内参号" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-model-item class="strong" label="提单数量">
-              <a-input size="small" v-model="form.billCount" placeholder="不填默认1" />
-            </a-form-model-item>
-          </a-col>
-        </a-row>
+
         <div v-if="form.carrierId!='EMC'">
           <div style="margin: 20px 0;margin-left: 10px;">
             <span style="font-size: 14px;font-weight: bold;color: black;">船期匹配优先级</span>
@@ -349,78 +316,8 @@
             </a-col>
           </a-row>
         </div>
-        <a-row style="margin-top: 20px;" v-if="form.carrierId=='EMC'" >
-          <a-col :span="12">
-            <div style="padding-left: 80px">
-              <span style="font-weight: bold;font-size: 15px;margin-right: 10px;color: black">发货人</span>
-              <span style="color: red">注意：模板生效时，此处填写内容，默认以此内容订舱，没填以订单中内容订舱</span>
-            </div>
-            <a-form-model-item label="发货人名称" :label-col="{span:4}" :wrapper-col="{span:18}">
-              <a-input size="small" v-model="form.shipperName" />
-            </a-form-model-item>
-            <a-form-model-item label="联系人信息" :label-col="{span:4}" :wrapper-col="{span:18}">
-              <a-select allowClear v-model="form.shipperSex" style="width: 13%;" placeholder="性别" size="small">
-                <a-select-option value="男">男</a-select-option>
-                <a-select-option value="女">女</a-select-option>
-              </a-select>
-              <a-input placeholder="姓" style="width: 13%;margin: 0 1%;" size="small" v-model="form.shipperFirstName" />
-              <a-input placeholder="名" style="width: 13%;" size="small" v-model="form.shipperLastName" />
-              <a-input placeholder="国家区号" style="width: 13%;margin: 0 1%;" size="small" v-model="form.shipperPhoneCountryCode" />
-              <a-input placeholder="城市区号" style="width: 13%;" size="small" v-model="form.shipperPhoneCode" />
-              <a-input placeholder="电话" style="width: 13%;margin: 0 1%;" size="small" v-model="form.shipperPhone" />
-              <a-input placeholder="分机号" style="width: 16%;" size="small" v-model="form.shipperPhoneExtension" />
-            </a-form-model-item>
-            <a-form-model-item label="内参号码" :label-col="{span:4}" :wrapper-col="{span:18}">
-              <a-input size="small" v-model="form.shipperInnerCode" />
-            </a-form-model-item>
 
-          </a-col>
-          <a-col :span="12">
-            <div style="padding-left: 80px">
-              <span style="font-weight: bold;font-size: 15px;margin-right: 10px;color: black">货代公司</span>
-              <span style="color: red">注意：模板生效时，此处填写内容，默认以此内容订舱，没填以订单中内容订舱</span>
-            </div>
-            <a-form-model-item label="订舱人名称" :label-col="{span:4}" :wrapper-col="{span:18}">
-              <a-input size="small" v-model="form.bookingName" />
-            </a-form-model-item>
-            <a-form-model-item label="联系人信息" :label-col="{span:4}" :wrapper-col="{span:18}">
-              <a-select allowClear v-model="form.bookingSex" style="width: 13%;" placeholder="性别" size="small">
-                <a-select-option value="男">男</a-select-option>
-                <a-select-option value="女">女</a-select-option>
-              </a-select>
-              <a-input placeholder="姓" style="width: 13%;margin: 0 1%" size="small" v-model="form.bookingFirstName" />
-              <a-input placeholder="名" style="width: 13%;" size="small" v-model="form.bookingLastName" />
-              <a-input placeholder="国家区号" style="width: 13%;margin: 0 1%" size="small" v-model="form.bookingPhoneCountryCode" />
-              <a-input placeholder="城市区号" style="width: 13%;" size="small" v-model="form.bookingPhoneCode" />
-              <a-input placeholder="电话号码" style="width: 13%;margin: 0 1%;" size="small" v-model="form.bookingPhone" />
-              <a-input placeholder="分机号" style="width: 16%;" size="small" v-model="form.bookingPhoneExtension	" />
-            </a-form-model-item>
-            <a-form-model-item label="内参号码" :label-col="{span:4}" :wrapper-col="{span:18}">
-              <a-input size="small" v-model="form.bookingInnerCode" />
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-        <a-row style="margin-top: 20px;" v-if="form.carrierId=='EMC'">
-          <a-col :span="12">
-            <div style="padding-left: 80px">
-              <span style="font-weight: bold;font-size: 15px;margin-right: 10px;color: black">收货人</span>
-              <span style="color: red">注意：模板生效时，此处填写内容，默认以此内容订舱，没填以订单中内容订舱</span>
-            </div>
-            <a-form-model-item label="收货人名称" :label-col="{span:4}" :wrapper-col="{span:18}">
-              <a-input size="small" v-model="form.consigneeName" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="12">
-            <div style="padding-left: 80px">
-              <span style="font-weight: bold;font-size: 15px;margin-right: 10px;color: black">通知人</span>
-              <span style="color: red">注意：模板生效时，此处填写内容，默认以此内容订舱，没填以订单中内容订舱</span>
-            </div>
-            <a-form-model-item label="通知人名称" :label-col="{span:4}" :wrapper-col="{span:18}">
-              <a-input size="small" v-model="form.notifypartName" />
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-        <a-row>
+        <a-row v-if="form.carrierId!='EMC'">
           <a-col style="padding-left: 80px" :span="12">
             <div style="margin-bottom: 10px">
               <span style="font-weight: bold;font-size: 15px;margin-right: 10px;color: black">品名</span>
@@ -436,7 +333,7 @@
             <a-textarea v-model="form.soRemark" style="width: 90%;" :auto-size="{ minRows: 3, maxRows: 5 }" />
           </a-col>
         </a-row>
-        <a-row >
+        <a-row v-if="form.carrierId!='EMC'">
           <a-col :span="12">
             <a-form-model-item :label-col="{span:4}" :wrapper-col="{span:18}" class="strong" label="接受BC邮箱">
               <a-input size="small" placeholder="多个以分号隔开，若不填，默认传下单操作邮箱" v-model="form.bcReceiveEmail" />