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

src/views/ecw/order/singleApply.vue

@@ -55,7 +55,7 @@
     <el-card class="card">
       <!-- 列表 -->
       <div slot="header" class="card-title">已合单订单</div>
-      <el-table v-loading="loading" border :data="list.mergedList" style="width: 200px;">
+      <el-table v-loading="loading" border :data="mergedList" style="width: 200px;">
         <el-table-column label="序号" align="center" prop="id" type="index">
           <template slot-scope="scope">
               <span>{{scope.$index + 1}}</span>
@@ -113,7 +113,7 @@
          </el-table-column>
         <el-table-column label="始发地" align="center">
             <template slot-scope="scope">
-              <span>{{importCityName(scope.row.scope.row.orderDepartureVO.departureId)}}</span>
+              <span>{{importCityName(scope.row.orderDepartureVO.departure.titleZh)}}</span>
             </template>
         </el-table-column>
         <el-table-column label="入仓货物属性" align="center">
@@ -129,7 +129,6 @@
         </el-table-column>
         <el-table-column label="状态" align="center">
            <template slot-scope="scope">
-               <!-- <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status" /> -->
                 {{scope.row.status==99?'异常':'正常'}}
           </template>
         </el-table-column>
@@ -170,11 +169,12 @@ export default {
       orderData:{},
       // 订单异常列表
       list: [],
+      mergedList:[],
       singleData:[],
       tradeCityList:[],
       loading:false,
       queryParams:{
-        mergedOrderNo:'UG2200012S',
+        mergedOrderNo:'UG2200033D',
         page:1,
         rosw:10
       },
@@ -188,7 +188,6 @@ export default {
       this.queryParams.mergedOrderNo = this.$route.query.orderNo
     }
     this.getList()
-    
     getTradeCityList().then(res => this.tradeCityList = res.data)
   },
   methods: {
@@ -197,11 +196,17 @@ export default {
       this.loading = true;
       // 执行查询
       getMergeListByOrderNo(this.queryParams).then(response => {
-        this.list = response.data;
-        this.total = response.data.unMergeList.total;
-        this.orderData = response.data.orderInfo
         this.loading = false;
+        if(response.data.mergedList){
+          this.mergedList = response.data;
+        }
+        if(response.data.unMergeList){
+          this.total = response.data.unMergeList.total;
           this.singleData = response.data.unMergeList.list;
+        }
+        if(response.data.orderInfo){
+          this.orderData = response.data.orderInfo
+        }
       });
     },
     handleSelectionChange(val) {
@@ -233,7 +238,7 @@ export default {
       }
       cancelMerge(params).then(res=>{
           that.$message.success("取消成功");
-           that.getList()
+           that.$router.back()
       })
     },
     submitForm(){
@@ -250,7 +255,7 @@ export default {
         }
         createMerge(params).then(res=>{
           that.$message.success("修改成功");
-          that.getList()
+          that.$router.back()
         })
     }
   }

src/views/ecw/order/splitApply.vue

@@ -44,7 +44,7 @@
               {{orderData.consignorVO?orderData.consignorVO.company||'无':'无'}}
           </el-descriptions-item>
           <el-descriptions-item label="发货电话">
-                {{orderData.consignorVO?(orderData.consignorVO.phone?(orderData.consignorVO.countryCode+orderData.consignorVO.phone):'无'):'无'}}
+                {{!orderData.consignorVO?"无":!orderData.consignorVO.phone?'无':(orderData.consignorVO.countryCode+orderData.consignorVO.phone)}}
           </el-descriptions-item>
         </el-descriptions>
         <el-descriptions :column="4">
@@ -55,7 +55,7 @@
                 {{orderData.consigneeVO?orderData.consigneeVO.company||'无':'无'}}
             </el-descriptions-item>
             <el-descriptions-item label="收货电话">
-                {{orderData.consigneeVO?(orderData.consigneeVO.phone?(orderData.consigneeVo.countryCode+orderData.consigneeVO.phone):'无'):'无'}}
+              {{!orderData.consigneeVO?"无":!orderData.consigneeVO.phone?'无':(orderData.consigneeVO.countryCode+orderData.consigneeVO.phone)}}
             </el-descriptions-item>
         </el-descriptions>
 
@@ -102,9 +102,9 @@
                 <span>品牌：
                   <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType" />
                 </span>
-                <span style="margin-left: 10px;">箱数：{{scope.row.warehouseInInfoVO.cartonsNum}}</span>
-                <span style="margin-left: 10px;">体积：{{scope.row.warehouseInInfoVO.volume}}m³</span>
-                <span style="margin-left: 10px;">重量：{{scope.row.warehouseInInfoVO.weight}}kg</span>
+                <span style="margin-left: 10px;">箱数：{{!scope.row.warehouseInInfoVO?0:scope.row.warehouseInInfoVO.cartonsNum}}</span>
+                <span style="margin-left: 10px;">体积：{{!scope.row.warehouseInInfoVO?0:scope.row.warehouseInInfoVO.volume}}m³</span>
+                <span style="margin-left: 10px;">重量：{{!scope.row.warehouseInInfoVO?0:scope.row.warehouseInInfoVO.weight}}kg</span>
               </el-row>
             </template>
         </el-table-column>
@@ -115,7 +115,8 @@
         </el-table-column>
         <el-table-column label="状态" align="center">
            <template slot-scope="scope">
-               <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status" />
+             {{orderData.status==99?'异常':'正常'}}
+               <!-- <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status" /> -->
           </template>
         </el-table-column>
       </el-table>
@@ -250,7 +251,7 @@
 <script>
 import {getDictData, getDictDatas,DICT_TYPE} from '@/utils/dict'
 import {getSplitList,splitApply,createSplit,cancelApply,createSplitItem,deleteSplitItem,deleteSplit} from "@/api/ecw/orderHandle"
-import {getTradeCityList} from '@/api/ecw/region'
+import {getWarehouseList} from '@/api/ecw/warehouse'
 import {getChannelList} from '@/api/ecw/channel'
 import WorkFlow from '@/components/WorkFlow'
 import {getOrder} from '@/api/ecw/order'
@@ -291,7 +292,7 @@ export default {
         prodTitleEn: [{ required: true, message: "请选择英文品名", trigger: "change" }],
       },
       queryParams:{
-        orderId:96,
+        orderId:176,
         lang:0
       },
       query:{
@@ -303,15 +304,12 @@ export default {
   },
   created() {
     this.getChannel()
-    getTradeCityList().then(res => this.tradeCityList = res.data)
+    getWarehouseList().then(res => this.tradeCityList = res.data)
     if (this.$route.query.orderId) {
       this.queryParams.orderId = this.$route.query.orderId
+    }
     this.getList()
     this.getOrder()
-    }else{
-      this.getList()
-      this.getOrder()
-    }
   },
   watch: {
   //监听table这个对象
@@ -349,7 +347,7 @@ export default {
     getOrder(){
       this.loading = true;
       getOrder(this.queryParams.orderId).then(response => {
-        this.orderData = response.data;
+        this.orderData = response.data
         this.query.destWarehouseId = response.data.logisticsInfoDto.startWarehouseId
         this.loading = false
 
@@ -397,9 +395,9 @@ export default {
           orderSum += column.num
           orderV += column.volume
           orderW += column.weight
-          leviteSum += column.warehouseInInfoVO.cartonsNum
-          leviteV += column.warehouseInInfoVO.volume
-          leviteW += column.warehouseInInfoVO.weight
+          leviteSum += column.warehouseInInfoVO?column.warehouseInInfoVO.cartonsNum:0
+          leviteV += column.warehouseInInfoVO?column.warehouseInInfoVO.volume:0
+          leviteW += column.warehouseInInfoVO?column.warehouseInInfoVO.weight:0
       });
       sums[1] = '下单统计：'+ orderSum+' 箱 '+ orderV +' m³ ' + orderW + ' kg ' + ' 入仓统计：'+ leviteSum+' 箱 '+ leviteV +' m³ ' + leviteW + ' kg'
 
@@ -411,13 +409,21 @@ export default {
         return arr.length>0?arr[0].titleZh:'无'
     },
     submitForm(){
+      if(this.splitData.length==0){
+         this.$modal.msgError("请先新建拆单")
+         return
+      }
+      // if(this.selectedUsers.length==0){
+      //    this.$modal.msgError("请选择抄送人")
+      //    return
+      // }
       var params = {
         orderId:this.queryParams.orderId,
         copyUserId:this.selectedUsers
       }
       splitApply(params).then(res=>{
         this.$modal.msgSuccess("申请成功");
-        that.getList()
+        this.$router.back()
       })
     },
     addShop(index){
@@ -479,7 +485,7 @@ export default {
         remarks:this.shopForm.remarks
       }
       createSplitItem(params).then(res=>{
-        that.$message.success("放入成功");
+        this.$message.success("放入成功");
         this.getList()
         this.shopForm = {}
       })
@@ -499,7 +505,7 @@ export default {
       that.$confirm('是否取消审核吗?').then(function () {
         cancelApply({orderId:that.queryParams.orderId}).then(res=>{
           that.$message.success("取消成功");
-          that.getList()
+          that.$router.back()
         })
       })