修改几个bug

src/views/ecw/offer/edit.vue

@@ -3,7 +3,7 @@
 
     <el-form ref="form" :model="form" :rules="rules" label-width="120px" inline :validate-on-rule-change="false">
         <el-card>
-            <div slot="header" class="card-title">{{$t('新建报价单')}}</div>
+            <div slot="header" class="card-title">{{$route.path.indexOf('create') > -1 ? $t('新建报价单') : $t('编辑报价单')}}</div>
             <el-form-item :label="$t('所属人')" prop="relation">
                 <el-radio-group v-model="form.relation">
                   <el-radio :label="1">{{$t('发件人')}}</el-radio>
@@ -203,7 +203,7 @@
               </el-table-column>
               <el-table-column :label="$t('数量') + '(个)'">
                 <template slot-scope="{row}">
-                    <el-input v-model.number="row.quantity" @input="calculationPrice" :disabled="!canAddProduct" />
+                    <el-input v-model="row.quantity" @input="calculationPrice" :disabled="!canAddProduct" />
                 </template>
               </el-table-column>
               <el-table-column :label="$t('总体积') + '(m³)'" width="100px">
@@ -871,6 +871,7 @@ export default {
                         "lineId": item.lineId,
                         "prodId": item.prodId,
                         "num": item.num,
+                        "quantity": item.quantity,
                         "boxGauge": item.boxGauge,
                         "volume": item.volume,
                         "transportId": item.transportId,
@@ -891,11 +892,12 @@ export default {
         })
     },
     onContactChoose(contact){
-        console.log('选择联系人', contact)
+        if(!contact) return
         if(!this.contactChooseType && !this.quickCreateType) return
         if(!this.contactChooseType && this.quickCreateType){
             this.contactChooseType = this.quickCreateType == 0 ? 'consignor' : 'consignee'
         }
+
         this.$set(this.form, this.contactChooseType + 'Company', contact.company)
         this.$set(this.form, this.contactChooseType + 'Id', contact.customerContactsId)
         this.$set(this.form, this.contactChooseType + 'CountryCode', contact.areaCode)

src/views/ecw/order/cargoControl.vue

@@ -50,7 +50,12 @@
       <el-form-item :label="$t('唛头')" prop="marks">
         <el-input v-model="queryParams.marks" placeholder="唛头" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      
+      <el-form-item :label="$t('外部仓')" prop="number">
+        <el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery">
+          <el-option :label="$t('外部仓')" :value="1"></el-option>
+          <el-option :label="$t('自有仓')" :value="0"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"

src/views/ecw/order/detail.vue

@@ -95,7 +95,7 @@
           {{order.isExternalWarehouse ? $t('外部仓') : $t('自有仓') }}
           <template v-for="(item, index) in order.externalWarehouseDtoList" >
             <div v-if="item.estLoadingTime || item.loadingAddress" :key="index">
-              <!-- {{$t('装柜时间')}}： {{item.estLoadingTime}} -->
+              {{$t('装柜时间')}}： {{item.estLoadingTime}}
               {{$t('装柜地址')}}：{{item.loadingAddress}}
             </div>
           </template>

src/views/ecw/order/edit.vue

@@ -305,7 +305,7 @@
                 </el-form-item>
                 <div v-if="form.isExternalWarehouse" class="pl-50">
                     <div v-for="(item, index) in form.externalWarehouseDtoList" class="flex" :key="index">
-                        <!-- <div class="w-300">
+                        <div class="w-300">
                             <el-form-item :label="$t('装货时间')"
                             :prop="'externalWarehouseDtoList.' + index + '.estLoadingTime'"
                             :rules="{
@@ -314,7 +314,7 @@
                             >
                                 <el-date-picker v-model="item.estLoadingTime" value-format="yyyy-MM-dd HH:mm:ss" class="w-200"></el-date-picker>
                             </el-form-item>
-                        </div> -->
+                        </div>
                         <div class="w-300">
                             <el-form-item :label="$t('装货地址')"
                             :prop="'externalWarehouseDtoList.' + index + '.loadingAddress'"
@@ -330,7 +330,7 @@
                     </div>
                 </div>
             </div>
-            <div>
+            <div v-if="!form.isExternalWarehouse">
                 <el-form-item :label="$t('预计送货日期')" prop="deliveryDate">
                     <el-date-picker v-model="form.deliveryDate" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
                 </el-form-item>
@@ -806,21 +806,26 @@ export default {
             
             this.form.type = this.form.type ? this.form.type.split(',').filter(item => item != '') : []
             this.form.packageTypeArr = this.form.packageType ? this.form.packageType.split(',').filter(item => item != '') : []
-            this.$set(this.form, 'consignorCompany',        res.data.consignorVO.company)
-            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, 'consignorPhone',          res.data.consignorVO.phone)
+            if(res.data.consignorVO){
+                this.$set(this.form, 'consignorCompany',        res.data.consignorVO.company)
+                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, 'consignorPhone',          res.data.consignorVO.phone)
+            }
 
-            this.$set(this.form, 'consigneeCompany',        res.data.consigneeVO.company)
-            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, 'consigneePhone',          res.data.consigneeVO.phone)
+            if(res.data.consigneeVO){
+                this.$set(this.form, 'consigneeCompany',        res.data.consigneeVO.company)
+                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, 'consigneePhone',          res.data.consigneeVO.phone)
+            }
+            
             if(res.data.ccIds){
                 this.ccIdArr = res.data.ccIds.split(",").filter(item => item && item != '')
             }

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

@@ -60,6 +60,12 @@
           <el-option v-for="item in creatorData" :key="item.id" :label="item.nickname" :value="item.id"/>
           </el-select>
         </el-form-item>
+        <el-form-item :label="$t('外部仓')" prop="number">
+          <el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery">
+            <el-option :label="$t('外部仓')" :value="1"></el-option>
+            <el-option :label="$t('自有仓')" :value="0"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
           <!-- <el-button icon="el-icon-refresh" @click="reset">重置</el-button> -->

src/views/ecw/order/index.vue

@@ -91,6 +91,12 @@
       <el-form-item :label="$t('快递单号')" prop="number">
         <el-input v-model="queryParams.number" :placeholder="$t('快递单号')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item :label="$t('外部仓')" prop="number">
+        <el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery">
+          <el-option :label="$t('外部仓')" :value="1"></el-option>
+          <el-option :label="$t('自有仓')" :value="0"></el-option>
+        </el-select>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>