Merge remote-tracking branch 'origin/dev' into dev

src/api/ecw/order.js

@@ -248,6 +248,16 @@ export function feeApplicationGet(params){
     params
   })
 }
+
+// 获得控货分页
+export function getCargoControlOrderPage(params){
+  return request({
+    url:'ecw/order-cargo-control/cargo/control/order',
+    method:'get',
+    params
+  })
+}
+
 //获得调仓明细
  export function orderWarehouseInGetAdjustInfo(params){
   return request({
@@ -284,4 +294,4 @@ export function feeApplicationGet(params){
        method:'put',
        data
      })
-}
+}
\ No newline at end of file

src/utils/dict.js

@@ -147,7 +147,7 @@ export const DICT_TYPE = {
   ORDER_ERROR_TYPE:'order_error_type',//订单异常类型
   ORDER_EXCEPTION_STATUS:'order_exception_status',//异常订单状态
   PAYMENT_TYPE:'payment_type',//收款类型
-  WAREHOUSE_IN_STATUS: 'warehouse_in_status', // 入仓状态
+  ORDER_WAREHOUSE_IN_STATUS: 'order_warehouse_in_status', // 入仓状态
 
   ECASH_INIT:'ecash_init', //e-cash
   FEE_TYPE:'receivable_fee_type',

src/views/ecw/order/cargoControl.vue

@@ -59,6 +59,14 @@
           :loading="exportLoading" v-hasPermi="['ecw:order:export']">导出</el-button>
       </el-form-item>
     </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="2">
+        <el-button type="primary" plain icon="el-icon-setting" size="mini" :disabled="multiple">批量复核</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
     
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
@@ -99,12 +107,12 @@
         <template slot-scope="scope">
           <el-button type="text"  size="mini" @click="showReleaseOrderId=scope.row.orderId">放货</el-button>
           
-          <el-button type="text"  size="mini" @click="$router.push(`/order/associated-order/${scope.row.orderId}`)" >修改</el-button>
-          <el-button type="text"  size="mini" @click="$router.push(`/order/mutex-order/${scope.row.orderId}`)" >取消</el-button>
-          <el-button type="text"  size="mini" @click="$router.push(`/order/mutex-order/${scope.row.orderId}`)" >放货复核</el-button>
-          <el-button type="text"  size="mini" @click="$router.push(`/order/mutex-order/${scope.row.orderId}`)" >查看</el-button>
-          <el-button type="text"  size="mini" @click="$router.push(`/order/mutex-order/${scope.row.orderId}`)" >调货</el-button>
-          <el-button type="text"  size="mini" @click="$router.push(`/order/mutex-order/${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="review(scope.row)" >放货复核</el-button>
+          <el-button type="text"  size="mini" @click="$router.push('detail?id=' + scope.row.orderId)" >查看</el-button>
+          <el-button type="text"  size="mini" >调货</el-button>
+          <el-button type="text"  size="mini" >反复核</el-button>
           <el-button type="text"  size="mini" @click="showTransferOrderId = scope.row.orderId" >控货权转移</el-button>
         </template>
       </el-table-column>
@@ -113,8 +121,9 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows"
       @pagination="getList" />
 
-    <transfer v-if="showTransferOrderId" order-id="1" @close="showTransferOrderId=null" />
-    <release  v-if="showReleaseOrderId"  order-id="1" @close="showReleaseOrderId=null" />
+    <transfer v-if="showTransferOrderId" :order-id="showTransferOrderId" @close="showTransferOrderId=null" />
+    <release  v-if="showReleaseOrderId"  :order-id="showReleaseOrderId"  @close="showReleaseOrderId=null" />
+    <release  v-if="showEditOrderId"     :order-id="showEditOrderId"     @close="showEditOrderId=null" />
   </div>
 </template>
 
@@ -127,17 +136,19 @@ import specialNeeds from '@/views/ecw/order/components/specialNeeds';
 import { getTradeCityList } from '@/api/ecw/region'
 import Transfer from '@/views/ecw/order/components/Transfer'
 import Release from './components/Release'
+import CargoControlEdit from './components/CargoControlEdit'
 import {
   getOrder,
   getOrderPage,
   exportOrderExcel,
+  getCargoControlOrderPage
 } from "@/api/ecw/order";
 
 
 export default {
-  name: "Order",
+  name: "OrderCargonControl",
   components: {
-    CustomerSelector, ProductSelector, Selector, Transfer, Release
+    CustomerSelector, ProductSelector, Selector, Transfer, Release,CargoControlEdit
   },
   data() {
     return {
@@ -171,7 +182,8 @@ export default {
       dateFilterType: '', //日期筛选类别
       dateFilter: [], //筛选日期
       showTransferOrderId: null, // 控制权转移操作订单
-      showReleaseOrderId: null
+      showReleaseOrderId: null, // 放货ID
+      showEditOrderId: null, // 修改ID
     };
   },
   computed: {
@@ -200,7 +212,7 @@ export default {
     getList() {
       this.loading = true;
       // 执行查询
-      getOrderPage(this.combinedQueryParams).then(response => {
+      getCargoControlOrderPage(this.combinedQueryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -236,32 +248,13 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    handleEdit() {
-      this.$router.push({
-        path:'/order/batch-single-application',
-        query:{list:this.ids.join(',')}
-      })
-    },
-    moleculeChange() { },
-    denominatorChange() { },
-    specialRendering(val){
-      if(val !== undefined){
-        let i = val.split(',')
-       let special = this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS).filter(e => {
-           return i.indexOf(e.value) > -1
-        })
-        return special
-      }
-    },
-    deleteSpecial(id,orderId){
-      orderSpecialNeed({orderId:orderId,advanceType:id}).then(
-        r =>{
-          if(r.code === 0){
-            this.getList()
-          }
-        }
-      )
-    },
+    // 复核
+    review(row){
+        this.$confirm('已核实放货信息，确认放货？')
+            .then(res => {
+                this.$alert('// TODO ')
+            })
+    }
   }
 };
 </script>

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

@@ -4,32 +4,32 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="订单号" prop="field101">
-              111
+              {{detail.orderNO}}
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="总箱数" prop="field104">
-              111
+              {{detail.sumNum}}
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="体积" prop="field103">
-              111
+              {{detail.sumVolume}}m³
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="重量" prop="field102">
-              111
+              {{detail.sumWeight}}kg
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="总控货箱数" prop="field105">
-              111
+              // TODO
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="剩余放货箱数" prop="field106">
-              111
+              // TODO
             </el-form-item>
           </el-col>
         </el-row>
@@ -93,6 +93,7 @@
 </template>
 <script>
 import ReleaseAgreement from "./ReleaseAgreement"
+import {getOrder} from '@/api/ecw/order'
 export default {
     props:{
         orderId: [String, Number]
@@ -108,7 +109,7 @@ export default {
     },
     computed:{
         title(){
-            let t = '控货权转移'
+            let t = '放货'
             if(this.detail){
                 t += '-' + this.detail.orderNo
             }
@@ -121,7 +122,7 @@ export default {
     },
     methods:{
         loadData(){
-            
+            getOrder(this.orderId).then(res => this.detail = res.data)
         },
         closeDialog(){
             this.show = false

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -15,7 +15,6 @@
             v-else v-model="form.brand"
             placeholder="可修改"
             filterable
-            @change="handleChangeBrand"
             allow-create>
             <el-option
               v-for="item in brandList"
@@ -205,13 +204,6 @@ export default {
   },
 
   methods: {
-    handleChangeBrand(b){
-      if (this.brandList.find(e => e.titleZh === b)){
-        this.isBeian = '有备案'
-      } else {
-        this.isBeian = '无备案'
-      }
-    },
     handleSubmit() {
       const orderWarehouseInItemDoList = this.form.orderWarehouseInItemDoList.map(e => {
         return {

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

@@ -56,7 +56,7 @@
         prop="diffType"
         v-slot="{row}"
         label="状态">
-        <dict-tag :type="DICT_TYPE.WAREHOUSE_IN_STATUS" :value="row.warehouseInInfoVO.diffType" />
+        <dict-tag :type="DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS" :value="row.warehouseInInfoVO && row.warehouseInInfoVO.diffType" />
       </el-table-column>
       <el-table-column
         prop="address"
@@ -102,12 +102,14 @@
       <div style="text-align: center">在完成入仓前，您还可以</div>
       <div style="text-align: center;padding: 15px 0">
         <el-button type="info" @click="areaVisible = true">选择储位</el-button>
-        <el-button type="info">打印标签</el-button>
+        <el-button type="info" @click="isShowPrint = true">打印标签</el-button>
       </div>
       <div style="text-align: center">
         <el-button type="primary" @click="handleSubmit()">确 定</el-button>
       </div>
     </el-dialog>
+
+    <print-tag v-if="isShowPrint" :order-id="orderId" @close="isShowPrint = false"></print-tag>
   </div>
 </template>
 
@@ -124,6 +126,7 @@ import orderBaseInfo from "@/components/OrderBaseInfo"
 import WarehouseAreaDialog from '@/components/WarehouseAreaDialog'
 import editDialog from '@/views/ecw/order/warehousing/components/editDialog'
 import {DICT_TYPE} from "@/utils/dict"
+import PrintTag from "@/views/ecw/order/components/PrintTag"
 
 export default {
   name: "Warehousing",
@@ -131,7 +134,8 @@ export default {
   components: {
     orderBaseInfo,
     WarehouseAreaDialog,
-    editDialog
+    editDialog,
+    PrintTag
   },
 
   mounted() {
@@ -156,9 +160,11 @@ export default {
       },
       currencyList:[],
       order: {},
+      orderId: undefined,
       orderItemList: [],
       specialList: [],
-      warehousing: undefined
+      warehousing: undefined,
+      isShowPrint: false
     }
   },