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

src/views/ecw/order/batchSingleApplication.vue

@@ -40,7 +40,8 @@
           </template>
         </el-table-column>
         <el-table-column label="出货渠道">
-
+          <template v-slot="{row}">
+           {{row.channelName || '/'}}</template>
         </el-table-column>
         <!--      <el-table-column label="始发仓" prop="startWarehouseName"></el-table-column>-->
         <el-table-column label="目的地" prop="objectiveName"></el-table-column>
@@ -122,6 +123,8 @@ import warehouseDetails from "@/views/ecw/order/components/warehouseDetails";
 import {getOrderPage} from "@/api/ecw/order";
 import workFlow from "@/components/WorkFlow";
 import Template from "@/views/cms/template";
+import {arrryToKeyedObjectBy} from "@/utils";
+import {getChannelList} from "@/api/ecw/channel";
 
 export default {
   name: "batchSingleApplication",
@@ -137,6 +140,9 @@ export default {
     warehouseDetails,
     workFlow
   },
+  created() {
+    getChannelList().then(res => this.channelList = res.data)
+    },
   watch: {
     dialogVisible(val) {
       if (val) {
@@ -154,6 +160,17 @@ export default {
   computed: {
     adjustmentBol() {
       return this.applyStatus?.orderWarehouseAdjustBackVO?.status === 1
+    },
+    getShipChannelName() {
+      return shippingChannelId => {
+        for (let index in this.channelList) {
+          let channelItem = this.channelList[index];
+          if (channelItem.channelId == shippingChannelId) {
+            return channelItem.nameZh;
+          }
+        }
+        return '/'
+      }
     }
   },
   data() {
@@ -170,7 +187,8 @@ export default {
         warehouseOutId: undefined,
         copyUserId: [],
       },
-      applyStatus:{}//调仓-查看状态
+      applyStatus:{},//调仓-查看状态,
+      channelList:[]
 
     }
   },
@@ -217,7 +235,8 @@ export default {
           message: '取消成功'
         });
       });
-    }
+    },
+
   }
 }
 </script>

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

@@ -2,16 +2,16 @@
   <div>
     <el-descriptions class="margin-top" border :column="4">
       <el-descriptions-item label="唛头">{{details.marks}}</el-descriptions-item>
-      <el-descriptions-item label="已到箱数/总箱数">{{details.sumQuantity || 0}}/{{details.totalsumNum || 0}}</el-descriptions-item>
+      <el-descriptions-item label="已到箱数/总箱数">{{details.sumNum || 0}}/{{details.costVO ? details.costVO.totalNum : 0}}</el-descriptions-item>
       <el-descriptions-item label="订单状态">
         <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="details.status" />
       </el-descriptions-item>
-      <el-descriptions-item label="送货日期"></el-descriptions-item>
+      <el-descriptions-item label="送货日期">{{details.deliveryDate}}</el-descriptions-item>
       <el-descriptions-item label="运输方式">
         <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="details.transportId"></dict-tag>
       </el-descriptions-item>
       <el-descriptions-item label="出货渠道">
-       <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="details.channelId"></dict-tag>
+       {{details.channelName || '/'}}
       </el-descriptions-item>
       <el-descriptions-item label="始发地">{{ details.logisticsInfoDto ? details.logisticsInfoDto.startTitleZh :''}}</el-descriptions-item>
       <el-descriptions-item label="目的地">{{details.logisticsInfoDto ? details.logisticsInfoDto.destTitleZh : ''}}</el-descriptions-item>

src/views/ecw/order/feeApplication.vue

@@ -114,7 +114,7 @@ export default {
   computed:{
     forbidden(){
       return (row)=>{
-        return this.list.findIndex(e => e.id = row.id)
+        return this.list.findIndex(e => e.id === row.id)
       }
     },
     IsExamine(){
@@ -173,8 +173,9 @@ export default {
       })
     },
     modify(row){
+      if(this.list.some(i => i.status === 0 || i.status === 1))return this.$message.warning('当前有未提交的数据或审核中的数据不能修改')
       this.isModifyIf = true;
-       this.$set(this.isModify, this.list.findIndex(e => e.id = row.id), false )
+       this.$set(this.isModify, this.list.findIndex(e => e.id === row.id), false )
     },
     examineFn(){
      let item =  this.list.find(e => e.status === 1);
@@ -200,6 +201,7 @@ export default {
   watch:{
     dialogVisible(val){
        if(val){
+         this.isModify = []
          this.getOrderList()
          getOrder(this.orderId).then(r =>{
            if(r.code === 0){

src/views/ecw/order/index.vue

@@ -100,8 +100,8 @@
           v-hasPermi="['ecw:order:create']">{{$t('新增')}}</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-setting" size="mini" @click="handleEdit" :disabled="!batchWarehouseAdjustment">{{$t('批量调仓')}}
-        </el-button>
+<!--        <el-button type="primary" plain icon="el-icon-setting" size="mini" @click="handleEdit" :disabled="!batchWarehouseAdjustment">{{$t('批量调仓')}}-->
+<!--        </el-button>-->
         <el-button type="primary" plain icon="el-icon-setting" size="mini" @click="showBatchPickup=true">{{$t('批量提货')}}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -210,9 +210,12 @@
                 v-hasPermi="['ecw:order:update']">{{$t('入仓')}}</el-button>
               <el-button size="mini" type="text" icon="el-icon-edit" @click="show = true;orderId = scope.row.orderId; "
                 v-hasPermi="['ecw:order:update']">{{$t('退仓')}}</el-button>
-              <el-button type="text" :disabled="!(scope.row.status === 5 && (scope.row.inWarehouseState === 215 ||scope.row.inWarehouseState === 0))"  size="mini" @click="orderId = scope.row.orderId;warehouseBol=true;">{{$t('调仓')}}</el-button>
-              <el-button type="text" :disabled="!(scope.row.status === 8 && scope.row.inWarehouseState === 213)"  size="mini" @click="$router.push({path:'/order/transfer-warehousing/' + scope.row.orderId + '/'  + 1 })" >{{$t('调拨出仓')}}</el-button>
-              <el-button type="text" :disabled="!(scope.row.status === 8 && scope.row.inWarehouseState === 214)"  size="mini" @click="$router.push({path:'/order/transfer-to-warehouse/' + scope.row.orderId + '/'  + 2 })" >{{$t('调拨到仓')}}</el-button>
+<!--              :disabled="!(scope.row.status === 5 && (scope.row.inWarehouseState === 215 ||scope.row.inWarehouseState === 0))"-->
+              <el-button type="text"  size="mini" @click="orderId = scope.row.orderId;warehouseBol=true;">{{$t('调仓')}}</el-button>
+<!--              :disabled="!(scope.row.status === 8 && scope.row.inWarehouseState === 213)"-->
+              <el-button type="text"   size="mini" @click="$router.push({path:'/order/transfer-warehousing/' + scope.row.orderId + '/'  + 1 })" >{{$t('调拨出仓')}}</el-button>
+<!--            :disabled="!(scope.row.status === 8 && scope.row.inWarehouseState === 214)"-->
+             <el-button type="text"   size="mini" @click="$router.push({path:'/order/transfer-to-warehouse/' + scope.row.orderId + '/'  + 2 })" >{{$t('调拨到仓')}}</el-button>
             </div>
 
           </el-popover>

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

@@ -36,7 +36,7 @@
               体积：{{ row.warehouseInInfoVO.volume }}m³<br>
               重量：{{ row.warehouseInInfoVO.weight }}Kg
             </template>
-            <span v-else>展示没有入库信息</span>
+            <span v-else>暂时没有入库信息</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -88,8 +88,8 @@
       </el-table>
 
       <div style="text-align: center;margin-top: 80px">
-        <el-button type="primary" @click="toweight" v-if="hasWarehouseInInfo && order.transportId === 1">申请重货优惠</el-button>
-        <el-button type="primary" @click="tolight" v-if="hasWarehouseInInfo && order.transportId === 2">申请泡货优惠</el-button>
+        <el-button type="primary" @click="toweight" v-if="hasWarehouseInInfo && (order.transportId === 1 || order.transportId === 2)">申请重货优惠</el-button>
+        <el-button type="primary" @click="tolight" v-if="hasWarehouseInInfo && (order.transportId === 3 || order.transportId === 4)">申请泡货优惠</el-button>
         <el-button type="primary" @click="$tab.closePage()">关闭窗口</el-button>
       </div>
     </el-card>

src/views/ecw/order/transferWarehousing.vue

@@ -8,7 +8,7 @@
     <el-divider content-position="left">
       货物信息
     </el-divider>
-    <el-table :show-summary="true" :summary-method="totalFn" :data=" orderDetails.orderItemVOList &&  orderDetails.orderItemVOList.length > 0  ? orderDetails.orderItemVOList : [] ">
+    <el-table :show-summary="true" :summary-method="totalFn" :data="orderItemVOList">
       <el-table-column width="80" type="index" label="序号"></el-table-column>
       <el-table-column label="品名">
         <template v-slot="{row}">
@@ -18,32 +18,30 @@
       </el-table-column>
       <el-table-column label="填单货物属性">
         <template v-slot="{row}">
-          <el-descriptions size="mini" :column="2">
-            <el-descriptions-item label="品牌">{{ row.brand }}</el-descriptions-item>
-            <el-descriptions-item label="箱数">{{ row.num }}</el-descriptions-item>
-            <el-descriptions-item label="体积">{{ row.volume }}m³</el-descriptions-item>
-            <el-descriptions-item label="重量">{{row.weight}}Kg</el-descriptions-item>
-          </el-descriptions>
+        <div>品牌：{{ row.brand }}</div><div>箱数：{{row.num}}</div><div>体积：{{ row.volume }}m³</div><div>重量{{row.weight}}Kg</div>
         </template>
       </el-table-column>
       <el-table-column label="入库货物属性">
         <template v-slot="{row}">
-          <el-descriptions size="mini" :column="2">
-            <el-descriptions-item label="品牌">{{ row.brand }}</el-descriptions-item>
-            <el-descriptions-item label="箱数"> {{  row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum :'' }}</el-descriptions-item>
-            <el-descriptions-item label="体积">{{  row.warehouseInInfoVO ? row.warehouseInInfoVO.volume :'' }}m³</el-descriptions-item>
-            <el-descriptions-item label="重量"> {{row.warehouseInInfoVO ? row.warehouseInInfoVO.weight : '' }}Kg</el-descriptions-item>
-          </el-descriptions>
+          <div v-for="(item,index) in row.orderWarehouseInBackItemDoList" :key="index">
+            <div>规格：{{item.boxGauge}}</div>
+            <div style="display: flex;justify-content: space-between;">
+              <div>品牌：{{row.brand}}</div>
+              <div>箱数：{{item.cartonsNum}}</div>
+              <div>体积：{{item.volume}} CMB</div>
+              <div>重量：{{item.weight}}KG</div>
+            </div>
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="最后操作时间">
            <template v-slot="{row}">
-             {{parseTime(row.createTime)}}
+             {{parseTime(row.updateTime)}}
            </template>
       </el-table-column>
       <el-table-column label="状态">
         <template v-slot="{row}">
-          <dict-tag :value=" row.warehouseInInfoVO ? row.warehouseInInfoVO.diffType :''" :type="DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS"/>
+          {{calculationStatus(row.cartonsNumDiff)}}
         </template>
       </el-table-column>
     </el-table>
@@ -65,10 +63,6 @@
             {{STATUS[row.status]}}
         </template>
       </el-table-column>
-      <el-table-column label="操作">
-        <template v-slot="{row}">
-        </template>
-      </el-table-column>
     </el-table>
     <el-descriptions style="margin-top: 20px" :column="4" border>
       <el-descriptions-item label="集运仓库">{{ warehouseDetails && warehouseDetails.warehouseOutName  ?  warehouseDetails.warehouseOutName : '' }}</el-descriptions-item>
@@ -149,7 +143,7 @@ import ordeDetailsForm from "@/views/ecw/order/components/ordeDetailsForm";
 import {
   cancelAdjust,
   getAdjustInfo,
-  getOrder, listByOrderId,
+  getOrder, getOrderWarehouseIn, listByOrderId,
   orderWarehouseInGetAdjustInfo,
   orderWarehousePicturePage, warehouseAdjustArrived,
   warehouseAdjustSendOut
@@ -202,7 +196,8 @@ export default {
       warehouseInShi:0,
       expressList:[],
       storageSpaceList:[],
-      applyStatus:{}
+      applyStatus:{},
+      orderItemVOList:[]
 
     }
   },
@@ -239,6 +234,17 @@ export default {
         urls: this.params.urls,
 
       }
+    },
+    calculationStatus(){
+      return (val)=>{
+        if(val > 0){
+          return `多${val}箱`
+        }else if(val < 0){
+           return `少${Math.abs(val)}箱`
+        }else {
+          return '准确到齐 '
+        }
+      }
     }
   },
   created() {
@@ -295,6 +301,11 @@ export default {
         }
       })
     })
+    getOrderWarehouseIn(this.orderId).then(r => {
+      if(r.code === 0){
+        this.orderItemVOList = r.data;
+      }
+    })
   },
   methods:{
     submit(){
@@ -323,9 +334,11 @@ export default {
          volume += Number(i.volume)
          num += Number(i.num)
          weight += Number(i.weight)
-         Wvolume += Number(i.warehouseInInfoVO ? i.warehouseInInfoVO.volume : 0);
-         Wnum += Number(i.warehouseInInfoVO ? i.warehouseInInfoVO.cartonsNum : 0)
-         Wweight += Number(i.warehouseInInfoVO ? i.warehouseInInfoVO.weight : 0)
+        i.orderWarehouseInBackItemDoList.forEach(m => {
+          Wvolume += Number(m.volume || 0)
+          Wnum += Number(m.cartonsNum || 0)
+          Wweight += Number(m.weight || 0)
+        })
        })
       let text = `下单统计：${num}箱 ${volume}m³ ${weight}Kg`
       let text2 =` 入仓统计：${Wnum}箱 ${Wvolume}m³ ${Wweight}Kg`
@@ -350,10 +363,6 @@ export default {
           }
         })
       }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消成功'
-        });
       });
     },
   },