订单优化

src/views/ecw/order/components/DetailProd.vue

@@ -248,7 +248,7 @@ export default {
       <el-table-column :label="$t('序号')" width="90px">
         <template slot-scope="scope">{{scope.$index + 1}}</template>
       </el-table-column>
-      <el-table-column prop="prodTitleZh" :label="$t('品名')">
+      <el-table-column prop="prodTitleZh" :label="$t('品名')" width="220px">
         <template slot-scope="{row}">
           <div>{{ getProdTypeName(row.prodType) }}</div>
           <div>{{row.prodTitleZh}}/{{row.prodTitleEn}}</div>
@@ -266,7 +266,7 @@ export default {
           {{showAttrText(row.warehouseInInfoVO ? row.warehouseInProdAttrIds : row.prodAttrIds)}}
         </template>
       </el-table-column>
-      <el-table-column prop="sumNum" :label="$t('入仓信息')"  width="90px">
+      <el-table-column prop="sumNum" :label="$t('入仓信息')"  width="220px">
         <template slot-scope="{row}">
           <!--<el-link type="primary" @click.native="showWarehouseLogs(row,1)">{{row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum : 0}}</el-link>
           <div v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.isMultiSpecification">({{$t('多规格')}})</div>-->
@@ -284,7 +284,7 @@ export default {
       <el-table-column prop="worth" :label="$t('货值')"  width="120px"/>
       <el-table-column prop="warehouseRecordRemark" :label="$t('入仓备注')"  width="120px"/>
       <el-table-column prop="warehouseInInfoVO.expressNo" :label="$t('快递单号')" />
-      <el-table-column prop="sumNum" :label="$t('收费数据')"  width="90px">
+      <el-table-column prop="sumNum" :label="$t('收费数据')"  width="220px">
         <template slot-scope="{row}">
           <div v-if="row.warehouseInInfoVO">
             {{row.chargeWeight}}Kg
@@ -292,7 +292,7 @@ export default {
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="" :label="`${$t('费用类型')}/${$t('模式')}`">
+      <el-table-column prop="" :label="`${$t('费用类型')}/${$t('模式')}`" width="200px">
         <template slot-scope="{row}">
           <dict-tag :type="DICT_TYPE.ECW_PAY_ADVANCE" :value="row.isPayAdvance" />
           <div v-if="row.charging ==0">{{ $t('运费/清关费') }}</div>
@@ -346,7 +346,7 @@ export default {
           </template>
         </template>
       </el-table-column>
-      <el-table-column prop="sumNum" :label="$t('填单信息')"  width="90px">
+      <el-table-column prop="sumNum" :label="$t('填单信息')"  width="180px">
         <template slot-scope="{row}">
           {{row.num}}{{$t('箱')}}
           {{row.weight}}Kg

src/views/ecw/order/detail.vue

@@ -67,8 +67,10 @@
       <el-descriptions border :title="$t('运输')" :column="5" :labelStyle="{ width: '110px' }" :contentStyle="{ width: '150px' }">
         <el-descriptions-item :label="$t('始发仓')">{{ $l(order.initialLogisticsInfoDto, "startTitle") }}</el-descriptions-item>
         <el-descriptions-item :label="$t('目的仓')">
-          {{ $l(order.initialLogisticsInfoDto, "destCountryTitle") }} - {{ $l(order.initialLogisticsInfoDto, "destCityTitle") }} -
-          {{ $l(order.initialLogisticsInfoDto, "destTitle") }}
+          <div class="w-300">
+            {{ $l(order.initialLogisticsInfoDto, "destCountryTitle") }} - {{ $l(order.initialLogisticsInfoDto, "destCityTitle") }} -
+            {{ $l(order.initialLogisticsInfoDto, "destTitle") }}
+          </div>
         </el-descriptions-item>
         <el-descriptions-item :label="$t('运输方式')">
           <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />

src/views/ecw/order/edit.vue

@@ -208,12 +208,6 @@
         <div slot="header" class="card-title">
           <!--lanbm 根据需求文档改 商品信息 为 商品 -->
           <div class="card-name">{{ $t('商品') }}</div>
-          <el-button type="primary" size="mini" @click="addProduct(null)"
-                     :disabled="!canAddProduct || !productEditable || updateChannel">{{ $t('添加') }}
-          </el-button>
-          <el-button type="primary" size="mini" @click="showBatchImportDialog=true"
-                     :disabled="!canAddProduct || !productEditable || updateChannel">{{ $t('批量添加') }}
-          </el-button>
         </div>
         <el-table :data="form.orderItemVOList" border class="product-list" v-if="!initing">
           <el-table-column :label="$t('序号')" width="60px" fixed>
@@ -383,6 +377,14 @@
           </el-table-column>
 
         </el-table>
+        <div class="flex justify-end mt-10">
+          <el-button type="primary" size="mini" @click="addProduct(null)"
+                     :disabled="!canAddProduct || !productEditable || updateChannel">{{ $t('添加') }}
+          </el-button>
+          <el-button type="primary" size="mini" @click="showBatchImportDialog=true"
+                     :disabled="!canAddProduct || !productEditable || updateChannel">{{ $t('批量添加') }}
+          </el-button>
+        </div>
         <!--
     </el-card>
     <el-card  class="mt-10"> -->
@@ -890,7 +892,9 @@ export default {
       showFullConsignee: false,
       destCountryList: [],
       destCityList: [],
-      selectedRouter: null
+      selectedRouter: null,
+      // 发货人默认付款
+      defaultPay: false
     };
   },
   computed: {
@@ -1080,9 +1084,10 @@ export default {
       if (!val) {
         this.$set(this.form, 'isCargoControl', true)
         // 无收货人且控货则默认发货人付款
-        this.$set(this.form, 'drawee', 1)
+        // this.$set(this.form, 'drawee', 1)
         // 清除收货人必填校验
         this.$refs.form?.clearValidate("consigneeContactsId")
+        this.setDefaultDrawee()
       }
     },
     ccIdArr(arr) {
@@ -1212,7 +1217,8 @@ export default {
     'form.isCargoControl'(isCargoControl) {
       console.log('form.isCargoControl', this.form.isCargoControl, this.initing)
       if (!this.initing) {
-        this.$set(this.form, 'drawee', isCargoControl && !this.hasConsignee ? 1 : 2)
+        // this.$set(this.form, 'drawee', isCargoControl && !this.hasConsignee ? 2 : 2)
+        this.setDefaultDrawee()
       }
 
       this.setBllLandingPrice('form.isCargoControl')
@@ -1534,6 +1540,7 @@ export default {
         //   this.$set(this, 'hasConsignee', true)
         // }
         // 如果默认付款则设置为发货人付款
+        this.defaultPay = contact.defaultPay
         if (contact.defaultPay) {
           this.$set(this.form, 'drawee', 1)
         }
@@ -1626,7 +1633,7 @@ export default {
       this.form.orderItemVOList.push(data || {
         prodAttrArr: [],
         prodId: null,
-        worth: '',
+        worth: undefined,
         volume: '',
         weight: '',
         num: undefined
@@ -2037,6 +2044,21 @@ export default {
     // 去掉唛头首尾空格
     trimMarks(){
       this.form.marks = this.form.marks.trim()
+    },
+    // 更新默认付款人
+    // 1发货人，2收货人，3自定义
+    setDefaultDrawee(){
+      if(this.defaultPay){
+        this.form.drawee = 1
+        return
+      }
+      if(!this.hasConsignee){
+        this.form.drawee = 2
+        return
+      }
+      if(this.form.isCargoControl){
+        this.form.drawee = 1
+      }
     }
   }
 };
@@ -2045,7 +2067,9 @@ export default {
 .w-380 {
   width: 380px;
 }
-
+.justify-end{
+  justify-content: flex-end;
+}
 .card-title {
   font-size: 18px;
   display: flex;

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

@@ -44,7 +44,7 @@
           class="w-200"
         />
       </el-form-item>
-      <el-form-item :label="$t('运输方式') + ':'" v-show="showSearch">
+      <el-form-item :label="$t('运输方式') + ':'">
         <dict-selector
           :type="DICT_TYPE.ECW_TRANSPORT_TYPE"
           :clearable="true"

src/views/ecw/order/index.vue

@@ -215,21 +215,9 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('发货人编号')" align="center">
-        <template slot-scope="{ row }">
-          <router-link :to="`/customer/query/${row.consignorCustomerId}`" class="link-type">
-            {{ row.consignorCustomerNumber }}
-          </router-link>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('收货人编号')" align="center" prop="consigneeCustomerNumber">
-        <template slot-scope="{ row }">
-          <router-link :to="`/customer/query/${row.consigneeCustomerId}`" class="link-type">
-            {{ row.consigneeCustomerNumber }}
-          </router-link>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('总箱数/入仓箱数')" align="center" prop="sumNum">
+      <el-table-column :label="$t('唛头')" align="center" prop="marks" />
+      
+      <el-table-column :label="$t('总箱数/入仓箱数')" align="center" prop="sumNum" width="200px">
         <template slot-scope="{ row }">
           <div :style="{ color: row.customsType != 1 ? 'red' : null }">{{ row.totalNum }}{{ $t("箱") }}/{{ row.sumNum }}{{ $t("箱") }}</div>
           <dict-tag v-if="row.customsType != 1" style="color: red" :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="row.customsType"></dict-tag>
@@ -261,13 +249,14 @@
           <span style="color: red" v-if="row.isExternalWarehouse">({{ $t("外部仓") }})</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('运输方式-渠道/目的地')" align="center" prop="transportId">
+      <el-table-column :label="$t('运输方式-渠道/目的地')" align="center" prop="transportId" width="200px">
         <template slot-scope="{ row }">
           <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId" />
           <template v-if="row.channelName"> - {{ row.channelName }} </template>
           / {{ row.dstWarehouseName }}
         </template>
       </el-table-column>
+      <el-table-column :label="$t('动态')" align="center" prop="statusMsg" />
       <el-table-column :label="$t('控货')" align="center" prop="transportId">
         <template slot-scope="{ row }">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="row.isCargoControl" />
@@ -279,13 +268,22 @@
           {{ getTypeText(row.type) }}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('状态')" align="center" prop="status">
-        <template slot-scope="scope">
-          <!-- <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status" /> -->
-          {{ scope.row.statusText }}
+      <el-table-column :label="$t('发货人编号')" align="center">
+        <template slot-scope="{ row }">
+          <router-link :to="`/customer/query/${row.consignorCustomerId}`" class="link-type">
+            {{ row.consignorCustomerNumber }}
+          </router-link>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('唛头')" align="center" prop="marks" />
+      <el-table-column :label="$t('收货人编号')" align="center" prop="consigneeCustomerNumber">
+        <template slot-scope="{ row }">
+          <router-link :to="`/customer/query/${row.consigneeCustomerId}`" class="link-type">
+            {{ row.consigneeCustomerNumber }}
+          </router-link>
+        </template>
+      </el-table-column>
+      
+      
       <el-table-column v-if="dept" :label="$t('客户经理')" align="center" prop="salesmanName" />
       <el-table-column :label="$t('发货人客服')" align="center" prop="consignorFollowCustomerService" />
       <el-table-column :label="$t('收货人客服')" align="center" prop="consigneeFollowCustomerService" />
@@ -295,8 +293,13 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
       <el-table-column :label="$t('提货率')" align="center" prop="pickRatio" />
-      <el-table-column :label="$t('动态')" align="center" prop="statusMsg" />
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width actions" width="180px">
+      <el-table-column :label="$t('状态')" align="center" prop="status">
+        <template slot-scope="scope">
+          <!-- <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status" /> -->
+          {{ scope.row.statusText }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width actions" width="180px" fixed="right">
         <template slot-scope="scope">
           <!-- 已删除的订单只需要删除和查看 https://zentao.jdshangmen.com/bug-view-684.html -->
           <template v-if="scope.row.status == 88">