Skip to content

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

6

parents b6038ad7 d46efa88
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3454 additions and 4573 deletions
.prettierignore 0 → 100644
View file @ f59219b7
zall-sdk-javascript-master/
\ No newline at end of file
.prettierrc 0 → 100644
View file @ f59219b7
{
"printWidth": 800,
"semi": false,
"psingleQuote": true,
"trailingComma": "none"
}
\ No newline at end of file
src/api/ecw/customer.js
View file @ f59219b7
......@@ -550,3 +550,11 @@ export function competitorListAll(){
method:'get'
})
}
export function customerMergeCus(params){
return request({
url:'ecw/customer/mergeCus',
method:'get',
params
})
}
\ No newline at end of file
src/api/ecw/orderCargoControl.js
View file @ f59219b7
import request from '@/utils/request'
import request from "@/utils/request"
// 获得控货分页
export function getCargoControlOrderPage(params){
export function getCargoControlOrderPage(params) {
return request({
url:'ecw/order-cargo-control/cargo/control/order',
method:'get',
url: "ecw/order-cargo-control/cargo/control/order",
method: "get",
params
})
}
export function getWarningCargoControlOrderPage(params){
export function getWarningCargoControlOrderPage(params) {
return request({
url:'ecw/order-cargo-control/warning/cargo/control/order',
method:'get',
url: "ecw/order-cargo-control/warning/cargo/control/order",
method: "get",
params
})
}
// 发送手机验证码
export function sendSmsCode(data){
export function sendSmsCode(data) {
return request({
url: '/ecw/order-cargo-control/send-sms-code',
method: 'post',
url: "/ecw/order-cargo-control/send-sms-code",
method: "post",
data
})
}
// 创建订单控货人信息
export function create(data){
export function create(data) {
return request({
url: '/ecw/order-cargo-control/create',
method: 'post',
url: "/ecw/order-cargo-control/create",
method: "post",
data
})
}
// 创建订单控货人放货记录
export function createPick(data){
export function createPick(data) {
return request({
url: '/ecw/order-cargo-control-pick/create',
method: 'post',
url: "/ecw/order-cargo-control-pick/create",
method: "post",
data
})
}
//获得控货订单放货编辑详情
export function getReleaseInfo(orderId){
export function getReleaseInfo(orderId) {
return request({
url:'/ecw/order-cargo-control/release/info/' + orderId,
method:'get'
url: "/ecw/order-cargo-control/release/info/" + orderId,
method: "get"
})
}
// 获得控货订单放货详情
export function getPickRleaseInfo(orderId){
export function getPickRleaseInfo(orderId) {
return request({
url:'/ecw/order-cargo-control-pick/release/info/' + orderId,
method:'get'
url: "/ecw/order-cargo-control-pick/release/info/" + orderId,
method: "get"
})
}
// 放货修改与反复核申请
export function updateApply(data){
export function updateApply(data) {
return request({
url: '/ecw/order-cargo-control-pick/update/apply',
method: 'put',
url: "/ecw/order-cargo-control-pick/update/apply",
method: "put",
data
})
}
// 复核(放货复核)
export function review(id){
export function review(id) {
return request({
url: '/ecw/order-cargo-control-pick/review/' + id,
method: 'put'
url: "/ecw/order-cargo-control-pick/review/" + id,
method: "put"
})
}
// 取消放货
export function cancel(id){
export function cancel(id) {
return request({
url: '/ecw/order-cargo-control-pick/cancel/' + id,
method: 'put'
url: "/ecw/order-cargo-control-pick/cancel/" + id,
method: "put"
})
}
// 取消审批
export function cancelApproval(approvalId, params){
export function cancelApproval(approvalId, params) {
return request({
url: '/ecw/order-cargo-control-pick/cancel/approval/' + approvalId,
method: 'get',
url: "/ecw/order-cargo-control-pick/cancel/approval/" + approvalId,
method: "get",
params
})
}
// 订单复核
export function orderReview(orderId){
export function orderReview(orderId) {
return request({
url: '/ecw/order-cargo-control/review/' + orderId,
method: 'put'
url: "/ecw/order-cargo-control/review/" + orderId,
method: "put"
})
}
// 根据订单id批量复合订单控货人放货
export function batchReview(data){
export function batchReview(data) {
return request({
url: '/ecw/order-cargo-control-pick/review/',
method: 'put',
url: "/ecw/order-cargo-control-pick/review/",
method: "put",
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
"Content-Type": "application/x-www-form-urlencoded"
},
data
})
}
// 获得可调货的控货订单列表
export function seasoningCondimentsSelect(params){
export function seasoningCondimentsSelect(params) {
return request({
url: '/ecw/order-cargo-control-pick/seasoning-condiments/cargo-control/order/select',
method: 'get',
url: "/ecw/order-cargo-control-pick/seasoning-condiments/cargo-control/order/select",
method: "get",
params
})
}
// 根据放货ID查询控货订单放货修改审核详情
export function getPickUpdateInfo(id){
export function getPickUpdateInfo(id) {
return request({
url: '/ecw/order-cargo-control-pick/update/info/' + id,
method: 'get'
url: "/ecw/order-cargo-control-pick/update/info/" + id,
method: "get"
})
}
// 获得控货订单放货修改申请详情 {approveId: 1}
export function getPickUpdateApproveInfo(params){
export function getPickUpdateApproveInfo(params) {
return request({
url: '/ecw/order-cargo-control-pick/update/info',
method: 'get',
url: "/ecw/order-cargo-control-pick/update/info",
method: "get",
params
})
}
export function getCondimentsIno(cargoControlPickId){
export function getCondimentsIno(cargoControlPickId) {
return request({
url: '/ecw/order-cargo-control-pick/seasoning/condiments/info/' + cargoControlPickId,
method: 'get'
url: "/ecw/order-cargo-control-pick/seasoning/condiments/info/" + cargoControlPickId,
method: "get"
})
}
// 参数搜索导出控货订单列表
export function exportCargoControl(params){
export function exportCargoControl(params) {
return request({
url: '/ecw/order/export/cargo/control/search',
method: 'get',
responseType: 'arraybuffer',
url: "/ecw/order/export/cargo/control/search",
method: "get",
responseType: "arraybuffer",
params
})
}
// 控货日志
export function getControlLogList(orderId){
export function getControlLogList(orderId) {
return request({
url: '/order/order-control-log/list/' + orderId,
method: 'get'
url: "/order/order-control-log/list/" + orderId,
method: "get"
})
}
// 控货业务审批申请
export function applyCargoControlApproval(data){
export function applyCargoControlApproval(data) {
return request({
url: 'ecw/order-cargo-control/update/apply',
method: 'put',
url: "ecw/order-cargo-control/update/apply",
method: "put",
data
})
}
//根据订单ID查询控货订单放货限制修改审核详情
export function getLimitUpdateInfo(orderId){
export function getLimitUpdateInfo(orderId) {
return request({
url: "/ecw/order-cargo-control/limit-update/info/" + orderId,
method: "get"
})
}
//根据订单ID查询海外仓模式修改审核详情
export function getReleaseTypeUpdateInfo(orderId) {
return request({
url: '/ecw/order-cargo-control/limit-update/info/' + orderId,
method: 'get'
url: "/ecw/order-cargo-control/overseas-warehouse-update/info/" + orderId,
method: "get"
})
}
src/i18n/languages/en_US.json
View file @ f59219b7
......@@ -4707,5 +4707,12 @@
"下次跟进时间": "Next follow-up time",
"提交结果": "Submit result",
"增加计划": "add plan",
"是否确认导出客户跟进记录数据项?": "Are you sure to export all customer follow-up record data items?"
"是否确认导出客户跟进记录数据项?": "Are you sure to export all customer follow-up record data items?",
"海外仓模式修改": "Modify overseas warehouse mode",
"合并客户": "Merge customer",
"保留客户": "Retained customer",
"​被合并客户-非主客户": "Consolidated customer - Non-principal customer",
"注意事项": "Matters need attention",
"选择客户": "Select a customer",
"运输": "Transportation"
}
src/permission.js
View file @ f59219b7
import router from './router'
import store from './store'
import { Message } from 'element-ui'
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import { getToken } from '@/utils/auth'
import { isRelogin } from '@/utils/request'
import router from "./router";
import store from "./store";
import { Message } from "element-ui";
import NProgress from "nprogress";
import "nprogress/nprogress.css";
import { getToken } from "@/utils/auth";
import { isRelogin } from "@/utils/request";
NProgress.configure({ showSpinner: false })
NProgress.configure({ showSpinner: false });
// 增加三方登陆 update by 芋艿
const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee']
const whiteList = [
"/login",
"/social-login",
"/auth-redirect",
"/bind",
"/register",
"/oauthLogin/gitee",
];
router.beforeEach((to, from, next) => {
NProgress.start()
NProgress.start();
if (to.matched && to.matched.length > 2) {
to.matched.splice(1, to.matched.length - 2);
}
if (getToken()) {
to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
to.meta.title && store.dispatch("settings/setTitle", to.meta.title);
/* has token*/
if (to.path === '/login') {
next({ path: '/' })
NProgress.done()
if (to.path === "/login") {
next({ path: "/" });
NProgress.done();
} else {
if (store.getters.roles.length === 0) {
isRelogin.show = true
isRelogin.show = true;
// 获取字典数据 add by 芋艿
store.dispatch('dict/loadDictDatas')
store.dispatch("dict/loadDictDatas");
// 判断当前用户是否已拉取完user_info信息
store.dispatch('GetInfo').then(() => {
isRelogin.show = false
store.dispatch('GenerateRoutes').then(accessRoutes => {
store
.dispatch("GetInfo")
.then(() => {
isRelogin.show = false;
store.dispatch("GenerateRoutes").then((accessRoutes) => {
// 根据roles权限生成可访问的路由表
router.addRoutes(accessRoutes) // 动态添加可访问路由表
next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
})
}).catch(err => {
store.dispatch('LogOut').then(() => {
Message.error(err)
next({ path: '/' })
})
router.addRoutes(accessRoutes); // 动态添加可访问路由表
next({ ...to, replace: true }); // hack方法 确保addRoutes已完成
});
})
.catch((err) => {
store.dispatch("LogOut").then(() => {
Message.error(err);
next({ path: "/" });
});
});
} else {
next()
next();
}
}
} else {
// 没有token
if (whiteList.indexOf(to.path) !== -1) {
// 在免登录白名单，直接进入
next()
next();
} else {
next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
NProgress.done()
next(`/login?redirect=${to.fullPath}`); // 否则全部重定向到登录页
NProgress.done();
}
}
})
});
router.afterEach(() => {
NProgress.done()
})
NProgress.done();
});
src/views/bpm/processInstance/detail.vue
View file @ f59219b7
This diff is collapsed.
src/views/ecw/customer/addPotentialCustom.vue
View file @ f59219b7
......@@ -145,7 +145,7 @@ export default {
if (valId) {
let p = {...this.form}
p.type = p.type.join(',')
p.customerContacts[0].name = p.name + p.customerContacts[0].phoneNew
p.customerContacts[0].name = p.name
createPotential(p).then(r => {
if (r.code === 0) {
this.$emit('change');
......
src/views/ecw/customer/components/customerFollowSelectOffer.vue
View file @ f59219b7
......@@ -76,7 +76,7 @@
<pagination v-show="offerTotal > 0" :total="offerTotal" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@pagination="getOfferList"/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirm">{{$t('确定')}}</el-button>
<el-button type="primary" @click="confirm">{{$t('确 定')}}</el-button>
</div>
</el-dialog>
</template>
......
src/views/ecw/customer/components/customerMerge.vue 0 → 100644
View file @ f59219b7
This diff is collapsed.
src/views/ecw/customer/index.vue
View file @ f59219b7
......@@ -581,7 +581,6 @@
>{{ $t("新增潜在客户") }}</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
......@@ -589,6 +588,8 @@
icon="el-icon-plus"
size="mini"
@click="handleMergeCus"
v-has-permi="[selectAuthorityFn('ecw:customer:merge')]"
v-if="path === '/customer/customer'"
>{{ $t("合并客户") }}</el-button
>
</el-col>
......@@ -1360,6 +1361,15 @@
ref="customerSetting"
@refresh="getList"
></customer-setting>
<customer-merge
ref="customerMerge"
@refresh="getList"
:countryList="countryList"
:getNodeLists="getNodeLists"
:productTypeList="getNodeLists"
:customerSelectFn="customerSelectFn"
v-if="customerMergeVisible"
></customer-merge>
<!--业绩类型 -->
<el-dialog title="业绩类型" :visible.sync="dialogVisible" width="30%">
<div>
......@@ -1422,6 +1432,7 @@ import Template from "@/views/cms/template/index.vue";
import AddPotentialCustom from "@/views/ecw/customer/addPotentialCustom.vue";
import Contacts from "@/views/ecw/customer/components/contacts.vue";
import CustomerSetting from "./components/customerSetting.vue";
import CustomerMerge from "./components/customerMerge.vue";
import AreaCodeSelector from "@/components/AreaCodeSelector/index.vue";
import { getCustomerSelect } from "@/api/ecw/customer";
import { getProductTypeList } from "@/api/ecw/productType";
......@@ -1438,7 +1449,8 @@ export default {
customerComplaints,
transferCustomer,
AreaCodeSelector,
CustomerSetting
CustomerSetting,
CustomerMerge
},
data() {
return {
......@@ -1552,6 +1564,7 @@ export default {
userId: undefined, //lanbm 2024-05-23 add
customerService: undefined,
customerFollowVisible: false,
customerMergeVisible: false,
enterOpenSeaTime: [],
customerServiceConfirmedTime: [],
firstDealTime: [],
......@@ -1712,8 +1725,13 @@ export default {
this.getList();
},
methods: {
handleMergeCus() {
//合并客户
handleMergeCus() {
this.customerMergeVisible = true
this.$nextTick(_ => {
this.$refs['customerMerge'].init()
this.$refs['customerMerge'].dialogVisible = true
})
},
recovery(row) {
this.$confirm(this.$t("是否要回收当前{name}", row), "提示", {
......@@ -2097,20 +2115,6 @@ export default {
return null
}
},
getBusiCountryNames(ids) {
if (ids) {
const idsArr = ids.split(',')
const strArr = []
this.countryList.forEach(item => {
if (idsArr.includes(item.id.toString())) {
strArr.push(this.isChinese ? item.nameZh : item.nameEn)
}
})
return strArr.length > 0 ? strArr.join(',') : null
} else {
return null
}
},
getPickupPointNames(ids) {
if (ids) {
const idsArr = ids.split(',')
......
src/views/ecw/customer/query.vue
View file @ f59219b7
......@@ -283,7 +283,7 @@
{{row.pickNum | deliveryRate(row.sumNum)}}
</template>
</el-table-column>
<el-table-column :label="$t('客户经理')" align="center" prop="customerName" />
<el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName" />
<el-table-column :label="$t('业绩归属客户方')" align="center" prop="customerName" />
</el-table>
<pagination @pagination="getorderList" :page.sync="queryParams.page" :limit.sync="queryParams.rows" :total="orderTotal" ></pagination>
......@@ -735,11 +735,13 @@
<el-tab-pane name="special" :label="$t('特殊设置')">
<el-descriptions :column="2">
<el-descriptions-item :label="$t('是否显示提单价格')">
<el-switch v-model="customer.isShowTidanPrice" disabled></el-switch>
<el-switch v-model="customer.isShowTidanPrice" disabled />
</el-descriptions-item>
<el-descriptions-item :label="$t('到仓确认')">{{ customer.arrivalConfirm }}</el-descriptions-item>
<el-descriptions-item :label="$t('重货标准')">{{ customer.weightUnit }}</el-descriptions-item>
<el-descriptions-item :label="$t('泡货标准')">{{ customer.lightUnit }}</el-descriptions-item>
<el-descriptions-item :label="$t('到仓确认')">
<el-switch v-model="customer.arrivalConfirm" :active-value="1" :inactive-value="0" disabled />
</el-descriptions-item>
<el-descriptions-item :label="$t('重货标准')">{{ customer.weightUnit ? `${customer.weightUnit}kg/cbm` : '' }}</el-descriptions-item>
<el-descriptions-item :label="$t('泡货标准')">{{ customer.lightUnit ? `${customer.lightUnit}kg/cbm` : ''}}</el-descriptions-item>
<el-descriptions-item :label="$t('控制无收货人')">
<el-switch v-model="customer.noConsignee" disabled />
</el-descriptions-item>
......
src/views/ecw/giftManagement/index.vue
View file @ f59219b7
......@@ -175,7 +175,7 @@
{{ handlePickMethod(row.pickMethod) }}
</template>
</el-table-column>
<el-table-column :label="$t('兑换网点')" align="center">
<el-table-column :label="$t('提货点')" align="center">
<template #default="{ row }">
{{
isChinese
......@@ -494,7 +494,7 @@ export default {
},
handleExchange(row) {
this.$router.push({
path: "/giftManagement/bulkExchange",
path: "/member/giftManagement/bulkExchange",
query: { rewardsID: row.id },
});
},
......
src/views/ecw/memberManagement/exchangeRecord/index.vue
View file @ f59219b7
......@@ -28,6 +28,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('会员编号')">
<el-input
v-model.trim="queryParams.memberCode"
style="width: 300px"
:placeholder="$t('请输入会员编号')"
clearable
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('领取方式')">
<dict-selector
v-model="queryParams.redeemType"
......@@ -179,8 +189,16 @@
width="140"
:label="$t('兑换记录ID')"
align="center"
prop="redemptionNumber"
/>
>
<template #default="{ row }">
<el-button
size="mini"
type="text"
@click="handleViewRecord(row )"
>{{ row.redemptionNumber}}</el-button
>
</template>
</el-table-column>
<el-table-column
width="140"
:label="$t('礼品ID')"
......@@ -297,14 +315,14 @@
@click="handleRewardEdit(scope.row)"
>{{ $t("编辑") }}</el-button
>
<el-button
<!-- <el-button
v-hasPermi="['ecw:memberManagement:view']"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleViewRecord(scope.row)"
>{{ $t("查看") }}</el-button
>
> -->
<el-button
v-hasPermi="['ecw:memberManagement:verification']"
size="mini"
......@@ -494,6 +512,7 @@ export default {
queryParams: {
rewardTitle: "",
memberName: "", // 会员昵称
memberCode:"", //会员编号
redeemType: "", // 兑换方式
status: "",
rewardCount: "",
......@@ -525,8 +544,17 @@ export default {
},
immediate: true,
},
"$route.query.memberCode": {
handler(val) {
if (val) {
this.queryParams.memberCode= val;
}
},
immediate: true,
},
},
created() {
this.getNodeListAPI();
this.handleQuery();
},
......@@ -573,21 +601,21 @@ export default {
// 核销
handleVerify(row) {
this.$router.push({
path: "/memberManagement/exchangeRecordOperation",
path: "/member/memberManagement/exchangeRecordOperation",
query: { exchangeRewardID: row.id, pageStatus: "verify" },
});
},
// 查看按钮操作
handleViewRecord(row) {
this.$router.push({
path: "/memberManagement/exchangeRecordOperation",
path: "/member/memberManagement/exchangeRecordOperation",
query: { exchangeRewardID: row.id, pageStatus: "view" },
});
},
// 兑换记录编辑操作
handleRewardEdit(row) {
this.$router.push({
path: "/memberManagement/exchangeRecordOperation",
path: "/member/memberManagement/exchangeRecordOperation",
query: { exchangeRewardID: row.id, pageStatus: "edit" },
});
},
......@@ -721,7 +749,7 @@ export default {
// 新增兑换
handleNewExchange() {
this.$router.push({
path: "/memberManagement/exchangeRecordOperation",
path: "/member/memberManagement/exchangeRecordOperation",
});
},
getNodeListAPI() {
......@@ -766,6 +794,7 @@ export default {
city: null,
endTime: null,
holdScore: null,
memberCode:'',
holdScoreOperate: null,
key: null,
redemptionNumber: null,
......@@ -808,6 +837,7 @@ export default {
country: null,
city: null,
endTime: null,
memberCode:'',
holdScore: null,
holdScoreOperate: null,
key: null,
......
src/views/ecw/memberManagement/exchangeRecordOperation/components/chooseGift.vue
View file @ f59219b7
......@@ -153,7 +153,7 @@
></el-table-column>
<el-table-column :label="$t('礼品名称')" align="center">
<template slot-scope="scope">
<el-button type="text" @click="handleView(scope.row)">{{
<el-button type="text" >{{
isChinese ? scope.row.titleZh : scope.row.titleEn
}}</el-button>
</template>
......@@ -415,7 +415,7 @@ export default {
},
handleExchange(row) {
this.$router.push({
path: "/giftManagement/bulkExchange",
path: "/member/giftManagement/bulkExchange",
query: { rewardsID: row.id },
});
},
......
src/views/ecw/memberManagement/integralRecord/index.vue
View file @ f59219b7
......@@ -174,6 +174,12 @@
{{ parseTime(row.createTime) || "/" }}</template
>
</el-table-column>
<el-table-column :label="$t('积分到期时间')" align="center">
<template v-slot="{ row }">
{{ parseTime(row.expireTime) || "/" }}</template
>
</el-table-column>
<el-table-column width="300" :label="$t('详细信息')" align="center">
<template v-slot="{ row }">
<!-- 人工操作-->
......@@ -186,7 +192,7 @@
type="text"
@click="
$router.push({
path: '/memberManagement/exchangeRecordOperation',
path: '/member/memberManagement/exchangeRecordOperation',
query: {
pageStatus: 'view',
exchangeRewardID: row.extParamJson.redeemId,
......@@ -230,7 +236,7 @@
type="text"
@click="
$router.push({
path: '/memberManagement/addIntegrationRuleOperation',
path: '/member/memberManagement/addIntegrationRuleOperation',
query: {
id: row.extParamJson.scoreRuleId,
pageStatus: 'view',
......@@ -258,6 +264,9 @@ import { queryMemberScoreRecord } from "@/api/ecw/memberManagement";
export default {
name: "EcwMembermanagementIntegralrecord",
props:{
memberCode:[String, Number],
},
data() {
return {
dateRangeCreateTime: [],
......@@ -285,7 +294,27 @@ export default {
return this.$i18n.locale === "zh_CN";
},
},
watch:{
memberCode:{
handler: function (newVal, oldVal) {
if(newVal){
this.queryParams.memberId= newVal
}
},
immediate: true,
},
$route: {
handler: function (route) {
const query = route.query;
if (query.memberCode) {
this.queryParams.key = this.$route.query.memberCode
}
},
immediate: true,
},
},
created() {
this.handleQuery();
},
activated() {
......
src/views/ecw/memberManagement/memberPointsSummary/index.vue
View file @ f59219b7
......@@ -149,7 +149,10 @@
<template #default="{ row }">
<el-button
type="text"
@click="$router.push('/memberManagement/integralRecord')"
@click="$router.push(
{path:'/member/memberManagement/integralRecord',
query: {memberCode:row.memberCode}
})"
>{{ row.holdScore }}</el-button
>
</template>
......@@ -158,7 +161,9 @@
<template #default="{ row }">
<el-button
type="text"
@click="$router.push('/memberManagement/exchangeRecord')"
@click="$router.push({path:'/member/giftManagement/exchangeRecord',
query: {memberCode:row.memberCode}
})"
>{{ row.usedScore }}</el-button
>
</template>
......
src/views/ecw/memberManagement/sharingStatistics/index.vue
View file @ f59219b7
......@@ -207,7 +207,7 @@ export default {
goShareDetails(row) {
if (row.triggerCount != "0") {
this.$router.push({
path: "/memberManagement/sharingStatisticalDetails",
path: "/member/memberManagement/sharingStatisticalDetails",
query: {
id: row.id,
},
......
src/views/ecw/offer/edit.vue
View file @ f59219b7
This diff is collapsed.
src/views/ecw/order/cargoControl.vue
View file @ f59219b7
This diff is collapsed.
src/views/ecw/order/cargoControlDetail.vue
View file @ f59219b7
This diff is collapsed.
src/views/ecw/order/components/updateReleaseType.vue 0 → 100644
View file @ f59219b7
<template>
<el-dialog :visible="show" @close="handleClose" :title="$t('海外仓修改申请')" width="1000px">
<el-form label-position="left" label-width="150px" :model="form" :disabled="applyStatus === 1">
<el-row :gutter="20">
<!-- 订单号 -->
<el-col :span="8">
<el-form-item :label="$t('订单号')">
<span>{{ order.orderNo }}</span>
</el-form-item>
</el-col>
<!-- 总箱数 -->
<el-col :span="8">
<el-form-item :label="$t('总箱数')">
<span>{{ order.sumNum }}</span>
</el-form-item>
</el-col>
<!-- 体积 -->
<el-col :span="8">
<el-form-item :label="$t('体积')">
<span>{{ order.sumVolume }}m³</span>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<!-- 重量 -->
<el-col :span="8">
<el-form-item :label="$t('重量')">
<span>{{ order.sumWeight }}Kg</span>
</el-form-item>
</el-col>
<!-- 总控箱数 -->
<el-col :span="8">
<el-form-item :label="$t('总控货箱数')">
<span>{{ order.sumNum }}</span>
</el-form-item>
</el-col>
<!-- 剩余放货箱数 -->
<el-col :span="8">
<el-form-item :label="$t('剩余放货箱数')">
<span>{{ order.sumNum - order.releaseNum }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<!-- 邮库/到仓时间 -->
<el-col :span="8">
<el-form-item :label="$t('卸柜/到仓时间')">
<span>{{ order.unloadTime }}</span>
</el-form-item>
</el-col>
<!-- 订单限制修改收货人 -->
<el-col :span="8">
<el-form-item :label="$t('订单限制修改收货人')">
<span>{{ order.isLimitUpdateConsignee ? $t("是") : $t("否") }}</span>
</el-form-item>
</el-col>
<!-- 订单锁定收货人天数 -->
<el-col :span="8" v-if="order.isLimitUpdateConsignee">
<el-form-item :label="$t('订单锁定收货人天数')">
<span>{{ order.lockConsigneeDay }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('增值服务')">
<span>{{ order.orgIsOverseasWarehouse ? $t("海外仓") : $t("非海外仓") }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" v-if="order.isLimitUpdateConsignee">
<!-- 放货锁定收货人到期时间 -->
<el-col :span="12">
<el-form-item :label="$t('放货锁定收货人到期时间')" label-width="180px">
<span>{{ order.lockConsigneeTime }}</span>
</el-form-item>
</el-col>
</el-row>
<el-divider>{{ $t("修改信息") }}</el-divider>
<el-row :gutter="20">
<!-- 修改海外仓模式 -->
<el-col :span="24">
<el-form-item :label="$t('增值服务')">
<el-tag>{{ form.newIsOverseasWarehouse ? $t("海外仓") : $t("非海外仓") }}</el-tag>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<!-- 修改原因 -->
<el-col :span="24">
<el-form-item :label="$t('修改原因')">
<el-input type="textarea" v-model="form.reasonZh"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<!-- 附件 -->
<el-col :span="24">
<el-form-item :label="$t('附件')">
<file-upload v-model="form.annex" :fileType="fileType"></file-upload>
</el-form-item>
</el-col>
</el-row>
<el-row>
<work-flow xmlkey="order_consignee_limit_change" v-model="form.ccIds"></work-flow>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose">{{ $t("取消") }}</el-button>
<el-button v-if="applyStatus === 1" type="primary" @click="handleGoBpm">{{ $t("审批中") }}</el-button>
<el-button v-else type="primary" @click="handleSubmit" :loading="loading">{{ $t("确定") }}</el-button>
</span>
</el-dialog>
</template>
<script>
import WorkFlow from "@/components/WorkFlow/index.vue"
import FileUpload from "@/components/FileUpload/index.vue"
import { applyCargoControlApproval, getReleaseTypeUpdateInfo } from "@/api/ecw/orderCargoControl"
import dayjs from "dayjs"
import { getApproval } from "@/api/ecw/order"
export default {
components: {
FileUpload,
WorkFlow
},
props: {
order: Object
},
data() {
return {
// 是否显示弹窗
show: true,
fileType: ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", "pdf", "jpg", "jpeg", "png", "mp4", "mov", "avi", "mp3"],
applyStatus: 0, // 审批状态: 1 处理中 2 通过 3 不通过 4 已取消
bpmId: null, // 审批流程ID
form: {
// 申请类型：此处应该是 61 放货限制修改申请 62 海外仓修改申请
applyType: 62,
newIsOverseasWarehouse: null,
// 修改原因
reasonZh: "",
// 附件
annex: "",
ccIds: []
},
// 审批信息
approvalDetail: null,
loading: false
}
},
mounted() {
// 根据订单获取审批详情
this.getApply()
},
methods: {
getApply() {
// 先重置
this.applyStatus = 0
getReleaseTypeUpdateInfo(this.order.orderId).then((res) => {
const data = res.data
console.log({ data })
this.form.applyType = 62
this.form.newIsOverseasWarehouse = data.newIsOverseasWarehouse
this.form.reasonZh = data.reasonZh
this.form.annex = data.annex
this.form.ccIds =
data.ccIds
?.split(",")
.filter((item) => !!item)
.map((item) => Number(item)) || []
this.applyStatus = data.applyStatus
this.bpmId = data.formId
})
},
/* getApproval(){
getApproval(this.id).then(res => {
this.approvalDetail = res.data
})
}, */
handleGoBpm() {
console.log("跳转审批页面，待完善")
this.handleClose()
this.$router.push({
path: "/bpm/process-instance/detail",
query: {
id: this.bpmId
}
})
},
handleClose() {
this.show = false
this.$emit("close")
},
handleSubmit() {
const data = {
...this.form,
ccIds: this.form.ccIds.join(","),
orderId: this.order.orderId
}
this.loading = true
applyCargoControlApproval(data)
.then((res) => {
this.$message.success(this.$t("操作成功"))
this.$emit("success")
this.handleClose()
})
.catch(() => {
this.loading = false
})
}
}
}
</script>
src/views/ecw/order/components/updateReleaseTypeApproval.vue 0 → 100644
View file @ f59219b7
This diff is collapsed.
src/views/ecw/order/detail.vue
View file @ f59219b7
......@@ -81,10 +81,10 @@
</el-descriptions-item>
<el-descriptions-item v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, order.transportId).cssClass == 'channel'":label="$t('出货渠道')" >{{order.channelName}}</el-descriptions-item>
<el-descriptions-item :label="$t('服务')" >
<el-tag v-if="order.type.indexOf('1') > -1">
<el-tag v-if="order.type && order.type.indexOf('1') > -1">
{{ $t('集运') }}
</el-tag>
<el-tag v-if="order.type.indexOf('2') > -1">
<el-tag v-if="order.type && order.type.indexOf('2') > -1">
{{ $t('海外仓') }}
</el-tag>
</el-descriptions-item>
......
src/views/ecw/order/index.vue
View file @ f59219b7
This diff is collapsed.
src/views/ecw/order/warningCargoControl.vue
View file @ f59219b7
This diff is collapsed.
src/views/ecw/region/index.vue
View file @ f59219b7
This diff is collapsed.
src/views/member/user/memberDetails.vue
View file @ f59219b7
This diff is collapsed.
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