Commit f49759cf authored by dcy's avatar dcy

特需申请

parent a6e73df7
...@@ -88,9 +88,9 @@ export function specialNeedCreate(data){ ...@@ -88,9 +88,9 @@ export function specialNeedCreate(data){
// 删除特需 // 删除特需
export function orderSpecialNeed(params){ export function orderSpecialNeed(params){
return request({ return request({
url:'/ecw/order-special-need/delete', url:'/ecw/order-special-need/deleteByOrderId',
method: 'delete', method: 'delete',
params:params data:params
}) })
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="content"> <div class="content">
<el-form label-width="180px" label-position="left"> <el-form label-width="180px" label-position="left">
<el-form-item label="特殊要求"> <el-form-item label="特殊要求">
<dict-selector v-model="form.advanceType" formType="radio" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" ></dict-selector> <dict-selector v-if="show" v-model="form.advanceType" formType="radio" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" ></dict-selector>
</el-form-item> </el-form-item>
<el-form-item label="特殊要求备注"><el-input type="textarea" style="width: 300px;" v-model="form.todoDetail"></el-input></el-form-item> <el-form-item label="特殊要求备注"><el-input type="textarea" style="width: 300px;" v-model="form.todoDetail"></el-input></el-form-item>
<el-form-item label="内陆运费垫付预计金额" v-if="form.advanceType == 6"> <el-form-item label="内陆运费垫付预计金额" v-if="form.advanceType == 6">
...@@ -64,8 +64,7 @@ export default { ...@@ -64,8 +64,7 @@ export default {
} }
}, },
submit(){ submit(){
specialNeedCreate(this.form).then(r=>{ specialNeedCreate([{orderId:this.orderId, ...this.form}]).then(r=>{
console.log(r)
if(r.code === 0){ if(r.code === 0){
this.clearFrom(); this.clearFrom();
this.$emit('update:show',false) this.$emit('update:show',false)
...@@ -76,9 +75,6 @@ export default { ...@@ -76,9 +75,6 @@ export default {
}, },
}, },
watch:{ watch:{
orderId(val){
this.form.orderId = val;
},
'form.advanceType'(val){ 'form.advanceType'(val){
this.form.transFee = undefined; this.form.transFee = undefined;
this.form.transCurrency = undefined; this.form.transCurrency = undefined;
......
...@@ -114,12 +114,14 @@ ...@@ -114,12 +114,14 @@
<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="订单编号" align="center" prop="orderNo" > <el-table-column label="订单编号" width="200px" align="center" prop="orderNo" >
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="{path: '/order/detail',query: {orderId: scope.row.orderId}}" class="link-type"> <router-link :to="{path: '/order/detail',query: {orderId: scope.row.orderId}}" class="link-type">
<span>{{ scope.row.orderNo }}</span> <span>{{ scope.row.orderNo }}</span>
</router-link> </router-link>
<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> <div style="display: flex;flex-wrap: wrap;">
<el-button @click="deleteSpecial(item.value,scope.row.orderId)" size="mini" style="margin-left: 20px" type="danger" circle v-for="(item,index) in specialRendering(scope.row.advanceType)" :key="index">{{item.label[0]}}</el-button>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="唛头" align="center" prop="marks" /> <el-table-column label="唛头" align="center" prop="marks" />
...@@ -202,7 +204,6 @@ ...@@ -202,7 +204,6 @@
<print-tag v-if="printTagOrderId !== null" :order-id="printTagOrderId" @close="printTagOrderId=null" /> <print-tag v-if="printTagOrderId !== null" :order-id="printTagOrderId" @close="printTagOrderId=null" />
<print-warehouse-receipt v-if="printWarehouseReceiptOrderId !== null" :order-id="printWarehouseReceiptOrderId" @close="printWarehouseReceiptOrderId=null" /> <print-warehouse-receipt v-if="printWarehouseReceiptOrderId !== null" :order-id="printWarehouseReceiptOrderId" @close="printWarehouseReceiptOrderId=null" />
<print-lading-bill v-if="printLadingBillOrderId !== null" :order-id="printLadingBillOrderId" @close="printLadingBillOrderId=null" /> <print-lading-bill v-if="printLadingBillOrderId !== null" :order-id="printLadingBillOrderId" @close="printLadingBillOrderId=null" />
<special-needs :show.sync="isShow" :order-id="orderId" ></special-needs>
</div> </div>
</template> </template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment