添加订单异常UI

src/api/ depository/orderWarehouseIn.js

+import request from '@/utils/request'
+
+// 创建入仓货物详情
+export function createOrderWarehouseIn(data) {
+  return request({
+    url: '/depository/order-warehouse-in/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新入仓货物详情
+export function updateOrderWarehouseIn(data) {
+  return request({
+    url: '/depository/order-warehouse-in/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除入仓货物详情
+export function deleteOrderWarehouseIn(id) {
+  return request({
+    url: '/depository/order-warehouse-in/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得入仓货物详情
+export function getOrderWarehouseIn(id) {
+  return request({
+    url: '/depository/order-warehouse-in/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得入仓货物详情分页
+export function getOrderWarehouseInPage(query) {
+  return request({
+    url: '/depository/order-warehouse-in/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出入仓货物详情 Excel
+export function exportOrderWarehouseInExcel(query) {
+  return request({
+    url: '/depository/order-warehouse-in/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/components/WarehouseAreaDialog/index.vue

@@ -66,7 +66,6 @@ export default {
   data() {
     return {
       opened: false,
-      key: 0,
 
       orderId: '',
       area: [],

src/utils/dict.js

@@ -96,7 +96,7 @@ export const DICT_TYPE = {
   ECW_IS_BRAND: 'is_brand', // 有无品牌
   ECW_OFFER_TYPE: 'offer_type', // 跟进类型
   ECW_OFFER_METHOD: 'offer_method', //  跟进方式
-  ECW_RECEIPT_STATE:'receipt_state',//收款单状态
+  ECW_RECEIPT_STATE: 'receipt_state',//收款单状态
   //--------ecw---------
   CUSTOMER_STATUS: 'customer_status',
   CUSTOMER_SOURCE: 'customer_source',
@@ -134,12 +134,13 @@ export const DICT_TYPE = {
   ORDER_TYPE: 'order_type', // 订单类型
   PRODUCT_RECORD_ATTRIBUTE: 'product_record_attribute', //产品备案属性
   CONTROL_GOODS_STATUS: 'control_goods_status', //控货状态
-  DISBURSEMENT_TYPE: 'disbursement_type' ,//垫付类型
+  DISBURSEMENT_TYPE: 'disbursement_type',//垫付类型
   DRAWEE: 'drawee', // 付款人
-  ORDER_STATUS:'order_status',//订单状态
-  BEGINTIME_TYPE_ENDTIME:'begintime_type_endtime',//订单日期筛选类别
+  ORDER_STATUS: 'order_status',//订单状态
+  BEGINTIME_TYPE_ENDTIME: 'begintime_type_endtime',//订单日期筛选类别
   ORDER_ERROR_TYPE:'order_error_type',//订单异常类型
   ORDER_EXCEPTION_STATUS:'order_exception_status',//异常订单状态
+
 }
 
 /**

src/views/ecw/order/detail.vue

 <template>
   <div class="app-container">
     <el-card class="card">
-      <div slot="header" class="card-title">订单详情-EC00636U-CNG2506-01</div>
-      <div slot="header" class="card-title">订单编号：EC00636U</div>
+      <div slot="header" class="card-title">订单详情：{{list.orderNo}}-{{list.orderId}}</div>
+      <div slot="header" class="card-title">订单编号：{{list.orderNo}}</div>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-descriptions class="margin-top" border title="发货人" :column="2">
-            <el-descriptions-item label="发货人">kooriookami</el-descriptions-item>
-            <el-descriptions-item label="发货人电话">18100000000</el-descriptions-item>
-            <el-descriptions-item label="发货人邮箱">18100000000</el-descriptions-item>
+            <el-descriptions-item label="发货人">{{list.consignorVO.name}}</el-descriptions-item>
+            <el-descriptions-item label="发货人电话">{{list.consignorVO.phone}}</el-descriptions-item>
+            <el-descriptions-item label="发货人邮箱">{{list.consignorVO.email}}</el-descriptions-item>
             <el-descriptions-item label="发货人公司名称">
-              <el-tag size="small">学校学校学校学校</el-tag>
+              <el-tag size="small">{{list.consignorVO.company}}</el-tag>
             </el-descriptions-item>
           </el-descriptions>
         </el-col>
         <el-col :span="12">
           <el-descriptions class="margin-top" border title="收货人" :column="2">
-            <el-descriptions-item label="收货人">kooriookami</el-descriptions-item>
-            <el-descriptions-item label="收货人电话">18100000000</el-descriptions-item>
-            <el-descriptions-item label="收货人邮箱">18100000000</el-descriptions-item>
+            <el-descriptions-item label="收货人">{{list.consigneeVO.name}}</el-descriptions-item>
+            <el-descriptions-item label="收货人电话">{{list.consigneeVO.phone}}</el-descriptions-item>
+            <el-descriptions-item label="收货人邮箱">{{list.consigneeVO.email}}</el-descriptions-item>
             <el-descriptions-item label="收货人公司名称">
-              <el-tag size="small">学校学校学校学校</el-tag>
+              <el-tag size="small">{{list.consigneeVO.company}}</el-tag>
             </el-descriptions-item>
           </el-descriptions>
         </el-col>
       </el-row>
     </el-card>
     <el-card class="card">
-      <div slot="header" class="card-title">物流信息/基础信息</div>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-descriptions class="margin-top" border title="物流信息" :column="2">
-            <el-descriptions-item label="始发仓">广州仓</el-descriptions-item>
-            <el-descriptions-item label="目的仓">Dubai</el-descriptions-item>
-            <el-descriptions-item label="地址" :span="2">广州市白云区鹤边鹤泰二横路民通院内第一栋捷道仓库E&C（收货时间周一至周六10:00-19：30）
-            </el-descriptions-item>
-            <el-descriptions-item label="运输方式">海运拼柜</el-descriptions-item>
-            <el-descriptions-item label="出货渠道">/</el-descriptions-item>
+            <el-descriptions-item label="始发仓">{{list.logisticsInfoDto.startTitleZh}}</el-descriptions-item>
+            <el-descriptions-item label="目的仓">{{list.logisticsInfoDto.destTitleZh}}</el-descriptions-item>
+            <el-descriptions-item label="地址" :span="2">{{list.logisticsInfoDto.startAddressZh}}</el-descriptions-item>
+            <el-descriptions-item label="运输方式">{{list.logisticsInfoDto.transportId | transportFilter(transportList)}}</el-descriptions-item>
+            <el-descriptions-item label="出货渠道">{{list.logisticsInfoDto.startTitleZh}}</el-descriptions-item>
           </el-descriptions>
         </el-col>
         <el-col :span="12">
           <el-descriptions class="margin-top" border title="基础信息" :column="2">
-            <el-descriptions-item label="唛头">kooriookami</el-descriptions-item>
-            <el-descriptions-item label="送货时间">2022-05-22</el-descriptions-item>
-            <el-descriptions-item label="是否控货">否</el-descriptions-item>
-            <el-descriptions-item label="填单信息">22箱 1000KG 14m³</el-descriptions-item>
-            <el-descriptions-item label="仓库实测">123箱 900Kg 11.23m³</el-descriptions-item>
-            <el-descriptions-item label="收款数据">123箱 900Kg 11.23m³</el-descriptions-item>
-            <el-descriptions-item label="入仓类型">一次到齐</el-descriptions-item>
-            <el-descriptions-item label="单证报关">我司全代</el-descriptions-item>
-            <el-descriptions-item label="代收货款">是（50000美元）</el-descriptions-item>
+            <el-descriptions-item label="唛头">{{list.marks}}</el-descriptions-item>
+            <el-descriptions-item label="送货时间"></el-descriptions-item>
+            <el-descriptions-item label="是否控货">{{list.isCargoControl?'是':'否'}}</el-descriptions-item>
+            <el-descriptions-item label="填单信息">{{list.sumNum}}箱 {{list.sumWeight}}Kg {{list.sumVolume}}m³</el-descriptions-item>
+            <el-descriptions-item label="仓库实测"></el-descriptions-item>
+            <el-descriptions-item label="收款数据"></el-descriptions-item>
+            <el-descriptions-item label="入仓类型"></el-descriptions-item>
+            <el-descriptions-item label="单证报关">{{list.customsType | customsTypeFilter(customsTypeList)}}</el-descriptions-item>
+            <el-descriptions-item label="代收货款">{{list.isCollection?'是':'否'}}</el-descriptions-item>
           </el-descriptions>
         </el-col>
       </el-row>
     </el-card>
     <el-card class="card">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName">
         <el-tab-pane label="货物详情" name="first">
-          <el-table :data="tableData" border style="width: 100%">
-            <el-table-column prop="date" label="中文品名" />
-            <el-table-column prop="name" label="英文品名" />
-            <el-table-column prop="address" label="品牌" />
-            <el-table-column prop="address" label="填单件数" />
-            <el-table-column prop="address" label="入仓件数" />
-            <el-table-column prop="address" label="单位" />
-            <el-table-column prop="address" label="货值" />
-            <el-table-column prop="address" label="材质" />
-            <el-table-column prop="address" label="体积(m3)" />
-            <el-table-column prop="address" label="重量(kg)" />
+          <el-table :data="list.orderItemVOList" border style="width: 100%">
+            <el-table-column prop="prodTitleZh" label="中文品名" />
+            <el-table-column prop="prodTitleEn" label="英文品名" />
+            <el-table-column prop="brand" label="品牌" />
+            <el-table-column prop="num" label="填单件数" />
+            <el-table-column prop="num" label="入仓件数" />
+            <el-table-column prop="unit" label="单位" />
+            <el-table-column prop="worth" label="货值" />
+            <el-table-column prop="" label="材质" />
+            <el-table-column prop="volume" label="体积(m3)" />
+            <el-table-column prop="weight" label="重量(kg)" />
           </el-table>
           <!-- 分页组件 -->
           <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo"
@@ -75,16 +73,16 @@
         </el-tab-pane>
         <el-tab-pane label="订单动态" name="second">
           <el-timeline :reverse="true">
-            <el-timeline-item v-for="(activity, index) in activities" :key="index" :timestamp="activity.timestamp">
-              {{ activity.content }}
+            <el-timeline-item v-for="(activity, index) in list.orderTimeVOList" :key="index" :timestamp="activity.timestamp">
+              {{ activity.titleZh }}
             </el-timeline-item>
           </el-timeline>
         </el-tab-pane>
         <el-tab-pane label="运单资料/提货单" name="three">
           <el-descriptions class="margin-top" border title="" :column="3">
-            <el-descriptions-item label="单票立即转运">是</el-descriptions-item>
-            <el-descriptions-item label="包装类型">纸箱</el-descriptions-item>
-            <el-descriptions-item label="包装要求备注">多个订单一起打包，不要单独打</el-descriptions-item>
+            <el-descriptions-item label="单票立即转运">{{list.isSingleTicketTransport?'是':'否'}}</el-descriptions-item>
+            <el-descriptions-item label="包装类型"></el-descriptions-item>
+            <el-descriptions-item label="包装要求备注">{{list.remarks}}</el-descriptions-item>
           </el-descriptions>
           <el-button type="text">查看入仓单</el-button>
           <el-button type="text" disabled>
@@ -109,10 +107,19 @@
 
 <script>
 import { getOrder } from '@/api/ecw/order'
+import { getDictDatas, DICT_TYPE } from '@/utils/dict';
 export default {
   name: "detail",
   components: {
 
+  },
+  filters: {
+    customsTypeFilter(e, customsTypeList) {
+      if (e) return customsTypeList.find(item => item.value == e).label
+    },
+    transportFilter(e, transportList) {
+      if (e) return transportList.find(item => item.value == e).label
+    }
   },
   data() {
     return {
@@ -135,15 +142,16 @@ export default {
       }, {
         content: '创建成功',
         timestamp: '2018-04-11'
-      }]
-    };
+      }],
+      customsTypeList: getDictDatas(DICT_TYPE.ECW_CUSTOMS_TYPE), //报关类型
+      transportList: getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE), //运输方式
+    }
   },
   created() {
     if (this.$route.query.orderId) {
       this.orderId = this.$route.query.orderId
       this.getList();
     }
-    this.getList();
   },
   methods: {
     /** 查询列表 */

src/views/ecw/order/index.vue

@@ -17,6 +17,10 @@
       <el-form-item label="收货人" prop="consigneeId">
         <el-input v-model="queryParams.consigneeId" placeholder="收货人" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item label="日期筛选">
+        <dict-selector :type="DICT_TYPE.BEGINTIME_TYPE_ENDTYPE" v-model="dateFilterType" style="width: 220px;margin-right: 0" />
+        <el-date-picker v-model="dateFilter" type="daterange" range-separator="-"  start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
 
       <el-form-item label="始发地" prop="startWarehouseId">
         <el-select v-model="queryParams.startWarehouseId" placeholder="请选择始发地">
@@ -54,9 +58,9 @@
       <el-form-item label="入仓类型" prop="warehouseType">
         <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="queryParams.warehousingType" />
       </el-form-item>
-      <!-- <el-form-item label="跟进客服" prop="">
-        <customer-selector v-model="" />
-      </el-form-item> -->
+      <el-form-item label="跟进客服" >
+        <customer-selector />
+      </el-form-item>
       <el-form-item label="订单状态" prop="status">
         <dict-selector :type="DICT_TYPE.PAY_ORDER_STATUS" v-model="queryParams.status"
           @keyup.enter.native="handleQuery" />
@@ -65,9 +69,9 @@
         <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="queryParams.customsType" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <!-- <el-form-item label="是否齐货" prop="customsType">
+      <el-form-item label="是否齐货" >
         <dict-selector v-model="queryParams.isCargoControl" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" />
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item label="重货比" prop="weightRatio">
         <el-input style="width: 100px;" v-model="molecule" placeholder="" clearable @change="moleculeChange"
           @keyup.enter.native="handleQuery" />
@@ -109,7 +113,14 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="订单编号" align="center" prop="orderNo" />
+
+      <el-table-column label="订单编号" align="center" prop="orderNo" >
+        <template slot-scope="scope">
+          <router-link :to="{path: '/order/detail',query: {orderId: scope.row.orderId}}" class="link-type">
+            <span>{{ scope.row.orderNo }}</span>
+          </router-link>
+        </template>
+      </el-table-column>
       <el-table-column label="唛头" align="center" prop="marks" />
       <el-table-column label="入仓箱数" align="center" prop="sumNum" />
       <el-table-column label="入仓重量" align="center" prop="sumWeight" />
@@ -313,7 +324,9 @@ export default {
       tradeCityList: [],
       productAttrList: [],  // 商品属性
       molecule: '', //重货比分子
-      denominator: '' //重货比分母
+      denominator: '', //重货比分母
+      dateFilterType: '', //日期筛选类别
+      dateFilter: [], //筛选日期
     };
   },
   computed: {

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

+<template>
+  <div>
+
+    <el-dialog
+      title="入仓-货物入仓"
+      :visible.sync="opened"
+      width="960px"
+      :before-close="handleClose()"
+    >
+      <el-descriptions border :column="2">
+        <el-descriptions-item label="中文品名"></el-descriptions-item>
+        <el-descriptions-item label="英文品名"></el-descriptions-item>
+        <el-descriptions-item label="品牌"></el-descriptions-item>
+        <el-descriptions-item label="是否备案"></el-descriptions-item>
+        <el-descriptions-item label="填单参数"></el-descriptions-item>
+      </el-descriptions>
+      <el-form ref="form" :model="form" label-width="80px" style="margin-top: 20px">
+        <el-form-item label="材质">
+          <dict-selector :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form.material"></dict-selector>
+        </el-form-item>
+        <el-form-item label="入仓时间">
+          <el-date-picker v-model="form.time" type="datetime" placeholder="请选择入仓时间"></el-date-picker>
+        </el-form-item>
+      </el-form>
+
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>入仓记录</span>
+          <el-button style="float: right;margin-left: 15px" size="mini" type="primary" icon="el-icon-minus" circle></el-button>
+          <el-button style="float: right" size="mini" type="primary" icon="el-icon-plus" circle></el-button>
+        </div>
+        <el-table
+          :data="[]"
+          style="width: 100%">
+          <el-table-column label="箱数">
+          </el-table-column>
+          <el-table-column label="包装类型">
+          </el-table-column>
+          <el-table-column label="长(cm)">
+          </el-table-column>
+          <el-table-column label="款(cm)">
+          </el-table-column>
+          <el-table-column label="高(cm)">
+          </el-table-column>
+          <el-table-column label="体积(m³)">
+          </el-table-column>
+          <el-table-column label="重量(Kg)">
+          </el-table-column>
+          <el-table-column label="数量">
+          </el-table-column>
+          <el-table-column label="快递单号">
+          </el-table-column>
+        </el-table>
+      </el-card>
+
+      <span slot="footer">
+        <el-button @click="opened = false">关 闭</el-button>
+        <el-button type="primary" @click="opened = false">提 交</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {getOrderWarehouseIn} from "@/api/ depository/orderWarehouseIn"
+import dictSelector from "@/components/DictSelector"
+import {DICT_TYPE} from "@/utils/dict"
+
+export default {
+  name: 'editDialog',
+
+  components: {
+    dictSelector
+  },
+
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    id:  Number
+  },
+
+  mounted() {
+  },
+
+  data() {
+    return {
+      DICT_TYPE,
+      opened: true,
+      form: {
+        material: undefined,
+        time: 0
+      },
+      orderItem: {}
+    };
+  },
+
+  watch: {
+    visible(val) {
+      if (val) {
+        this.opened = true
+        if (this.id) {
+          getOrderWarehouseIn(this.id).then(r => {
+            this.orderItem = r.data
+          })
+        }
+      } else {
+      }
+    },
+    opened(val) {
+      if (val) {
+      } else {
+        this.$emit('update:visible', false)
+      }
+    }
+  },
+
+  methods: {
+    handleClose() {},
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -55,7 +55,7 @@
         prop="address"
         label="操作">
         <template v-slot="{row}">
-          <el-button size="mini" type="text">入仓</el-button>
+          <el-button size="mini" type="text" @click="handleWarehousing(row.prodId)">入仓</el-button>
           <el-button size="mini" type="text">追加</el-button>
           <el-button size="mini" type="text">退仓</el-button>
         </template>
@@ -156,6 +156,8 @@
     </el-form>
 
     <warehouse-area-dialog :visible.sync="areaVisible"></warehouse-area-dialog>
+
+    <edit-dialog :visible.sync="warehousingVisible" :id="warehousingId"></edit-dialog>
   </div>
 </template>
 
@@ -164,13 +166,15 @@ import {getCurrencyList} from "@/api/ecw/currency"
 import {getOrder} from "@/api/ecw/order"
 import orderBaseInfo from "@/components/OrderBaseInfo"
 import WarehouseAreaDialog from '@/components/WarehouseAreaDialog'
+import editDialog from '@/views/ecw/order/warehousing/components/editDialog'
 
 export default {
   name: "Warehousing",
 
   components: {
     orderBaseInfo,
-    WarehouseAreaDialog
+    WarehouseAreaDialog,
+    editDialog
   },
 
   mounted() {
@@ -180,15 +184,25 @@ export default {
     }
     getCurrencyList().then(res => this.currencyList = res.data)
   },
+
   data() {
     return {
       areaVisible: false,
+      warehousingVisible: false,
       form: {
         a: '',
         b: 3
       },
       currencyList:[],
-      order: {}
+      order: {},
+      warehousingId: undefined
+    }
+  },
+
+  methods: {
+    handleWarehousing(id) {
+      this.warehousingId = id
+      this.warehousingVisible = true
     }
   }
 }