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

src/views/ecw/box/ladingBill/index.vue

@@ -64,7 +64,14 @@
             {{ scope.row.loadWeight }}kg
           </template>
         </el-table-column>
+        <el-table-column :label="$t('订单状态')" align="left" prop="orderStatusString" />
+        <el-table-column :label="$t('首次入仓时间')" align="left" prop="rucangTime">
+          <template slot-scope="scope">
+            {{ scope.row.rucangTime }}
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('客户经理')" align="center" prop="salesmanId" />
+
         <el-table-column :label="$t('制作')" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <!-- 0 （未制作提货单）  1（审核中） 2（审核通过） 3（审核拒绝） -->

src/views/ecw/productPrice/edit.vue

@@ -885,7 +885,7 @@ export default {
           if(data.lineChannelList.length < 1){
             return this.$message.error(this.$t('请选择需要修改的路线'))
           }
-          await this.$confirm(this.t("已选择{route}条路线，确认提交？", {route: data.lineChannelList.length}))
+          await this.$confirm(this.$t("已选择{route}条路线，确认提交？", {route: data.lineChannelList.length}))
           data.productIdList = [this.form.productId]
           this.loading = true
           batchUpdateProductPrice(data).then(response => {