Merge remote-tracking branch 'origin/predev' into predev

src/i18n/languages/en_US.json

@@ -3831,8 +3831,19 @@
     "取消付款单反审核": "Cancel Payment Order De-approval",
     "提交核销": "Submit for verification",
     "是否确认删除渠道管理编号为{channelId}的数据项?": "Are you sure to delete the data item with channel management number {channelId}?",
-    "流程详情":"Flow details",
-    "收款单核销审核":"The payment voucher verification review",
+    "流程详情": "Flow details",
+    "收款单核销审核": "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"
-}
+    "合计：{totalNum}箱，{totalVolume}m³(测) {totalChargeVolume}m³(重) {totalWeight}KG": "Total：{totalNum}Box，{totalVolume}m³(Test) {totalChargeVolume}m³(Weight) {totalWeight}KG",
+    "确定要取消此报价单么？": "",
+    "确定要恢复此报价单么？": "",
+    "确定要删除此报价单么？": "",
+    "优质条件": "",
+    "港口": "",
+    "出证速度": "Speed of certification",
+    "快": "fast",
+    "慢": "slow",
+    "CTN NO": "",
+    "请输入CTN NO": "请输入CTN NO",
+    "境内外类型": "Internal and external types"
+}
\ No newline at end of file

src/views/ecw/box/shippingSea/utils.js

@@ -988,13 +988,12 @@ function getColmnMapping() {
         type: "supplier",
       },
       {
-        title: i18n.$t("提单品名"),
+        title: i18n.$t("提单号"),
         key: "blMblNo",
       },
       {
         title: i18n.$t("通知方"),
-        key: "notifyingId",
-        type: "user",
+        key: "notifyingName",
       },
       {
         title: i18n.$t("提单备注"),

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

@@ -196,8 +196,8 @@
       </div>
     </el-dialog>
     <el-dialog :title="order.orderNo + $t('订单转异')" center :visible.sync="escapeBol">
-      <el-form label-position="top" label-width="200">
-        <el-form-item :label="$t('原因类型')">
+      <el-form label-position="top" label-width="200" ref="exceptionForm" :model="form" :rules="exceptionRules">
+        <el-form-item :label="$t('原因类型')" prop="manualExceptionType">
           <dict-selector v-model="form.manualExceptionType" form-type="checkbox" :type="DICT_TYPE.MANUAL_EXCEPTION_TYPE" multiple ></dict-selector>
         </el-form-item>
         <el-form-item :label="$t('附件')">
@@ -208,7 +208,7 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button  type="primary" @click="handleSubmit">{{$t('确认并完成入仓')}}</el-button>
+        <el-button  type="primary" @click="handleException">{{$t('确认并完成入仓')}}</el-button>
         <el-button @click="escapeBol = false">{{$t('取消')}}</el-button>
       </span>
     </el-dialog>
@@ -286,7 +286,7 @@ export default {
         orderLocationCreateReqVOList: [],
         exceptionUrls:[],
         descZh:'',
-        manualExceptionType:'',
+        manualExceptionType:[],
         urls: [],
         sumVolume: '',
         sumWeight: '',
@@ -309,6 +309,19 @@ export default {
             "start": 0
           }
         ]
+      },
+      exceptionRules: {
+        manualExceptionType: [
+          { required: true, message: '请勾选原因类型', trigger: 'change' },
+          {
+            validator: (rule, value, callback) => {
+              if (value.length <= 0) {
+                callback(new Error('请勾选原因类型'))
+              }
+              callback()
+            }, trigger: 'change'
+          }
+        ]
       }
     }
   },
@@ -401,6 +414,15 @@ export default {
       })
       return result
     },
+    handleException() {
+      this.$refs.exceptionForm.validate((valid) => {
+        if (valid) {
+          this.handleSubmit()
+        } else {
+          this.$message.warning('请勾选原因类型')
+        }
+      })
+    },
     async handleSubmit() {
       if (this.specialHas0()) {
         const confirm = await this.$confirm(this.$t('有特需费用为0或未填写，请问是否继续？'), this.$t('注意'), {

src/views/ecw/productPrice/index.vue

@@ -758,13 +758,13 @@ export default {
     batchBlock(){
       batchBlock({ids: this.ids.join(',')}).then(res => {
         this.$message.success(res.msg || this.$t('操作成功'))
-        this.handleQuery()
+        this.getList()
       })
     },
     batchOff(){
       batchOff({ids: this.ids.join(',')}).then(res => {
         this.$message.success(res.msg || this.$t('操作成功'))
-        this.handleQuery()
+        this.getList()
       })
     },
 

src/views/ecw/supplier/edit.vue

@@ -62,7 +62,7 @@
       
       <div v-if="formData.areaType==0">
         <el-form-item :label="$t('供应商类别')" prop="companyType">
-          <dict-selector v-model="formData.companyTypeArr" type="company_type" multiple :disabled="disabled" />
+          <dict-selector v-model="formData.companyTypeArr" type="company_type" multiple />
         </el-form-item>
       </div>