Merge remote-tracking branch 'origin/release' into release

src/api/infra/apiAccessLog.js

@@ -5,7 +5,9 @@ export function getApiAccessLogPage(query) {
   return request({
     url: '/infra/api-access-log/page',
     method: 'get',
+    timeout: 1000*60*3,
     params: query
+
   })
 }
 

src/api/infra/apiErrorLog.js

@@ -13,6 +13,7 @@ export function getApiErrorLogPage(query) {
   return request({
     url: '/infra/api-error-log/page',
     method: 'get',
+    timeout: 1000*60*3,
     params: query
   })
 }

src/i18n/languages/en_US.json

@@ -3897,4 +3897,4 @@
     "收费方数": "",
     "可放入重量": "",
     "可放入收费重量": ""
-}
+}
\ No newline at end of file

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

@@ -167,11 +167,19 @@
               </el-input>
             </template>
           </el-table-column>
+          <el-table-column :label="$t('货值')" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.worth" @change="updateField(scope.row, 'worth')" size="mini" :disabled="index === 0">
+                <span slot="append">{{ $t('美元') }}</span>
+              </el-input>
+            </template>
+          </el-table-column>
           <el-table-column :label="$t('箱数')" align="center">
             <template slot-scope="scope">
               <span>{{scope.row.num}}</span>
             </template>
           </el-table-column>
+
           <el-table-column :label="$t('计划装柜')" align="center">
             {{planCabinet}}
           </el-table-column>
@@ -251,6 +259,12 @@
           <el-form-item :label="$t('收费重量')">
             <el-input-number v-model="shopForm.chargeWeight" controls-position="right"  :min="0" :max="mainOrderItem.chargeWeight"></el-input-number>
           </el-form-item>
+          <el-form-item v-if="mainOrderItem.orderItemId" label-width="0">
+            {{ $t('剩余货值') }}：{{ mainOrderItem.worth || 0 }}{{ $t('美元') }}
+          </el-form-item>
+          <el-form-item :label="$t('放入货值')">
+            <el-input-number v-model="shopForm.worth" controls-position="right"  :min="0" :max="mainOrderItem.worth"></el-input-number>
+          </el-form-item>
           <!--按照原型这里需要显示剩余数量，但是事实无法计算剩余数量，因为已装数量是未知的-->
           <el-form-item :label="$t('放入数量(个)')+'：'" prop="quantity" v-if="isQuantity">
             <el-input-number v-model="shopForm.quantity" controls-position="right" :min="0" :max="mainOrderItem.quantity || undefined"></el-input-number>
@@ -552,8 +566,9 @@ export default {
       this.$set(this.shopForm, 'chargeVolume',  (this.mainOrderItem.chargeVolume * rate).toFixed(2))
       this.$set(this.shopForm, 'weight',        (this.mainOrderItem.weight * rate).toFixed(2))
       this.$set(this.shopForm, 'chargeWeight',  (this.mainOrderItem.chargeWeight * rate).toFixed(2))
+      this.$set(this.shopForm, 'worth',  (this.mainOrderItem.worth * rate).toFixed(2))
     },
-    async getSelectData(item) {
+    /*async getSelectData(item) {
       await quantityRequired(this.orderData.lineId).then((res) => {
         if (res.data) {
           this.isQuantity = true;
@@ -569,7 +584,7 @@ export default {
           delete this.shopRules.putQuantity;
         }
       });
-    },
+    },*/
     shopAdd() {
       this.$refs["shopForm"].validate((valid) => {
         if (valid) {
@@ -604,7 +619,8 @@ export default {
             volume: this.shopForm.volume,
             weight: this.shopForm.weight,
             chargeWeight: this.shopForm.chargeWeight,
-            chargeVolume: this.shopForm.chargeVolume
+            chargeVolume: this.shopForm.chargeVolume,
+            worth: this.shopForm.worth
           };
           // 按数量计费的才需要传递数量
           if(this.isQuantity){

src/views/ecw/box/shippingSea/utils.js

@@ -1209,11 +1209,11 @@ const constantDict = {
   billingMethod: [
     {
       value: "1",
-      label: i18n.$t("电放"),
+      label: i18n.$t("正本"),
     },
     {
       value: "2",
-      label: i18n.$t("正本"),
+      label: i18n.$t("电放"),
     },
   ],
   // 是否有文件

src/views/ecw/financial/creatCollection.vue

@@ -690,7 +690,7 @@ import {getWarehouseList} from '@/api/ecw/warehouse'
 import WorkFlow from '@/components/WorkFlow/'
 
 export default {
-  name: "CreatCollection",
+  name: "EcwFinancialCreatcollection",
   components: {
     CustomerSelector,WorkFlow
   },
@@ -745,6 +745,10 @@ export default {
       isUpdate:false
     };
   },
+  activated(){
+    console.log(11)
+    // this.getList();
+  },
   async created() {
     getUserProfile().then(res => {
       this.discountForm.author = res.data.username

src/views/ecw/financial/creatPayment.vue

@@ -456,7 +456,7 @@ import {getWarehouseList} from '@/api/ecw/warehouse'
 import WorkFlow from '@/components/WorkFlow/'
 
 export default {
-  name: "CreatPayment",
+  name: "EcwFinancialCreatpayment",
   components: {
     CustomerSelector,WorkFlow
   },
@@ -495,6 +495,10 @@ export default {
       dialogVisible:false
     };
   },
+  activated(){
+    console.log(11)
+    // this.getList();
+  },
   async created() {
     await getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
     getWarehouseList().then(res => this.warehouseList = res.data)

src/views/ecw/order/cargoControl.vue

@@ -310,7 +310,7 @@ export default {
             })
             .then(res => {
               this.$message.success('操作成功')
-              this.handleQuery()
+              this.getList()
             })
     },
     // 批量复核
@@ -319,7 +319,7 @@ export default {
         return batchReview("orderIds=" + this.ids.join(','))
       }).then(() => {
         this.$message.success(this.$t('操作成功'))
-        this.handleQuery()
+        this.getList()
       })
     },
     cargoTransfer(row){
@@ -333,15 +333,15 @@ export default {
     },
     onReleaseSuccess(){
       this.showReleaseOrderId = null
-      this.handleQuery()
+      this.getList()
     },
     onFallbackSuccess(){
       this.showFallbackOrder = null
-      this.handleQuery()
+      this.getList()
     },
     onTransferCargoSuccess(){
       this.showTransferCargoOrderId = null
-      this.handleQuery()
+      this.getList()
     }
   }
 };

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

@@ -84,7 +84,7 @@
           <send-sms-code :order-id="detail.orderId" scene="5" />
         </el-form-item>
         <el-form-item label="" style="margin-top:20px">
-          <el-button type="success" @click="submit">{{$t('确认放货')}}</el-button>
+          <el-button type="success" @click="submit">{{$t('确认提货')}}</el-button>
           <el-button type="default" @click="closeDialog">{{$t('关闭')}}</el-button>
         </el-form-item>
       </el-form>
@@ -182,7 +182,7 @@ export default {
               this.$emit('success')
             })
           })
-          
+
 
         }
     }
@@ -205,4 +205,4 @@ export default {
 ::v-deep .release-table .el-form-item__error{
     position: static;
 }
-</style>
+</style>
\ No newline at end of file

src/views/ecw/order/edit.vue

 <template>
   <div class="app-container">
-
-    <el-form ref="form" :model="form" :rules="rules" label-position="left" inline>
+    <!--初始化过程中不渲染页面，利用此特性在新建订单后重新初始化表单(字典选择组件默认值)-->
+    <el-form v-if="!initing" ref="form" :model="form" :rules="rules" label-position="left" inline>
         <el-card v-if="form.applyStatus == 1" class="mb-10">
             <div slot="header" class="card-title">{{$t('以下信息修改审核中')}}</div>
             <el-table :data="form.applyInfoList">
@@ -1195,14 +1195,17 @@ export default {
         // 添加的提交
         createOrder(data).then(response => {
           this.$modal.msgSuccess(this.$t("新增成功"));
-
+          this.initing = true
           // 重置数据
           this.form = {...makeDefaultFormData()}
           this.routerList = []
           this.addProduct()
           this.$nextTick(() =>{
-            this.$refs.form.clearValidate()
-            this.$redirect('success?orderId=' + response.data)
+            this.initing = false
+            this.$nextTick(() => {
+              this.$refs.form.clearValidate
+              this.$redirect('success?orderId=' + response.data)
+            })
           })
 
 

src/views/ecw/order/index.vue

@@ -168,7 +168,7 @@
             <span>{{ scope.row.orderNo }}</span>
           </router-link>
           <div style="display: flex;flex-wrap: wrap;" v-if="scope.row.advanceType">
-            <el-button @click="deleteSpecial(item.value,scope.row.orderId)" size="mini" style="margin-left: 20px" type="danger" circle v-for="(item,index) in specialRendering(scope.row.advanceType)" :key="index">{{item.label[0]}}</el-button>
+            <el-button @click="deleteSpecial(item.value,scope.row.orderId)" size="mini" style="margin-left: 20px" type="danger" circle v-for="(item,index) in specialRendering(scope.row.advanceType)" :key="index">{{item.symbol}}</el-button>
           </div>
         </template>
       </el-table-column>
@@ -859,10 +859,15 @@ export default {
     moleculeChange() { },
     denominatorChange() { },
     specialRendering(val){
+      console.log('val', val)
       if(val !== undefined){
         let i = val.split(',')
         return this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS).filter(e => {
            return i.indexOf(e.value) > -1
+        }).map(item => {
+          // 打字开头的用最后一个字，否则取第一个字
+          item.symbol = item.label[0] == '打' ? item.label[item.label.length-1]: item.label[0]
+           return item
         })
       }
     },

src/views/ecw/order/prepayDeal.vue

@@ -589,6 +589,7 @@
       }
     },
     methods: {
+      getDictData,
       onTableMounted(e){
           // console.warn('onTableMounted', e)
       },

src/views/ecw/order/release.vue

@@ -18,7 +18,7 @@
                 {{$t('数量')}}：{{order.sumQuantity}}{{$t('个')}}
             </div>
           </el-form-item>
-          <el-form-item :label="$t('放货方式')">
+          <el-form-item :label="$t('提货方式')">
             <dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.pickType" form-type="radio" formatter="number"></dict-selector>
           </el-form-item>
           <el-form-item :label="$t('提货时间')" v-if="form.pickType == 1">
@@ -54,7 +54,7 @@
             <el-input v-model="form.remark" type="textarea" placeholder=""></el-input>
           </el-form-item>
           <el-form-item label="">
-            <el-button type="primary" @click="submit">{{$t('确认放货')}}</el-button>
+            <el-button type="primary" @click="submit">{{$t('确认提货')}}</el-button>
             <el-button type="default" @click="$router.back()">{{$t('取消')}}</el-button>
           </el-form-item>
         </el-form>

src/views/ecw/order/splitApply.vue

@@ -28,10 +28,16 @@
               <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
           </el-descriptions-item>
           <el-descriptions-item :label="$t('始发地')" >
-               {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:$t('无')}}
+              <template v-if="orderData.logisticsInfoDto">
+                {{$l(orderData.logisticsInfoDto, 'startTitle')}}
+              </template>
+              <template v-else>{{$t('无')}}</template>
           </el-descriptions-item>
           <el-descriptions-item :label="$t('目的地')" :span="2">
-             {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destTitleZh:$t('无')}}
+            <template v-if="orderData.logisticsInfoDto">
+              {{$l(orderData.logisticsInfoDto, 'destTitle')}}
+            </template>
+            <template v-else>{{$t('无')}}</template>
           </el-descriptions-item>
           <el-descriptions-item :label="$t('发货人姓名')">
               {{orderData.consignorVO?orderData.consignorVO.name||$t('无'):$t('无')}}
@@ -184,17 +190,24 @@
               </el-input>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('箱数')" align="center">
+          <el-table-column :label="$t('货值')" align="center">
             <template slot-scope="scope">
-                   <span>{{scope.row.num}}</span>
-                </template>
-            </el-table-column>
-            <el-table-column :label="$t('操作')" align="center">
-              <template slot-scope="scope">
-                <el-button v-if="index==0" disabled size="mini" type="text" icon="el-icon-delete" @click="removeShop(scope.row.id)">{{$t('移出')}}</el-button>
-               <el-button v-else size="mini" type="text" icon="el-icon-delete" @click="removeShop(scope.row.id)">{{$t('移出')}}</el-button>
+              <el-input v-model="scope.row.worth" @change="updateField(scope.row, 'worth')" size="mini" :disabled="index === 0">
+                <span slot="append">{{ $t('美元') }}</span>
+              </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('箱数')" align="center">
+          <template slot-scope="scope">
+                 <span>{{scope.row.num}}</span>
               </template>
-            </el-table-column>
+          </el-table-column>
+          <el-table-column :label="$t('操作')" align="center">
+            <template slot-scope="scope">
+              <el-button v-if="index==0" disabled size="mini" type="text" icon="el-icon-delete" @click="removeShop(scope.row.id)">{{$t('移出')}}</el-button>
+             <el-button v-else size="mini" type="text" icon="el-icon-delete" @click="removeShop(scope.row.id)">{{$t('移出')}}</el-button>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
     </el-card>
@@ -274,7 +287,14 @@
         <el-form-item :label="$t('收费重量')">
           <el-input-number v-model="shopForm.chargeWeight" controls-position="right"  :min="0" :max="mainOrderItem.chargeWeight"></el-input-number>
         </el-form-item>
-
+       <el-form-item v-if="mainOrderItem.orderItemId">
+         <div>{{$t('剩余货值')}}：{{ mainOrderItem.worth || 0 }}{{ $t('美元') }}</div>
+       </el-form-item>
+       <el-form-item :label="$t('放入货值')">
+         <el-input-number v-model="shopForm.worth" controls-position="right"  :min="0" :max="mainOrderItem.worth">
+           <template slot="append">{{ $t('元') }}</template>
+         </el-input-number>
+       </el-form-item>
         <el-form-item :label="$t('备注信息')+':'">
            <el-input v-model="shopForm.remark"></el-input>
         </el-form-item>
@@ -319,10 +339,12 @@ import {getChannelList} from '@/api/ecw/channel'
 import WorkFlow from '@/components/WorkFlow'
 import {getOrder, splitItemUpdate} from '@/api/ecw/order'
 import Decimal from 'decimal.js'
+import Template from "@/views/cms/template";
 
 export default {
   name: "SplitApply",
   components: {
+    Template,
     WorkFlow
   },
   data() {
@@ -640,14 +662,15 @@ export default {
       this.$set(this.shopForm, 'chargeVolume',  (this.mainOrderItem.chargeVolume * rate).toFixed(2))
       this.$set(this.shopForm, 'weight',        (this.mainOrderItem.weight * rate).toFixed(2))
       this.$set(this.shopForm, 'chargeWeight',  (this.mainOrderItem.chargeWeight * rate).toFixed(2))
+      this.$set(this.shopForm, 'worth',  (this.mainOrderItem.worth * rate).toFixed(2))
     },
-    changeProdTitleEn(){
+    /*changeProdTitleEn(){
         var list = []
         list = this.splitData[0].orderSplitItemBackVOList.filter(item=>item.prodTitleEn == this.shopForm.prodTitleEn)
         this.shopForm.sum = list[0].num
         this.quantitySum = list[0].quantity
         this.shopForm.prodTitleZh = list[0].prodTitleZh
-    },
+    },*/
     haddleAdd(){
       let that = this
       if(!that.form.transportId){
@@ -691,7 +714,11 @@ export default {
         volume: this.shopForm.volume,
         chargeVolume: this.shopForm.chargeVolume,
         weight: this.shopForm.weight,
-        chargeWeight: this.shopForm.chargeWeight
+        chargeWeight: this.shopForm.chargeWeight,
+        worth: this.shopForm.worth
+      }
+      if(this.quantityshow){
+        params.quantity = this.shopForm.quantity
       }
       createSplitItem(params).then(res=>{
         this.$message.success(this.$t("放入成功"));