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

src/components/ProductSelector/index.vue

@@ -34,6 +34,11 @@ export default {
         lang: {
             type: String,
             default: 'Zh'
+        },
+        // 是否显示待确认商品，不传默认不显示
+        determined: {
+          type: Boolean,
+          default: false
         }
     },
     data(){
@@ -85,7 +90,7 @@ export default {
         remoteMethod(keyword){
             let params = {
                 pageSize: keyword ? 100000 : 10,
-                filter: false
+                filter: !this.determined
             }
             if(this.productType){
                 params.typeId = this.productType

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

@@ -9,7 +9,22 @@
     <el-row style="margin-top:15px">
       <el-table :data="billData.list" border max-height="500px">
         <el-table-column :label="$t('序号')" align="center" width="50" prop="tidanNo" />
-        <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
+        <el-table-column :label="$t('订单号')" align="center" prop="orderNo">
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.orderNo}}
+            </div>
+            <div style="color:blue;fontWeight:bold;">
+              {{ scope.row.drawee? scope.row.drawee:''}}
+            </div>
+            <div style="color:red;fontWeight:bold;">
+              {{ scope.row.applicationInfo? scope.row.applicationInfo : ''}}
+            </div>
+            <div style="color:red;fontWeight:bold;">
+              {{ scope.row.customsTypeName? scope.row.customsTypeName : ''}}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('货物信息')" align="center" prop="">
           <template slot-scope="scope">
             <section class="table-goodList">

src/views/ecw/order/edit.vue

@@ -929,21 +929,25 @@ export default {
             this.form.packageTypeArr = this.form.packageType ? this.form.packageType.split(',').filter(item => item != '') : []
             if(res.data.consignorVO){
                 this.$set(this.form, 'consignorCompany',        res.data.consignorVO.company)
+                this.$set(this.form, 'consignorCompanyEn',        res.data.consignorVO.companyEn)
                 this.$set(this.form, 'consignorContactsId',     res.data.consignorVO.customerContactsId)
                 this.$set(this.form, 'consignorCountryCode',    res.data.consignorVO.countryCode.replace('+', ''))
                 this.$set(this.form, 'consignorEmail',          res.data.consignorVO.email)
                 this.$set(this.form, 'consignorId',             res.data.consignorVO.customerId)
                 this.$set(this.form, 'consignorName',           res.data.consignorVO.name)
+                this.$set(this.form, 'consignorNameEn',         res.data.consignorVO.nameEn)
                 this.$set(this.form, 'consignorPhone',          res.data.consignorVO.phone)
             }
 
             if(res.data.consigneeVO){
                 this.$set(this.form, 'consigneeCompany',        res.data.consigneeVO.company)
+                this.$set(this.form, 'consigneeCompanyEn',      res.data.consigneeVO.companyEn)
                 this.$set(this.form, 'consigneeContactsId',     res.data.consigneeVO.customerContactsId)
                 this.$set(this.form, 'consigneeCountryCode',    res.data.consigneeVO.countryCode.replace('+', ''))
                 this.$set(this.form, 'consigneeEmail',          res.data.consigneeVO.email)
                 this.$set(this.form, 'consigneeId',             res.data.consigneeVO.customerId)
                 this.$set(this.form, 'consigneeName',           res.data.consigneeVO.name)
+                this.$set(this.form, 'consigneeNameEn',         res.data.consigneeVO.nameEn)
                 this.$set(this.form, 'consigneePhone',          res.data.consigneeVO.phone)
             }
 
@@ -995,11 +999,13 @@ export default {
             this.contactChooseType = this.quickCreateType == 0 ? 'consignor' : 'consignee'
         }
         this.$set(this.form, this.contactChooseType + 'Company', contact.company)
+        this.$set(this.form, this.contactChooseType + 'CompanyEn', contact.companyEn||'')
         this.$set(this.form, this.contactChooseType + 'ContactsId', contact.customerContactsId)
         this.$set(this.form, this.contactChooseType + 'CountryCode', contact.areaCode.replace('+', ''))
         this.$set(this.form, this.contactChooseType + 'Email', contact.email)
         this.$set(this.form, this.contactChooseType + 'Id', contact.customerId)
         this.$set(this.form, this.contactChooseType + 'Name', contact.contactsName)
+        this.$set(this.form, this.contactChooseType + 'NameEn', contact.contactsNameEn||'')
         this.$set(this.form, this.contactChooseType + 'Phone', contact.phoneNew)
         this.contactChooseType = null
         this.quickCreateType = null

src/views/ecw/order/warehousing/components/Warehouse.vue

@@ -13,14 +13,14 @@
               <el-descriptions-item>
                 <template slot="label"><span style="color: red">*</span>{{ $t('中文品名') }}</template>
                 <span style="min-width: 200px;margin-right: 15px;display: inline-block">
-                  <product-selector v-if="!order.parentOrderId && !isAdd" v-model="form.prodId" @change="onProductChange"/>
+                  <product-selector v-if="!order.parentOrderId && !isAdd" v-model="form.prodId" @change="onProductChange" determined/>
                   <span v-else>{{ warehousing.prodTitleZh }}</span>
                 </span>
                 <el-button v-if="!order.parentOrderId && !isAdd" type="text" @click="isShowProduct = true">添加新商品</el-button>
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label"><span style="color: red">*</span>{{ $t('英文品名') }}</template>
-                <product-selector v-if="!order.parentOrderId && !isAdd" lang="En" v-model="form.prodId" @change="onProductChange"/>
+                <product-selector v-if="!order.parentOrderId && !isAdd" lang="En" v-model="form.prodId" @change="onProductChange" determined/>
                 <span v-else>{{ warehousing.prodTitleEn }}</span>
               </el-descriptions-item>
               <el-descriptions-item :label="$t('品牌')">