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

src/api/system/download.js

@@ -19,5 +19,5 @@ export function download(id){
 
 // 获取文件二进制
 export function downloadFileResponse(url){
-  return axios.get(url)
+  return axios.get(url, {responseType: 'blob'})
 }

src/views/ecw/order/edit.vue

@@ -884,8 +884,8 @@ export default {
             this.$set(this.form, 'channelId', null)
         }
 
-
-        if(transportId == 3){
+        console.log('form.transportId', this.form.transportId, this.initing)
+        if(!this.initing && transportId == 3){
           // 如果是专线空运默认目的港清关选择我司
           this.$set(this.form, 'portDestCustomsClear', 1)
         }
@@ -1119,6 +1119,15 @@ export default {
                         })
                     })
                 }
+
+                // 在初始化结束后transportId还会发生一次变化导致目的港清关被重置，所以需要延迟一下。暂不清楚原因
+                setTimeout(() =>{
+                    console.log('transportId', this.form.transportId)
+                    console.log('portDestCustomsClear', this.form.portDestCustomsClear, res.data.portDestCustomsClear)
+                    if(res.data.portDestCustomsClear){
+                        this.$set(this.form, 'portDestCustomsClear', res.data.portDestCustomsClear)
+                    }
+                }, 100)
                 this.initing = false
             })
 
@@ -1425,7 +1434,7 @@ export default {
       	offParams.consignorPhone = that.form.consignorPhone
       }
       getOfferSelect(offParams).then((res) => {
-        that.offerData = res.data
+        that.offerData = res.data || []
         if (!that.form.offerId && that.form.orderId) {
           that.getOfferNumber(that.form.orderId)
         }
@@ -1434,6 +1443,7 @@ export default {
     getOfferNumber(id) {
       const that = this
       getOfferCheck({ orderId: id }).then(response => {
+        if(!response.data) return
         if(that.offerData.length==0){
           that.offerData.push(response.data)
         }

src/views/ecw/order/special/Preferential.vue

@@ -90,7 +90,7 @@ export default {
       return {
         4: this.$t('重货标准优惠申请'),
         5: this.$t('泡货标准优惠申请'),
-        29: this.$t('泡货优惠申请')
+        29: this.$t('申请泡重优惠')
       }[this.applyType]
       // return this.applyType == 4 ? this.$t('重货优惠申请') : this.$t('泡货优惠申请')
     },

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

@@ -113,9 +113,9 @@
           1.海运整柜、海运拼柜显示重货优惠  1,2
           2.空运专线、海空联运显示泡货优惠  3,4
          -->
-        <el-button v-hasPermi="['ecw:order:heavy']" type="primary" @click="showPreferentialType=4" v-if="order.transportId === 1 || order.transportId === 2">{{$t('申请重货优惠')}}</el-button>
+        <el-button v-hasPermi="['ecw:order:heavy']" type="primary" @click="showPreferentialType=4" v-if="order.transportId === 1 || order.transportId === 2">{{$t('申请重货标准优惠')}}</el-button>
         <template  v-else>
-          <el-button v-hasPermi="['ecw:order:bulky2']" type="primary" @click="showPreferentialType=29">{{$t('申请泡货优惠')}}</el-button>
+          <el-button v-hasPermi="['ecw:order:bulky2']" type="primary" @click="showPreferentialType=29">{{$t('申请泡重优惠')}}</el-button>
           <el-button v-hasPermi="['ecw:order:bulky']" type="primary" @click="showPreferentialType=5">{{$t('申请泡货标准优惠')}}</el-button>
         </template>
         <el-button type="primary" @click="$tab.closePage()">{{$t('关闭窗口')}}</el-button>

src/views/system/download/index.vue

@@ -84,6 +84,7 @@ export default {
           download(row.id).then(res => {
               return downloadFileResponse(res.data)
           }).then(res => {
+              console.log({res})
               this.$download.download0(res.data, row.name + row.fileSuffix, res.headers['content-type'])
           }).finally(() => {
               loading.close()