Merge branch 'feature/order_edit' into pre-release

src/views/ecw/order/edit.vue

@@ -111,17 +111,17 @@
             <div class="form-section">
                 <el-form-item :label="$t('运输方式')" prop="transportId">
                     <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="form.transportId" formatter="number"
-                                   clearable @input="updateRoutes('transportId')"/>
+                                   clearable @input="updateRoutes('transportId')" :disabled="form.shipmentState"/>
                 </el-form-item>
             </div>
             <div class="form-section">
                 <el-form-item :label="$t('始发城市')" prop="departureId" :disabled="false">
-                    <el-select v-model="form.departureId" :placeholder="$t('请选择始发地')" :disabled="false" clearable @input="updateRoutes('departureId')">
+                    <el-select v-model="form.departureId" :placeholder="$t('请选择始发地')" :disabled="form.shipmentState" clearable @input="updateRoutes('departureId')">
                         <el-option v-for="item in exportCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item :label="$t('目的国家')" prop="destCountryId">
-                    <el-select v-model="form.destCountryId" :placeholder="$t('请选择目的国家')" @change="handleChangeDestCountry" clearable>
+                    <el-select v-model="form.destCountryId" :placeholder="$t('请选择目的国家')" @change="handleChangeDestCountry" clearable :disabled="form.shipmentState">
                         <el-option v-for="item in showDestCountryList" :label="$l(item, 'guojiaName')" :value="item.guojia" :key="item.guojia"></el-option>
                     </el-select>
                 </el-form-item>
@@ -162,7 +162,7 @@
               <el-form-item :label="$t('增值服务')" v-if="routeOtherServices.indexOf('1') > -1 || routeOtherServices.indexOf('4') > -1">
                 <el-checkbox-group v-model="form.type">
                   <el-checkbox label="1" v-if="routeOtherServices.indexOf('1') > -1">{{$t('集运')}}</el-checkbox>
-                  <el-checkbox label="2" v-if="routeOtherServices.indexOf('4') > -1">{{$t('海外仓')}}</el-checkbox>
+                  <el-checkbox label="2" v-if="routeOtherServices.indexOf('4') > -1" :disabled="form.shipmentState">{{$t('海外仓')}}</el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
             </div>
@@ -370,7 +370,8 @@
                     <i class="el-icon-question"></i>
                   </el-tooltip>
                 </template>
-                <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="form.customsType" form-type="radio" defaultable :disabled="false" />
+                <!--241023 已起运不让修改报关方式-->
+                <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="form.customsType" form-type="radio" defaultable :disabled="isShipment" />
                 <!--自单代报显示提示-->
                 <div v-if="+form.customsType === 2"  style="color:red;font-size:14px">{{$t('报关退税，请备齐资料。')}}</div>
               </el-form-item>
@@ -964,6 +965,10 @@ export default {
     showDestCityList(){
       if(!this.form.destCountryId) return this.destCityList
       return this.destCityList.filter(item => item.guojia === this.form.destCountryId) || []
+    },
+    // 是否已起运（已起运不让修改报关方式）
+    isShipment(){
+      return [326,328,329,330,332,391,392,426,428,432].indexOf(this.form.shipmentState) > -1
     }
   },
   watch:{
@@ -1662,6 +1667,9 @@ export default {
 
         // 修改的提交
         if (this.form.orderId) {
+            if(this.form.tidanNo){
+              await this.$confirm(this.$t('提单已制作，如需修改请联系客服'))
+            }
             let data = Object.assign({}, this.form, {
               status: submitType,
               customDraweeVOList: this.customDraweeList,