订单特需，关联

src/api/ecw/associatedOrder.js

 // export function
 import request from '@/utils/request'
 
-export function orderGuanlian(params){
+export function guanlianList(params){
   return request({
-    url:'order/guanlian/page',
-    method:'get',
-    params:params,
+    url:'/order/guanlian/getGuanlianOrderByOrderId',
+    method:'post',
+    data:params,
   })
 };

src/api/ecw/order.js

@@ -84,3 +84,11 @@ export  function specialNeedCreate(data){
     data:data,
   })
 }
+// 删除特需
+ export function orderSpecialNeed(params){
+  return request({
+    url:'/ecw/order-special-need/delete',
+    method: 'delete',
+    params:params
+  })
+ }

src/views/ecw/order/associatedOrder.vue

@@ -10,33 +10,8 @@
     <el-form-item label="订单号"><div class="content">
       <el-input></el-input>
     </div></el-form-item>
-    <el-form-item label="唛头"><div class="content">
-      <el-input></el-input>
-    </div></el-form-item>
-    <el-form-item label="商品类型"><div class="content">
-      <el-input></el-input>
-    </div></el-form-item>
-    <el-form-item label="商品名称"><div class="content">
-      <el-input></el-input>
-    </div></el-form-item>
-    <el-form-item label="运输方式"><div class="content">
-      <el-input></el-input>
-    </div></el-form-item>
-    <el-form-item label="出货渠道"><div class="content">
-      <el-input></el-input>
-    </div></el-form-item>
-    <el-form-item label="客户名称"><div class="content">
-      <el-input></el-input>
-    </div></el-form-item>
-    <el-form-item label="客户手机号"><div class="content">
-      <el-input></el-input>
-    </div></el-form-item>
-    <el-form-item label="商品特性"><div class="content">
-      <el-input></el-input>
-    </div></el-form-item>
     <el-form-item><div class="content">
       <el-button>查询</el-button>
-      <el-button>重置</el-button>
     </div></el-form-item>
   </el-form>
   <el-divider></el-divider>
@@ -51,23 +26,30 @@
         <el-button type="primary" @click="$router.push(`/order/add-associated-order/${orderId}`)">添加关联订单</el-button>
      </div>
    </div>
-   <el-table>
+   <el-table :data="list">
      <el-table-column
        type="selection"
        width="55">
      </el-table-column>
-     <el-table-column label="序号"></el-table-column>
-     <el-table-column label="订单号"></el-table-column>
-     <el-table-column label="唛头"></el-table-column>
-     <el-table-column label="商品名列表"></el-table-column>
-     <el-table-column label="货物特性"></el-table-column>
-     <el-table-column label="货物材质"></el-table-column>
+     <el-table-column type="index" label="序号"></el-table-column>
+     <el-table-column label="订单号" prop="orderNo"></el-table-column>
+     <el-table-column label="唛头" prop="marks"></el-table-column>
      <el-table-column label="货物数据"></el-table-column>
-     <el-table-column label="入仓时间"></el-table-column>
-     <el-table-column label="状态"></el-table-column>
+     <el-table-column label="入仓时间" prop="remarks"></el-table-column>
+     <el-table-column label="状态" prop="status" >
+       <template v-slot:default="scope">
+<!--         <dict-tag :value="scope.row.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>-->
+       </template>
+     </el-table-column>
      <el-table-column label="操作人"></el-table-column>
-     <el-table-column label="操作时间"></el-table-column>
-     <el-table-column label="操作"></el-table-column>
+     <el-table-column label="操作时间" prop="createTime"></el-table-column>
+     <el-table-column label="操作">
+       <template>
+         <el-button type="text">
+           移出
+         </el-button>
+       </template>
+     </el-table-column>
    </el-table>
 </div>
 </template>
@@ -76,7 +58,8 @@
 //关联订单
 import ordeDetailsForm from "@/views/ecw/order/components/ordeDetailsForm";
 import {getOrder} from "@/api/ecw/order";
-import {orderGuanlian} from "@/api/ecw/associatedOrder";
+import {guanlianList,} from "@/api/ecw/associatedOrder";
+import {getDictDatas,DICT_TYPE} from '@/utils/dict'
 export default {
   name: "associatedOrder",
   props:{
@@ -90,9 +73,10 @@ export default {
       orderDetails:{},
       params:{
         orderId:undefined,
-        page:1,
-        rows:10
-      }
+      },
+      list:[],
+      DICT_TYPE,
+      getDictDatas
     }
   },
   created() {
@@ -106,8 +90,10 @@ export default {
   },
   methods:{
     getList(){
-      orderGuanlian(this.params).then(r => {
-        console.log(r)
+      guanlianList(this.params).then(r => {
+        if(r.code === 0){
+          this.list = r.data
+        }
       })
     }
   }

src/views/ecw/order/feeApplication.vue

@@ -48,11 +48,6 @@
             {{scope.row.status == 0 ?'未提交': scope.row.applicationAuthor}}
           </template>
        </el-table-column>
-       <el-table-column label="审核人">
-          <template  v-slot:default ="scope">
-            {{scope.row.status == 0 ?'未提交': scope.row.shenhe}}
-          </template>
-       </el-table-column>
        <el-table-column label="操作">
          <template v-slot:default = 'scope'>
            <el-button type="text" v-if="scope.row.status !== 0">{{status[scope.row.status]}}</el-button>
@@ -109,7 +104,6 @@ export default {
             remarks:undefined,
             receiveFlag:0,
             applicationAuthor:undefined,
-            shenhe:undefined,
             status:0,
           }
         )

src/views/ecw/order/index.vue

@@ -119,7 +119,7 @@
           <router-link :to="{path: '/order/detail',query: {orderId: scope.row.orderId}}" class="link-type">
             <span>{{ scope.row.orderNo }}</span>
           </router-link>
-          {{scope.row.advanceType}}
+          <el-button @click="deleteSpecial(item.value,scope.row.orderId)" style="margin-left: 20px" type="danger" circle v-for="(item,index) in specialRendering(scope.row.advanceType)" :key="index">{{item.label[0]}}</el-button>
         </template>
       </el-table-column>
       <el-table-column label="唛头" align="center" prop="marks" />
@@ -153,7 +153,7 @@
           <el-button size="mini" type="text" icon="el-icon-delete" @click="printTagOrderId=scope.row.orderId"
             v-hasPermi="['ecw:order:delete']">打印标签</el-button>
           <el-button type="text"  size="mini" @click="$router.push(`/order/fee-application/${scope.row.orderId}`)">费用申请</el-button>
-          <el-button type="text"  size="mini" @click="orderId = scope.row.orderId;isShow = true" >特殊</el-button>
+          <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>
         </template>
       </el-table-column>
@@ -210,7 +210,15 @@ import { getProductAttrList } from '@/api/ecw/productAttr'
 import CustomerSelector from '@/components/CustomerSelector'
 import specialNeeds from '@/views/ecw/order/components/specialNeeds';
 import { getTradeCityList } from '@/api/ecw/region'
-import { createOrder, updateOrder, deleteOrder, getOrder, getOrderPage, exportOrderExcel } from "@/api/ecw/order";
+import {
+  createOrder,
+  updateOrder,
+  deleteOrder,
+  getOrder,
+  getOrderPage,
+  exportOrderExcel,
+  orderSpecialNeed
+} from "@/api/ecw/order";
 import { getDictDatas, DICT_TYPE } from '@/utils/dict';
 import PrintTag from './components/PrintTag'
 
@@ -296,6 +304,8 @@ export default {
       printTagOrderId: null, // 显示打印标签的订单号
       isShow:false,//特殊显示
       orderId:undefined,
+      DICT_TYPE,
+      getDictDatas
     };
   },
   computed: {
@@ -510,7 +520,25 @@ export default {
     },
     handleEdit() { },
     moleculeChange() { },
-    denominatorChange() { }
+    denominatorChange() { },
+    specialRendering(val){
+      if(val !== undefined){
+        let i = val.split(',')
+       let special = this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS).filter(e => {
+           return i.indexOf(e.value) > -1
+        })
+        return special
+      }
+    },
+    deleteSpecial(id,orderId){
+      orderSpecialNeed({orderId:orderId,advanceType:id}).then(
+        r =>{
+          if(r.code === 0){
+            this.getList()
+          }
+        }
+      )
+    }
   }
 };
 </script>