Commit 5d5accba authored by 黄奎's avatar 黄奎

1

parent 0ddf254b
...@@ -338,8 +338,7 @@ ...@@ -338,8 +338,7 @@
<th>{{$t('salesModule.BigBag')}}</th> <th>{{$t('salesModule.BigBag')}}</th>
<th>{{$t('sm.youhuijine')}}</th> <th>{{$t('sm.youhuijine')}}</th>
<th>{{$t('Operation.Op_daishou')}}</th> <th>{{$t('Operation.Op_daishou')}}</th>
<!-- <th>{{$t('op.JapnaseYen')}}</th>
<th>{{$t('op.RYCBJ')}}</th> -->
<th>{{$t('hotel.hotel_OrderStates')}}</th> <th>{{$t('hotel.hotel_OrderStates')}}</th>
<th>{{$t('fnc.cjshijian')}}</th> <th>{{$t('fnc.cjshijian')}}</th>
<th>{{$t('op.RZLDR')}}</th> <th>{{$t('op.RZLDR')}}</th>
...@@ -349,8 +348,8 @@ ...@@ -349,8 +348,8 @@
<th>{{$t('MarketingActi.endTime')}}</th> <th>{{$t('MarketingActi.endTime')}}</th>
<th width="180">{{$t('system.table_operation')}}</th> <th width="180">{{$t('system.table_operation')}}</th>
</tr> </tr>
<tbody v-for="(item,index) in dataList"> <tbody v-for="(item,index) in dataList" :key="`d_`+index">
<tr :key="`d_`+index"> <tr >
<td style="border-bottom:2px solid #333" rowspan="2">{{item.OrderID}} <td style="border-bottom:2px solid #333" rowspan="2">{{item.OrderID}}
<div> <div>
<el-tooltip class="item" effect="dark" :content="$t('objFill.xiaochengxdd')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('objFill.xiaochengxdd')" placement="top">
...@@ -409,6 +408,7 @@ ...@@ -409,6 +408,7 @@
<el-button type="success" icon="iconfont icon-sousuo" @click="goOrderDetails(item.OrderID)"> <el-button type="success" icon="iconfont icon-sousuo" @click="goOrderDetails(item.OrderID)">
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<!--修改成本价-->
<el-tooltip v-if="EmployeeId==380||EmployeeId==46||EmployeeId==1||EmployeeId==5" class="item" <el-tooltip v-if="EmployeeId==380||EmployeeId==46||EmployeeId==1||EmployeeId==5" class="item"
effect="dark" :content="$t('op.UpdateCBJ')" placement="top-start"> effect="dark" :content="$t('op.UpdateCBJ')" placement="top-start">
<el-button type="success" icon="iconfont icon-Edit" @click="getThisMsg(item)"></el-button> <el-button type="success" icon="iconfont icon-Edit" @click="getThisMsg(item)"></el-button>
...@@ -919,7 +919,6 @@ ...@@ -919,7 +919,6 @@
this.didaCancelOrderMsg.ConfirmID = res.data.data.ConfirmID; this.didaCancelOrderMsg.ConfirmID = res.data.data.ConfirmID;
this.didaCancelOrderMsg.Currency = res.data.data.Currency; this.didaCancelOrderMsg.Currency = res.data.data.Currency;
this.cancelDidaOrderDialog = true; this.cancelDidaOrderDialog = true;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
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