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

src/i18n/languages/en_US.json

@@ -4252,5 +4252,6 @@
     "发货人名称、手机号": "sender name or mobile",
     "收货人名称、手机号": "Receiver Name or Mobile",
   "订单费用报表": "Order cost report",
-  "请先选择目的国": "select the destination country first"
+  "请先选择目的国": "select the destination country first",
+    "控货日志": "Control cargo log"
 }

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

@@ -479,6 +479,7 @@ export default  {
       let total = {}
       arr.forEach(item => {
         const currency = item[currencyField]
+          if(!currency) return
         if(!total[currency]){
           total[currency] = new Decimal(0)
         }

src/views/ecw/order/edit.vue

@@ -1006,6 +1006,7 @@ export default {
   },
   activated(){
     if(this.$route.query.id != this.form.id){
+        console.log("activated 加载订单数据")
         this.getOrder()
     }
     let transportType = undefined
@@ -1020,7 +1021,6 @@ export default {
     this.updateChannel = this.$route.query.updateChannel == 1
   },
   async created() {
-
     this.productAttrList = (await getProductAttrList()).data
     this.channelList = (await getChannelList()).data
     this.tradeCityList = (await getTradeCityList()).data
@@ -1042,6 +1042,7 @@ export default {
       this.updateChannel = true
     }
     if(this.$route.query.id){
+        console.log('created 加载订单数据')
         this.getOrder()
     }else{
         this.addProduct()
@@ -1056,7 +1057,11 @@ export default {
         // console.warn('onTableMounted', e)
     },
     getOrder(){
-      this.initing = true
+        if(this.form.orderId == this.$route.query.id){
+            console.log('加载中或者已加载此订单数据，不重复加载', this.initing, this.form.orderId, this.$route.query.id)
+            return
+        }
+        this.initing = true
         getUpdateInfo(this.$route.query.id).then(res => {
             this.form = Object.assign({}, {...res.data}, {orderItemVOList: []})
             this.getOfferData()
@@ -1116,6 +1121,7 @@ export default {
                     this.form.orderItemVOList.push({...item})
                 })
 
+                // 已入仓后，必填字段修改则需要显示审批流
                 if(this.inWarehouse){
                     Object.keys(this.rules).forEach(field => {
                         console.log("watch", field)
@@ -1132,6 +1138,9 @@ export default {
                     if(res.data.portDestCustomsClear){
                         this.$set(this.form, 'portDestCustomsClear', res.data.portDestCustomsClear)
                     }
+                    if(res.data.deliveryWay){
+                        this.$set(this.form, 'deliveryWay', res.data.deliveryWay)
+                    }
                 }, 100)
                 this.initing = false
             })

src/views/ecw/order/penddingList.vue

@@ -453,7 +453,7 @@ export default {
           this.exporting = true
           const exportParams = Array.isArray(params) ? {orderIdList: params} : {...params}
           exportWaitingShipment(exportParams).then(res => {
-              this.$download.excel(res, this.$t('待出订单') + '.xls');
+              this.$message.success(this.$t('已加入导出队列，请稍后在下载日志中下载'))
           }).finally(() => {
               this.exporting = false
           })

src/views/ecw/order/stockingList.vue

@@ -349,7 +349,8 @@ export default {
     exportXls(params){
       this.exporting = true
       exportCanShipment(params).then(res => {
-        this.$download.excel(res, this.$t('备货订单') + '.xls');
+        // this.$download.excel(res, this.$t('备货订单') + '.xls');
+          this.$message.success(this.$t('已加入导出队列，请稍后在下载日志中下载'))
       }).finally(() => {
         this.exporting = false
       })

src/views/ecw/productPrice/edit.vue

@@ -30,40 +30,41 @@
           disabled/>
       </el-form-item>-->
       <!--多条路线批量修改-->
-      <el-form-item :label="$t('路线')" prop="lineChannelList" v-if="lineList.length">
-        <template v-if="lineList.length == 1">
-          <el-input
-          v-for="(item, index) in lineList"
-          :key="index"
-          :value="!item.warehouseLineDO ? $t('数据异常,缺少warehouseLineDO字段') : $t('【{transport}】从【{from}】发往【{to}】', {
-            transport: getDictDataLabel(DICT_TYPE.ECW_TRANSPORT_TYPE, item.warehouseLineDO.transportType),
-            from: $l(item.warehouseLineDO, 'startTitle'),
-            to: $l(item.warehouseLineDO, 'destTitle')
-          })"
-          disabled />
-        </template>
-        <el-checkbox-group v-else v-model="checkList">
-          <el-checkbox
-          v-for="item in lineList"
-          :key="item.id"
-          :label="item.id"
-          :disabled="!item.warehouseLineDO"
-          style="display:block"
-          >
-            {{
-              !item.warehouseLineDO ? $t('数据异常,缺少warehouseLineDO字段') : $t('【{transport}】从【{from}】发往【{to}】', {
+        <template  v-if="lineList.length">
+          <el-form-item :label="$t('路线')" prop="lineChannelList">
+            <template v-if="lineList.length == 1">
+              <el-input
+              v-for="(item, index) in lineList"
+              :key="index"
+              :value="!item.warehouseLineDO ? $t('数据异常,缺少warehouseLineDO字段') : $t('【{transport}】从【{from}】发往【{to}】', {
                 transport: getDictDataLabel(DICT_TYPE.ECW_TRANSPORT_TYPE, item.warehouseLineDO.transportType),
                 from: $l(item.warehouseLineDO, 'startTitle'),
                 to: $l(item.warehouseLineDO, 'destTitle')
-              })
-            }}
-          </el-checkbox>
-        </el-checkbox-group>
-      </el-form-item>
-      <el-form-item v-if="channel" :label="$t('出货渠道')">
-        {{$l(channel, 'name')}}
-      </el-form-item>
-
+              })"
+              disabled />
+            </template>
+            <el-checkbox-group v-else v-model="checkList">
+              <el-checkbox
+              v-for="item in lineList"
+              :key="item.id"
+              :label="item.id"
+              :disabled="!item.warehouseLineDO"
+              style="display:block"
+              >
+                {{
+                  !item.warehouseLineDO ? $t('数据异常,缺少warehouseLineDO字段') : $t('【{transport}】从【{from}】发往【{to}】', {
+                    transport: getDictDataLabel(DICT_TYPE.ECW_TRANSPORT_TYPE, item.warehouseLineDO.transportType),
+                    from: $l(item.warehouseLineDO, 'startTitle'),
+                    to: $l(item.warehouseLineDO, 'destTitle')
+                  })
+                }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+          <el-form-item v-if="channel" :label="$t('出货渠道')">
+              {{$l(channel, 'name')}}
+          </el-form-item>
+        </template>
       <!--有路线则不显示路线选择器-->
       <routers-selector v-else v-model="selectedRoutes" :option="routerOption" :type="type" />