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

src/views/ecw/box/cancelClear.vue

@@ -3,12 +3,16 @@
     <div class="message-title">{{$t(`您确定撤销${cancelClearInfo.orderNo}已清关状态吗?`)}}</div>
     <el-form ref="arrivalForm" :rules="rules" :model="cusClearanceObj" label-width="120px">
       <el-form-item :label="$t('撤销理由')" prop="clEstTime">
-        <el-input v-model="cusClearanceObj.applyReason" type="textarea" :rows="4"></el-input>
+        <el-input v-if="flag" v-model="cusClearanceObj.applyReason" type="textarea" :rows="4"></el-input>
+        <template v-else>
+          {{apply.applyReason}}
+        </template>
       </el-form-item>
     </el-form>
 
     <el-row class="operate-button">
-      <el-button type="primary" @click="onSubmit">{{$t('确定')}}</el-button>
+      <el-button v-if="flag" type="primary" @click="onSubmit">{{$t('确定')}}</el-button>
+      <el-button v-if="!flag" type="primary" @click="$router.push({path: '/bpm/process-instance/detail', query: {id: apply.bpmProcessId}})">{{$t('审核中')}}</el-button>
       <el-button @click="cancel">{{$t('取消')}}</el-button>
     </el-row>
   </div>
@@ -34,9 +38,19 @@ export default {
         applyReason: [
           { required: true, message: this.$t("必填"), trigger: "change" },
         ]
-      }
+      },
+      apply: {},
+      flag: true
     };
   },
+  created() {
+    let orders = this.shipmentObj.clearanceInfo?.clearanceOrderBackList
+    let order = orders.find(item=>item.orderId == this.cancelClearInfo.orderId)
+    if(order){
+      this.apply = order
+      this.flag = false
+    }
+  },
   methods: {
     onSubmit() {
       this.$refs["arrivalForm"].validate((valid) => {

src/views/ecw/box/queryAir.vue

@@ -108,7 +108,7 @@
               <el-table-column prop="" :label="$t('操作')" align="center" width="120px">
                 <template slot-scope="scope">
                   <el-button type="primary" size="small" :disabled="scope.row.abnormalDealStatus === 1" @click="()=>updateStatus('single', scope.row)">{{$t('更新状态')}}</el-button>
-                  <el-button type="primary" size="small" :disabled="shipmentObj.clStatus==132||(shipmentObj.clearanceInfo&&shipmentObj.clearanceInfo.clearanceOrderList.findIndex(ff=>ff.orderId == scope.row.orderId) == -1)" @click="()=>cancleClear(scope.row)">{{$t('撤销清关申请')}}</el-button>
+                  <el-button type="primary" size="small" :disabled="shipmentObj.clStatus==132|| (shipmentObj.clearanceInfo == null) || (shipmentObj.clearanceInfo&&shipmentObj.clearanceInfo.clearanceOrderList.findIndex(ff=>ff.orderId == scope.row.orderId) == -1)" @click="()=>cancleClear(scope.row)">{{$t('撤销清关申请')}}</el-button>
                 </template>
               </el-table-column>
             </el-table>

src/views/ecw/box/shippingAir/nodePage/mergePkg/index.vue

@@ -110,7 +110,7 @@
               <el-radio-button :label="2">{{ $t('已装箱列表') }}</el-radio-button>
             </el-radio-group>
           </div>
-          <un-pkg-page v-if="pkgPageType == 1" :pkgData="pkgData" :shipmentObj="shipmentObj" />
+          <un-pkg-page v-if="pkgPageType == 1" :pkgData="pkgData" :shipmentObj="shipmentObj" @reload="getList" />
           <pkg-page v-if="pkgPageType == 2" :pkgData="pkgData" :shipmentObj="shipmentObj" @closeDialog="closeDialog" @reload="getList" />
         </el-dialog>
         <!-- 打印标签 -->

src/views/ecw/box/shippingAir/nodePage/mergePkg/unPkgPage.vue

@@ -125,6 +125,7 @@ export default {
       createPkgOrder(data).then(() => {
         this.$message.success(this.$t('装箱成功'))
         this.getList()
+        this.$emit('reload')
       })
     },
     // 选中

src/views/ecw/box/shippingAir/nodePage/twoWayTakeoff.vue

@@ -4,10 +4,13 @@
       <el-form-item :label="$t('预计起飞时间')">
         {{getTakeOffTime()}}
       </el-form-item>
+      <el-form-item :label="$t('预计到港时间')" prop="est_time">
+        <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="twoWayTakeoffObj.est_time" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+      </el-form-item>
       <el-form-item :label="$t('实际起飞时间')" prop="dtRealFlyTime">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="twoWayTakeoffObj.dtRealFlyTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
-      <el-form-item v-if="dtRealHeadTimeFlag" :label="$t('实际头程时间')" prop="dtRealHeadTime">
+      <el-form-item v-if="dtRealHeadTimeFlag" :label="$t('预计二程起飞时间')" prop="dtRealHeadTime">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="twoWayTakeoffObj.dtRealHeadTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
     </el-form>
@@ -62,6 +65,7 @@ export default {
     let oldData = { ...this.$attrs.shipmentObj[voName] };
     oldData = formatDateStr(oldData, ["dtRealFlyTime"], "YYYY-MM-DD HH:mm:ss");
     oldData = formatDateStr(oldData, ["dtRealHeadTime"], "YYYY-MM-DD HH:mm:ss");
+    oldData = formatDateStr(oldData, ["est_time"], "YYYY-MM-DD HH:mm:ss");
     this.twoWayTakeoffObj = oldData;
     if(this.$attrs.shipmentObj['bookAirInfo'].voyage && this.$attrs.shipmentObj['bookAirInfo'].voyage == 2){
       this.dtRealHeadTimeFlag = true

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

@@ -752,6 +752,27 @@ function getColmnMapping() {
         key: "operator",
       },
     ],
+    boxAirFlyInfo:  [
+      {
+        title: i18n.$t("预计到港时间"),
+        key: "dtRealFlyTime",
+        type: "datetime",
+      },
+      {
+        title: i18n.$t("实际起飞时间"),
+        key: "dtRealFlyTime",
+        type: "datetime",
+      },
+      {
+        title: i18n.$t("预计二程起飞时间"),
+        key: "dtRealHeadTime",
+        type: "datetime",
+      },
+      {
+        title: i18n.$t("业务员"),
+        key: "operator",
+      },
+    ],
     clearanceDocInfo: [
       {
         title: "agent list",

src/views/ecw/productBrank/Empower/components/showContacts.vue

+<script>
+export default {
+  name: "showContacts",
+  props:{
+    phoneString:[String]
+  },
+  data(){
+    return {
+      phoneList:[],
+    }
+  },
+  mounted() {
+    let phone = this.phoneString
+    this.phoneList = phone.split('(;)');
+    console.log(this.phoneList)
+  }
+}
+</script>
+
+<template>
+<div>
+ <div v-for="(item, index) in phoneList" :key="index" >
+     <div>
+         <span>联系人{{index + 1}}：</span>
+         <span>{{item.split('(@)')[1]}}</span>
+     </div>
+     <div>
+         <span>联系电话{{index + 1}}：</span>
+         <span>+{{item.split('(@)')[0]}}</span>
+     </div>
+ </div>
+</div>
+</template>
+
+<style scoped lang="scss">
+
+</style>

src/views/ecw/productBrank/Empower/index.vue

@@ -43,9 +43,10 @@
               :label="$t('客户名称')">
             </el-table-column>
             <el-table-column
-              prop="phone"
-              :formatter="(row, column, cellValue) => '+' + cellValue"
               :label="$t('客户号码')">
+                <template v-slot="{row}">
+            <show-contacts :phone-string="row.phone" ></show-contacts>
+                </template>
             </el-table-column>
             <el-table-column
               prop="feeScale"
@@ -78,9 +79,11 @@
               :label="$t('客户名称')">
             </el-table-column>
             <el-table-column
-              prop="phone"
-              :formatter="(row, column, cellValue) => '+' + cellValue"
+                    width="210"
               :label="$t('客户号码')">
+                <template v-slot="{row}">
+                    <show-contacts :phone-string="row.phone" ></show-contacts>
+                </template>
             </el-table-column>
             <el-table-column
               prop="fileUrl"
@@ -211,10 +214,12 @@ import DictSelector from "@/components/DictSelector"
 import { DICT_TYPE, getDictDataLabel } from '@/utils/dict'
 import FileUpload from '@/components/FileUpload'
 import { parseTime } from '@/utils/ruoyi'
+import ShowContacts from "@/views/ecw/productBrank/Empower/components/showContacts.vue";
 
 export default {
   name: "Empower",
   components: {
+      ShowContacts,
     DictSelector,
     FileUpload
   },