控货列表

src/api/ecw/orderCargoControl.js

@@ -61,7 +61,7 @@ export function updateApply(data){
   })
 }
 
-// 复核
+// 复核(放货复核)
 export function review(id){
   return request({
     url: '/ecw/order-cargo-control-pick/review/' + id,
@@ -85,3 +85,11 @@ export function cancelApproval(approvalId, params){
     params
   })
 }
+
+// 订单复核
+export function orderReview(orderId){
+  return request({
+    url: '/ecw/order-cargo-control/review/' + orderId,
+    method: 'put'
+  })
+}

src/api/ecw/orderHandle.js

@@ -119,3 +119,12 @@ export function deleteSplitItem(id) {
     method: 'delete'
   })
 }
+
+// 根据合并编号获得订单信息、已合单列表和待合单列表
+export function getMergeListByMergeId(params){
+  return request({
+    url: '/order/merge/getMergeListByMergeId',
+    method: 'get',
+    params
+  })
+}
\ No newline at end of file

src/views/bpm/processInstance/detail.vue

@@ -135,6 +135,7 @@ import specialDiscount from "@/views/ecw/offer/specialDiscount"
 import warehouseDetails from "@/views/ecw/order/components/warehouseDetails";
 import shippingDetail from '@/views/ecw/box/shippingDetail'
 import SplitDetail from '@/views/ecw/order/components/SplitDetail'
+import MergeDetail from '@/views/ecw/order/components/MergeDetail'
 
 // 流程实例的详情页，可用于审批
 export default {
@@ -144,7 +145,8 @@ export default {
     specialDiscount,
     warehouseDetails,
     shippingDetail,
-    SplitDetail
+    SplitDetail,
+    MergeDetail
   },
   computed:{
     matterNum(){
@@ -240,7 +242,11 @@ export default {
           processId: this.processInstance.businessKey,
         },
         split_detail: {
-          component: "splitDetail",
+          component: "SplitDetail",
+          id: this.processInstance.businessKey,
+        },
+        merge_detail: {
+          component: "MergeDetail",
           id: this.processInstance.businessKey,
         }
       }

src/views/ecw/order/cargoControl.vue

@@ -78,9 +78,7 @@
         </template>
       </el-table-column>
       <el-table-column label="唛头" align="center" prop="marks" />
-      <el-table-column label="箱数" align="center" prop="sumNum">
-        <template slot-scope="{row}">{{row.totalNum}}</template>
-      </el-table-column>
+      <el-table-column label="箱数" align="center" prop="sumNum" />
       <el-table-column label="已放箱数" align="center" prop="sumWeight">
         <template slot-scope="{row}">{{row.releaseNum}}</template>
       </el-table-column>
@@ -105,15 +103,29 @@
       
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px">
         <template slot-scope="scope">
+          <!--控货中,已入仓-->
+          <template v-if="[0,2].indexOf(scope.row.cargoControlStatus) > -1 && scope.row.sumNum > 0">
             <el-button type="text"  size="mini" @click="showReleaseOrderId=scope.row.orderId">放货</el-button>
-          
-          <el-button type="text"  size="mini" @click="showEditOrderId=scope.row.orderId" >修改</el-button>
-          <el-button type="text"  size="mini" >取消</el-button>
+            <el-button type="text"  size="mini" @click="showTransferOrder = scope.row" >控货权转移</el-button>
+          </template>
+          <!--部分控货-->
+          <template v-if="scope.row.cargoControlStatus == 2">
+            <el-button type="text"  size="mini" @click="toDetail(scope.row)" >修改</el-button>
+            <el-button type="text"  size="mini" @click="toDetail(scope.row)" >取消</el-button>
             <el-button type="text"  size="mini" @click="review(scope.row)" >放货复核</el-button>
-          <el-button type="text"  size="mini" @click="$router.push('cargo_control/detail?id=' + scope.row.orderId)" >查看</el-button>
+          </template>
+          <!--已完成放货-->
+          <template v-if="scope.row.cargoControlStatus == 1">
+            <el-button type="text"  size="mini" @click="toDetail(scope.row)" >查看</el-button>
             <el-button type="text"  size="mini" @click="showTransferCargoOrderId=scope.row.orderId" >调货</el-button>
-          <el-button type="text"  size="mini" >反复核</el-button>
-          <el-button type="text"  size="mini" @click="showTransferOrder = scope.row" >控货权转移</el-button>
+            <el-button type="text"  size="mini" @click="$alert('//TODO')">反复核</el-button>
+          </template>
+
+          <!-- <el-button type="text"  size="mini" >取消</el-button>
+          
+          <el-button type="text"  size="mini" @click="$router.push('cargo_control/detail?id=' + scope.row.orderId)" >查看</el-button> -->
+          
+          
         </template>
       </el-table-column>
     </el-table>
@@ -122,8 +134,7 @@
       @pagination="getList" />
 
     <transfer v-if="showTransferOrder" v-bind="showTransferOrder" @close="showTransferOrder=null" />
-    <release  v-if="showReleaseOrderId"  :order-id="showReleaseOrderId"  @close="showReleaseOrderId=null" />
-    <release  v-if="showEditOrderId"     :order-id="showEditOrderId"     @close="showEditOrderId=null" />
+    <release  v-if="showReleaseOrderId"  :order-id="showReleaseOrderId"  @close="showReleaseOrderId=null" @success="onReleaseSuccess" />
     <transfer-cargo v-if="showTransferCargoOrderId"     :order-id="showTransferCargoOrderId"     @close="showTransferCargoOrderId=null" />
   </div>
 </template>
@@ -179,7 +190,6 @@ export default {
       dateFilter: [], //筛选日期
       showTransferOrder: null, // 控制权转移操作订单
       showReleaseOrderId: null, // 放货ID
-      showEditOrderId: null, // 修改ID
       showTransferCargoOrderId: null, // 调货ID
     };
   },
@@ -245,12 +255,27 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
+    toDetail(row){
+      this.$router.push('cargo_control/detail?id=' + row.orderId)
+    },
     // 复核
     review(row){
+        // 未放货完成则打开详情，已完成放货则弹窗
+        if(row.releaseNum < row.sumNum){
+          return this.toDetail(row)
+        }
         this.$confirm('已核实放货信息，确认放货？')
             .then(res => {
-                this.$alert('// TODO ')
+                return orderReview(row.orderId)
+            })
+            .then(res => {
+              this.$message.success('操作成功')
+              this.handleQuery()
             })
+    },
+    onReleaseSuccess(){
+      this.showReleaseOrderId = null
+      this.handleQuery()
     }
   }
 };

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

 <!--拆单审核中的申请信息部分-->
 <template>
     <div v-if="detail">
-        <el-descriptions :column="4" v-if="order">
-            <el-descriptions-item label="订单号">{{order.orderNo}}</el-descriptions-item>
-            <el-descriptions-item label="运输方式">
-                <dict-tag class="mr-10" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
-            </el-descriptions-item>
-            <el-descriptions-item label="出货方式">
-                {{channel ? channel.nameZh : ''}}
-            </el-descriptions-item>
-            <el-descriptions-item label="订单状态">
-                <el-tag size="small">
-                    <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="order.status" />
-                </el-tag>
-            </el-descriptions-item>
-            <el-descriptions-item label="唛头">{{order.marks}}</el-descriptions-item>
-            <el-descriptions-item label="始发仓">
-                {{order.logisticsInfoDto.startTitleZh}}
-            </el-descriptions-item>
-            <el-descriptions-item label="目的仓">
-                {{order.logisticsInfoDto.destAddressZh}}
-            </el-descriptions-item>
-        </el-descriptions>
-
-        <template v-for="item in detail.orderSplitBackVOList">
-            <div class="title mt-20" :key="item.orderNo">
-                <span class="mr-10">{{item.orderNo}}</span>
-                <dict-tag class="mr-10" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item.transportId" />
-                <span class="mr-10" v-if="item.channelName">{{item.channelName}}</span>
-                <span>发往{{item.dstWarehouseName}}</span>
-            </div>
-            <el-table :data="item.orderSplitItemBackVOList" :key="'items-' + item.orderNo">
-            <el-table-column label="序号">
-                <template slot-scope="scope">{{scope.$index+1}}</template>
+        <el-table :data="detail.unMergeList.list">
+            <el-table-column label="订单编号">
+                <template slot-scope="scope">{{scope.row.orderNo}}</template>
             </el-table-column>
-            <el-table-column label="中文品名">
-                <template slot-scope="{row}">{{row.prodTitleZh}}</template>
+            <el-table-column label="唛头">
+                <template slot-scope="{row}">{{row.marks}}</template>
             </el-table-column>
-            <el-table-column label="英文品名">
-                <template slot-scope="{row}">{{row.prodTitleEn}}</template>
+            <el-table-column label="已到箱数/总箱数">
+                <template slot-scope="{row}">// TODO/{{row.sumNum}}</template>
             </el-table-column>
-            <el-table-column label="品牌">
+            <el-table-column label="下单统计">
                 <template slot-scope="{row}">
-                    <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
+                    22箱 44m³ 50kg
                 </template>
             </el-table-column>
-            <el-table-column label="体积">
-                <template slot-scope="{row}">{{row.volume}} m³</template>
+            <el-table-column label="入仓你统计">
+                <template slot-scope="{row}">总箱数：1 总体积：m³ 总重量 110kg</template>
+            </el-table-column>
+            <el-table-column label="入仓时间">
+                <template slot-scope="{row}">
+                    // TODO
+                </template>
+            </el-table-column>
+            <el-table-column label="运输方式">
+                <template slot-scope="{row}">{{row.num}}</template>
+            </el-table-column>
+            <el-table-column label="出货渠道">
+                <template slot-scope="{row}">{{row.num}}</template>
+            </el-table-column>
+            <el-table-column label="始发仓">
+                <template slot-scope="{row}">{{row.num}}</template>
             </el-table-column>
-            <el-table-column label="重量">
-                <template slot-scope="{row}">{{row.weight}}kg</template>
+            <el-table-column label="目的仓">
+                <template slot-scope="{row}">{{row.num}}</template>
+            </el-table-column>
+            <el-table-column label="发货人">
+                <template slot-scope="{row}">{{row.num}}</template>
+            </el-table-column>
+            <el-table-column label="收货人">
+                <template slot-scope="{row}">{{row.num}}</template>
             </el-table-column>        
-            <el-table-column label="箱数">
-                <template slot-scope="{row}">{{row.num}}</template></el-table-column>          
         </el-table>
-        </template>
     </div>
 </template>
 <script>
 import {getApproval, getOrder} from '@/api/ecw/order'
+import {getMergeListByMergeId} from '@/api/ecw/orderHandle'
 import {getChannel} from '@/api/ecw/channel'
 export default {
     name: 'MergeDetail',
@@ -76,14 +65,14 @@ export default {
         id(){
             this.getData()
         },
-        detail(){
+        /* detail(){
             this.getOrder()
-        },
-        order(){
+        }, */
+        /* order(){
             if(this.order.channelId){
                 this.getChannel()
             }
-        }
+        } */
     },
     created(){
         if(this.id){
@@ -92,11 +81,11 @@ export default {
     },
     methods:{
         getData(){
-            getApproval(this.id).then(res => {
-                this.detail = JSON.parse(res.data.details)
+            getMergeListByMergeId({id: this.id}).then(res => {
+                this.detail = res.data
             })
         },
-        getOrder(){
+        /* getOrder(){
             getOrder(this.detail.orderId).then(res => {
                 this.order = res.data
             })
@@ -105,7 +94,7 @@ export default {
             getChannel(this.order.channelId).then(res => {
                 this.channel = res.data
             })
-        }
+        } */
     }
 }
 </script>

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

@@ -156,7 +156,8 @@ export default {
             console.log('submit')
             createPick(Object.assign({orderId: this.orderId}, this.formData)).then(res => {
               this.$message.success(res.msg || '操作成功')
-              this.closeDialog()
+              this.show = false
+              this.$emit('success')
             })
           })
           

src/views/ecw/order/edit.vue

@@ -486,7 +486,7 @@ export default {
       },
       // 表单校验
       rules: {
-        
+        marks: [{required: true, message: '请填写唛头'}]
       },
       labelStyle: 'width:120px',
       showBatchImportDialog: false, // 显示批量导入弹窗