Skip to content

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

Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

parents 01cc9d03 ddbfb679
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 879 additions and 22 deletions
public/static/plugins/ueditor/ueditor.all.min.js
View file @ 284f746f
This source diff could not be displayed because it is too large. You can view the blob instead.
src/api/ecw/offer.js
View file @ 284f746f
...@@ -88,3 +88,12 @@ export function createOfferSpecial(data) { ...@@ -88,3 +88,12 @@ export function createOfferSpecial(data) {
data: data data: data
}) })
} }
// 特价详情
export function getOfferSpecial(offerProdId) {
return request({
url: '/ecw/offer/special/info/' + offerProdId + '?offerProdId=' + offerProdId,
method: 'get'
})
}
src/api/ecw/warehouseArea.js 0 → 100644
View file @ 284f746f
import request from '@/utils/request'
// 创建库区库域
export function createWarehouseArea(data) {
return request({
url: '/ecw/warehouse-area/create',
method: 'post',
data: data
})
}
// 更新库区库域
export function updateWarehouseArea(data) {
return request({
url: '/ecw/warehouse-area/update',
method: 'put',
data: data
})
}
// 删除库区库域
export function deleteWarehouseArea(id) {
return request({
url: '/ecw/warehouse-area/delete?id=' + id,
method: 'delete'
})
}
// 获得库区库域
export function getWarehouseArea(id) {
return request({
url: '/ecw/warehouse-area/get?id=' + id,
method: 'get'
})
}
// 获得库区库域分页
export function getWarehouseAreaPage(query) {
return request({
url: '/ecw/warehouse-area/page',
method: 'get',
params: query
})
}
// 导出库区库域 Excel
export function exportWarehouseAreaExcel(query) {
return request({
url: '/ecw/warehouse-area/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
export function getWarehouseAreaList(query) {
return request({
url: '/ecw/warehouse-area/list',
method: 'get',
params: query
})
}
src/api/ecw/warehouseAreaPosition.js 0 → 100644
View file @ 284f746f
import request from '@/utils/request'
// 创建仓位
export function createWarehouseAreaPosition(data) {
return request({
url: '/ecw/warehouse-area-position/create',
method: 'post',
data: data
})
}
// 更新仓位
export function updateWarehouseAreaPosition(data) {
return request({
url: '/ecw/warehouse-area-position/update',
method: 'put',
data: data
})
}
// 删除仓位
export function deleteWarehouseAreaPosition(id) {
return request({
url: '/ecw/warehouse-area-position/delete?id=' + id,
method: 'delete'
})
}
// 获得仓位
export function getWarehouseAreaPosition(id) {
return request({
url: '/ecw/warehouse-area-position/get?id=' + id,
method: 'get'
})
}
// 获得仓位分页
export function getWarehouseAreaPositionPage(query) {
return request({
url: '/ecw/warehouse-area-position/page',
method: 'get',
params: query
})
}
// 导出仓位 Excel
export function exportWarehouseAreaPositionExcel(query) {
return request({
url: '/ecw/warehouse-area-position/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
src/components/Ueditor/index.vue
View file @ 284f746f
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
autoHeightEnabled: false, autoHeightEnabled: false,
initialFrameHeight: 300, initialFrameHeight: 300,
initialFrameWidth: '100%', initialFrameWidth: '100%',
serverUrl: process.env.VUE_APP_BASE_API + "/admin-api/ecw/lading-template/editor?api_token=" +getToken().replace("Bearer ",""), serverUrl: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/editor?api_token=" +getToken().replace("Bearer ",""),
} }
} }
}, },
......
src/views/ecw/customerConfirm/index.vue
View file @ 284f746f
...@@ -435,7 +435,7 @@ export default { ...@@ -435,7 +435,7 @@ export default {
/** 表单重置 */ /** 表单重置 */
resetHandOverForm() { resetHandOverForm() {
this.form = { this.form = {
customerId: undefined, customerIdList: undefined,
customerServiceId: undefined customerServiceId: undefined
}; };
this.resetForm("handOverForm"); this.resetForm("handOverForm");
...@@ -482,9 +482,8 @@ export default { ...@@ -482,9 +482,8 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handOver(row) { handOver(row) {
this.resetHandOverForm(); this.resetHandOverForm();
this.openHandOver = true; this.openHandOver = true;
this.handOverForm.customerId = row.id; this.handOverForm.customerIdList = [row.id];
}, },
/** 提交按钮 */ /** 提交按钮 */
...@@ -548,7 +547,7 @@ export default { ...@@ -548,7 +547,7 @@ export default {
this.openHandOver = false; this.openHandOver = false;
this.handOverForm = { this.handOverForm = {
customerId: undefined, customerId: undefined,
customerServiceId: undefined customerIdList : undefined
}; };
}, },
......
src/views/ecw/customerToBeAssigned/index.vue
View file @ 284f746f
...@@ -336,7 +336,7 @@ export default { ...@@ -336,7 +336,7 @@ export default {
} }
handOverCustomer({ handOverCustomer({
customerServiceId:this.service, customerServiceId:this.service,
customerId:this.transferData.id customerIdList :[this.transferData.id]
}).then(r=>{ }).then(r=>{
if(r.code === 0){ if(r.code === 0){
this.transferShow = false; this.transferShow = false;
......
src/views/ecw/oceanCustomer/index.vue
View file @ 284f746f
...@@ -59,13 +59,14 @@ ...@@ -59,13 +59,14 @@
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" size="mini" @click="batchHandover" <el-button type="primary" size="mini" @click="batchHandover"
:disabled="multipleSelection.length === 0"
>批量移交</el-button> >批量移交</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
<el-table-column <el-table-column
type="selection" type="selection"
width="55"> width="55">
...@@ -118,7 +119,8 @@ ...@@ -118,7 +119,8 @@
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="transferShow = false">取 消</el-button> <el-button @click="transferShow = false">取 消</el-button>
<el-button type="primary" @click="transferFn">确 定</el-button> <el-button type="primary" v-if="isBatch" @click="transferFn(multipleSelection.map(item => item.id))">确 定</el-button>
<el-button type="primary" v-else @click="transferFn([transferData.id])">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<!-- 分页组件 --> <!-- 分页组件 -->
...@@ -189,6 +191,8 @@ export default { ...@@ -189,6 +191,8 @@ export default {
service:undefined,//客服 service:undefined,//客服
transferData:undefined,//移交数据 transferData:undefined,//移交数据
transferShow:false, transferShow:false,
multipleSelection:[],
isBatch:false,
}; };
}, },
created() { created() {
...@@ -348,6 +352,8 @@ export default { ...@@ -348,6 +352,8 @@ export default {
this.service = row.customerService this.service = row.customerService
this.transferData = row; this.transferData = row;
this.transferShow =true; this.transferShow =true;
this.isBatch = false;
}, },
customerServiceFn(val){ customerServiceFn(val){
if(this.customerServiceList.length > 0){ if(this.customerServiceList.length > 0){
...@@ -357,18 +363,19 @@ export default { ...@@ -357,18 +363,19 @@ export default {
return '' return ''
} }
}, },
transferFn(){ transferFn(val){
if(!this.service){ if(!this.service){
return this.$message.warning('请选择跟进客服！'); return this.$message.warning('请选择跟进客服！');
} }
handOverCustomer({ handOverCustomer({
customerServiceId:this.service, customerServiceId:this.service,
customerId:this.transferData.id customerIdList:val
}).then(r=>{ }).then(r=>{
if(r.code === 0){ if(r.code === 0){
this.transferShow = false; this.transferShow = false;
this.service = ''; this.service = '';
this.getList(); this.getList();
this.multipleSelection = [];
this.$message.success('移交成功！'); this.$message.success('移交成功！');
} }
}) })
...@@ -397,9 +404,10 @@ export default { ...@@ -397,9 +404,10 @@ export default {
}, },
batchHandover(){ batchHandover(){
this.transferShow = true; this.transferShow = true;
this.isBatch = true
}, },
handleSelectionChange(val){ handleSelectionChange(val){
console.log(val); this.multipleSelection = val;
} }
} }
}; };
......
src/views/ecw/offer/specialDiscount.vue
View file @ 284f746f
...@@ -6,10 +6,23 @@ ...@@ -6,10 +6,23 @@
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>优惠申请</span> <span>优惠申请</span>
</div> </div>
offerId: {{ form.offerId }}<br> <el-form ref="form" :model="form" label-width="80px">
offerProdId: {{ form.offerProdId }}<br> <el-form-item label="offerId">
clearanceFreight: {{ form.clearanceFreight }}<br> <el-input v-model="form.offerId" placeholder="placeholder"></el-input>
seaFreight: {{ form.seaFreight }} </el-form-item>
<el-form-item label="offerProdId">
<el-input v-model="form.offerProdId" placeholder="placeholder"></el-input>
</el-form-item>
<el-form-item label="clearanceFreight">
<el-input v-model="form.clearanceFreight" placeholder="placeholder"></el-input>
</el-form-item>
<el-form-item label="seaFreight">
<el-input v-model="form.seaFreight" placeholder="placeholder"></el-input>
</el-form-item>
</el-form>
<h3>
{{ JSON.stringify(follow) }}
</h3>
<div> <div>
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">提交</el-button>
</div> </div>
...@@ -20,7 +33,7 @@ ...@@ -20,7 +33,7 @@
</template> </template>
<script> <script>
import {createOfferSpecial, getOffer} from "@/api/ecw/offer" import {createOfferSpecial, getOffer, getOfferSpecial} from "@/api/ecw/offer"
export default { export default {
name: "specialDiscount", name: "specialDiscount",
...@@ -46,6 +59,7 @@ export default { ...@@ -46,6 +59,7 @@ export default {
seaFreight seaFreight
} }
}) })
this.getOfferSpecial()
}, },
data() { data() {
return { return {
...@@ -56,7 +70,8 @@ export default { ...@@ -56,7 +70,8 @@ export default {
"offerId": 0, "offerId": 0,
"offerProdId": 0, "offerProdId": 0,
"seaFreight": 0 "seaFreight": 0
} },
follow: {}
} }
}, },
methods: { methods: {
...@@ -64,6 +79,11 @@ export default { ...@@ -64,6 +79,11 @@ export default {
createOfferSpecial(this.form).then(r => { createOfferSpecial(this.form).then(r => {
this.$message.success(r.msg || '提交成功') this.$message.success(r.msg || '提交成功')
}) })
},
getOfferSpecial(){
getOfferSpecial(this.form.offerProdId).then(r => {
this.follow = r.data
})
} }
} }
} }
......
src/views/ecw/warehouse/index.vue
View file @ 284f746f
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
<el-input v-model="ladingform.prefixCounter" placeholder="请输入货柜前缀" /> <el-input v-model="ladingform.prefixCounter" placeholder="请输入货柜前缀" />
</el-form-item> </el-form-item>
<el-form-item label="抬头" prop="titleZh"> <el-form-item label="抬头" prop="titleZh">
<editor v-model="ladingform.titleZh" :min-height="192"/> <ueditor v-model="ladingform.titleZh" :min-height="192"/>
</el-form-item> </el-form-item>
<el-card class="box-card"> <el-card class="box-card">
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
</el-card> </el-card>
<el-form-item label="条款" prop="contentZh"> <el-form-item label="条款" prop="contentZh">
<editor v-model="ladingform.contentZh" :min-height="192"/> <ueditor v-model="ladingform.contentZh" :min-height="192"/>
</el-form-item> </el-form-item>
<el-form-item v-if="showFlag"> <el-form-item v-if="showFlag">
...@@ -333,7 +333,7 @@ import { getDictDatas, DICT_TYPE } from '@/utils/dict' ...@@ -333,7 +333,7 @@ import { getDictDatas, DICT_TYPE } from '@/utils/dict'
import {CommonStatusEnum} from '@/utils/constants' import {CommonStatusEnum} from '@/utils/constants'
import { uploadFile } from "@/api/infra/file"; import { uploadFile } from "@/api/infra/file";
import { listDept } from "@/api/system/dept"; import { listDept } from "@/api/system/dept";
import Editor from '@/components/Editor'; import Ueditor from '@/components/Ueditor'
import {getDictData} from '@/utils/dict' import {getDictData} from '@/utils/dict'
import RoutersSelector from '@/components/RoutersSelector'; import RoutersSelector from '@/components/RoutersSelector';
import { has } from 'min-dash'; import { has } from 'min-dash';
...@@ -343,7 +343,7 @@ export default { ...@@ -343,7 +343,7 @@ export default {
name: "Warehouse", name: "Warehouse",
components: { components: {
Template, Template,
Editor, Ueditor,
RoutersSelector RoutersSelector
}, },
data() { data() {
......
src/views/ecw/warehouseArea/index.vue 0 → 100644
View file @ 284f746f
<template>
<div class="app-container">
<!-- 操作工具栏 -->
<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="['ecw:warehouse-area:create']">新增库域</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list" row-key="id" default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="代码" align="center" prop="code" />
<el-table-column label="类型" align="center" prop="pid">
<template slot-scope="scope">
<span>{{ scope.row.pid == 0 ? '库域' : '库区' }}</span>
</template>
</el-table-column>
<el-table-column label="仓库" align="center" prop="warehouse" width="180">
<template slot-scope="scope">
<span>{{ warehouseName(scope.row.warehouseId) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:warehouse-area:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:warehouse-area:delete']">删除</el-button>
<el-button size="mini" type="text" @click="handleCreate(scope.row)" v-if="scope.row.pid==0"
v-hasPermi="['ecw:warehouse-area:create']">添加库区</el-button>
<el-button size="mini" type="text" @click="positionManager(scope.row)" v-if="scope.row.pid>0"
v-hasPermi="['ecw:warehouse-area:create']">查看仓位</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@pagination="getList"/>
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="上级库域" prop="parentName" v-if="parentDo">
<span>{{parentDo.name}}</span>
</el-form-item>
<el-form-item label="类型" prop="parentType" v-if="parentDo">
<span>库区</span>
</el-form-item>
<el-form-item label="名称" prop="name">
<el-input v-model="form.name" placeholder="请输入名称" />
</el-form-item>
<el-form-item label="代码" prop="code">
<el-input v-model="form.code" placeholder="请输入代码" />
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-select v-model="form.warehouseId" clearable :disabled="parentDo">
<el-option v-for="warehouse in warehouseList" :key="warehouse.id" :label="warehouse.titleZh" :value="warehouse.id" />
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { createWarehouseArea, updateWarehouseArea, deleteWarehouseArea, getWarehouseArea, getWarehouseAreaPage, exportWarehouseAreaExcel } from "@/api/ecw/warehouseArea";
import { getWarehouseList } from "@/api/ecw/warehouse"
export default {
name: "WarehouseArea",
components: {
},
data() {
return {
//仓库列表
warehouseList: [],
parentDo:null,
// 遮罩层
loading: true,
// 导出遮罩层
exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 库区库域列表
list: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
dateRangeCreateTime: [],
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 10,
warehouseId: null,
name: null,
code: null,
pid: null,
status: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
}
};
},
computed: {
warehouseName() {
return warehouseId => {
for(let index in this.warehouseList) {
let warehouseItem = this.warehouseList[index];
if(warehouseItem.id == warehouseId) {
return warehouseItem.titleZh;
}
}
}
},
},
created() {
this.requestWarehouseList();
this.getList();
},
methods: {
positionManager(row) {
this.$router.push('/warehouse/warehouse-area-position?areaId=' + row.id);
},
/**查询仓库 */
requestWarehouseList() {
getWarehouseList({}).then(response => {
this.warehouseList = response.data;
})
},
/** 查询列表 */
getList() {
this.loading = true;
// 处理查询参数
let params = {...this.queryParams};
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行查询
getWarehouseAreaPage(params).then(response => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
});
},
/** 取消按钮 */
cancel() {
this.open = false;
this.reset();
},
/** 表单重置 */
reset() {
this.parentDo = null;
this.form = {
id: undefined,
warehouseId: undefined,
name: undefined,
code: undefined,
pid: undefined,
status: undefined,
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dateRangeCreateTime = [];
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加库区库域";
},
/** 新增库区 */
handleCreate(row) {
this.reset();
this.parentDo = row;
this.form.warehouseId = row.warehouseId;
this.form.pid = row.id;
this.open = true;
this.title = "添加库区库域";
},
findParent(pid) {
for(let index in this.list) {
let row = this.list[index];
if(row.id == pid) return row;
}
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id;
getWarehouseArea(id).then(response => {
this.form = response.data;
if(this.form.pid > 0) {
this.parentDo = this.findParent(this.form.pid);
}
this.open = true;
this.title = "修改库区库域";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (!valid) {
return;
}
// 修改的提交
if (this.form.id != null) {
updateWarehouseArea(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
return;
}
// 添加的提交
createWarehouseArea(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
});
},
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除库区库域编号为"' + id + '"的数据项?').then(function() {
return deleteWarehouseArea(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// 处理查询参数
let params = {...this.queryParams};
params.pageNo = undefined;
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有库区库域数据项?').then(() => {
this.exportLoading = true;
return exportWarehouseAreaExcel(params);
}).then(response => {
this.$download.excel(response, '${table.classComment}.xls');
this.exportLoading = false;
}).catch(() => {});
}
}
};
</script>
src/views/ecw/warehouseAreaPosition/index.vue 0 → 100644
View file @ 284f746f
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