Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release

src/i18n/languages/en_US.json

@@ -3834,25 +3834,25 @@
     "收款单核销审核": "The payment voucher verification review",
     "系统提示": "System prompt",
     "合计：{totalNum}箱，{totalVolume}m³(测) {totalChargeVolume}m³(重) {totalWeight}KG": "Total：{totalNum}Box，{totalVolume}m³(Test) {totalChargeVolume}m³(Weight) {totalWeight}KG",
-    "确定要取消此报价单么？": "",
-    "确定要恢复此报价单么？": "",
-    "确定要删除此报价单么？": "",
-    "优质条件": "",
-    "港口": "",
+    "确定要取消此报价单么？": "Are you sure you want to cancel this quote?",
+    "确定要恢复此报价单么？": "Are you sure you want to restore this quote?",
+    "确定要删除此报价单么？": "Are you sure you want to delete this quote?",
+    "优质条件": "high-quality conditions",
+    "港口": "port",
     "出证速度": "Speed of certification",
     "快": "fast",
     "慢": "slow",
-    "CTN NO": "",
-    "请输入CTN NO": "请输入CTN NO",
+    "CTN NO": "CTN NO",
+    "请输入CTN NO": "Please enter CTN NO",
     "境内外类型": "Internal and external types",
     "为保证入仓数据准确性，入仓请带上一份装箱单（品名，件数，毛重，尺寸方数，是否有牌）": "To ensure the accuracy of warehousing information, please bring a packing list with goods when entrying the warehouse. (Packing list should contain: Product name, Number of cartons, Gross weight, Measurements, Branded or not)",
     "姓名(英文)": "Name (English)",
     "公司(英文)": "Company (English)",
-    "入仓体积": "",
-    "收费体积": "",
-    "入仓重量": "",
-    "收费重量": "",
-    "数据无效": "",
+    "入仓体积": "Warehouse volume",
+    "收费体积": "Fee volume",
+    "入仓重量": "Warehouse weight",
+    "收费重量": "Fee weight",
+    "数据无效": "The data is invalid",
     "客户英文名称": "the customer's English name",
     "请输入客户英文名称": "Please enter the customer's English name",
     "付款人姓名": "The sender's name",
@@ -3860,8 +3860,8 @@
     "公司英文名称": "Company English Name",
     "联系人英文名称": "Contact's English name",
     "请输入联系人英文名称": "Please enter the contact's name in English",
-    "入仓修改时间": "",
-    "退仓图片": "",
+    "入仓修改时间": "Warehouse modification time",
+    "退仓图片": "withdrawal image",
     "发货人中文名称": "The sender's Chinese name",
     "发货人英文名称": "The sender's English name",
     "发货人公司中文名称": "Sender Company's Chinese name",
@@ -3876,5 +3876,25 @@
     "新增品名中文": "New product name in Chinese",
     "新增品名英文": "New product name in English",
     "{prods}等商品拆单总数据跟主单不匹配": "The total data for the split order of {prods} products does not match the main order.",
-    "入仓特性": ""
+    "入仓特性": "",
+    "剩余入仓方数": "",
+    "剩余收费方数": "",
+    "剩余入仓重量": "",
+    "剩余收费重量": "",
+    "是否需要一起预装?": "",
+    "请注意，预装反审后，全部提单需重新制作": "",
+    "请先处理完出货异常，再进行操作": "",
+    "业绩类型": "",
+    "普通订单": "",
+    "收费统计": "",
+    "公司中文名称": "",
+    "展示": "",
+    "查看无归属客服异常": "Viewing unassigned customer service exceptions.",
+    "最多可放入{quantity}": "",
+    "可放入仓方数": "",
+    "可放入收费方数": "",
+    "入仓方数": "",
+    "收费方数": "",
+    "可放入重量": "",
+    "可放入收费重量": ""
 }
\ No newline at end of file

src/views/ecw/order/exception/index.vue

@@ -49,6 +49,9 @@
         <el-form-item :label="$t('订单号')+':'">
           <el-input v-model="queryParams.orderNo" :placeholder="$t('请输入订单号')" clearable @keyup.enter.native="handleQuery"/>
         </el-form-item>
+        <el-form-item label="">
+            <el-checkbox style="margin-left:20px" v-model="queryParams.isHaveCustomer">{{$t('查看无归属客服异常')}}</el-checkbox>
+        </el-form-item>
       </el-row>
       <el-row>
 <!--        <el-form-item :label="$t('发货人')+':'">
@@ -298,6 +301,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      console.log(this.queryParams)
       this.queryParams.page = 1
       this.getList();
     },