修复订单编辑bug

src/views/ecw/order/edit.vue

@@ -18,7 +18,7 @@
                 <el-table-column label="新内容" prop="newValue"></el-table-column>
             </el-table>
         </el-card>
-        <div class="page-title">{{ editMode  ? $t('编辑订单') + '-' + form.orderNo  : $t('新建订单')}}</div>
+        <div class="page-title">{{ editMode  ? $t('编辑订单') + '-' + (form.orderNo || $t('草稿'))  : $t('新建订单')}}</div>
 
         <el-card class="form-section mt-10">
           <template #header>
@@ -360,9 +360,9 @@
         <el-card class="mt-10">
             <div class="card-title" slot="header">{{$t('通用')}}</div>
             <div class="form-section">
-                <el-form-item :label="$t('唛头')" prop="marks" >
-                    <el-input v-model="form.marks" ></el-input>
-                </el-form-item>
+              <el-form-item :label="$t('唛头')" prop="marks" class="w-500" >
+                  <el-input v-model="form.marks" ></el-input>
+              </el-form-item>
               <el-form-item :label="$t('单证报关')" :span="2" prop="customsType">
                 <template #label>
                   {{$t('单证报关')}}
@@ -379,7 +379,7 @@
               <!--目的港清关：选择专线空运才显示，默认选中我司
               我司选中后，按钮下方显示“多票”和“单票”的操作，默认选中多票。
               客户选中后，按钮下方显示“单票”的操作，默认选中，无需点击-->
-              <div class="form-section">
+              <div class="form-section w-500">
                 <el-form-item :label="$t('目的港清关')">
                   <el-radio-group v-model="form.portDestCustomsClear">
                     <el-radio :label="1">
@@ -407,7 +407,7 @@
               </div>
             </div>
             <div class="form-section">
-              <el-form-item :label="$t('是否控货')" prop="isCargoControl" class="ml-20">
+              <el-form-item :label="$t('是否控货')" prop="isCargoControl" class="w-500">
                   <template #label>
                     {{$t('是否控货')}}
                     <el-tooltip effect="dark" :content="$t('是指由发货人与收货人约定在货物的国际运输过程中，我司作为第三方对该货物货权的控制;需由发货人授权我司放货的情况下收货人才能提取该票货物的一种交易方式')" placement="top">
@@ -425,7 +425,7 @@
                        }"
                   />
               </el-form-item>
-              <el-form-item :label="$t('付款人')" prop="drawee">
+              <el-form-item :label="$t('付款人')" prop="drawee" class="w-500">
                 <dict-selector :formatter="Number" :type="DICT_TYPE.DRAWEE" v-model="form.drawee" defaultable form-type="radio"  :disabled="false"/>
                 <el-table :data="customDraweeList" v-if="form.drawee==3" >
                   <el-table-column :label="$t('费用类型')" prop="label" width="200px"></el-table-column>
@@ -444,7 +444,7 @@
               </el-form-item>
             </div>
             <div class="form-section flex">
-              <el-form-item :label="$t('入仓类型')" prop="warehouseType">
+              <el-form-item :label="$t('入仓类型')" prop="warehouseType" class="w-500">
                 <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="form.warehouseType" defaultable  :disabled="false" />
               </el-form-item>
               <div>
@@ -480,26 +480,25 @@
               </div>
             </div>
             <div class="form-section">
-              <el-form-item :label="$t('预计送货日期')" prop="deliveryDate" v-if="!form.isExternalWarehouse">
+              <el-form-item :label="$t('预计送货日期')" prop="deliveryDate" v-if="!form.isExternalWarehouse" class="w-500">
                 <el-date-picker v-model="form.deliveryDate" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
               </el-form-item>
-              <el-form-item :label="$t('是否代收货款')" prop="isCollection" v-if="collectionProxy">
+              <el-form-item :label="$t('是否代收货款')" prop="isCollection" v-if="collectionProxy" class="w-500">
                 <dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.isCollection" form-type="radio" :disabled="false" />
               </el-form-item>
               <!--代收货款，只有非控货订单、并且线路开通了代收货款后，才显示是否代收货款选项-->
-              <el-form-item :label="$t('代收货款金额')" v-if="collectionProxy && form.isCollection" prop="collectionProxy" class="ml-20">
+              <el-form-item :label="$t('代收货款金额')" v-if="collectionProxy && form.isCollection" prop="collectionProxy">
                 <el-input type="number" v-model="form.collectionProxy" class="w-200 mr-10"  :disabled="false"></el-input>
                 <selector v-model="form.collectionProxyCurrency" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100"  :disabled="false"/>
               </el-form-item>
             </div>
             <div class="form-section flex">
-              <el-form-item :label="$t('收货方式')" prop="harvestMethod" class="ml-20">
+              <el-form-item :label="$t('收货方式')" prop="harvestMethod" class="w-500">
                 <el-select v-model="form.harvestMethod" @change="handleChange">
                   <el-option :label="$t('自提')" :value="1" ></el-option>
                   <el-option v-if="homeDeliveryService" :label="$t('送货上门')" :value="2" ></el-option>
                 </el-select>
               </el-form-item>
-
               <el-form-item :label="$t('关联报价单')" prop="offerId">
                 <span v-if="offerIdNochange&&offerNumber">{{offerNumber}}</span>
                 <el-select
@@ -1643,10 +1642,11 @@ export default {
         // 修改的提交
         if (this.form.orderId) {
             let data = Object.assign({}, this.form, {
-                status: submitType,
+              status: submitType,
               customDraweeVOList: this.customDraweeList,
               // transportUpdateReqVOList: this.transportList.filter(item => item._enabled),
               orderItemVOList: this.getProductListWithDefaultValue(),
+              hasConsignee: this.hasConsignee
             })
             data.type = data.type.join(',')
             updateApply(data).then(response => {
@@ -1664,7 +1664,8 @@ export default {
             customDraweeVOList: this.customDraweeList,
             // transportUpdateReqVOList: this.transportList.filter(item => item._enabled),
             orderItemVOList: this.getProductListWithDefaultValue(),
-            status: submitType
+            status: submitType,
+            hasConsignee: this.hasConsignee
         })
         data.type = data.type.join(',')
         // 添加的提交