Merge branch 'release2.2' of...

Merge branch 'release2.2' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release2.2

src/api/ecw/orderCargoControl.js

@@ -148,4 +148,12 @@ export function exportCargoControl(params){
     responseType: 'arraybuffer',
     params
   })
-}
+}
\ No newline at end of file
+
+// 控货日志
+export function getControlLogList(orderId){
+  return request({
+    url: '/order/order-control-log/list/' + orderId,
+    method: 'get'
+  })
+}

src/views/ecw/exchangeRate/index.vue

@@ -126,7 +126,7 @@
         <el-input type="textarea" v-model="form.note"></el-input>
         </el-form-item>
          <template v-if="form.id">
-           <el-form-item :label="$t('创建人')">{{getOperator(form.updater)}}</el-form-item>
+           <el-form-item :label="$t('创建人')">{{form.creatorName}}</el-form-item>
            <el-form-item :label="$t('创建时间')">{{parseTime(form.createTime)}}</el-form-item>
            <el-form-item :label="$t('最后更新时间')">{{parseTime(form.updateTime)}}</el-form-item>
            <el-form-item :label="$t('最后更新人')">{{getOperator(form.updater)}}</el-form-item>
@@ -308,7 +308,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNo = 1;
+      this.queryParams.page = 1;
       this.getList();
     },
     /** 重置按钮操作 */
@@ -392,8 +392,8 @@ export default {
     handleExport() {
       // 处理查询参数
       let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
+      params.page = undefined;
+      params.rows = undefined;
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行导出
       this.$modal.confirm(this.$t('是否确认导出所有汇率管理数据项?')).then(() => {

src/views/ecw/financial/selfNoReport.vue

@@ -257,10 +257,10 @@ export default {
     },
     // 获取列的货币名称 columnName 取值为Other, Freight, Clearance
     ColumnCurrencyName(){
-      return (columnName) => {
+      return (columnName, wrapper = true) => {
         if(!this.list.length) return ''
         let field = `total${columnName}FeeCurrency`
-        return `(${this.list[0]['summaryInfo'][field]})`
+        return wrapper ? `(${this.list[0]['summaryInfo'][field]})` : this.list[0]['summaryInfo'][field]
       }
     }
   },
@@ -296,35 +296,38 @@ export default {
     },
     // 返回汇总行数据
     getSummary(){
+      const FreightCurrencyName = this.ColumnCurrencyName('Freight', false)
+      const ClearanceCurrencyName = this.ColumnCurrencyName('Clearance', false)
+      const OtherCurrencyName = this.ColumnCurrencyName('Other', false)
       const data = [
         this.$t('合计'),
         '',
         // 应收款
-        this.getTotal('receivableTotalFee'),
+        this.getTotal('receivableTotalFee') + 'USD',
         // 应收运费
-        this.getTotal('totalReceivableFreightFee'),
+        this.getTotal('totalReceivableFreightFee') + FreightCurrencyName,
         // 应收清关费
-        this.getTotal('totalReceivableClearanceFee'),
+        this.getTotal('totalReceivableClearanceFee') + ClearanceCurrencyName,
         // 应收其他费用
-        this.getTotal('totalReceivableOtherFee'),
+        this.getTotal('totalReceivableOtherFee') + OtherCurrencyName,
         // 目的地实收运费
-        this.getTotal('totalNetReceiptsCollectFreightFee'),
+        this.getTotal('totalNetReceiptsCollectFreightFee') + FreightCurrencyName,
         // 目的地实收清关费
-        this.getTotal('totalNetReceiptsCollectClearanceFee'),
+        this.getTotal('totalNetReceiptsCollectClearanceFee') + ClearanceCurrencyName,
         // 目的地实收其他费用
-        this.getTotal('totalNetReceiptsCollectOtherFee'),
+        this.getTotal('totalNetReceiptsCollectOtherFee') + OtherCurrencyName,
         // 中国实收运费
-        this.getTotal('netReceiptsAdvanceFreightFee'),
+        this.getTotal('netReceiptsAdvanceFreightFee') + FreightCurrencyName,
         // 中国实收清关费
-        this.getTotal('netReceiptsAdvanceClearanceFee'),
+        this.getTotal('netReceiptsAdvanceClearanceFee') + ClearanceCurrencyName,
         // 中国实收其他费用
-        this.getTotal('netReceiptsAdvanceOtherFee'),
+        this.getTotal('netReceiptsAdvanceOtherFee') + OtherCurrencyName,
         // 运费折扣
-        this.getTotal('discountFreightFee'),
+        this.getTotal('discountFreightFee') + FreightCurrencyName,
         // 清关费折扣
-        this.getTotal('discountClearanceFee'),
+        this.getTotal('discountClearanceFee') + ClearanceCurrencyName,
         // 其他费用折扣
-        this.getTotal('discountOtherFee')
+        this.getTotal('discountOtherFee') + OtherCurrencyName,
       ]
       console.log('sum', {data})
       return data

src/views/ecw/order/cargoControl.vue

@@ -145,6 +145,7 @@
             <el-button type="text"  size="mini" @click="cargoTransfer(scope.row)"  v-hasPermi="['ecw:cargo_control:cargo_transfer']">{{$t('调货')}}</el-button>
             <el-button type="text"  size="mini" @click="showFallbackOrder=scope.row" v-if="scope.row.isReleaseAfterGoods" v-hasPermi="['ecw:cargo_control:fallback']">{{$t('反复核')}}</el-button>
           </template>
+          <el-button type="text"  size="mini" @click="showLogOrderId=scope.row.orderId"  v-hasPermi="['ecw:cargo_control:log']">{{$t('控货日志')}}</el-button>
           <el-button type="text"  size="mini" @click="toDetail(scope.row)"  v-hasPermi="['ecw:cargo_control:show']">{{$t('查看')}}</el-button>
         </template>
       </el-table-column>
@@ -157,6 +158,8 @@
     <release        v-if="showReleaseOrderId"         :order-id="showReleaseOrderId"        @close="showReleaseOrderId=null"        @success="onReleaseSuccess" />
     <transfer-cargo v-if="showTransferCargoOrderId"   :order-id="showTransferCargoOrderId"  @close="showTransferCargoOrderId=null"  @success="onTransferCargoSuccess" :cargoControlPickId="pickInfo ? pickInfo.id : 0" />
     <fallback       v-if="showFallbackOrder !== null" :order="showFallbackOrder"            @close="showFallbackOrder=null"         @success="onFallbackSuccess" :index="null"   />
+    <!--控货日志-->
+    <cargo-log-list v-if="showLogOrderId" :order-id="showLogOrderId" @close="showLogOrderId=null" />
   </div>
 </template>
 
@@ -173,9 +176,11 @@ import { getCargoControlOrderPage, batchReview, orderReview, getPickRleaseInfo,
 import TransferCargo from '@/views/ecw/order/components/TransferCargo'
 import Fallback from './components/Fallback'
 import {getWarehouseList} from '@/api/ecw/warehouse'
+import CargoLogList from "@/views/ecw/order/components/CargoLogList.vue";
 export default {
   name: "EcwOrderCargocontrol",
   components: {
+    CargoLogList,
     CustomerSelector, ProductSelector, Selector, Transfer, Release,CargoControlEdit, TransferCargo, Fallback
   },
   data() {
@@ -215,6 +220,7 @@ export default {
       showTransferCargoOrderId: null, // 调货ID
       showFallbackOrder: null, // 调货订单
       pickInfo: null, // 当前操作的提货信息
+      showLogOrderId: null, // 显示控货日志的订单ID
     };
   },
   computed: {

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

+<template>
+    <el-dialog :title="$t('控货日志')" visible :before-close="closeDialog" :close-on-click-modal="false" width="1000px">
+      <el-table :data="list">
+        <el-table-column :label="$t('操作时间')" prop="createTime" width="200">
+          <template slot-scope="{row}">{{row.createTime|parseTime}}</template>
+        </el-table-column>
+        <el-table-column :label="$t('操作人')" prop="creatorName" width="100"></el-table-column>
+        <el-table-column :label="$t('操作人类型')" prop="content" width="100">
+          <template slot-scope="{row}">{{row.userType == 1 ? $t('会员') : $t('管理员')}}</template>
+        </el-table-column>
+        <el-table-column :label="$t('操作类型')" prop="type" width="200"></el-table-column>
+        <el-table-column :label="$t('备注')" prop="msg"></el-table-column>
+      </el-table>
+    </el-dialog>
+</template>
+<script>
+import {
+  getControlLogList,
+} from '@/api/ecw/orderCargoControl'
+import {parseTime} from '@/utils/ruoyi'
+export default {
+    props:{
+        orderId: Number
+    },
+  filters: {parseTime},
+    data(){
+        return {
+            show: false,
+            list:[]
+        }
+    },
+    created(){
+        this.show = true
+        this.loadData()
+    },
+    methods:{
+        loadData(){
+          getControlLogList(this.orderId).then(res => this.list = res.data)
+        },
+        closeDialog(){
+            this.show = false
+            this.$emit('close');
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+
+</style>