Merge branch 'dev' of...

Merge branch 'dev' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into pre-release

src/views/ecw/box/shippingAir/nodePage/mergePkg/unPkgPage.vue

@@ -47,7 +47,9 @@
           </el-table-column>
           <el-table-column :label="$t('箱数')" align="center" prop="sumNum">
             <template slot-scope="scope">
-             {{ scope.row.sumNum }}<span v-if="scope.row.mixStatus === 1">（{{$t('混箱')}}）</span>
+              <el-link type="primary">
+                {{ scope.row.sumNum }}<span v-if="scope.row.mixStatus === 1">（{{$t('混箱')}}）</span>
+              </el-link>
             </template>
           </el-table-column>
           <el-table-column :label="$t('纸箱尺寸')" align="center">
@@ -82,19 +84,30 @@
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows" @pagination="getList" />
       </el-row>
     </el-row>
+    <warehouse-detail :orderId="showWarehouseInItemId" :orderItemId="showWarehouseInItemId" v-if="showWarehouseInItemId" @close="showWarehouseInItemId=null" />
+    <realated-order :orderItemId="showRelatedItemId" v-if="showRelatedItemId" @close="showRelatedItemId=null"></realated-order>
   </div>
 </template>
 
 <script>
 import { getUnPkgPage, createPkgOrder, createBatchPkgOrder } from '@/api/ecw/boxAir'
 import { formatDate, serviceMsg } from '../../utils'
+import WarehouseDetail from "../../../shippingSea/nodePage/tally/warehouseDetail";
+import RealatedOrder from "../../../shippingSea/nodePage/tally/realatedOrder.vue";
+import {getOrder} from "@/api/ecw/order";
 export default {
+  components: {
+    WarehouseDetail,
+    RealatedOrder,
+  },
   props: {
     pkgData: Object,
     shipmentObj: Object,
   },
   data() {
     return {
+      showWarehouseInItemId: null,
+      showRelatedItemId: null,
       pagList: [],
       // 查询参数
       queryParams: {
@@ -113,7 +126,11 @@ export default {
   methods: {
     getList() {
       getUnPkgPage(this.queryParams).then((res) => {
+        let list = [];
         this.pagList = res.data.list || []
+        res.data.forEach((item) => {
+
+        })
         this.total = res.data.total
       })
     },
@@ -136,6 +153,17 @@ export default {
       })
       return data.toString()
     },
+    // 显示入仓记录
+    showWarehouseLogs(row) {
+      getOrder(row.orderId).then((response) => {
+        this.order = response.data;
+        this.showWarehouseInItemId = row.orderId;
+      });
+    },
+    // 显示关联单
+    showRelatedOrder(row) {
+      this.showRelatedItemId = row.orderId
+    },
     addPkg(row) {
       let data = {
         pkgId: this.pkgData.id,