订单特价申请，等待接口更新

src/api/ecw/order.js

@@ -325,4 +325,30 @@ export function getApproval(id){
     url:'/order/approval/get?id=' + id,
     method:'get'
   })
-}
+}
\ No newline at end of file
+
+// 特价申请
+export function createOrderSpecial(data) {
+  return request({
+    url: '/ecw/order/special/apply',
+    method: 'put',
+    data: data
+  })
+}
+
+// 获得订单特价申请详情
+export function getOrderSpecial(offerProdId, type = 1) {
+  return request({
+    url: '/ecw/order/special/info/' + offerProdId + '/' + type,
+    method: 'get'
+  })
+}
+
+// 根据订单项商品ID与审批类型获得订单商品的特价申请详情
+export function getOrderSpecialByApproveId(approveId) {
+  return request({
+    url: '/ecw/order/special/info?approveId=' + approveId,
+    method: 'get'
+  })
+}
+

src/router/index.js

@@ -289,6 +289,20 @@ export const constantRoutes = [
     hidden: true,
     redirect: 'noredirect',
     children: [
+      {
+        path: 'special/:orderId(\\d+)',
+        component: (resolve) => import('@/views/ecw/order/special'),
+        props: true,
+        name: 'order-special',
+        meta: {title: '订单特价申请', icon: '', activeMenu: '/order/index'}
+      },
+      {
+        path: 'discount/:offerProdId(\\d+)',
+        component: (resolve) => import('@/views/ecw/order/special/discount'),
+        props: true,
+        name: 'discount',
+        meta: {title: '订单优惠申请', icon: '', activeMenu: '/order/index'}
+      },
       {
         path: 'associated-order/:orderId(\\d+)',
         component: (resolve) => require(['@/views/ecw/order/associatedOrder'],resolve),

src/views/ecw/order/index.vue

@@ -173,7 +173,7 @@
               <el-button type="text"  size="mini" @click="orderId = scope.row.orderId;isShow = true" >特需</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 size="mini" type="text" icon="el-icon-edit" @click="$router.push('/order/special?id=' + scope.row.orderId)"
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('/order/special/' + scope.row.orderId)"
                      v-hasPermi="['ecw:order:update']">特价</el-button>
 
               <el-button type="text"  size="mini" @click="$router.push(`/order/release?orderId=${scope.row.orderId}`)">确认放货</el-button>

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

@@ -3,11 +3,11 @@
     <el-card>
       <div slot="header" class="card-title">申请特价</div>
       <!-- 列表 -->
-      <div class="offer-header">
-        <span style="font-size: 15px;">订单号：{{ offer.number }}</span>
+      <div class="order-header">
+        <span style="font-size: 15px;">订单号：{{ order.number }}</span>
       </div>
 
-      <el-table v-loading="loading" :data="offer.offerProdRespVOList">
+      <el-table v-loading="loading" :data="order.orderItemVOList">
         <el-table-column label="序号" align="center" prop="id" type="index"></el-table-column>
         <el-table-column
           prop="prodTitleZh"
@@ -20,17 +20,22 @@
           prop="prodAttrIds"
           label="填单货物属性">
           <template v-slot="{row}">
-            {{ getProductNamesByIds(row.prodAttrIds) }}
+            品牌：{{ ['无牌', '有牌', '中性'][row.brandType] }}<br>
+            箱数：{{ row.num }}<br>
+            体积：{{ row.volume }}m³<br>
+            重量：{{ row.weight }}Kg
           </template>
         </el-table-column>
         <el-table-column
           prop="address"
           label="入库货物属性">
           <template v-slot="{row}">
-            品牌：{{ row.brand ? '有' : '无' }}<br>
-            箱数：{{ row.num }}<br>
-            体积：{{ row.volume }}m³<br>
-            重量：{{ row.weight }}Kg
+            <template v-if="row.warehouseInInfoVO">
+              品牌：{{ ['无牌', '有牌', '中性'][row.brandType] }}<br>
+              箱数：{{ row.warehouseInInfoVO.cartonsNum }}<br>
+              体积：{{ row.warehouseInInfoVO.volume }}m³<br>
+              重量：{{ row.warehouseInInfoVO.weight }}Kg
+            </template>
           </template>
         </el-table-column>
         <el-table-column
@@ -64,18 +69,18 @@
             清关费：{{ row.clearanceFreight }} {{ currentMap[row.clearanceFreightCurrency] }}/{{ unitMap[row.clearanceFreightVolume] }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="status"
-          :formatter="(v) => ['取消报价', '特价审批中', '需求确认(草稿)', '跟进中', '赢单', '输单', '报价完成', '审批通过', '审批拒绝'][v.status]"
-          label="审核状态">
-        </el-table-column>
+<!--        <el-table-column-->
+<!--          prop="status"-->
+<!--          :formatter="(v) => ['取消报价', '特价审批中', '需求确认(草稿)', '跟进中', '赢单', '输单', '报价完成', '审批通过', '审批拒绝'][v.status]"-->
+<!--          label="审核状态">-->
+<!--        </el-table-column>-->
         <el-table-column
           prop="address"
           label="操作">
           <template v-slot="{row}">
-            <el-button size="mini" type="text" v-hasPermi="['ecw:offer:update']" @click="$router.push(`/offer/discount/${row.offerProdId}?offerId=${row.offerId}`)">优惠申请</el-button>
-            <!--            <el-button size="mini" type="text" v-hasPermi="['ecw:offer:update']">佣金规则</el-button>-->
-            <!--            <el-button size="mini" type="text" v-hasPermi="['ecw:offer:update']">管理折扣</el-button>-->
+            <el-button size="mini" type="text" v-hasPermi="['ecw:order:update']" @click="$router.push(`/order/discount/${row.prodId}?orderId=${row.orderId}`)">优惠申请</el-button>
+            <el-button size="mini" type="text" v-hasPermi="['ecw:order:update']">佣金规则</el-button>
+            <el-button size="mini" type="text" v-hasPermi="['ecw:order:update']">管理折扣</el-button>
           </template>
         </el-table-column>
 
@@ -102,7 +107,7 @@ export default {
   components: {
   },
   props: {
-    offerId: String
+    orderId: [String, Number]
   },
   data() {
     return {
@@ -116,14 +121,14 @@ export default {
       params:{
         page:1,
         rows:20,
-        offerId:0,
+        orderId:0,
         type:2
       },
       relationId:0,
       creatorName:'test',
-      offer: {
+      order: {
         number: '',
-        offerProdRespVOList: []
+        orderItemVOList: []
       },
       unitList:[],
       currencyList:[],
@@ -131,8 +136,8 @@ export default {
     };
   },
   created() {
-    if(this.offerId){
-      this.params.offerId = this.offerId
+    if(this.orderId){
+      this.params.orderId = this.orderId
       this.getOrder()
     }
     getUnitList().then(res => this.unitList = res.data)
@@ -142,9 +147,9 @@ export default {
   methods: {
     getOrder(){
       this.loading = true
-      getOrder(this.offerId).then(response => {
+      getOrder(this.orderId).then(response => {
         this.loading = false
-        this.offer = response.data
+        this.order = response.data
       })
     },
     getProductNamesByIds(ids){
@@ -183,7 +188,7 @@ export default {
   font-size: 18px;
   font-weight: bold;
 }
-.offer-header{
+.order-header{
   padding-bottom: 16px;
   display: flex;
   align-items: center;