Merge remote-tracking branch 'origin/release2.2' into release2.2

# Conflicts:
#	src/i18n/languages/en_US.json

src/i18n/languages/en_US.json

@@ -1142,7 +1142,7 @@
     "手续费（RMB）": "Handling fee (RMB)",
     "需要": "need",
     "不需要": "unnecessary",
-    "元": "RMB",
+    "元": "Yuan",
     "银行收款明细": "Bank Receipt Details",
     "批量核销": "Batch write-off",
     "添加收款明细": "Add Receipt Details",

src/views/ecw/box/shippingSea/nodePage/cabinet/index.vue

@@ -10,8 +10,8 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('装柜时间')" prop="ldBoxTime">
-        {{cabinetObj.ldBoxTime?new Date(cabinetObj.ldBoxTime).format('yyyy-MM-dd hh:mm:ss'):new Date().format('yyyy-MM-dd hh:mm:ss')}}
-        <!-- <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldBoxTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> -->
+        <!-- {{cabinetObj.ldBoxTime?new Date(cabinetObj.ldBoxTime).format('yyyy-MM-dd hh:mm:ss'):new Date().format('yyyy-MM-dd hh:mm:ss')}} -->
+        <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldBoxTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item :label="$t('出仓时间')">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldOutWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>

src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue

@@ -585,30 +585,9 @@ export default {
         const list = this.warehouseInList.find(item => item.orderItemId == orderItemId)?.orderWarehouseInBackItemDoList || []
         return list.map(item => {
           let [boxGauge1, boxGauge2, boxGauge3] = item.boxGauge.split('*')
-          let labelArr = [
-            this.$t('{num}箱', {num: item.cartonsNum}),
-            this.$l(this.getDictDatas(this.DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE).find(dict => dict.value == item.specificationType), 'label'),
-            this.$t('长{boxGauge1}cm', {boxGauge1}),
-            this.$t('宽{boxGauge2}cm', {boxGauge2}),
-            this.$t('高{boxGauge3}cm', {boxGauge3}),
-            this.$t('方数{volume}m³', {volume: item.volume}),
-            this.$t('重量{weight}kg', {weight: item.weight})
-          ]
-          if (item.quantityAll) {
-            labelArr.push(this.$t('数量{n}', {n: item.quantityAll}))
-          }
-          if (item.expressNo) {
-            labelArr.push(this.$t('快递{expressNo}', {expressNo: item.expressNo}))
-          }
-          if (item.orderLocationBackVOList && item.orderLocationBackVOList.length) {
-            labelArr.push(this.$t('储位{location}', {
-              location: item.orderLocationBackVOList.map(v => v.code || v.areaName + (v.locationName || '')).join(',')
-            }))
-          }
           item.boxGauge1 = boxGauge1
           item.boxGauge2 = boxGauge2
           item.boxGauge3 = boxGauge3
-          item.text = labelArr.join(',')
           return item
         })
       }

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

@@ -12,13 +12,10 @@
         </el-form-item>
         <el-form-item :label="$t('特殊要求备注')"><el-input  type="textarea" style="width: 300px;" v-model="todoDetail"></el-input></el-form-item>
         <el-form-item v-for="(item,index) in  this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS)" v-if="advanceType.indexOf(item.value) > -1" :key="item.value" :label="item.label + '预计金额'">
-          <el-input style="width: 300px;" v-model.number="specialNeedsList[index].transFee" type="number">
-            <div style="width: 100px;" slot="append" >
-              <el-select   v-model="specialNeedsList[index].transCurrency">
-                <el-option v-for="item in JSON.parse(currency)" :key="item.id" :label="item.titleZh" :value="item.id" />
-              </el-select>
-            </div>
-          </el-input>
+          <el-input-number style="width: 300px;" v-model.number="specialNeedsList[index].transFee" type="number" :min="0" step-strictly></el-input-number>
+          <el-select   v-model="specialNeedsList[index].transCurrency">
+            <el-option v-for="item in JSON.parse(currency)" :key="item.id" :label="item.titleZh" :value="item.id" />
+          </el-select>
            <div style="display: inline-block;margin-left: 20px;">
              <span style="margin-right: 10px;">{{ $t('付款类型') }}</span>
              <dict-selector  :placeholder="$t('请选择付款类型')"  v-model="specialNeedsList[index].payType"  :type="DICT_TYPE.PAYMENT_TYPE" ></dict-selector>

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

@@ -32,6 +32,8 @@
              <el-option v-for="item in importCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id" ></el-option>
             </el-select>
         </el-form-item> -->
+        </el-row>
+        <el-row>
         <el-form-item :label="$t('运输方式')+':'" >
             <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :clearable="true" v-model="queryParams.transportId" />
         </el-form-item>
@@ -222,6 +224,7 @@
           <el-button v-else-if="scope.row.orderExceptionType=='order_pick_up_exception'" v-hasPermi="['ecw:exception:pickUp']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
           <el-button v-else-if="scope.row.orderExceptionType=='not_customer_service_exception'" v-hasPermi="['ecw:exception:notCustomer']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
           <el-button v-else-if="scope.row.orderExceptionType=='goods_add_exception'" v-hasPermi="['ecw:exception:goodsAddException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
+          <el-button v-else-if="scope.row.orderExceptionType=='fee_exception '" v-hasPermi="['ecw:exception:feeException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/ecw/order/pending.vue

@@ -127,6 +127,7 @@
             <el-button v-else-if="scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='order_pick_up_exception'" v-hasPermi="['ecw:exception:pickUp']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('查看')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='not_customer_service_exception'" v-hasPermi="['ecw:exception:notCustomer']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('查看')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='goods_add_exception'" v-hasPermi="['ecw:exception:goodsAddException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('查看')}}</el-button>
+            <el-button v-else-if="scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='fee_exception '" v-hasPermi="['ecw:exception:feeException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('查看')}}</el-button>
 
             <el-tag style="margin-left:10px" v-if="scope.row.orderExceptionStatus==2">{{$t('已完成')}}</el-tag>
             <el-button v-else-if="scope.row.orderExceptionType=='order_superfluous_box_exception'" v-hasPermi="['ecw:exception:superfluousBox']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
@@ -146,6 +147,7 @@
             <el-button v-else-if="scope.row.orderExceptionType=='order_pick_up_exception'" v-hasPermi="['ecw:exception:pickUp']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionType=='not_customer_service_exception'" v-hasPermi="['ecw:exception:notCustomer']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionType=='goods_add_exception'" v-hasPermi="['ecw:exception:goodsAddException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
+            <el-button v-else-if="scope.row.orderExceptionType=='fee_exception '" v-hasPermi="['ecw:exception:feeException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/ecw/order/prepayDeal.vue

@@ -11,10 +11,10 @@
             <router-link :to="{path: '/order/detail',query: {orderId: orderData.orderId}}" class="link-type">
               <span>{{orderData.orderNo || ''}}</span>
             </router-link>
-            
+
           </el-form-item>
        </el-row>
-       <div v-if="shopData&&orderExceptionData.orderExceptionType!='goods_add_exception'">
+       <div v-if="shopData&&['goods_add_exception','fee_exception',].indexOf(orderExceptionData.orderExceptionType) == -1">
          <el-row>
             <el-form-item :label="$t('产品名称')+':'" >
               {{shopData.prodTitleZh || ''}}
@@ -34,7 +34,7 @@
        </el-row>
 
        <!-- 单证异常，发货人异常，其他异常 不显示这部分内容 -->
-       <div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
+       <div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception','fee_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
         <!-- 预付异常,提货异常,代收货款是针对整个订单的 -->
         <template v-if="['order_pay_exception','order_pick_up_exception', 'order_cod_exception','not_customer_service_exception'].indexOf(orderExceptionData.orderExceptionType) > -1">
           <el-row>
@@ -162,7 +162,7 @@
       </el-table>
 
       <!-- 单证异常，发货人异常，其他异常的表格 -->
-      <el-table v-if="['order_doc_exception', 'order_consignor_exception', 'order_other_exception'].indexOf(orderExceptionData.orderExceptionType) > -1" v-loading="loading" border :data="orderData.orderItemVOList">
+      <el-table v-if="['order_doc_exception', 'order_consignor_exception', 'order_other_exception','fee_exception'].indexOf(orderExceptionData.orderExceptionType) > -1" v-loading="loading" border :data="orderData.orderItemVOList">
         <el-table-column :label="$t('序号')" align="center" prop="id" type="index">
             <template slot-scope="scope">
                 <span>{{scope.$index + 1}}</span>
@@ -610,7 +610,7 @@
           // that.orderExceptionData.orderExceptionType = 'order_other_exception'
           // that.orderExceptionData.orderExceptionType = 'order_miss_exception'
            // that.orderExceptionData.orderExceptionType = 'not_customer_service_exception'
-           // that.orderExceptionData.orderExceptionType = 'goods_add_exception'
+           // that.orderExceptionData.orderExceptionType = 'fee_exception'
           that.loading = false;
           that.orderId = response.data.orderId
           that.getOrderData()

src/views/ecw/order/splitApply/components/PutIn.vue

@@ -48,8 +48,8 @@
       <div>
         {{$t('可拆')}}：
         {{maxSplitNum}}{{$t('箱')}}，
-        {{$t('体积')}}：{{leftData('volume')}}{{$t('m³')}}，
-        {{$t('重量')}}：{{leftData('weight')}}{{$t('kg')}}，
+        {{$t('体积')}}：{{leftData('volume')}}m³，
+        {{$t('重量')}}：{{leftData('weight')}}kg，
         {{$t('数量')}}：{{leftData('quantity')}}{{$t('个')}}
       </div>
     </el-card>

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

@@ -716,30 +716,9 @@ export default {
         const list = this.warehouseInList.find(item => item.orderItemId == orderItemId)?.orderWarehouseInBackItemDoList || []
         return list.map(item => {
           let [boxGauge1, boxGauge2, boxGauge3] = item.boxGauge.split('*')
-          let labelArr = [
-            this.$t('{num}箱', {num: item.cartonsNum}),
-            this.$l(this.getDictDatas(this.DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE).find(dict => dict.value == item.specificationType), 'label'),
-            this.$t('长{boxGauge1}cm', {boxGauge1}),
-            this.$t('宽{boxGauge2}cm', {boxGauge2}),
-            this.$t('高{boxGauge3}cm', {boxGauge3}),
-            this.$t('方数{volume}m³', {volume: item.volume}),
-            this.$t('重量{weight}kg', {weight: item.weight})
-          ]
-          if (item.quantityAll) {
-            labelArr.push(this.$t('数量{n}', {n: item.quantityAll}))
-          }
-          if (item.expressNo) {
-            labelArr.push(this.$t('快递{expressNo}', {expressNo: item.expressNo}))
-          }
-          if (item.orderLocationBackVOList && item.orderLocationBackVOList.length) {
-            labelArr.push(this.$t('储位{location}', {
-              location: item.orderLocationBackVOList.map(v => v.code || v.areaName + (v.locationName || '')).join(',')
-            }))
-          }
           item.boxGauge1 = boxGauge1
           item.boxGauge2 = boxGauge2
           item.boxGauge3 = boxGauge3
-          item.text = labelArr.join(',')
           return item
         })
       }

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

@@ -135,16 +135,15 @@
     <h2 v-if="orderSpecialNeeds.length > 0">{{$t('特殊需求')}}</h2>
     <el-form ref="form" :model="form" label-width="200px">
       <el-form-item :label="$i18n.locale === 'en_US' ? item.labelEn : item.label" v-for="(item, index) in orderSpecialNeeds" :key="item.value" style="width: 600px">
-        <el-input v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoney" :placeholder="$t('请输入') + ($i18n.locale === 'en_US' ? item.labelEn : item.label)">
-          <el-select v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoneyCurrency" :placeholder="$t('请选择')" slot="append" style="width: 100px">
-            <el-option
-              v-for="item in currencyList"
-              :key="item.id"
-              :label="$i18n.locale === 'en_US' ? item.titleEn : item.titleZh"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-input>
+        <el-input-number v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoney" type="number" :min="0" step-strictly :placeholder="$t('请输入') + ($i18n.locale === 'en_US' ? item.labelEn : item.label)"></el-input-number>
+        <el-select v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoneyCurrency" :placeholder="$t('请选择')" style="width: 100px">
+          <el-option
+            v-for="item in currencyList"
+            :key="item.id"
+            :label="$i18n.locale === 'en_US' ? item.titleEn : item.titleZh"
+            :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
 
       <h2>{{$t('订单数据')}}</h2>