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

src/api/ecw/boxAir.js

@@ -369,9 +369,9 @@ export function updateAllOrderClearance(data) {
  * @param {*} data
  * @return {*}
  */
-export function getLineInfoList(params) {
+export function getLineInfo(params) {
   return request({
-    url: `/ecw/warehouse/getLineInfoList`,
+    url: `/ecw/warehouse/getLineInfo`,
     method: "get",
     params
   });

src/views/ecw/box/indexAir.vue

@@ -120,7 +120,7 @@
               <el-dropdown-item command="error" v-has-permi="['shipment:air:exception']">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost" v-has-permi="['shipment:air:fee']">{{$t('费用登记')}}</el-dropdown-item>
               <el-dropdown-item command="batchMarkup" v-has-permi="['shipment:air:batchMarkup']">{{$t('批量加价')}}</el-dropdown-item>
-              <el-dropdown-item  :disabled="scope.row.prStatus<25"  command="editLadingBill" v-has-permi="['shipment:air:editLadingBill']">{{$t('编辑提货单')}}</el-dropdown-item>
+              <el-dropdown-item command="editLadingBill" v-has-permi="['shipment:air:editLadingBill']">{{$t('编辑提货单')}}</el-dropdown-item>
 <!--              <el-dropdown-item command="delete">{{$t('删除')}}</el-dropdown-item>-->
 
             </el-dropdown-menu>
@@ -206,7 +206,7 @@ import {
   dealCustomsSplitNotify,
   exportPreloadGoodsList, downloadReceivableList, getAirNoticeList, zipDownload, downloadAirReceivableList
 } from '@/api/ecw/box'
-import { getLineInfoList } from '@/api/ecw/boxAir'
+import { getLineInfo } from '@/api/ecw/boxAir'
 import { getChannelList } from '@/api/ecw/channel'
 import { getWarehouseList } from '@/api/ecw/warehouse'
 import costForm from './costForm.vue'
@@ -518,6 +518,12 @@ export default {
             this.handleDelete(row);
             break;
           case "editLadingBill":
+            getLineInfo({startWarehouseId: row.startWarehouseId,destWarehouseId: row.destWarehouseId,transportType:row.transportType})
+            console.log(row,12121)
+            if(1){
+              this.$message.error(this.$t("此出货单状态未到提单节点"));
+              return
+            }
             const cabinetLabel = this.getCabinetName(row.cabinetId);
             const title = this.$t(
               "查看提单 {selfNo}",

src/views/ecw/box/shippingAir/nodePage/cusClearance.vue

@@ -95,7 +95,7 @@
           <template slot-scope="scope"> {{ scope.row.sumVolume }}/{{ scope.row.sumWeight }} </template>
         </el-table-column>
         <el-table-column :label="$t('到港状态')" prop="arrival" />
-        <el-table-column :label="$t('到港状态')" prop="clear" />
+        <el-table-column :label="$t('清关状态')" prop="clear" />
         <el-table-column :label="$t('控货')">
           <template slot-scope="scope">
             {{ cargoControlStatus[scope.row.cargoControlStatus] }}

src/views/ecw/box/shippingAir/nodePage/preinstall.vue

@@ -288,7 +288,7 @@
                 </el-table-column>
                 <el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfoVO.cartonsNum">
                   <template slot-scope="scope">
-                    <span style="color: blue;" v-if="scope.row.mixStatus == 1">{{scope.row.warehouseInInfoVO.cartonsNum}}{{$t('(混箱)')}}</span>
+                    <el-button v-if="scope.row.mixStatus == 1" type="text" @click="seeBox(scope.row.orderId,scope.row.orderItemId)">{{scope.row.warehouseInInfoVO.cartonsNum}}{{$t('(混箱)')}}</el-button>
                     <template v-else>
                       {{scope.row.warehouseInInfoVO.cartonsNum}}
                     </template>
@@ -373,6 +373,16 @@
         <el-button type="primary" @click="relationOrderListDialog.visible = false">{{$t('关闭窗口')}}</el-button>
       </el-row>
     </el-dialog>
+    <el-dialog :title="$t('箱明细')" :visible.sync="boxShow" :before-close="closeBox" :close-on-click-modal="false" append-to-body width="1024px">
+      <el-form v-if="boxShow">
+        <WarehouseRecordDetailItem
+          v-for="(item, index) in boxData"
+          :key="index" v-model="boxData[index]"
+          :index="index" :attr-list="attrList"
+          :readonly="true"
+        />
+      </el-form>
+    </el-dialog>
 
   </div>
 </template>
@@ -391,6 +401,8 @@ import {
   getAllRelateOrderList
 } from "@/api/ecw/boxSea";
 import { createGoods, preloadPage } from "@/api/ecw/boxAir"
+import {getProductAttrList} from '@/api/ecw/productAttr'
+import { getOrderWarehouseIn } from '@/api/ecw/order'
 import { getChannelList } from "@/api/ecw/channel";
 import userSelect from "./common/userSelect.vue";
 import {
@@ -403,6 +415,7 @@ import {
 import dayjs from "dayjs";
 import WorkFlow from "@/components/WorkFlow";
 import Decimal from "decimal.js";
+import WarehouseRecordDetailItem from "@/views/ecw/order/warehousing/components/WarehouseRecordDetailItem.vue";
 
 /**
  * 分拣
@@ -410,7 +423,7 @@ import Decimal from "decimal.js";
 export default {
   name: "preinstall",
   inheritAttrs: false,
-  components: { userSelect, WorkFlow },
+  components: { userSelect, WorkFlow, WarehouseRecordDetailItem },
   data() {
     return {
       // 状态
@@ -472,6 +485,10 @@ export default {
         visible: false,
         data: []
       },
+      // 特性列表
+      attrList: [],
+      boxShow:false,
+      boxData: []
 
     };
   },
@@ -626,6 +643,25 @@ export default {
       this.queryParams = {};
       this.$refs["queryForm"].resetFields();
     },
+    closeBox(){
+      this.boxData = []
+      this.boxShow = false
+    },
+    seeBox(orderId,orderItemId){
+      getOrderWarehouseIn(orderId).then(async(res) => {
+        let orderwarehouseList = res.data
+        var warehouseItem = orderwarehouseList.find(item => item.orderItemId == orderItemId)
+        warehouseItem.orderWarehouseInBackItemDoList.forEach(item=>{
+          if(item.orderWarehouseInDetailsVOList){
+            item.orderWarehouseInDetailsVOList.forEach(w=>{
+              this.boxData.push(w)
+            })
+          }
+        })
+        this.attrList = (await getProductAttrList()).data
+        this.boxShow = true
+      })
+    },
     /** 提交 */
     onSubmit() {
       this.$refs["operatorForm"].validate((valid, errors) => {

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -258,7 +258,14 @@
                     <dict-tag :type="DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL" :value="row.feeType" />{{ $t('）') }}
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfoVO.cartonsNum" />
+                <el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfoVO.cartonsNum">
+                  <template slot-scope="scope">
+                    <el-button v-if="scope.row.mixStatus == 1" type="text" @click="seeBox(scope.row.orderId,scope.row.orderItemId)">{{scope.row.warehouseInInfoVO.cartonsNum}}{{$t('(混箱)')}}</el-button>
+                    <template v-else>
+                      {{scope.row.warehouseInInfoVO.cartonsNum}}
+                    </template>
+                  </template>
+                </el-table-column>
                 <el-table-column :label="$t('体积') +'/' + $t('重量')" align="center" prop="volumeWeight">
                   <template slot-scope="scope">
                     <p v-if="scope.row.warehouseInInfoVO && scope.row.warehouseInInfoVO.volume">{{getTotlContent(scope.row.warehouseInInfoVO,['volume'])}}</p>
@@ -336,7 +343,16 @@
         <el-button type="primary" @click="relationOrderListDialog.visible = false">{{$t('关闭窗口')}}</el-button>
       </el-row>
     </el-dialog>
-
+    <el-dialog :title="$t('箱明细')" :visible.sync="boxShow" :before-close="closeBox" :close-on-click-modal="false" append-to-body width="1024px">
+      <el-form v-if="boxShow">
+        <WarehouseRecordDetailItem
+          v-for="(item, index) in boxData"
+          :key="index" v-model="boxData[index]"
+          :index="index" :attr-list="attrList"
+          :readonly="true"
+        />
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
@@ -366,14 +382,16 @@ import {
 import dayjs from "dayjs";
 import WorkFlow from "@/components/WorkFlow";
 import Decimal from "decimal.js";
-
+import {getProductAttrList} from '@/api/ecw/productAttr'
+import { getOrderWarehouseIn } from '@/api/ecw/order'
+import WarehouseRecordDetailItem from "@/views/ecw/order/warehousing/components/WarehouseRecordDetailItem.vue";
 /**
  * 预装
  */
 export default {
   name: "preinstall",
   inheritAttrs: false,
-  components: { userSelect, WorkFlow },
+  components: { userSelect, WorkFlow, WarehouseRecordDetailItem },
   data() {
     return {
       // 状态
@@ -433,7 +451,10 @@ export default {
         visible: false,
         data: []
       },
-
+      // 特性列表
+      attrList: [],
+      boxShow:false,
+      boxData: []
     };
   },
   computed: {
@@ -548,6 +569,25 @@ export default {
       this.queryParams = {};
       this.$refs["queryForm"].resetFields();
     },
+    closeBox(){
+      this.boxData = []
+      this.boxShow = false
+    },
+    seeBox(orderId,orderItemId){
+      getOrderWarehouseIn(orderId).then(async(res) => {
+        let orderwarehouseList = res.data
+        var warehouseItem = orderwarehouseList.find(item => item.orderItemId == orderItemId)
+        warehouseItem.orderWarehouseInBackItemDoList.forEach(item=>{
+          if(item.orderWarehouseInDetailsVOList){
+            item.orderWarehouseInDetailsVOList.forEach(w=>{
+              this.boxData.push(w)
+            })
+          }
+        })
+        this.attrList = (await getProductAttrList()).data
+        this.boxShow = true
+      })
+    },
     /** 提交 */
     onSubmit() {
       this.$refs["operatorForm"].validate((valid, errors) => {