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

src/api/ecw/offer.js

@@ -142,4 +142,20 @@ export function exportDeptOfferExcel(query) {
     params: query,
     responseType: 'blob'
   })
+}
+// 报价单
+export function getOfferSelect(params) {
+  return request({
+    url: '/ecw/offer/select',
+    method: 'get',
+    params
+  })
+}
+// 报价单
+export function getOfferCheck(params) {
+  return request({
+    url: '/ecw/offer/check',
+    method: 'get',
+    params
+  })
 }
\ No newline at end of file

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

@@ -297,9 +297,9 @@
                     <dict-tag :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" :value="scope.row.material" />
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('特性')" align="center" prop="attrNameList" width="120">
+                <el-table-column :label="$t('特性')" align="center" prop="warehouseInAttrNameList" width="120">
                   <template slot-scope="scope">
-                    {{scope.row.attrNameList?scope.row.attrNameList.toString():""}}
+                    {{scope.row.warehouseInAttrNameList?scope.row.warehouseInAttrNameList.toString():""}}
                   </template>
                 </el-table-column>
                 <!-- <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">

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

@@ -94,7 +94,7 @@ export default {
           const { currNode, shipmentObj } = this.$attrs;
           let approvalType = 14; // 预装反审
           if (currNode.type === "cabinet") approvalType = 9; // 装柜反审
-          if (currNode.type === "unloading") approvalType = 7; // 卸柜反审核
+          if (currNode.type === "unloading") approvalType = 16; // 到仓反审核
 
           approvalCreate({
             shipmentId: shipmentObj.id,

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

@@ -7,7 +7,7 @@
       <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 :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>
@@ -54,6 +54,7 @@ export default {
       dialogVisible: false,
       // 提示消息
       showMsg: false,
+      dtRealHeadTimeFlag: false
     };
   },
   created() {
@@ -62,6 +63,9 @@ export default {
     oldData = formatDateStr(oldData, ["dtRealFlyTime"], "YYYY-MM-DD HH:mm:ss");
     oldData = formatDateStr(oldData, ["dtRealHeadTime"], "YYYY-MM-DD HH:mm:ss");
     this.twoWayTakeoffObj = oldData;
+    if(this.$attrs.shipmentObj['bookAirInfo'].voyage && this.$attrs.shipmentObj['bookAirInfo'].voyage == 2){
+      this.dtRealHeadTimeFlag = true
+    }
   },
   watch: {
   },

src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue

@@ -267,7 +267,7 @@ export default {
         approvalCreate({
             shipmentId: this.$attrs.shipmentObj.id,
             approvalStatus: 0,
-            approvalType: 3, // 卸柜
+            approvalType: 15, // 卸柜
             copyUserId: this.selectedUsers,
           }).then((res) => {
             serviceMsg(res, this).then(() => {

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

@@ -208,6 +208,9 @@ export default {
     }
   },
   computed:{
+    isChinese(){
+      return this.$i18n.locale === 'zh_CN'
+    },
     currencyMap(){
       return arrryToKeyedObjectBy(this.currencyList, 'id')
     },
@@ -249,7 +252,7 @@ export default {
         return ''
     },
     selectChannel(val){
-      if(this.channelList.length > 0 && !!val) return this.channelList.find(e => e.channelId === val).nameEn
+      if(this.channelList.length > 0 && !!val) return this.channelList.find(e => e.channelId === val)[this.isChinese ? 'nameZh' : 'nameEn']
       return ''
     },
     getDetails(){

src/views/ecw/order/detail.vue

@@ -108,6 +108,12 @@
         <el-descriptions-item :label="$t('单证报关')">
           <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" />
         </el-descriptions-item>
+        <el-descriptions-item :label="$t('关联报价单')">
+          <router-link v-if="offerData" :to="{path: '/offer/detail',query: {offerId: offerData.offerId}}" class="link-type">
+            <span>{{ offerData.number }}</span>
+          </router-link>
+          <span v-else>/</span>
+        </el-descriptions-item>
       </el-descriptions>
       <el-descriptions class="mr-10" border :column="2" :class="showMore?'showInfo':'hiddenInfo'" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
         <el-descriptions-item :label="$t('出单方式')">
@@ -479,6 +485,7 @@
 
 <script>
 import {getOrder, operateLogPage} from '@/api/ecw/order'
+import {getOfferCheck} from '@/api/ecw/offer'
 import { getDictDatas, DICT_TYPE, getDictData } from '@/utils/dict';
 import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
 import PrintLadingBill from './components/PrintLadingBill'
@@ -553,6 +560,7 @@ export default {
       packAfterData:null,//显示打包历史详情
       showDeclaration:false, //显示报关资料
       showFeeSummary: false, // 是否显示费用汇总
+      offerData:'' //关联报价单
     }
   },
   computed:{
@@ -614,6 +622,7 @@ export default {
     if (this.$route.query.orderId) {
       this.orderId = this.$route.query.orderId
       this.getOrder();
+      this.getOfferNumber()
     }
 
     getCurrencyList().then(res => this.currencyList = res.data)
@@ -811,6 +820,12 @@ export default {
     //查看打包历史详情
     showPackDetail(packAfterData){
       this.packAfterData = packAfterData
+    },
+    getOfferNumber() {
+      const that = this
+      getOfferCheck({ orderId: that.orderId }).then(response => {
+        that.offerData = response.data
+      })
     }
   }
 };

src/views/ecw/order/edit.vue

@@ -448,6 +448,22 @@
                      </el-table>
                 </el-form-item>
             </div>
+            <el-form-item :label="$t('关联报价单')" prop="offerId">
+                <el-select
+                  v-model="form.offerId"
+                  filterable
+                  clearable
+                  reserve-keyword
+                  :placeholder="$t('请选择')"
+                >
+                  <el-option
+                    v-for="(item, index) in offerData"
+                    :key="index"
+                    :label="item.number"
+                    :value="item.offerId"
+                  />
+                </el-select>
+            </el-form-item>
         </el-card>
 
         <el-card  class="mt-10" v-if="transport">
@@ -595,6 +611,7 @@ import Decimal from 'decimal.js'
 import WorkFlow from '@/components/WorkFlow'
 import { getCustomer } from "@/api/ecw/customer";
 import {debounce} from "@/utils";
+import {  getOfferSelect, getOfferCheck } from "@/api/ecw/offer"
 
 // 缓存默认的表单数据
 let makeDefaultFormData = () => {
@@ -608,7 +625,7 @@ let makeDefaultFormData = () => {
     externalWarehouseDtoList:[],
     orderItemVOList:[],
     drawee: 2,
-    harvestMethod: "1"
+    harvestMethod: "1",
   }
 }
 window.Decimal = Decimal
@@ -662,7 +679,8 @@ export default {
       showWorkFlow: false, // 是否显示工作流表单
       calculating: false, // 是否正在计算费用，防止频繁重新请求
       initing: true, // 初始化中,
-      updateChannel: false // 是否更新渠道
+      updateChannel: false, // 是否更新渠道
+      offerData: []// 关联报价单
     };
   },
   computed:{
@@ -877,6 +895,18 @@ export default {
     'form.channelId'(){
         this.calculationPrice()
     },
+    'form.consigneeCountryCode'(){
+      if(this.form.lineId) this.getOfferData()
+    },
+    'form.consignorCountryCode'(){
+      if(this.form.lineId) this.getOfferData()
+    },
+    'form.consigneePhone'(){
+      if(this.form.lineId) this.getOfferData()
+    },
+    'form.consignorPhone'(){
+      if(this.form.lineId) this.getOfferData()
+    },
     'form.lineId'(lineId){
         let router = this.routerList.find(item => item.id == lineId)
         if(!router){
@@ -897,7 +927,7 @@ export default {
             this.$set(this.form, 'isCargoControl', false)
           }
         })
-
+        this.getOfferData()
     },
     /* 'form.packageTypeArr'(val){
         console.log('packageType', val, val.length)
@@ -1024,7 +1054,7 @@ export default {
       this.initing = true
         getUpdateInfo(this.$route.query.id).then(res => {
             this.form = Object.assign({}, {...res.data}, {orderItemVOList: []})
-
+            this.getOfferData()
             /* this.form.orderItemVOList = []; */
 
             this.form.type = this.form.type ? this.form.type.split(',').filter(item => item != '') : []
@@ -1114,6 +1144,7 @@ export default {
         this.$set(this.form, this.contactChooseType + 'Phone', contact.phoneNew)
         this.contactChooseType = null
         this.quickCreateType = null
+        if(this.form.lineId)  this.getOfferData()
     },
     upload(e){
         console.log({upload: e})
@@ -1370,7 +1401,46 @@ export default {
             arr.push(tmp)
         })
         return arr
-    }
+    },
+    // 关联报价单
+    getOfferData() {
+      const that = this
+      const offParams = {}
+      if (that.form.lineId) {
+      	offParams.lineId = that.form.lineId
+      }
+      if (that.form.channelId) {
+      	offParams.channelId = that.form.channelId
+      }
+      if (that.form.consigneeContactsId) {
+      	offParams.consigneeId = that.form.consigneeContactsId
+      } else {
+      	offParams.consigneeCode = that.form.consigneeCountryCode
+      	offParams.consigneePhone = that.form.consigneePhone
+      }
+      if (that.form.consignorContactsId) {
+      	offParams.consignorId = that.form.consignorContactsId
+      } else {
+      	offParams.consignorCode = that.form.consignorCountryCode
+      	offParams.consignorPhone = that.form.consignorPhone
+      }
+      getOfferSelect(offParams).then((res) => {
+        that.offerData = res.data
+        if (!that.form.offerId && that.form.orderId) {
+          that.getOfferNumber(that.form.orderId)
+        }
+      })
+    },
+    getOfferNumber(id) {
+      const that = this
+      getOfferCheck({ orderId: id }).then(response => {
+        if(that.offerData.length==0){
+          that.offerData.push(response.data)
+        }
+        console.log(that.offerData)
+        that.$set(that.form, 'offerId', response.data.offerId)
+      })
+    },
   }
 };
 </script>

src/views/ecw/order/penddingList.vue

@@ -413,6 +413,7 @@ export default {
         return this.$message.error("暂无选择订单")
       }
       this.showBatchException = true
+      this.batchExceptionForm.exceptionUrls = []
     },
     handleBatchException(){
       // 以下代码是copilot生成，暂无接口，回头在改