aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-12-31 09:14:06 +08:00
parent f00dac4cf6
commit 87a028a420
5 changed files with 290 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/api/monitor/cache.js
View File

@ -7,3 +7,69 @@ export function getCache() {
method: 'get'
})
}
export function getCacheInfo() {
return request({
url: '/monitor/cache/getCacheInfo',
method: 'get',
})
}
/**
* 获取Redis指定的key，如不指定，则获取所有
*/
export function getCacheKeys(data) {
return request({
url: '/monitor/cache/getCacheKeys',
method: 'POST',
data: data
})
}
/**
* 获取key的个数
*/
export function getKeysCount() {
return request({
url: '/monitor/cache/getKeysCount',
method: 'get',
})
}
/**
* 根据key获取value信息
*/
export function getValueByKey(data) {
return request({
url: '/monitor/cache/getValueByKey',
method: 'POST',
data: data
})
}
/**
* 根据key删除缓存信息
*/
export function delKey(data) {
return request({
url: '/monitor/cache/delKey',
method: 'POST',
data: data
})
}
/**
* 删除所有缓存
*/
export function delKeys(data) {
return request({
url: '/monitor/cache/delKeys',
method: 'POST',
data: data
})
}

144
src/views/emis/emisSettlePayRecord/index.vue
View File

@ -1,8 +1,95 @@
<template>
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="9">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-form-item label="" prop="queryKey" label-width="80px">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderType">
<el-radio :key="1" label="1">运单号</el-radio>
<el-radio :key="2" label="2">账单号</el-radio>
</el-radio-group>
</div>
<XdTextareaInput
v-model="queryParams.queryKey"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="2"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="登记时间" prop="createTime" label-width="100px" >
<div slot="label" style="text-align: left;">
<el-radio-group class="query-label" v-model="queryDateType">
<el-radio :key="1" label="1">登记时间</el-radio>
<el-radio :key="2" label="2">交易时间</el-radio>
</el-radio-group>
</div>
<elDateAdvPicker v-model="dateTimeRange" ></elDateAdvPicker>
<!-- <elDateSimplePicker placeholder="" v-model="dateTimeRange" style="z-index:9999;width:300px" ></elDateSimplePicker> -->
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="15">
<el-form-item :label="$t('进仓状态')" prop="stockInFlag">
<el-select clearable v-model="queryParams.stockInFlag" placeholder="">
<el-option key="0" label="未进仓" value="0"></el-option>
<el-option key="1" label="已进仓" value="1"></el-option>
<el-option key="2" label="部分进仓" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('确认状态')" prop="confirmStatus">
<el-select clearable v-model="queryParams.confirmStatus" placeholder="">
<el-option key="0" label="未确认" value="0"></el-option>
<el-option key="1" label="已确认" value="1"></el-option>
<el-option key="2" label="部分确认" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="寄件人" prop="sendName">
<el-input
v-model="queryParams.params.sendName"
:placeholder="$t('寄件人')"
clearable
/>
</el-form-item>
<el-form-item label="寄件人电话" prop="sendMobile">
<el-input
v-model="queryParams.params.sendMobile"
:placeholder="$t('寄件人电话')"
clearable
/>
</el-form-item>
<el-form-item label="寄件公司" prop="sendCompany">
<el-input
v-model="queryParams.params.sendCompany"
:placeholder="$t('寄件公司')"
clearable
/>
</el-form-item>
<el-form-item :label="$t('销售联系人')" prop="salesmen">
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen" ></SalemanPicker>
</el-form-item>
</el-col>
</el-row>
</SearchForm>
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="queryCode" label-width="80px">
<el-form-item label="" prop="queryKey" label-width="80px">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderType">
<el-radio :key="1" label="1">运单号</el-radio>
@ -10,7 +97,7 @@
</el-radio-group>
</div>
<XdTextareaInput
v-model="queryParams.queryCode"
v-model="queryParams.queryKey"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="2"
@ -49,21 +136,21 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="账单号" prop="settleBillNo">
<!-- <el-form-item label="账单号" prop="settleBillNo">
<el-input
v-model="queryParams.settleBillNo"
:placeholder="$t('账单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="审核状态" prop="blAudit">
</el-form-item> -->
<!-- <el-form-item label="审核状态" prop="blAudit">
<el-select v-model="queryParams.blAudit" placeholder="" clearable filterable style="width:100%">
<el-option label="未审核" :value="0"></el-option>
<el-option label="审核通过" :value="1"></el-option>
<el-option label="审核不通过" :value="2"></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<!-- <el-form-item label="" prop="customerCode">
<el-input
v-model="queryParams.customerCode"
@ -263,8 +350,9 @@ export default {
openForm: false,
titleForm: "",
queryCode:null,
queryOrderType:null,
queryDateType:null,
// 弹出展示层
id:null,
@ -285,7 +373,7 @@ export default {
pageNum: 1,
pageSize: 20,
queryCode:null,
queryKey:null,
payType: null,
recType: null,
@ -334,25 +422,43 @@ export default {
},
created() {
this.queryOrderType="1";
this.queryDateType="1";
this.getList();
},
methods: {
initQueryParams(){
// 按运单查询时的处理
if(this.queryOrderType==1){
this.queryParams.params.billCode=this.queryParams.queryKey;
this.queryParams.settleBillNo=null;
}
else if(this.queryOrderType==2){
this.queryParams.params.billCode=null;
this.queryParams.settleBillNo=this.queryParams.queryKey;
}
let thisQueryParams = {...this.queryParams};
if(this.queryDateType==1){
thisQueryParams = this.addDateRange(this.queryParams, this.dateTimeRange,"createTime");
}
else if(this.queryDateType==2){
thisQueryParams = this.addDateRange(this.queryParams, this.dateTimeRange,"tradeDate");
}
return thisQueryParams;
},
/** 查询账单收退款记录列表 */
getList() {
// 按运单查询时的处理
if(this.queryOrderType=="1"){
this.queryParams.params.billCode=this.queryParams.queryCode;
this.queryParams.settleBillNo=null;
}
else if(this.queryOrderType=="2"){
this.queryParams.params.billCode=null;
this.queryParams.settleBillNo=this.queryParams.queryCode;
}
let qParam=this.initQueryParams();
this.loading = true;
listEmisSettlePayRecord(this.addDateRange(this.queryParams, this.dateTimeRange,'createTime')).then(response => {
listEmisSettlePayRecord(qParam).then(response => {
this.emisSettlePayRecordList = response.rows;
this.total = response.total;
this.loading = false;

39
src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
View File

@ -83,35 +83,6 @@
</el-col>
</el-row>
<!-- <el-form-item label="" prop="entryDate">
<el-date-picker clearable
v-model="queryParams.entryDate"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="$t('进仓日期')">
</el-date-picker>
</el-form-item> -->
<!-- <el-form-item label="" prop="confirmDate">
<el-date-picker clearable
v-model="queryParams.confirmDate"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="$t('确认时间')">
</el-date-picker>
</el-form-item> -->
<!-- <el-form-item label="" prop="usedStatus">
<el-input
v-model="queryParams.usedStatus"
:placeholder="$t('占用状态')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
</SearchForm>
@ -159,7 +130,7 @@
@click="handleAccept"
>货齐开单</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
@ -167,7 +138,7 @@
:disabled="single"
@click="handleException"
>异常回复</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
type="primary"
@ -459,10 +430,8 @@ export default {
this.titleForm = "修改";
},
handleView(row) {
this.id=row.id;
this.titleView="查看";
this.openView=true;
// this.router.push({ path: '/emis/emisWarehouseIn/viewDetail', query: { id: row.id }})
let rowItem=this.selectionList[0];
this.$emit("onSelect",rowItem);
},
handleFormChanged(){
this.openForm = false;

112
src/views/emis/emisWarehouseInBatch/WarehouseStockIn.vue
View File

@ -23,7 +23,9 @@
</div>
<el-collapse v-model="activeNames">
<el-collapse-item title="" name="1">
<el-collapse-item title="" name="2">
<template slot="title">
<div class="form-group-title"><span class="title">{{ $t('货物明细') }}</span></div>
</template>
@ -170,19 +172,8 @@
</el-col>
<el-col :span="24">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 20px;">
<!-- <el-col :span="6">
<el-form-item :label="$t('包装类型')" prop="packType" label-width="70px">
<el-select multiple="" v-model="form.packType" placeholder="">
<el-option
v-for="dict in dict.type.emis_tab_packing_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-col :span="4">
<el-form-item :label="$t('总件数')" prop="parcelQty" label-width="70px">
<el-input v-model="form.parcelQty" style="text-align: right;" placeholder="" />
</el-form-item>
@ -203,32 +194,29 @@
</div>
</el-form-item>
</el-col>
<!-- <el-col :span="6">
<el-form-item :label="$t('货值')" prop="realValue" label-width="70px" >
<div style="">
<el-input v-model="form.realValue" style="text-align: right;width: 120px" placeholder="货值" >
<span slot="suffix">(USD)</span>
</el-input>
</div>
<el-form-item :label="$t('包装类型')" prop="packType" label-width="70px">
<el-select multiple="" v-model="form.packType" placeholder="">
<el-option
v-for="dict in dict.type.emis_tab_packing_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col> -->
</el-col> -->
</el-row>
</el-col>
<el-col :span="24">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 20px;">
<!-- <el-col :span="6">
<el-form-item label="代垫运费" prop="blPrepareInFreight">
<el-input v-model="form.blPrepareInFreight" placeholder="请输入代垫运费" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="代垫运费" prop="prepareInEstFee">
<el-input v-model="form.prepareInEstFee" placeholder="请输入代垫运费" />
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-col :span="5">
<el-form-item label="快递公司" prop="prepareInExpress">
<el-select
style="width:100%"
@ -240,16 +228,31 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="快递单号" prop="prepareInBillCode">
<el-input v-model="form.prepareInBillCode" placeholder="请输入快递单号" />
</el-form-item>
</el-col>
<!-- <el-col :span="6">
<el-col :span="6">
<el-form-item label="是否代垫运费" prop="blPrepareInFreight" label-width="100px">
<el-radio-group v-model="form.blPrepareInFreight">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="5" v-if="form.blPrepareInFreight==1">
<el-form-item label="代垫运费" prop="prepareInEstFee">
<el-input v-model="form.prepareInEstFee" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="自定义标识" prop="prepareInRemark">
<el-input v-model="form.prepareInRemark" placeholder="请输入自定义标识" />
</el-form-item>
</el-col> -->
</el-col>
</el-row>
</el-col>
@ -257,7 +260,7 @@
</el-collapse-item>
<el-collapse-item title="" name="2">
<el-collapse-item title="" name="3">
<template slot="title">
<div class="form-group-title"><span class="title">{{ $t('收货图片') }}</span></div>
</template>
@ -288,11 +291,11 @@
</div>
</el-col>
<el-col :span="24">
<!-- <el-col :span="24">
<div class="head-container">
<div>历史进仓列表</div>
</div>
</el-col>
</el-col> -->
</el-row>
</el-form>
@ -317,7 +320,7 @@ export default {
dicts: ['emis_tab_packing_type','emis_express_code'],
data() {
return {
activeNames:['1','2'],
activeNames:['1','2','3'],
id:null,
emisWarehouseInBatchOptions: [],
@ -332,7 +335,16 @@ export default {
// 表单校验
rules: {
inNo: [
{ required: true, message: "进仓单号不能为空", trigger: ["blur","change"] }
{ required: true, message: "进仓单号不能为空", trigger: "blur" }
],
totalVolume: [
{ required: true, message: "总体积不能为空", trigger: "blur" }
],
parcelQty: [
{ required: true, message: "总件数不能为空", trigger: "blur" }
],
billWeight: [
{ required: true, message: "总重量不能为空", trigger: "blur" }
],
}
@ -340,29 +352,11 @@ export default {
},
watch: {
// $route () {
// if(this.$route.query.addFrom=="stockIn"){
// this.action="add";
// this.addFrom="stockIn";
// this.id=this.$route.query.id;
// this.inNo=this.$route.query.inNo;
// this.$route.meta.title = "收货入仓";
// this.initData();
// }
// },
inNo(newVal){
this.initData();
}
},
created() {
// this.initData();
// if(this.$route.query.addFrom=="stockIn"){
// this.action="add";
// this.addFrom="stockIn";
// this.id=this.$route.query.id;
// this.inNo=this.$route.query.inNo;
// this.$route.meta.title = "收货入仓";
// }
this.initData();
},
@ -401,6 +395,8 @@ export default {
// this.form.totalWeight: null,
console.log("====>emisWarehouseInBatchOptions===>",this.form )
// 如果订单有货物数据，直接带过来
this.form.cargoList=[];
this.loading = false;
});

66
src/views/emis/emisWarehouseInBatch/WsInBatchList.vue
View File

@ -9,10 +9,22 @@
<div v-for="(item,index) in emisWarehouseInBatchList" :key="resetRefreshId+'.'+index">
<CardWithHeader :header="'入仓时间:'+item.entryDate" >
<template v-slot:body>
<div>入仓货物</div>
<div>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 8px;margin-bottom:8px;color:black;font-weight:bold">
<el-col :span="3">
件数:{{ item.parcelQty }}
</el-col>
<el-col :span="3">
重量：{{ item.billWeight }}(kg)
</el-col>
<el-col :span="3">
体积：{{ item.totalVolume }}(m³)
</el-col>
</el-row>
</div>
<div >
<el-table
class="cargoList"
border
stripe
:data="item.cargoList"
@ -90,35 +102,39 @@
</el-table>
<div style="margin-top:20px">
</div>
<div style="margin-top:10px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 8px;margin-bottom:8px;color:black;font-weight:bold">
<el-col :span="5">
快递公司: <dict-tag :options="dict.type.emis_express_code" :value="item.prepareInExpress"/>
</el-col>
<el-col :span="5">
快递单号:{{ item.prepareInBillCode }}
</el-col>
<el-col :span="6">
是否代垫运费:
<span v-if="item.blPrepareInFreight==1">是</span>
<span v-else>否</span>
</el-col>
<el-col :span="5" v-if="item.blPrepareInFreight==1">
代垫运费:{{ item.prepareInEstFee }} 元
</el-col>
<el-col :span="5">
自定义标识:{{item.prepareInRemark }}
</el-col>
</el-row>
</div>
<div style="margin-top:20px">
<div>进仓图片：</div>
<div v-if="item.picUrl" style="display:inline-flex">
<div >
<ImagePreview height="40px" v-for="(pic,index2) in (item.picUrl||'').split(',')" :key="index2" :src="pic" ></ImagePreview>
</div>
</div>
</div>
<!-- <div>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 20px;">
<el-col :span="6">
总件数:{{ item.parcelQty }}
</el-col>
<el-col :span="6">
<el-form-item :label="$t('总重量')" prop="billWeight" label-width="70px">
{{ item.billWeight }}(kg)
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('总体积')" prop="totalVolume" label-width="70px" >
<div style="">
{{ item.totalVolume }}(m³)
</div>
</el-form-item>
</el-col>
</el-row>
</div> -->
</div>
</template>
</CardWithHeader>