更新合单

src/views/ecw/order/singleApply.vue

@@ -17,17 +17,18 @@
             <el-descriptions-item label="送货日期">
              {{orderData.consigneeVO?orderData.consigneeVO.deliveryDate:'无'}}
             </el-descriptions-item>
+
             <el-descriptions-item label="运输方式">
                 <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
             </el-descriptions-item>
             <el-descriptions-item label="出货渠道">
                   {{orderData.channelId?getChannelName(orderData.channelId):'/'}}
             </el-descriptions-item>
-            <el-descriptions-item label="始发地">
-                  {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:'无'}}
+            <el-descriptions-item label="始发地" :span="2">
+                  {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:'无'}}
             </el-descriptions-item>
             <el-descriptions-item label="目的地">
-               {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destTitleZh:'无'}}
+               {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:'无'}}
             </el-descriptions-item>
             <el-descriptions-item label="发货人姓名">
                 {{orderData.consignorVO?orderData.consignorVO.name||'无':'无'}}
@@ -36,7 +37,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">
@@ -47,7 +48,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>
 
@@ -113,7 +114,7 @@
          </el-table-column>
         <el-table-column label="始发地" align="center">
             <template slot-scope="scope">
-              <span>{{importCityName(scope.row.orderDepartureVO.departure.titleZh)}}</span>
+              <span>{{scope.row.orderDepartureDO.departure}}</span>
             </template>
         </el-table-column>
         <el-table-column label="入仓货物属性" align="center">
@@ -141,11 +142,11 @@
     </el-card>
     <work-flow v-if='singleData.length>0' xmlkey="merge_order" v-model="selectedUsers"></work-flow>
     <div slot="footer" class="card footer_btn" v-if="singleData.length>0">
-        <el-button  v-if="orderData.status!=16" type="primary" @click="submitForm">提交申请</el-button>
-        <el-button v-if="orderData.status!=16" plain type="primary" @click="$router.back()">取消</el-button>
-        <el-button v-if="orderData.status==16"  type="primary" disabled>审核中</el-button>
-        <el-button v-if="orderData.status==16" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
-        <el-button v-if="orderData.status==16" plain type="primary" @click="$router.back()">返回</el-button>
+        <el-button  v-if="orderData.inWarehouseState!=209" type="primary" @click="submitForm">提交申请</el-button>
+        <el-button v-if="orderData.inWarehouseState!=209" plain type="primary" @click="$router.back()">取消</el-button>
+        <el-button v-if="orderData.inWarehouseState==209"  type="primary" disabled>审核中</el-button>
+        <el-button v-if="orderData.inWarehouseState==209" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
+        <el-button v-if="orderData.inWarehouseState==209" plain type="primary" @click="$router.back()">返回</el-button>
     </div>
     <el-dialog
       title="提示"
@@ -162,7 +163,7 @@
       </span>
     </el-dialog>
   </div>
-</template> 
+</template>
 
 <script>
 import {getMergeListByOrderNo,createMerge,cancelMerge} from "@/api/ecw/orderHandle"
@@ -188,7 +189,7 @@ export default {
       tradeCityList:[],
       loading:false,
       queryParams:{
-        mergedOrderNo:'UG2200033D',
+        mergedOrderNo:'NG2200006L',
         page:1,
         rosw:10
       },
@@ -227,8 +228,9 @@ export default {
     },
     handleSelectionChange(val) {
        var orderNo = []
+       console.log(val)
        val.forEach((item)=>{
-         orderNo.push(item.mergedOrder.orderNo)
+         orderNo.push(item.orderNo)
        })
        this.orderNos = orderNo.join(',')
      },
@@ -252,7 +254,8 @@ export default {
         return
       }
       var  params = {
-        id:that.orderData.orderId,
+        applyOrderNo :that.queryParams.mergedOrderNo,
+        orderNo :that.queryParams.mergedOrderNo,
         reason:that.reason
       }
       cancelMerge(params).then(res=>{
@@ -267,12 +270,12 @@ export default {
         return
       }
         var  params = {
-          applyOrderNo:queryParams.mergedOrderNo,
+          applyOrderNo:that.queryParams.mergedOrderNo,
           copyUserId:that.selectedUsers,
           orderNos:that.orderNos,
           status:1
         }
-        createMerge(params).then(res=>{
+        createMerge([params]).then(res=>{
           that.$message.success("修改成功");
           that.$router.back()
         })

src/views/ecw/order/splitApply.vue

@@ -24,19 +24,15 @@
             <el-descriptions-item label="送货日期">
               {{orderData.consigneeVO?orderData.consigneeVO.deliveryDate:'无'}}
             </el-descriptions-item>
-        </el-descriptions>
-        <el-descriptions :column="4">
           <el-descriptions-item label="运输方式">
               <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
           </el-descriptions-item>
-          <el-descriptions-item label="始发地">
-               {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:'无'}}
+          <el-descriptions-item label="始发地" :span="2">
+               {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:'无'}}
           </el-descriptions-item>
           <el-descriptions-item label="目的地">
-             {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destTitleZh:'无'}}
+             {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:'无'}}
           </el-descriptions-item>
-        </el-descriptions>
-        <el-descriptions :column="4">
           <el-descriptions-item label="发货人姓名">
               {{orderData.consignorVO?orderData.consignorVO.name||'无':'无'}}
           </el-descriptions-item>
@@ -180,11 +176,11 @@
     </el-card>
     <work-flow xmlkey="split_order" v-model="selectedUsers"></work-flow>
     <div slot="footer" class="card footer_btn" v-if="orderData.status!=99">
-        <el-button  v-if="orderData.status!=19" type="primary" @click="submitForm">提交申请</el-button>
-        <el-button v-if="orderData.status!=19" plain type="primary" @click="$router.back()">取消</el-button>
-        <el-button v-if="orderData.status==19" type="primary" disabled>审核中</el-button>
-        <el-button v-if="orderData.status==19" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
-        <el-button v-if="orderData.status==19" plain type="primary" @click="$router.back()">返回</el-button>
+        <el-button  v-if="orderData.inWarehouseState!=207" type="primary" @click="submitForm">提交申请</el-button>
+        <el-button v-if="orderData.inWarehouseState!=207" plain type="primary" @click="$router.back()">取消</el-button>
+        <el-button v-if="orderData.inWarehouseState==207" type="primary" disabled>审核中</el-button>
+        <el-button v-if="orderData.inWarehouseState==207" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
+        <el-button v-if="orderData.inWarehouseState==207" plain type="primary" @click="$router.back()">返回</el-button>
     </div>
      <!-- 对话框(添加 / 修改) -->
         <el-dialog title="新建拆单" :visible.sync="open" width="400px" append-to-body>