Skip to content

J
jiedao-app-operator-master
Commit f5728349 authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

合并dev分支

parents efefd5cb d216cab7
Hide whitespace changes
Inline Side-by-side
Showing with 200 additions and 106 deletions
.env.dev
View file @ f5728349
......@@ -5,7 +5,7 @@ NODE_ENV = 'production'
VUE_APP_TITLE = 捷道管理系统 - 测试版
# 捷道管理系统/开发环境
VUE_APP_BASE_API = 'https://api.sit.jdshangmen.com'
VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
# VUE_APP_BASE_API = '/api'
# 路由懒加载
......
.env.development
View file @ f5728349
......@@ -6,7 +6,7 @@ VUE_APP_TITLE = 捷道管理系统-测试站
# 捷道管理系统/开发环境
VUE_APP_BASE_API = 'https://api.sit.jdshangmen.com'
VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
......
src/api/ecw/orderCargoControl.js
View file @ f5728349
......@@ -138,4 +138,14 @@ export function getCondimentsIno(cargoControlPickId){
url: '/ecw/order-cargo-control-pick/seasoning/condiments/info/' + cargoControlPickId,
method: 'get'
})
}
// 参数搜索导出控货订单列表
export function exportCargoControl(params){
return request({
url: '/ecw/order/export/cargo/control/search',
method: 'get',
responseType: 'arraybuffer',
params
})
}
\ No newline at end of file
src/assets/images/profile.jpg
View replaced file @ efefd5cb View file @ f5728349
src/assets/images/profile.jpg

79.2 KB | W: | H:

src/assets/images/profile.jpg

12.7 KB | W: | H:

src/assets/images/profile.jpg
src/assets/images/profile.jpg
src/assets/images/profile.jpg
src/assets/images/profile.jpg
  • 2-up
  • Swipe
  • Onion skin
src/components/AreaSelector/index.vue
View file @ f5728349
......@@ -48,11 +48,9 @@ export default {
},
'formData.country'(country){
this.$emit('countryChange', country)
this.$set(this.formData, 'province', undefined)
},
'formData.province'(province){
this.$emit('provinceChange', province)
this.$set(this.formData, 'city', '')
}
},
computed:{
......
src/views/ecw/box/indexAir.vue
View file @ f5728349
......@@ -50,13 +50,13 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['shipment:box:create']">{{$t('出货安排')}}
v-hasPermi="['shipment:box:create:air']">{{$t('出货安排')}}
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
:loading="exportLoading"
v-hasPermi="['shipment:box:export']">{{$t('导出')}}
v-hasPermi="['shipment:box:export:air']">{{$t('导出')}}
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......
src/views/ecw/box/indexFutureBox.vue
View file @ f5728349
......@@ -75,7 +75,7 @@
</el-table-column>
<el-table-column :label="$t('异常订单方数')" align="center" prop="exceptionNumber">
<template slot-scope="{row}">
{{row.getExceptionVolume || 0}}
{{row.exceptionNumber || 0}}
</template>
</el-table-column>
<el-table-column :label="$t('待排单订单方数')" align="center" prop="warehousingNumber">
......
src/views/ecw/box/indexSea.vue
View file @ f5728349
......@@ -65,11 +65,11 @@
<!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['shipment:box:action:create']">{{$t('出货安排')}}
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['shipment:box:create']">{{$t('出货安排')}}
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['shipment:box:action:export']">{{$t('导出')}}
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['shipment:box:export']">{{$t('导出')}}
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -230,7 +230,7 @@ export default {
{ value: "3", label: this.$t("起运时间") },
{ value: "4", label: this.$t("到港时间") },
{ value: "5", label: this.$t("清关时间") },
{ value: "6", label: this.$t("提货时间") },
{ value: "6", label: this.$t("卸柜时间") },
],
// 遮罩层
loading: true,
......
src/views/ecw/box/indexSeaAir.vue
View file @ f5728349
......@@ -51,11 +51,11 @@
<!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['shipment:seaAir:action:create']">{{$t('出货安排')}}
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['shipment:box:create:seaAir']">{{$t('出货安排')}}
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['shipment:seaAir:action:export']">{{$t('导出')}}
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['shipment:box:export:seaAir']">{{$t('导出')}}
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -222,7 +222,7 @@ export default {
{ value: "3", label: this.$t("起运时间") },
{ value: "4", label: this.$t("到港时间") },
{ value: "5", label: this.$t("清关时间") },
{ value: "6", label: this.$t("提货时间") },
{ value: "6", label: this.$t("卸柜时间") },
],
// 遮罩层
loading: true,
......
src/views/ecw/box/query.vue
View file @ f5728349
......@@ -6,9 +6,9 @@
<h2>{{$t('出货详情')}}</h2>
<div>
<!-- <el-button size="small" @click="handleCommand('edit')">{{$t('编辑')}}</el-button> -->
<el-button size="small" @click="handleCommand('router')">{{$t('操作')}}</el-button>
<el-button type="primary" size="small" @click="handleCommand('error')">{{$t('异常登记')}}</el-button>
<el-button type="primary" size="small" @click="handleCommand('cost')">{{$t('费用登记')}}</el-button>
<el-button size="small" v-hasPermi="['shipment:box:action:sea']" @click="handleCommand('router')">{{$t('操作')}}</el-button>
<el-button type="primary" v-hasPermi="['shipment:box:action:error']" size="small" @click="handleCommand('error')">{{$t('异常登记')}}</el-button>
<el-button type="primary" v-hasPermi="['shipment:box:action:cost']" size="small" @click="handleCommand('cost')">{{$t('费用登记')}}</el-button>
<!-- <el-button type="danger" size="small" @click="handleCommand('delete')">{{$t('删除')}}</el-button> -->
</div>
</div>
......@@ -56,8 +56,8 @@
{{getSectionInfo}}
</p>
<div style="margin-left:30px;">
<el-button type="primary" size="small" @click="()=>updateStatus('selected')">{{$t('更新所选订单状态')}}</el-button>
<el-button type="primary" size="small" @click="()=>updateStatus('all')">{{$t('更新全部订单状态')}}</el-button>
<el-button type="primary" v-hasPermi="['shipment:box:order:select']" size="small" @click="()=>updateStatus('selected')">{{$t('更新所选订单状态')}}</el-button>
<el-button type="primary" v-hasPermi="['shipment:box:order:all']" size="small" @click="()=>updateStatus('all')">{{$t('更新全部订单状态')}}</el-button>
</div>
<div class="document-status">
<p>{{$t('单证状态')}}：</p>
......@@ -176,7 +176,7 @@
<el-table-column prop="title" :label="$t('文件类型')"></el-table-column>
<el-table-column prop="" :label="$t('下载链接')">
<template slot-scope="scope">
<a v-if="scope.row.serviceName" href="javascript:void(0)" @click="downloadDetailFile(scope.row)">{{$t('下载')}}</a>
<a v-if="scope.row.serviceName" href="javascript:void(0)" @click="downloadDetailFile(scope.row)" v-hasPermi="[`${scope.row.hasPermi}`]">{{$t('下载')}}</a>
<div v-else>{{$t('未完成')}}</div>
</template>
</el-table-column>
......@@ -298,24 +298,27 @@ export default {
costDetail: {},
// 下载
downloadList: [
{ title: this.$t("预装单"), serviceName: "downloadPreloadGoodsList" },
{ title: this.$t("已装单"), serviceName: "downloadLoadGoodsList" },
{ title: this.$t("应收汇总表"), serviceName: "downloadReceivableList" },
{ title: this.$t("预装单"), serviceName: "downloadPreloadGoodsList", hasPermi: "shipment:box:download:downloadPreloadGoodsList" },
{ title: this.$t("已装单"), serviceName: "downloadLoadGoodsList", hasPermi: "shipment:box:download:downloadLoadGoodsList" },
{ title: this.$t("应收汇总表"), serviceName: "downloadReceivableList", hasPermi: "shipment:box:download:downloadReceivableList" },
{
title: this.$t("提货单"),
serviceName: "zipDownload",
fileFormat: "zip",
hasPermi: "shipment:box:download:zipDownload"
},
{
title: "agent list",
serviceName: "downloadAgentListFiles",
type: "url",
hasPermi: "shipment:box:download:downloadAgentListFiles"
},
{ title: "soncap", serviceName: "downloadSoncapFiles", type: "url" },
{ title: "soncap", serviceName: "downloadSoncapFiles", type: "url", hasPermi: "shipment:box:download:downloadSoncapFiles" },
{
title: this.$t("提单Copy"),
serviceName: "downloadLadingCopy",
type: "url",
hasPermi: "shipment:box:download:downloadLadingCopy"
},
],
// 选中行
......
src/views/ecw/box/shippingSea/nodePage/preinstall.vue
View file @ f5728349
......@@ -663,7 +663,9 @@ export default {
});
});
})
.catch((_) => {});
.catch((_) => {
this.queryAllData();
});
} else {
serviceMsg(res, this).then(() => {
this.queryAllData();
......@@ -683,7 +685,9 @@ export default {
});
});
})
.catch((_) => {});
.catch((_) => {
this.queryAllData();
});
}
});
} else {
......
src/views/ecw/busiPwd/index.vue
View file @ f5728349
......@@ -236,7 +236,7 @@ export default {
this.exportLoading = true;
return exportBusiPwdExcel(params);
}).then(response => {
this.$download.excel(response, '${table.classComment}.xls');
this.$download.excel(response, '导出数据.xls');
this.exportLoading = false;
}).catch(() => {});
}
......
src/views/ecw/coupon/edit.vue
View file @ f5728349
......@@ -471,10 +471,13 @@ export default {
item.combUnit = 'prodUnit_' + item.prodUnit
}else if(item.fullCurrencyId){
item.combUnit = 'fullCurrencyId_' + item.fullCurrencyId
}else{
}
this.fee[item.type].push({...item})
})
console.log(JSON.stringify(this.fee, null, 4))
/* if(this.costType != this.form.costType){
console.error(`费用类型冲突，计算出来的类型为${this.costType},接口费用类型为${res.data.costType}，类型为${res.data.type}`)
this.$alert(this.$t('费用类型冲突'))
......@@ -519,6 +522,7 @@ export default {
},
// 满减活动如果选择的满多少金额减，则在选择满货币后需要同步减的货币，且禁用减的货币修改
checkReduceCurrency(item){
console.log('checkReduceCurrency', {...item}, this.form.type)
// 金额满减
if([2,4,5,7].indexOf(this.form.type) > -1){
// 只要不是按产品单位满减
......
src/views/ecw/coupon/index.vue
View file @ f5728349
......@@ -20,7 +20,7 @@
<el-option :label="$t('已过期')" value="2" />
</el-select>
</el-form-item>
<el-form-item :label="$t('关键字')" prop="conditionCurrencyId">
<el-form-item :label="$t('关键字')" prop="searchKey">
<el-input v-model="queryParams.searchKey" :placeholder="$t('请输入关键字')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item>
......
src/views/ecw/currency/index.vue
View file @ f5728349
......@@ -101,9 +101,8 @@
<!-- <el-input v-model="form.show" :placeholder="$t('请输入状态')" />-->
<!-- </el-form-item>-->
<el-form-item label="100外币兑人民币汇率" prop="huilv">
<el-input v-model="form.huilv" placeholder="请输入100外币兑人民币汇率汇率" />
<el-input v-model="form.huilv" placeholder="请输入100外币兑人民币汇率" />
</el-form-item>
<el-form-item label="100人民币兑外币汇率" prop="exchangeToFc">
<el-input v-model="form.exchangeToFc" placeholder="请输入100人民币兑外币汇率" />
</el-form-item>
......
src/views/ecw/customer/query.vue
View file @ f5728349
......@@ -109,8 +109,8 @@
</el-table>
</el-card>
<el-tabs style="margin-top: 15px" type="border-card">
<el-tab-pane :label="$t('订单')">
<el-tabs v-model="activeName" style="margin-top: 15px" type="border-card">
<el-tab-pane name="order" :label="$t('订单')">
<el-card class="box-card">
<div slot="header" class="clearfix">
<el-form :inline="true">
......@@ -207,7 +207,7 @@
<pagination @pagination="getorderList" :page.sync="queryParams.page" :limit.sync="queryParams.rows" :total="orderTotal" ></pagination>
</el-card>
</el-tab-pane>
<el-tab-pane :label="$t('报价')">
<el-tab-pane name="quote" :label="$t('报价')">
<el-table
:data="infoListOfferList"
style="width: 100%"
......@@ -260,13 +260,13 @@
</el-table>
<pagination @pagination="getInfoListOfferPage" :page.sync="infoListOfferFrom.pageNo" :limit.sync="infoListOfferFrom.pageSize" :total="infoListOfferTotal" ></pagination>
</el-tab-pane>
<el-tab-pane :label="$t('跟进')">
<el-tab-pane name="follow" :label="$t('跟进')">
<customer-follow ref="customerFollow" :id="id" :customer-id="id"></customer-follow>
</el-tab-pane>
<el-tab-pane :label="$t('客户投诉')">
<el-tab-pane name="complain" :label="$t('客户投诉')">
<customer-complaint ref="customerComplaint" :customer-id="id" hidden-search></customer-complaint>
</el-tab-pane>
<el-tab-pane :label="$t('账单')">
<el-tab-pane name="bill" :label="$t('账单')">
<el-table style="width: 100%" :data="infoListReceiptList">
<el-table-column :label="$t('序号')" type="index"></el-table-column>
<el-table-column :label="$t('账单')" prop="receiptNo"></el-table-column>
......@@ -291,7 +291,7 @@
<el-table-column :label="$t('业务员')" prop="salesmanName"></el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane :label="$t('数据')">
<el-tab-pane name="data" :label="$t('数据')">
<el-descriptions :column="2">
<el-descriptions-item :label="$t('海空联运/海运拼柜/海运整柜/专线空运')">{{orderStatisticsObj.hklyTotal || 0}}/{{orderStatisticsObj.hypgTotal || 0 }}/{{orderStatisticsObj.hyzgTotal || 0}}/{{orderStatisticsObj.zxkyTotal || 0}}</el-descriptions-item>
<el-descriptions-item :label="$t('最后交易日期')">{{orderStatisticsObj.lastBusinessDate}}</el-descriptions-item>
......@@ -302,7 +302,7 @@
<el-descriptions-item :label="$t('已出货订单')">{{orderStatisticsObj.shipmentTotal || 0}}</el-descriptions-item>
</el-descriptions>
</el-tab-pane>
<el-tab-pane :label="$t('品牌授权')">
<el-tab-pane name="empower" :label="$t('品牌授权')">
<el-table border style="width:100%" :data="brandAuthorizationList">
<el-table-column type="index" :prop="$t('序号')"></el-table-column>
<el-table-column :label="$t('中文标题')" prop="titleZh" ></el-table-column>
......@@ -349,7 +349,7 @@
<pagination v-show="brandAuthorizationTotal > 0" :total="brandAuthorizationTotal" :page.sync="brandAuthorizationFrom.pageNo" :limit.sync="brandAuthorizationFrom.pageSize"
@pagination="getBrankByCustomerList"/>
</el-tab-pane>
<el-tab-pane :label="$t('信用日志')">
<el-tab-pane name="credit" :label="$t('信用日志')">
<el-card class="box-card">
<div slot="header" class="clearfix">
<el-button style="float: right;" type="primary" @click="dialogVisible = true" >{{$t('添加信用日志')}}</el-button>
......@@ -381,7 +381,7 @@
<pagination @pagination="creditLogPage" :page.sync="customerCreditLogFrom.pageNo" :limit.sync="customerCreditLogFrom.pageSize" :total="customerCreditLogFrom.total" ></pagination>
</el-card>
</el-tab-pane>
<el-tab-pane :label="$t('等级日志')">
<el-tab-pane name="grade" :label="$t('等级日志')">
<el-table style="width: 100%" :data="getCustomerGradeList">
<el-table-column :label="$t('序号')" type="index"></el-table-column>
<el-table-column :label="$t('规则名称')" prop="name"></el-table-column>
......@@ -499,19 +499,49 @@ export default {
listServiceUser().then(r => {
this.serviceUserList = r.data
})
this.getBrankByCustomerList()
// this.getBrankByCustomerList()//品牌授权
this.getCustomerGrade()
this.creditLogPage()
this.getorderList()
this.getInfoListOfferPage()
this.getOrderStatistics()
this.creditScoreStatisticFn()
this.infoListReceiptFn()
// this.creditLogPage()//等级日志
this.getorderList()//订单
// this.getInfoListOfferPage()//报价
// this.getOrderStatistics()//数据
// this.creditScoreStatisticFn() //信用日志
// this.infoListReceiptFn()//账单
},
watch:{
activeName(val){
console.log(val,'val')
switch (val) {
case 'order':
this.getorderList()//订单
break
case 'quote':
this.getInfoListOfferPage()//报价
break
case 'bill':
this.infoListReceiptFn()//账单
break
case 'data':
this.getOrderStatistics()//数据
break
case 'empower':
this.getBrankByCustomerList()//品牌授权
break
case 'credit':
this.creditScoreStatisticFn() //信用日志
break
case 'grade':
this.creditLogPage()//等级日志
break
}
}
},
data() {
return {
activeName:'order',
STATUS:{
0:this.$t('取消报价'),
1:this.$t('特价审批中'),
......
src/views/ecw/deptTarget/myAchievement.vue
View file @ f5728349
......@@ -3,14 +3,14 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item :label="$t('关键字')" prop="transportType">
<el-input v-model="queryParams.key" :placeholder="$t('请输入关键字查找')" />
<el-form-item :label="$t('关键字')" prop="key">
<el-input v-model="queryParams.key" :placeholder="$t('请输入关键字查找')" clearable/>
</el-form-item>
<el-form-item :label="$t('运输方式')" prop="transportType">
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number"/>
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number" clearable/>
</el-form-item>
<el-form-item :label="$t('唛头')" prop="transportType">
<el-input v-model="queryParams.marks" :placeholder="$t('请输入关键字查找')" />
<el-form-item :label="$t('唛头')" prop="marks">
<el-input v-model="queryParams.marks" :placeholder="$t('请输入关键字查找')" clearable />
</el-form-item>
<el-form-item :label="$t('资源类型')" prop="customerType">
<!-- <el-select clearable v-model="queryParams.customerType" :placeholder="$t('请选择资源类型')" clearable size="small">
......@@ -31,7 +31,7 @@
<el-option :label="$t('装柜时间')" value="ldBoxTime"/>
</el-select>
</el-form-item> -->
<el-form-item>
<el-form-item prop="dateFilter">
<el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<!-- <el-date-picker v-model="queryParams.beginStartTime" :placeholder="$t('请选择开始时间')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>-->
</el-form-item>
......@@ -40,6 +40,7 @@
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button type="primary" icon="el-icon-search" @click="resetQuery">{{$t('重置')}}</el-button>
<!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
>{{$t('导出')}}</el-button> -->
</el-form-item>
......@@ -301,10 +302,12 @@
this.queryParams.pageNo = 1;
this.queryParams.beginStartTime=this.dateFilter[0];
this.queryParams.endStartTime=this.dateFilter[1];
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dateFilter = []
this.dateRangeCreateTime = [];
this.dateRangeStartTime = [];
this.dateRangeEndTime = [];
......@@ -409,6 +412,9 @@
data.sumVolume += item.completeVolume
data.sumNum += item.sumNum
})
data.developVolume = data.developVolume.toFixed(2);
data.companyVolume = data.companyVolume.toFixed(2);
data.sumVolume = data.sumVolume.toFixed(2);
this.$set(this,'totalData',data)
}else{
this.totalData.sumWeight =this.myAchievementData.totalWeight
......
src/views/ecw/offer/detail.vue
View file @ f5728349
......@@ -6,11 +6,11 @@
<div class="offer-header">
<span style="font-size: 15px;">{{$t('报价单号')}}：{{list.number}}</span>
<div class="btns">
<el-button size="mini" type="primary" v-if="list.status!=5" @click="$router.push('edit?id=' + offerId)">{{$t('编辑')}}</el-button>
<el-button type="primary" v-if="[1,3,7].indexOf(list.status) > -1" size="mini" @click="handleAdd">{{$t('跟进')}}</el-button>
<el-button type="primary" v-if="[3,7].indexOf(list.status) > -1" size="mini" @click="toResult">{{$t('结果')}}</el-button>
<el-button size="mini" v-if="[1,3,7].indexOf(list.status) > -1" type="primary" @click.native="$router.push('/offer/special?offerId=' + offerId)" >{{$t('特价')}}</el-button>
<el-button type="danger" size="mini" @click="handleDelete">{{$t('删除')}}</el-button>
<el-button v-hasPermi="['ecw:offer:update']" size="mini" type="primary" v-if="list.status!=5" @click="$router.push('edit?id=' + offerId)">{{$t('编辑')}}</el-button>
<el-button v-hasPermi="['ecw:offer:loglist']" type="primary" v-if="[1,3,7].indexOf(list.status) > -1" size="mini" @click="handleAdd">{{$t('跟进')}}</el-button>
<el-button v-hasPermi="['ecw:offer:result']" type="primary" v-if="[3,7].indexOf(list.status) > -1" size="mini" @click="toResult">{{$t('结果')}}</el-button>
<el-button v-hasPermi="['ecw:offer:discount','ecw:offer:commission']" size="mini" v-if="[1,3,7].indexOf(list.status) > -1" type="primary" @click.native="$router.push('/offer/special?offerId=' + offerId)" >{{$t('特价')}}</el-button>
<el-button v-hasPermi="['ecw:offer:delete']" type="danger" size="mini" @click="handleDelete">{{$t('删除')}}</el-button>
</div>
</div>
<div>
......@@ -290,7 +290,7 @@
{{list.competitor||'/'}}
</el-descriptions-item>
<el-descriptions-item :label="$t('重要程度')">
<el-rate v-model="list.importance"></el-rate>
<el-rate v-model="list.importance" disabled></el-rate>
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="4">
......
src/views/ecw/offer/index.vue
View file @ f5728349
......@@ -126,7 +126,7 @@
<el-dropdown-item @click.native="$router.push('edit?id=' + scope.row.offerId)" v-if="[1,2,3,7].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:update']">{{$t('编辑')}}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push('logList?offerId=' + scope.row.offerId)" v-if="[1,3,7].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:loglist']">{{$t('跟进')}}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push(`result?offerId=${scope.row.offerId}&number=${scope.row.number}`)" v-if="[3,7].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:result']">{{$t('结果')}}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push('/offer/special?offerId=' + scope.row.offerId)" v-if="[1,3,7].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:discount','ecw:offer:commission',]">{{$t('特价')}}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push('/offer/special?offerId=' + scope.row.offerId)" v-if="[1,3,7].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:discount','ecw:offer:commission']">{{$t('特价')}}</el-dropdown-item>
<el-dropdown-item @click.native="cancel(scope.row.offerId)" v-if="[1,3,7].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:cancel']">{{$t('取消')}}</el-dropdown-item>
<el-dropdown-item @click.native="recovery(scope.row.offerId)" v-if="[0].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:recovery']">{{$t('恢复')}}</el-dropdown-item>
<el-dropdown-item @click.native="deleteOffer(scope.row.offerId)" v-if="[0,1,2,3,4,5,6,7].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:delete']">{{$t('删除')}}</el-dropdown-item>
......
src/views/ecw/order/cargoControl.vue
View file @ f5728349
......@@ -161,12 +161,12 @@ import CustomerSelector from '@/components/CustomerSelector'
import Transfer from '@/views/ecw/order/components/Transfer'
import Release from './components/Release'
import CargoControlEdit from './components/CargoControlEdit'
import { getCargoControlOrderPage, batchReview, orderReview, getPickRleaseInfo } from "@/api/ecw/orderCargoControl"
import { getCargoControlOrderPage, batchReview, orderReview, getPickRleaseInfo, exportCargoControl } from "@/api/ecw/orderCargoControl"
import TransferCargo from '@/views/ecw/order/components/TransferCargo'
import Fallback from './components/Fallback'
import {getWarehouseList} from '@/api/ecw/warehouse'
export default {
name: "EcwOrderCargonControl",
name: "EcwOrderCargocontrol",
components: {
CustomerSelector, ProductSelector, Selector, Transfer, Release,CargoControlEdit, TransferCargo, Fallback
},
......@@ -269,9 +269,9 @@ export default {
// 执行导出
this.$modal.confirm('是否确认导出所有订单数据项?').then(() => {
this.exportLoading = true;
return exportOrderExcel(this.combinedQueryParams);
return exportCargoControl(this.combinedQueryParams);
}).then(response => {
this.$download.excel(response, '${table.classComment}.xls');
this.$download.excel(response, this.$t('控货订单') + '.xlsx');
this.exportLoading = false;
}).catch(() => { });
},
......
src/views/ecw/order/components/PrintWarehouseReceipt.vue
View file @ f5728349
......@@ -165,8 +165,8 @@ export default {
LODOP.SET_PREVIEW_WINDOW(1,0,0,'410mm','139mm',"");
LODOP.SET_PRINT_PAGESIZE(0,'203.9mm','178mm',"");
LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW",true);
LODOP.SET_PRINT_MODE("FULL_HEIGHT_FOR_OVERFLOW",true);
/* LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW",true);
LODOP.SET_PRINT_MODE("FULL_HEIGHT_FOR_OVERFLOW",true); */
LODOP.ADD_PRINT_HTM('40mm',0,'204mm','148mm', document.getElementById("myproa").innerHTML);
LODOP.SET_PRINT_MODE("AUTO_CLOSE_PREWINDOW", true);
......
src/views/ecw/order/index.vue
View file @ f5728349
......@@ -240,10 +240,10 @@
'ecw:order:split_log',
// 下面几个是特价里的
'ecw:order:discount',
'ecw:order:reduce',
'ecw:order:commission',
'ecw:order:heavy',
'ecw:order:bulky'
'ecw:order:reduce',
'ecw:order:commission',
'ecw:order:heavy',
'ecw:order:bulky'
]" >
<el-button type="text">{{$t('操作')}}</el-button>
<el-dropdown-menu slot="dropdown">
......@@ -667,7 +667,7 @@ export default {
exportSearch(){
return this.exportExcel(this.getExportFunc(), this.combinedQueryParams, this.$t("导出搜索"))
},
// 导出异常单
// 导出异常单
exportAbnormal(){
return this.exportExcel(exportAbnormal, this.combinedQueryParams, this.$t("异常单统计"))
},
......@@ -766,7 +766,11 @@ export default {
}
// 执行查询
func(this.combinedQueryParams).then(response => {
this.list = response.data.list;
// 部分情况下，订单后面的操作下拉菜单会显示按钮，但是下来没有选项，在elTable组件更新的时候会导致渲染错误，所以要在更新渲染前清空一次list让table彻底重新渲染，避免部分更新导致异常
this.list = []
this.$nextTick(() => {
this.list = response.data.list
})
this.total = response.data.total;
this.loading = false;
});
......
src/views/ecw/order/release.vue
View file @ f5728349
......@@ -22,7 +22,7 @@
<dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.pickType" form-type="radio" formatter="number"></dict-selector>
</el-form-item>
<el-form-item :label="$t('提货时间')" v-if="form.pickType == 1">
<el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<el-date-picker v-model="form.pickTime" placeholder="" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
<template v-if="form.pickType == 2">
......@@ -49,14 +49,14 @@
<el-form-item :label="$t('附件')">
<image-upload v-model="form.attachment" />
</el-form-item>
<el-form-item :label="$t('备注')">
<el-input v-model="form.remark" type="textarea" placeholder=""></el-input>
</el-form-item>
<el-form-item label="">
<el-button type="primary" @click="submit">{{$t('确认放货')}}</el-button>
<el-button type="default" @click="$router.back()">{{$t('取消')}}</el-button>
</el-form-item>
</el-form-item>
</el-form>
</div>
</template>
......@@ -87,7 +87,8 @@ export default {
getOrder(this.$route.query.orderId).then(res => {
this.order = res.data
this.$set(this.form, 'pickType', this.order.consigneeVO.harvestMethod)
})
});
this.form.pickTime = new Date().format('yyyy-MM-dd hh:mm:ss');
},
submit(){
create(Object.assign({orderId: this.order.orderNo}, this.form)).then(res => {
......@@ -98,4 +99,4 @@ export default {
}
}
}
</script>
\ No newline at end of file
</script>
src/views/ecw/order/warehousing/components/editDialog.vue
View file @ f5728349
......@@ -496,8 +496,9 @@ export default {
this.inTime = this.warehousing.inTime
if (!!this.warehousing.brandName){
this.getProductBrandPage(this.warehousing.brandName)
} else {
this.getProductBrandPage()
}
this.getProductBrandPage()
}
} else {
}
......@@ -565,7 +566,13 @@ export default {
this.form1.prodTitleZh = product.titleZh
this.form1.prodTitleEn = product.titleEn
},
handleTabs(){},
handleTabs(){
if (this.activeName === 'first'){
this.getProductBrandPage(this.warehousing.brandName)
} else {
this.getProductBrandPage()
}
},
handleBrandChange(v){
getFeeTypeByOrderProduct({
brandId: parseInt(v),
......
src/views/ecw/productBrank/Empower/index.vue
View file @ f5728349
......@@ -102,6 +102,14 @@
<span >{{row.startTime?(parseTime(row.startTime, '{y}-{m}-{d}') + ' - ' + parseTime(row.endTime, '{y}-{m}-{d}')):'永久'}}</span>
</template>
</el-table-column>
<el-table-column
prop="startTime"
width="200px"
:label="$t('添加时间')">
<template v-slot="{row}">
<span >{{parseTime(row.createTime)}}</span>
</template>
</el-table-column>
<el-table-column
prop="feeScale"
:formatter="(row) => getDictDataLabel(DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL, row.feeScale)"
......
src/views/ecw/productBrank/index.vue
View file @ f5728349
......@@ -61,11 +61,27 @@
<dict-tag :type="DICT_TYPE.BRAND_REG_TYPE" :value="scope.row.filing" />
</template>
</el-table-column>
<el-table-column :label="$t('创建人')" align="center" prop="creator" width="180">
<template v-slot="{row}">
{{(row.creator && allSimplList.length) && allSimplList.find(i => i.id == row.creator).nickname}}
</template>
</el-table-column>
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
</el-table-column>
<el-table-column :label="$t('修改人')" align="center" prop="updater" width="180">
<template v-slot="{row}">
{{ (row.updater && allSimplList.length) && allSimplList.find(i => i.id == row.updater).nickname}}
</template>
</el-table-column>
<el-table-column :label="$t('修改时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleEmpower(scope.row)" v-show="scope.row.filing === '1'"
v-hasPermi="['ecw:product-brank:update']">{{ $t('添加授权客户') }}</el-button>
......@@ -143,6 +159,7 @@ import {getProductTypeList} from "@/api/ecw/productType"
import {getProductList} from "@/api/ecw/product"
import BrandForm from "@/views/ecw/productBrank/BrandForm"
import Empower from "@/views/ecw/productBrank/Empower"
import {listAllSimpl} from "@/api/system/user";
export default {
name: "ProductBrank",
......@@ -194,7 +211,8 @@ export default {
showEmpower: false,
empowerId: null,
empowerTitle: ''
empowerTitle: '',
allSimplList:[],
};
},
created() {
......@@ -204,6 +222,9 @@ export default {
})
getProductList().then(r => {
this.productList = r.data
});
listAllSimpl().then(r => {
this.allSimplList = r.data
})
},
methods: {
......
src/views/ecw/zhongPao/index.vue
View file @ f5728349
......@@ -194,10 +194,7 @@ export default {
handleStatusChange(row){
let text = row.status === CommonStatusEnum.ENABLE ? this.$t("启用") : this.$t("停用");
this.$modal.confirm('确认要' + text + '吗?').then(function() {
return updateZhongPao({
id: row.id,
status: row.status
})
return updateZhongPao(row)
}).then(() => {
this.$modal.msgSuccess(text + "成功");
}).catch(function() {
......@@ -207,7 +204,7 @@ export default {
},
departureFormatter(row, column, cellValue) {
if (cellValue === 0) return this.$t('全部')
return this.warehouseList.find(e => e.id === cellValue)?.titleZh
return this.tradeCityList.find(e => e.id === cellValue)?.titleZh
},
objectiveFormatter(row, column, cellValue) {
if (!cellValue || cellValue.length === 0) return ''
......
src/views/infra/apiAccessLog/index.vue
View file @ f5728349
......@@ -19,8 +19,8 @@
<el-input v-model="queryParams.requestUrl" :placeholder="$t('请输入请求地址')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item :label="$t('请求时间')">
<el-date-picker v-model="dateRangeBeginTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
<el-date-picker v-model="dateRangeBeginTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item :label="$t('执行时长')" prop="duration">
<el-input v-model="queryParams.duration" :placeholder="$t('请输入执行时长')" clearable @keyup.enter.native="handleQuery"/>
......@@ -160,7 +160,7 @@ export default {
this.loading = true;
// 处理查询参数
let params = {...this.queryParams};
this.addBeginAndEndTime(params, this.dateRangeBeginTime, 'beginTime');
this.addBeginAndEndTime(params, this.dateRangeBeginTime, 'beginTime',false);
// 执行查询
getApiAccessLogPage(params).then(response => {
this.list = response.data.list;
......
src/views/infra/apiErrorLog/index.vue
View file @ f5728349
......@@ -19,8 +19,8 @@
<el-input v-model="queryParams.requestUrl" :placeholder="$t('请输入请求地址')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item :label="$t('异常时间')">
<el-date-picker v-model="dateRangeExceptionTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
<el-date-picker v-model="dateRangeExceptionTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item :label="$t('处理状态')" prop="processStatus">
<el-select v-model="queryParams.processStatus" :placeholder="$t('请选择处理状态')" clearable>
......@@ -168,7 +168,7 @@ export default {
this.loading = true;
// 处理查询参数
let params = {...this.queryParams};
this.addBeginAndEndTime(params, this.dateRangeExceptionTime, 'exceptionTime');
this.addBeginAndEndTime(params, this.dateRangeExceptionTime, 'exceptionTime', false);
// 执行查询
getApiErrorLogPage(params).then(response => {
this.list = response.data.list;
......
src/views/system/loginlog/index.vue
View file @ f5728349
......@@ -16,8 +16,8 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('登录时间')">
<el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
......@@ -99,8 +99,8 @@ export default {
getList() {
this.loading = true;
list(this.addDateRange(this.queryParams, [
this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
this.dateRange[0] ,
this.dateRange[1],
])).then(response => {
this.list = response.data.list;
this.total = response.data.total;
......
src/views/system/operatelog/index.vue
View file @ f5728349
......@@ -22,8 +22,8 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('操作时间')">
<el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
......@@ -171,8 +171,8 @@ export default {
getList() {
this.loading = true;
listOperateLog(this.addDateRange(this.queryParams, [
this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
this.dateRange[0] ,
this.dateRange[1],
])).then( response => {
this.list = response.data.list;
this.total = response.data.total;
......
src/views/system/sms/smsLog.vue
View file @ f5728349
......@@ -23,8 +23,8 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('发送时间')">
<el-date-picker v-model="dateRangeSendTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
<el-date-picker v-model="dateRangeSendTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item :label="$t('接收状态')" prop="receiveStatus">
<el-select v-model="queryParams.receiveStatus" :placeholder="$t('请选择接收状态')" clearable>
......@@ -33,8 +33,8 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('接收时间')">
<el-date-picker v-model="dateRangeReceiveTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
<el-date-picker v-model="dateRangeReceiveTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
......@@ -45,7 +45,7 @@
<!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
<el-button type="primary" plain icon="el-icon-plus" size="mini"
v-hasPermi="['system:sms-log:create']">{{ $t('新增') }}</el-button>
</el-col>
<el-col :span="1.5">
......@@ -243,8 +243,8 @@ export default {
this.loading = true;
// 处理查询参数
let params = {...this.queryParams};
this.addBeginAndEndTime(params, this.dateRangeSendTime, 'sendTime');
this.addBeginAndEndTime(params, this.dateRangeReceiveTime, 'receiveTime');
this.addBeginAndEndTime(params, this.dateRangeSendTime, 'sendTime', false);
this.addBeginAndEndTime(params, this.dateRangeReceiveTime, 'receiveTime', false);
// 执行查询
getSmsLogPage(params).then(response => {
this.list = response.data.list;
......
src/views/system/sms/smsTemplate.vue
View file @ f5728349
......@@ -56,6 +56,8 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column :label="$t('模板编号')" align="center" prop="id" />
<el-table-column :label="$t('模板编码')" align="center" prop="code" />
<el-table-column :label="$t('模板编码')" align="center" prop="code" />
<el-table-column :label="$t('模板名称')" align="center" prop="name" />
<el-table-column label="中文API模板编号" align="center" prop="apiTemplateId" width="120" />
......
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