Commit 82aea793 authored by Smile's avatar Smile

任务88:客户端改造,页面屏蔽我要发货,屏蔽去处理,复制,申请退仓,修改按钮

parent 3c3b2707
......@@ -397,7 +397,7 @@
>
</div>
</div>
<jd-button
<jd-button v-if="isDelivery"
style="margin: 16px auto; width: 160px"
:name="$t('sidebar.delivery')"
@click.native="transVisble = true"
......@@ -1026,6 +1026,7 @@ export default {
components: { JdButton, DictTag },
data() {
return {
isDelivery: false,
check: false,
action: "",
showMyOrder: true,
......@@ -1054,6 +1055,7 @@ export default {
this.getMemberSystemStatus();
this.action = this.$route.name;
this.userInfo = this.loginUser;
this.isForeignUser()
getMark().then((r) => {
this.mark = r.data;
});
......@@ -1065,6 +1067,11 @@ export default {
});
},
methods: {
isForeignUser(){
if (this.loginUser != null){
this.isDelivery = this.loginUser.areaCode === '86';
}
},
onLanguageChange(newVal, oldVal) {
if (newVal !== oldVal) {
this.getInfo();
......
......@@ -17,7 +17,7 @@
<!-- 搜索工作栏 -->
<el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" style="margin-top: 20px;">
<el-form-item :label="$t('controlorder.No')" prop="searchKey">
<el-input v-model="queryParams.searchKey" style="width: 230px;" :placeholder="$t('controlorder.NoRules')"
<el-input v-model="queryParams.searchKey" onkeyup="this.value=this.value.replace(/\s+/g, '')" style="width: 230px;" :placeholder="$t('controlorder.NoRules')"
clearable/>
</el-form-item>
<el-form-item :label="$t('postorder.status')" prop="dynamicStatusList">
......
......@@ -37,7 +37,7 @@
</el-col>
<el-col :span="8">
<el-form-item :label="$t('controlorder.No')" prop="searchKey">
<el-input v-model="queryParams.searchKey" style="width: 230px;" :placeholder="$t('controlorder.NoRules')" clearable />
<el-input v-model="queryParams.searchKey" onkeyup="this.value=this.value.replace(/\s+/g, '')" style="width: 230px;" :placeholder="$t('controlorder.NoRules')" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -135,10 +135,10 @@
header-align="center"
>
<template slot-scope="scope">
<el-button v-if="scope.row.status <= 2" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row, false)">{{ $t('postorder.edit') }}</el-button>
<el-button v-if="scope.row.status <= 2 && isDelivery" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row, false)">{{ $t('postorder.edit') }}</el-button>
<el-button v-if="scope.row.status == 2" size="mini" type="text" icon="el-icon-delete" @click="oprateOrder(scope.row.orderId)">{{ $t('postorder.cancel') }}</el-button>
<el-button v-if="scope.row.status == 5" size="mini" type="text" icon="el-icon-edit" @click="refundWarehouse(scope.row)">{{ $t('postorder.refundWarehouse') }}</el-button>
<el-button v-if="scope.row.abnormalState>1&&scope.row.status!=88" size="mini" type="text" icon="el-icon-edit" @click="handleAbnormal(scope.row.orderId)">{{ $t('postorder.abnormal') }}</el-button>
<el-button v-if="scope.row.status == 5 && isDelivery" size="mini" type="text" icon="el-icon-edit" @click="refundWarehouse(scope.row)">{{ $t('postorder.refundWarehouse') }}</el-button>
<el-button v-if="scope.row.abnormalState>1&&scope.row.status!=88 && isDelivery" size="mini" type="text" icon="el-icon-edit" @click="handleAbnormal(scope.row.orderId)">{{ $t('postorder.abnormal') }}</el-button>
<el-button v-if="scope.row.status == 0" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row.orderId)">{{ $t('postorder.delete') }}</el-button>
<el-button v-if="scope.row.customsType == 2" size="mini" type="text" icon="el-icon-edit" @click.native="declarationOrderId=scope.row.orderId;declarationOrderNo=scope.row.orderNo">{{ $t('common.uploadDeclaration') }}</el-button>
<el-button
......@@ -152,7 +152,7 @@
@click.native="printTagOrderId=scope.row.orderId"
>{{ $t('打印标签') }}
</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleCopy(scope.row)">{{ $t('postorder.copy') }}</el-button>
<el-button size="mini" type="text" v-if="isDelivery" icon="el-icon-edit" @click="handleCopy(scope.row)">{{ $t('postorder.copy') }}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -212,6 +212,7 @@
<script>
import { getIssued, cancelOrder, deleteOrder, refundWarehouseApply, copyOrder } from '@/api/order'
import { parseTime } from '@/utils'
import { mapGetters } from "vuex";
import RightToolbar from '@/components/RightToolbar'
import Pagination from '@/components/Pagination'
import DictTag from '@/components/DictTag'
......@@ -234,6 +235,7 @@ export default {
orderList: [],
// 显示搜索条件
showSearch: true,
isDelivery: false,
dateFilterType: '', // 日期筛选类别
dynamicStatusList: '', // 状态筛选类别
dateFilter: [], // 筛选日期
......@@ -255,6 +257,7 @@ export default {
}
},
computed: {
...mapGetters(["loginUser"]),
// expoerCityList() {
// return this.tradeCityList.filter(item => item.type == 2)
// },
......@@ -288,8 +291,14 @@ export default {
},
created() {
this.getList()
this.isForeignUser()
},
methods: {
isForeignUser(){
if (this.loginUser != null){
this.isDelivery = this.loginUser.areaCode === '86';
}
},
getStatusName: function (item) {
const orderStatus = this.getRealStatus(item);
const special = this.getDictDatas(this.DICT_TYPE.APP_ORDER_STATUS);
......
......@@ -37,7 +37,7 @@
</el-col>
<el-col :span="8">
<el-form-item :label="$t('controlorder.No')" prop="searchKey">
<el-input v-model="queryParams.searchKey" style="width: 230px;" :placeholder="$t('controlorder.NoRules')" clearable />
<el-input v-model="queryParams.searchKey" onkeyup="this.value=this.value.replace(/\s+/g, '')" style="width: 230px;" :placeholder="$t('controlorder.NoRules')" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
......
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