This commit is contained in:
linfso 2024-05-22 09:13:21 +08:00
parent ae65b30e96
commit 3889ebc808
12 changed files with 3404 additions and 0 deletions

View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询进仓单列表
export function listEmisWarehouseIn(query) {
return request({
url: '/emis/emisWarehouseIn/list',
method: 'get',
params: query
})
}
// 查询进仓单详细
export function getEmisWarehouseIn(id) {
return request({
url: '/emis/emisWarehouseIn/' + id,
method: 'get'
})
}
// 新增进仓单
export function addEmisWarehouseIn(data) {
return request({
url: '/emis/emisWarehouseIn',
method: 'post',
data: data
})
}
// 修改进仓单
export function updateEmisWarehouseIn(data) {
return request({
url: '/emis/emisWarehouseIn',
method: 'put',
data: data
})
}
// 删除进仓单
export function delEmisWarehouseIn(id) {
return request({
url: '/emis/emisWarehouseIn/' + id,
method: 'delete'
})
}

View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询进仓单批次列表
export function listEmisWarehouseInBatch(query) {
return request({
url: '/emis/emisWarehouseInBatch/list',
method: 'get',
params: query
})
}
// 查询进仓单批次详细
export function getEmisWarehouseInBatch(id) {
return request({
url: '/emis/emisWarehouseInBatch/' + id,
method: 'get'
})
}
// 新增进仓单批次
export function addEmisWarehouseInBatch(data) {
return request({
url: '/emis/emisWarehouseInBatch',
method: 'post',
data: data
})
}
// 修改进仓单批次
export function updateEmisWarehouseInBatch(data) {
return request({
url: '/emis/emisWarehouseInBatch',
method: 'put',
data: data
})
}
// 删除进仓单批次
export function delEmisWarehouseInBatch(id) {
return request({
url: '/emis/emisWarehouseInBatch/' + id,
method: 'delete'
})
}

View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询进仓单明细列表
export function listEmisWarehouseInDtl(query) {
return request({
url: '/emis/emisWarehouseInDtl/list',
method: 'get',
params: query
})
}
// 查询进仓单明细详细
export function getEmisWarehouseInDtl(id) {
return request({
url: '/emis/emisWarehouseInDtl/' + id,
method: 'get'
})
}
// 新增进仓单明细
export function addEmisWarehouseInDtl(data) {
return request({
url: '/emis/emisWarehouseInDtl',
method: 'post',
data: data
})
}
// 修改进仓单明细
export function updateEmisWarehouseInDtl(data) {
return request({
url: '/emis/emisWarehouseInDtl',
method: 'put',
data: data
})
}
// 删除进仓单明细
export function delEmisWarehouseInDtl(id) {
return request({
url: '/emis/emisWarehouseInDtl/' + id,
method: 'delete'
})
}

View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询运单转件表列表
export function listEmisWaybillTransfer(query) {
return request({
url: '/emis/emisWaybillTransfer/list',
method: 'get',
params: query
})
}
// 查询运单转件表详细
export function getEmisWaybillTransfer(id) {
return request({
url: '/emis/emisWaybillTransfer/' + id,
method: 'get'
})
}
// 新增运单转件表
export function addEmisWaybillTransfer(data) {
return request({
url: '/emis/emisWaybillTransfer',
method: 'post',
data: data
})
}
// 修改运单转件表
export function updateEmisWaybillTransfer(data) {
return request({
url: '/emis/emisWaybillTransfer',
method: 'put',
data: data
})
}
// 删除运单转件表
export function delEmisWaybillTransfer(id) {
return request({
url: '/emis/emisWaybillTransfer/' + id,
method: 'delete'
})
}

View File

@ -0,0 +1,237 @@
<template>
<div >
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-form-item label="进仓序列号" prop="serialNo">
<el-input v-model="form.serialNo" placeholder="请输入进仓序列号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="进仓单号" prop="inNo">
<el-input v-model="form.inNo" placeholder="请输入进仓单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="订单号" prop="orderSn">
<el-input v-model="form.orderSn" placeholder="请输入订单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="运单号" prop="billCode">
<el-input v-model="form.billCode" placeholder="请输入运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="客户编号" prop="customerCode">
<el-input v-model="form.customerCode" placeholder="请输入客户编号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="客户名称" prop="customerName">
<el-input v-model="form.customerName" placeholder="请输入客户名称" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="进仓日期" prop="entryDate">
<el-date-picker clearable
v-model="form.entryDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择进仓日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="客户确认状态" prop="confirmStatus">
<el-input v-model="form.confirmStatus" placeholder="请输入客户确认状态" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="确认时间" prop="confirmDate">
<el-date-picker clearable
v-model="form.confirmDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择确认时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="占用状态" prop="usedStatus">
<el-input v-model="form.usedStatus" placeholder="请输入占用状态" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="状态" prop="status">
<el-input v-model="form.status" placeholder="请输入状态" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="删除标志(0代表存在" prop="delFlag">
<el-input v-model="form.delFlag" placeholder="请输入删除标志(0代表存在" />
</el-form-item>
</el-col>
<!--
<el-form-item label="上级字典">
<treeselect
ref="tree"
v-model="form.parentId"
:options="emisWarehouseInOptions"
:normalizer="normalizer"
:default-expand-level="1"
:show-count="true"
placeholder="选择上级"
/>
</el-form-item>
-->
</el-row>
</el-form>
<div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</div>
</template>
<script>
import { listEmisWarehouseIn, getEmisWarehouseIn, delEmisWarehouseIn, addEmisWarehouseIn, updateEmisWarehouseIn } from "@/api/emis/emisWarehouseIn";
export default {
name: "emisWarehouseInForm",
props:{
id:{
type:Number
}
},
components: { },
dicts: [
],
data() {
return {
emisWarehouseInOptions: [],
// 遮罩层
loading: true,
// 表单参数
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "id不能为空", trigger: "blur" }
],
}
};
},
watch: {
"id": {
handler (newValue, oldValue) {
this.id = newValue;
this.initData();
},
deep: true
}
},
created() {
this.initData();
},
methods: {
initData() {
if(this.id !=null) {
this.loading = true;
getEmisWarehouseIn(this.id).then(response => {
this.form = response.data;
this.loading = false;
});
}else{
this.reset();
}
// this.getTreeselect();
},
// 取消按钮
cancel() {
this.reset();
this.$emit("on-cancel");
},
// 表单重置
reset() {
this.form = {
id: null,
serialNo: null,
inNo: null,
orderSn: null,
billCode: null,
customerCode: null,
customerName: null,
entryDate: null,
confirmStatus: null,
confirmDate: null,
usedStatus: null,
status: null,
remark: null,
tenantId: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
createSite: null,
updateSite: null
};
this.resetForm("form");
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateEmisWarehouseIn(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$emit("on-changed");
});
} else {
addEmisWarehouseIn(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$emit("on-changed");
});
}
}
});
},
// /** 转换菜单数据结构 */
// normalizer(node) {
// if (node.children && !node.children.length) {
// delete node.children;
// }
// return {
// id: node.id,
// label: node.idName,
// children: node.children
// };
// },
// /** 查询菜单下拉树结构 */
// getTreeselect() {
// const queryParams = {}
// listEmisWarehouseIn(queryParams).then(response => {
// this.emisWarehouseInOptions = [];
// const rootItem = { idId: 0, emisWarehouseInName: '-', children: [] };
// rootItem.children = this.handleTree(response.data, "id");
// this.emisWarehouseInOptions.push(rootItem);
// if(this.parentId != undefined) {
// this.form.parentId = this.parentId;
// }
// });
// },
}
};
</script>

View File

@ -0,0 +1,484 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="serialNo">
<el-input
v-model="queryParams.serialNo"
:placeholder="$t('进仓序列号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="inNo">
<el-input
v-model="queryParams.inNo"
:placeholder="$t('进仓单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="orderSn">
<el-input
v-model="queryParams.orderSn"
:placeholder="$t('订单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="billCode">
<el-input
v-model="queryParams.billCode"
:placeholder="$t('运单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="customerCode">
<el-input
v-model="queryParams.customerCode"
:placeholder="$t('客户编号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="customerName">
<el-input
v-model="queryParams.customerName"
:placeholder="$t('客户名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<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="confirmStatus">
<el-input
v-model="queryParams.confirmStatus"
:placeholder="$t('客户确认状态')"
clearable
@keyup.enter.native="handleQuery"
/>
</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>
<el-form-item label="" prop="status">
<el-input
v-model="queryParams.status"
:placeholder="$t('状态')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="remark">
<el-input
v-model="queryParams.remark"
:placeholder="$t('备注')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="delFlag">
<el-input
v-model="queryParams.delFlag"
:placeholder="$t('删除标志(0代表存在')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</SearchForm>
<XdTable v-loading="loading"
border stripe
size="small"
:data="emisWarehouseInList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<div slot="toolbar">
<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="['emis:emisWarehouseIn:add']"
>新增</el-button>
</el-col>
<!--
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['emis:emisWarehouseIn:edit']"
>修改</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['emis:emisWarehouseIn:remove']"
>删除</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['emis:emisWarehouseIn:export']"
>导出</el-button>
</el-col> -->
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
</template>
</el-table-column>
<el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom" min-width="80">
<template slot-scope="scope">
<div v-if="scope.row.settleStatus == 0" style="color:red;">
<span class="el-tag el-tag--info">未结算</span>
</div>
<div v-if="scope.row.settleStatus == 10" style="color:red;">
<span class="el-tag">待确认</span>
</div>
<div v-if="scope.row.settleStatus == 11" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已确认</span>
</div>
<div v-if="scope.row.settleStatus == 20" >
<span class="el-tag el-tag--warning el-tag--light">待打款</span>
</div>
<div v-if="scope.row.settleStatus == 21" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已打款</span>
</div>
<div v-if="scope.row.settleStatus == 40" style="color:red;">
<span class="el-tag el-tag--danger">已拒绝</span>
</div>
</template>
</el-table-column>
-->
<el-table-column :label="$t('进仓序列号')" align="center" prop="serialNo" min-width="100" />
<el-table-column :label="$t('进仓单号')" align="center" prop="inNo" min-width="100" />
<el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" />
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
<el-table-column :label="$t('客户编号')" align="center" prop="customerCode" min-width="100" />
<el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
<el-table-column :label="$t('进仓日期')" align="center" prop="entryDate" min-width="100" />
<el-table-column :label="$t('客户确认状态')" align="center" prop="confirmStatus" min-width="100" />
<el-table-column :label="$t('确认时间')" align="center" prop="confirmDate" min-width="100" />
<el-table-column :label="$t('占用状态')" align="center" prop="usedStatus" min-width="100" />
<el-table-column :label="$t('状态')" align="center" prop="status" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('删除标志(0代表存在')" align="center" prop="delFlag" min-width="100" />
<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="handleUpdate(scope.row)"
v-hasPermi="['emis:emisWarehouseIn:edit']"
>修改</el-button>
<!--
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['emis:emisWarehouseIn:remove']"
>删除</el-button> -->
</template>
</el-table-column>
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisWarehouseInForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWarehouseInForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisWarehouseInView :id="id" ></EmisWarehouseInView>
</el-dialog>
-->
</div>
</template>
<script>
import { listEmisWarehouseIn, getEmisWarehouseIn, delEmisWarehouseIn, addEmisWarehouseIn, updateEmisWarehouseIn } from "@/api/emis/emisWarehouseIn";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
// import emisWarehouseInView from '@/views/emis/emisWarehouseIn/emisWarehouseInView';
import emisWarehouseInForm from '@/views/emis/emisWarehouseIn/emisWarehouseInForm';
export default {
name: "emisWarehouseIn",
components: { elDateSimplePicker,emisWarehouseInForm },
dicts: [
],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 创建时间搜索
dateTimeRange:[],
// 总条数
total: 0,
// 进仓单表格数据
emisWarehouseInList: [],
currentId:null,
openForm: false,
titleForm: "",
// 弹出展示层
id:null,
titleView:"",
openView: false,
// 更新站点时间范围
daterangeEntryDate: [],
// 更新站点时间范围
daterangeConfirmDate: [],
// 更新站点时间范围
daterangeCreateTime: [],
// 更新站点时间范围
daterangeUpdateTime: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
serialNo: null,
inNo: null,
orderSn: null,
billCode: null,
customerCode: null,
customerName: null,
entryDate: null,
confirmStatus: null,
confirmDate: null,
usedStatus: null,
status: null,
remark: null,
delFlag: null,
},
};
},
created() {
this.getList();
},
methods: {
/** 查询进仓单列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeEntryDate && '' != this.daterangeEntryDate) {
this.queryParams.params["beginEntryDate"] = this.daterangeEntryDate[0];
this.queryParams.params["endEntryDate"] = this.daterangeEntryDate[1];
}
if (null != this.daterangeConfirmDate && '' != this.daterangeConfirmDate) {
this.queryParams.params["beginConfirmDate"] = this.daterangeConfirmDate[0];
this.queryParams.params["endConfirmDate"] = this.daterangeConfirmDate[1];
}
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
}
if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
}
listEmisWarehouseIn(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisWarehouseInList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
// 排序 查询字段是表格中字段名字 动态取值排序顺序
handleSortChange(column) {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order;
this.getList();
},
/** 新增按钮操作 */
handleAdd(row) {
this.currentId=null;
this.openForm= true;
this.titleForm = "新增";
},
handleShowMoreInput(){
this.moreInputVisible = !this.moreInputVisible;
},
/** 修改按钮操作 */
handleUpdate(row) {
this.currentId= row.id;
this.openForm = true;
this.titleForm = "修改";
},
handleView(row) {
this.id=row.id;
this.titleView="查看";
this.openView=true;
// this.router.push({ path: '/emis/emisWarehouseIn/viewDetail', query: { id: row.id }})
},
handleFormChanged(){
this.openForm = false;
this.getList();
},
cancelForm(){
this.openForm = false;
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除').then(function() {
return delEmisWarehouseIn(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// this.download('emis/emisWarehouseIn/export', {
// ...this.queryParams
// }, `emisWarehouseIn_${new Date().getTime()}.xlsx`)
const loadingInstance = this.$loading({
text: '正在导出...'
})
var qParam = {...this.queryParams};
qParam.pageNum=1;
qParam.pageSize=5000;
listEmisWarehouseIn(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
this.downloadLoading = false
if (response.code === 200) {
const curList = response.rows
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['id','进仓序列号','进仓单号','订单号','运单号','客户编号','客户名称','进仓日期','客户确认状态','确认时间','占用状态','状态','备注','租户ID','删除标志(0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
const filterVal = ['id','serialNo','inNo','orderSn','billCode','customerCode','customerName','entryDate','confirmStatus','confirmDate','usedStatus','status','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
const data = this.formatJson(filterVal, curList, response.rows)
excel.export_json_to_excel({
header: tHeader,
data,
filename: '进仓单',
autoWidth: true
})
loadingInstance.close()
})
}
});
},
formatJson(filterVal, jsonData, resData) {
let index = 0
return jsonData.map(v => filterVal.map(j => {
if (j === 'index') {
return ++index
}
if (j === 'status') {
var statusStr='xxx'
if(v[j] == 10){
statusStr='xxx'
}
return statusStr;
}
return v[j]
}))
},
/** 列索引函数 */
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
},
/** 时间搜索响应函数 */
dateTimeChange(value){
this.dateTimeRange=value;
},
}
};
</script>
<style scoped>
.el-divider{
margin-top: 0px;
background: 0 0;
border-top: 1px solid #E6EBF5;
}
.el-divider__text {
color: #0955ee;
cursor: pointer;
}
</style>

View File

@ -0,0 +1,264 @@
<template>
<div >
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-form-item label="进仓序列号" prop="serialNo">
<el-input v-model="form.serialNo" placeholder="请输入进仓序列号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="进仓单号" prop="inNo">
<el-input v-model="form.inNo" placeholder="请输入进仓单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="进仓子批次单号in_no+001" prop="inBatchNo">
<el-input v-model="form.inBatchNo" placeholder="请输入进仓子批次单号in_no+001" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="客户编号" prop="customerCode">
<el-input v-model="form.customerCode" placeholder="请输入客户编号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="客户名称" prop="customerName">
<el-input v-model="form.customerName" placeholder="请输入客户名称" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="订单号" prop="orderSn">
<el-input v-model="form.orderSn" placeholder="请输入订单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="运单号" prop="billCode">
<el-input v-model="form.billCode" placeholder="请输入运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="运输工具编号" prop="transCarNo">
<el-input v-model="form.transCarNo" placeholder="请输入运输工具编号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="进仓日期" prop="entryDate">
<el-date-picker clearable
v-model="form.entryDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择进仓日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="客户确认状态" prop="confirmStatus">
<el-input v-model="form.confirmStatus" placeholder="请输入客户确认状态" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="确认时间" prop="confirmDate">
<el-date-picker clearable
v-model="form.confirmDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择确认时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="状态" prop="status">
<el-input v-model="form.status" placeholder="请输入状态" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="总件数" prop="totalParcelQty">
<el-input v-model="form.totalParcelQty" placeholder="请输入总件数" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="总体积" prop="totalVolume">
<el-input v-model="form.totalVolume" placeholder="请输入总体积" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="总重量" prop="totalWeight">
<el-input v-model="form.totalWeight" placeholder="请输入总重量" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="删除标志(0代表存在" prop="delFlag">
<el-input v-model="form.delFlag" placeholder="请输入删除标志(0代表存在" />
</el-form-item>
</el-col>
<!--
<el-form-item label="上级字典">
<treeselect
ref="tree"
v-model="form.parentId"
:options="emisWarehouseInBatchOptions"
:normalizer="normalizer"
:default-expand-level="1"
:show-count="true"
placeholder="选择上级"
/>
</el-form-item>
-->
</el-row>
</el-form>
<div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</div>
</template>
<script>
import { listEmisWarehouseInBatch, getEmisWarehouseInBatch, delEmisWarehouseInBatch, addEmisWarehouseInBatch, updateEmisWarehouseInBatch } from "@/api/emis/emisWarehouseInBatch";
export default {
name: "emisWarehouseInBatchForm",
props:{
id:{
type:Number
}
},
components: { },
dicts: [
],
data() {
return {
emisWarehouseInBatchOptions: [],
// 遮罩层
loading: true,
// 表单参数
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "id不能为空", trigger: "blur" }
],
delFlag: [
{ required: true, message: "删除标志(0代表存在不能为空", trigger: "blur" }
],
}
};
},
watch: {
"id": {
handler (newValue, oldValue) {
this.id = newValue;
this.initData();
},
deep: true
}
},
created() {
this.initData();
},
methods: {
initData() {
if(this.id !=null) {
this.loading = true;
getEmisWarehouseInBatch(this.id).then(response => {
this.form = response.data;
this.loading = false;
});
}else{
this.reset();
}
// this.getTreeselect();
},
// 取消按钮
cancel() {
this.reset();
this.$emit("on-cancel");
},
// 表单重置
reset() {
this.form = {
id: null,
serialNo: null,
inNo: null,
inBatchNo: null,
customerCode: null,
customerName: null,
orderSn: null,
billCode: null,
transCarNo: null,
entryDate: null,
confirmStatus: null,
confirmDate: null,
status: null,
totalParcelQty: null,
totalVolume: null,
totalWeight: null,
remark: null,
tenantId: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
createSite: null,
updateSite: null
};
this.resetForm("form");
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateEmisWarehouseInBatch(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$emit("on-changed");
});
} else {
addEmisWarehouseInBatch(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$emit("on-changed");
});
}
}
});
},
// /** 转换菜单数据结构 */
// normalizer(node) {
// if (node.children && !node.children.length) {
// delete node.children;
// }
// return {
// id: node.id,
// label: node.idName,
// children: node.children
// };
// },
// /** 查询菜单下拉树结构 */
// getTreeselect() {
// const queryParams = {}
// listEmisWarehouseInBatch(queryParams).then(response => {
// this.emisWarehouseInBatchOptions = [];
// const rootItem = { idId: 0, emisWarehouseInBatchName: '-', children: [] };
// rootItem.children = this.handleTree(response.data, "id");
// this.emisWarehouseInBatchOptions.push(rootItem);
// if(this.parentId != undefined) {
// this.form.parentId = this.parentId;
// }
// });
// },
}
};
</script>

View File

@ -0,0 +1,524 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="serialNo">
<el-input
v-model="queryParams.serialNo"
:placeholder="$t('进仓序列号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="inNo">
<el-input
v-model="queryParams.inNo"
:placeholder="$t('进仓单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="inBatchNo">
<el-input
v-model="queryParams.inBatchNo"
:placeholder="$t('进仓子批次单号in_no+001')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="customerCode">
<el-input
v-model="queryParams.customerCode"
:placeholder="$t('客户编号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="customerName">
<el-input
v-model="queryParams.customerName"
:placeholder="$t('客户名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="orderSn">
<el-input
v-model="queryParams.orderSn"
:placeholder="$t('订单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="billCode">
<el-input
v-model="queryParams.billCode"
:placeholder="$t('运单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="transCarNo">
<el-input
v-model="queryParams.transCarNo"
:placeholder="$t('运输工具编号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<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="confirmStatus">
<el-input
v-model="queryParams.confirmStatus"
:placeholder="$t('客户确认状态')"
clearable
@keyup.enter.native="handleQuery"
/>
</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="status">
<el-input
v-model="queryParams.status"
:placeholder="$t('状态')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="totalParcelQty">
<el-input
v-model="queryParams.totalParcelQty"
:placeholder="$t('总件数')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="totalVolume">
<el-input
v-model="queryParams.totalVolume"
:placeholder="$t('总体积')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="totalWeight">
<el-input
v-model="queryParams.totalWeight"
:placeholder="$t('总重量')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="remark">
<el-input
v-model="queryParams.remark"
:placeholder="$t('备注')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="delFlag">
<el-input
v-model="queryParams.delFlag"
:placeholder="$t('删除标志(0代表存在')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</SearchForm>
<XdTable v-loading="loading"
border stripe
size="small"
:data="emisWarehouseInBatchList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<div slot="toolbar">
<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="['emis:emisWarehouseInBatch:add']"
>新增</el-button>
</el-col>
<!--
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['emis:emisWarehouseInBatch:edit']"
>修改</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['emis:emisWarehouseInBatch:remove']"
>删除</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['emis:emisWarehouseInBatch:export']"
>导出</el-button>
</el-col> -->
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
</template>
</el-table-column>
<el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom" min-width="80">
<template slot-scope="scope">
<div v-if="scope.row.settleStatus == 0" style="color:red;">
<span class="el-tag el-tag--info">未结算</span>
</div>
<div v-if="scope.row.settleStatus == 10" style="color:red;">
<span class="el-tag">待确认</span>
</div>
<div v-if="scope.row.settleStatus == 11" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已确认</span>
</div>
<div v-if="scope.row.settleStatus == 20" >
<span class="el-tag el-tag--warning el-tag--light">待打款</span>
</div>
<div v-if="scope.row.settleStatus == 21" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已打款</span>
</div>
<div v-if="scope.row.settleStatus == 40" style="color:red;">
<span class="el-tag el-tag--danger">已拒绝</span>
</div>
</template>
</el-table-column>
-->
<el-table-column :label="$t('进仓序列号')" align="center" prop="serialNo" min-width="100" />
<el-table-column :label="$t('进仓单号')" align="center" prop="inNo" min-width="100" />
<el-table-column :label="$t('进仓子批次单号in_no+001')" align="center" prop="inBatchNo" min-width="100" />
<el-table-column :label="$t('客户编号')" align="center" prop="customerCode" min-width="100" />
<el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
<el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" />
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
<el-table-column :label="$t('运输工具编号')" align="center" prop="transCarNo" min-width="100" />
<el-table-column :label="$t('进仓日期')" align="center" prop="entryDate" min-width="100" />
<el-table-column :label="$t('客户确认状态')" align="center" prop="confirmStatus" min-width="100" />
<el-table-column :label="$t('确认时间')" align="center" prop="confirmDate" min-width="100" />
<el-table-column :label="$t('状态')" align="center" prop="status" min-width="100" />
<el-table-column :label="$t('总件数')" align="center" prop="totalParcelQty" min-width="100" />
<el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
<el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('删除标志(0代表存在')" align="center" prop="delFlag" min-width="100" />
<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="handleUpdate(scope.row)"
v-hasPermi="['emis:emisWarehouseInBatch:edit']"
>修改</el-button>
<!--
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['emis:emisWarehouseInBatch:remove']"
>删除</el-button> -->
</template>
</el-table-column>
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisWarehouseInBatchForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWarehouseInBatchForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisWarehouseInBatchView :id="id" ></EmisWarehouseInBatchView>
</el-dialog>
-->
</div>
</template>
<script>
import { listEmisWarehouseInBatch, getEmisWarehouseInBatch, delEmisWarehouseInBatch, addEmisWarehouseInBatch, updateEmisWarehouseInBatch } from "@/api/emis/emisWarehouseInBatch";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
// import emisWarehouseInBatchView from '@/views/emis/emisWarehouseInBatch/emisWarehouseInBatchView';
import emisWarehouseInBatchForm from '@/views/emis/emisWarehouseInBatch/emisWarehouseInBatchForm';
export default {
name: "emisWarehouseInBatch",
components: { elDateSimplePicker,emisWarehouseInBatchForm },
dicts: [
],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 创建时间搜索
dateTimeRange:[],
// 总条数
total: 0,
// 进仓单批次表格数据
emisWarehouseInBatchList: [],
currentId:null,
openForm: false,
titleForm: "",
// 弹出展示层
id:null,
titleView:"",
openView: false,
// 更新站点时间范围
daterangeEntryDate: [],
// 更新站点时间范围
daterangeConfirmDate: [],
// 更新站点时间范围
daterangeCreateTime: [],
// 更新站点时间范围
daterangeUpdateTime: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
serialNo: null,
inNo: null,
inBatchNo: null,
customerCode: null,
customerName: null,
orderSn: null,
billCode: null,
transCarNo: null,
entryDate: null,
confirmStatus: null,
confirmDate: null,
status: null,
totalParcelQty: null,
totalVolume: null,
totalWeight: null,
remark: null,
delFlag: null,
},
};
},
created() {
this.getList();
},
methods: {
/** 查询进仓单批次列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeEntryDate && '' != this.daterangeEntryDate) {
this.queryParams.params["beginEntryDate"] = this.daterangeEntryDate[0];
this.queryParams.params["endEntryDate"] = this.daterangeEntryDate[1];
}
if (null != this.daterangeConfirmDate && '' != this.daterangeConfirmDate) {
this.queryParams.params["beginConfirmDate"] = this.daterangeConfirmDate[0];
this.queryParams.params["endConfirmDate"] = this.daterangeConfirmDate[1];
}
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
}
if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
}
listEmisWarehouseInBatch(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisWarehouseInBatchList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
// 排序 查询字段是表格中字段名字 动态取值排序顺序
handleSortChange(column) {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order;
this.getList();
},
/** 新增按钮操作 */
handleAdd(row) {
this.currentId=null;
this.openForm= true;
this.titleForm = "新增";
},
handleShowMoreInput(){
this.moreInputVisible = !this.moreInputVisible;
},
/** 修改按钮操作 */
handleUpdate(row) {
this.currentId= row.id;
this.openForm = true;
this.titleForm = "修改";
},
handleView(row) {
this.id=row.id;
this.titleView="查看";
this.openView=true;
// this.router.push({ path: '/emis/emisWarehouseInBatch/viewDetail', query: { id: row.id }})
},
handleFormChanged(){
this.openForm = false;
this.getList();
},
cancelForm(){
this.openForm = false;
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除').then(function() {
return delEmisWarehouseInBatch(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// this.download('emis/emisWarehouseInBatch/export', {
// ...this.queryParams
// }, `emisWarehouseInBatch_${new Date().getTime()}.xlsx`)
const loadingInstance = this.$loading({
text: '正在导出...'
})
var qParam = {...this.queryParams};
qParam.pageNum=1;
qParam.pageSize=5000;
listEmisWarehouseInBatch(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
this.downloadLoading = false
if (response.code === 200) {
const curList = response.rows
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['id','进仓序列号','进仓单号','进仓子批次单号in_no+001','客户编号','客户名称','订单号','运单号','运输工具编号','进仓日期','客户确认状态','确认时间','状态','总件数','总体积','总重量','备注','租户ID','删除标志(0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
const filterVal = ['id','serialNo','inNo','inBatchNo','customerCode','customerName','orderSn','billCode','transCarNo','entryDate','confirmStatus','confirmDate','status','totalParcelQty','totalVolume','totalWeight','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
const data = this.formatJson(filterVal, curList, response.rows)
excel.export_json_to_excel({
header: tHeader,
data,
filename: '进仓单批次',
autoWidth: true
})
loadingInstance.close()
})
}
});
},
formatJson(filterVal, jsonData, resData) {
let index = 0
return jsonData.map(v => filterVal.map(j => {
if (j === 'index') {
return ++index
}
if (j === 'status') {
var statusStr='xxx'
if(v[j] == 10){
statusStr='xxx'
}
return statusStr;
}
return v[j]
}))
},
/** 列索引函数 */
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
},
/** 时间搜索响应函数 */
dateTimeChange(value){
this.dateTimeRange=value;
},
}
};
</script>
<style scoped>
.el-divider{
margin-top: 0px;
background: 0 0;
border-top: 1px solid #E6EBF5;
}
.el-divider__text {
color: #0955ee;
cursor: pointer;
}
</style>

View File

@ -0,0 +1,339 @@
<template>
<div >
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-form-item label="进仓主单号" prop="inNo">
<el-input v-model="form.inNo" placeholder="请输入进仓主单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="进仓子单号" prop="inChildNo">
<el-input v-model="form.inChildNo" placeholder="请输入进仓子单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="货物编码" prop="goodsCode">
<el-input v-model="form.goodsCode" placeholder="请输入货物编码" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="货物名称" prop="goodsName">
<el-input v-model="form.goodsName" placeholder="请输入货物名称" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="实际数量" prop="cargoQty">
<el-input v-model="form.cargoQty" placeholder="请输入实际数量" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="异常数量" prop="abnormalQty">
<el-input v-model="form.abnormalQty" placeholder="请输入异常数量" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="出库数量" prop="outQty">
<el-input v-model="form.outQty" placeholder="请输入出库数量" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="重量" prop="weight">
<el-input v-model="form.weight" placeholder="请输入重量" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="货物单价" prop="price">
<el-input v-model="form.price" placeholder="请输入货物单价" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="货物币种" prop="currency">
<el-input v-model="form.currency" placeholder="请输入货物币种" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="原产国" prop="nationArea">
<el-input v-model="form.nationArea" placeholder="请输入原产国" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="行邮税号" prop="taxNo">
<el-input v-model="form.taxNo" placeholder="请输入行邮税号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="海关编码" prop="hscode">
<el-input v-model="form.hscode" placeholder="请输入海关编码" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="品牌" prop="brand">
<el-input v-model="form.brand" placeholder="请输入品牌" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="材质" prop="material">
<el-input v-model="form.material" placeholder="请输入材质" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="用途" prop="purpose">
<el-input v-model="form.purpose" placeholder="请输入用途" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="成分" prop="ingredients">
<el-input v-model="form.ingredients" placeholder="请输入成分" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="厂家" prop="manufacturer">
<el-input v-model="form.manufacturer" placeholder="请输入厂家" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="供应商" prop="supplier">
<el-input v-model="form.supplier" placeholder="请输入供应商" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="功能" prop="function">
<el-input v-model="form.function" placeholder="请输入功能" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="规格型号" prop="goodsModel">
<el-input v-model="form.goodsModel" placeholder="请输入规格型号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="毛重" prop="grossWeight">
<el-input v-model="form.grossWeight" placeholder="请输入毛重" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="净重" prop="netWeight">
<el-input v-model="form.netWeight" placeholder="请输入净重" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="长" prop="length">
<el-input v-model="form.length" placeholder="请输入长" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="高" prop="height">
<el-input v-model="form.height" placeholder="请输入高" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="体积" prop="volume">
<el-input v-model="form.volume" placeholder="请输入体积" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="条码" prop="barcode">
<el-input v-model="form.barcode" placeholder="请输入条码" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="排序" prop="orderNum">
<el-input v-model="form.orderNum" placeholder="请输入排序" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="删除标志(0代表存在" prop="delFlag">
<el-input v-model="form.delFlag" placeholder="请输入删除标志(0代表存在" />
</el-form-item>
</el-col>
<!--
<el-form-item label="上级字典">
<treeselect
ref="tree"
v-model="form.parentId"
:options="emisWarehouseInDtlOptions"
:normalizer="normalizer"
:default-expand-level="1"
:show-count="true"
placeholder="选择上级"
/>
</el-form-item>
-->
</el-row>
</el-form>
<div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</div>
</template>
<script>
import { listEmisWarehouseInDtl, getEmisWarehouseInDtl, delEmisWarehouseInDtl, addEmisWarehouseInDtl, updateEmisWarehouseInDtl } from "@/api/emis/emisWarehouseInDtl";
export default {
name: "emisWarehouseInDtlForm",
props:{
id:{
type:Number
}
},
components: { },
dicts: [
],
data() {
return {
emisWarehouseInDtlOptions: [],
// 遮罩层
loading: true,
// 表单参数
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "id不能为空", trigger: "blur" }
],
delFlag: [
{ required: true, message: "删除标志(0代表存在不能为空", trigger: "blur" }
],
}
};
},
watch: {
"id": {
handler (newValue, oldValue) {
this.id = newValue;
this.initData();
},
deep: true
}
},
created() {
this.initData();
},
methods: {
initData() {
if(this.id !=null) {
this.loading = true;
getEmisWarehouseInDtl(this.id).then(response => {
this.form = response.data;
this.loading = false;
});
}else{
this.reset();
}
// this.getTreeselect();
},
// 取消按钮
cancel() {
this.reset();
this.$emit("on-cancel");
},
// 表单重置
reset() {
this.form = {
id: null,
inNo: null,
inChildNo: null,
goodsCode: null,
goodsName: null,
cargoQty: null,
abnormalQty: null,
outQty: null,
unit: null,
weight: null,
price: null,
currency: null,
nationArea: null,
taxNo: null,
hscode: null,
brand: null,
material: null,
purpose: null,
ingredients: null,
manufacturer: null,
supplier: null,
function: null,
goodsModel: null,
grossWeight: null,
netWeight: null,
length: null,
width: null,
height: null,
volume: null,
barcode: null,
orderNum: null,
remark: null,
tenantId: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
createSite: null,
updateSite: null
};
this.resetForm("form");
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateEmisWarehouseInDtl(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$emit("on-changed");
});
} else {
addEmisWarehouseInDtl(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$emit("on-changed");
});
}
}
});
},
// /** 转换菜单数据结构 */
// normalizer(node) {
// if (node.children && !node.children.length) {
// delete node.children;
// }
// return {
// id: node.id,
// label: node.idName,
// children: node.children
// };
// },
// /** 查询菜单下拉树结构 */
// getTreeselect() {
// const queryParams = {}
// listEmisWarehouseInDtl(queryParams).then(response => {
// this.emisWarehouseInDtlOptions = [];
// const rootItem = { idId: 0, emisWarehouseInDtlName: '-', children: [] };
// rootItem.children = this.handleTree(response.data, "id");
// this.emisWarehouseInDtlOptions.push(rootItem);
// if(this.parentId != undefined) {
// this.form.parentId = this.parentId;
// }
// });
// },
}
};
</script>

View File

@ -0,0 +1,652 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="inNo">
<el-input
v-model="queryParams.inNo"
:placeholder="$t('进仓主单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="inChildNo">
<el-input
v-model="queryParams.inChildNo"
:placeholder="$t('进仓子单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="goodsCode">
<el-input
v-model="queryParams.goodsCode"
:placeholder="$t('货物编码')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="goodsName">
<el-input
v-model="queryParams.goodsName"
:placeholder="$t('货物名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="cargoQty">
<el-input
v-model="queryParams.cargoQty"
:placeholder="$t('实际数量')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="abnormalQty">
<el-input
v-model="queryParams.abnormalQty"
:placeholder="$t('异常数量')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="outQty">
<el-input
v-model="queryParams.outQty"
:placeholder="$t('出库数量')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="unit">
<el-input
v-model="queryParams.unit"
:placeholder="$t('单位')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="weight">
<el-input
v-model="queryParams.weight"
:placeholder="$t('重量')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="price">
<el-input
v-model="queryParams.price"
:placeholder="$t('货物单价')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="currency">
<el-input
v-model="queryParams.currency"
:placeholder="$t('货物币种')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="nationArea">
<el-input
v-model="queryParams.nationArea"
:placeholder="$t('原产国')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="taxNo">
<el-input
v-model="queryParams.taxNo"
:placeholder="$t('行邮税号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="hscode">
<el-input
v-model="queryParams.hscode"
:placeholder="$t('海关编码')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="brand">
<el-input
v-model="queryParams.brand"
:placeholder="$t('品牌')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="material">
<el-input
v-model="queryParams.material"
:placeholder="$t('材质')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="purpose">
<el-input
v-model="queryParams.purpose"
:placeholder="$t('用途')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="ingredients">
<el-input
v-model="queryParams.ingredients"
:placeholder="$t('成分')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="manufacturer">
<el-input
v-model="queryParams.manufacturer"
:placeholder="$t('厂家')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="supplier">
<el-input
v-model="queryParams.supplier"
:placeholder="$t('供应商')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="function">
<el-input
v-model="queryParams.function"
:placeholder="$t('功能')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="goodsModel">
<el-input
v-model="queryParams.goodsModel"
:placeholder="$t('规格型号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="grossWeight">
<el-input
v-model="queryParams.grossWeight"
:placeholder="$t('毛重')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="netWeight">
<el-input
v-model="queryParams.netWeight"
:placeholder="$t('净重')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="length">
<el-input
v-model="queryParams.length"
:placeholder="$t('长')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="height">
<el-input
v-model="queryParams.height"
:placeholder="$t('高')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="volume">
<el-input
v-model="queryParams.volume"
:placeholder="$t('体积')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="barcode">
<el-input
v-model="queryParams.barcode"
:placeholder="$t('条码')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="orderNum">
<el-input
v-model="queryParams.orderNum"
:placeholder="$t('排序')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="remark">
<el-input
v-model="queryParams.remark"
:placeholder="$t('备注')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="delFlag">
<el-input
v-model="queryParams.delFlag"
:placeholder="$t('删除标志(0代表存在')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</SearchForm>
<XdTable v-loading="loading"
border stripe
size="small"
:data="emisWarehouseInDtlList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<div slot="toolbar">
<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="['emis:emisWarehouseInDtl:add']"
>新增</el-button>
</el-col>
<!--
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['emis:emisWarehouseInDtl:edit']"
>修改</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['emis:emisWarehouseInDtl:remove']"
>删除</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['emis:emisWarehouseInDtl:export']"
>导出</el-button>
</el-col> -->
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
</template>
</el-table-column>
<el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom" min-width="80">
<template slot-scope="scope">
<div v-if="scope.row.settleStatus == 0" style="color:red;">
<span class="el-tag el-tag--info">未结算</span>
</div>
<div v-if="scope.row.settleStatus == 10" style="color:red;">
<span class="el-tag">待确认</span>
</div>
<div v-if="scope.row.settleStatus == 11" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已确认</span>
</div>
<div v-if="scope.row.settleStatus == 20" >
<span class="el-tag el-tag--warning el-tag--light">待打款</span>
</div>
<div v-if="scope.row.settleStatus == 21" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已打款</span>
</div>
<div v-if="scope.row.settleStatus == 40" style="color:red;">
<span class="el-tag el-tag--danger">已拒绝</span>
</div>
</template>
</el-table-column>
-->
<el-table-column :label="$t('进仓主单号')" align="center" prop="inNo" min-width="100" />
<el-table-column :label="$t('进仓子单号')" align="center" prop="inChildNo" min-width="100" />
<el-table-column :label="$t('货物编码')" align="center" prop="goodsCode" min-width="100" />
<el-table-column :label="$t('货物名称')" align="center" prop="goodsName" min-width="100" />
<el-table-column :label="$t('实际数量')" align="center" prop="cargoQty" min-width="100" />
<el-table-column :label="$t('异常数量')" align="center" prop="abnormalQty" min-width="100" />
<el-table-column :label="$t('出库数量')" align="center" prop="outQty" min-width="100" />
<el-table-column :label="$t('单位')" align="center" prop="unit" min-width="100" />
<el-table-column :label="$t('重量')" align="center" prop="weight" min-width="100" />
<el-table-column :label="$t('货物单价')" align="center" prop="price" min-width="100" />
<el-table-column :label="$t('货物币种')" align="center" prop="currency" min-width="100" />
<el-table-column :label="$t('原产国')" align="center" prop="nationArea" min-width="100" />
<el-table-column :label="$t('行邮税号')" align="center" prop="taxNo" min-width="100" />
<el-table-column :label="$t('海关编码')" align="center" prop="hscode" min-width="100" />
<el-table-column :label="$t('品牌')" align="center" prop="brand" min-width="100" />
<el-table-column :label="$t('材质')" align="center" prop="material" min-width="100" />
<el-table-column :label="$t('用途')" align="center" prop="purpose" min-width="100" />
<el-table-column :label="$t('成分')" align="center" prop="ingredients" min-width="100" />
<el-table-column :label="$t('厂家')" align="center" prop="manufacturer" min-width="100" />
<el-table-column :label="$t('供应商')" align="center" prop="supplier" min-width="100" />
<el-table-column :label="$t('功能')" align="center" prop="function" min-width="100" />
<el-table-column :label="$t('规格型号')" align="center" prop="goodsModel" min-width="100" />
<el-table-column :label="$t('毛重')" align="center" prop="grossWeight" min-width="100" />
<el-table-column :label="$t('净重')" align="center" prop="netWeight" min-width="100" />
<el-table-column :label="$t('长')" align="center" prop="length" min-width="100" />
<el-table-column :label="$t('高')" align="center" prop="height" min-width="100" />
<el-table-column :label="$t('体积')" align="center" prop="volume" min-width="100" />
<el-table-column :label="$t('条码')" align="center" prop="barcode" min-width="100" />
<el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('删除标志(0代表存在')" align="center" prop="delFlag" min-width="100" />
<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="handleUpdate(scope.row)"
v-hasPermi="['emis:emisWarehouseInDtl:edit']"
>修改</el-button>
<!--
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['emis:emisWarehouseInDtl:remove']"
>删除</el-button> -->
</template>
</el-table-column>
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisWarehouseInDtlForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWarehouseInDtlForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisWarehouseInDtlView :id="id" ></EmisWarehouseInDtlView>
</el-dialog>
-->
</div>
</template>
<script>
import { listEmisWarehouseInDtl, getEmisWarehouseInDtl, delEmisWarehouseInDtl, addEmisWarehouseInDtl, updateEmisWarehouseInDtl } from "@/api/emis/emisWarehouseInDtl";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
// import emisWarehouseInDtlView from '@/views/emis/emisWarehouseInDtl/emisWarehouseInDtlView';
import emisWarehouseInDtlForm from '@/views/emis/emisWarehouseInDtl/emisWarehouseInDtlForm';
export default {
name: "emisWarehouseInDtl",
components: { elDateSimplePicker,emisWarehouseInDtlForm },
dicts: [
],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 创建时间搜索
dateTimeRange:[],
// 总条数
total: 0,
// 进仓单明细表格数据
emisWarehouseInDtlList: [],
currentId:null,
openForm: false,
titleForm: "",
// 弹出展示层
id:null,
titleView:"",
openView: false,
// 更新站点时间范围
daterangeCreateTime: [],
// 更新站点时间范围
daterangeUpdateTime: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
inNo: null,
inChildNo: null,
goodsCode: null,
goodsName: null,
cargoQty: null,
abnormalQty: null,
outQty: null,
unit: null,
weight: null,
price: null,
currency: null,
nationArea: null,
taxNo: null,
hscode: null,
brand: null,
material: null,
purpose: null,
ingredients: null,
manufacturer: null,
supplier: null,
function: null,
goodsModel: null,
grossWeight: null,
netWeight: null,
length: null,
height: null,
volume: null,
barcode: null,
orderNum: null,
remark: null,
delFlag: null,
},
};
},
created() {
this.getList();
},
methods: {
/** 查询进仓单明细列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
}
if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
}
listEmisWarehouseInDtl(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisWarehouseInDtlList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
// 排序 查询字段是表格中字段名字 动态取值排序顺序
handleSortChange(column) {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order;
this.getList();
},
/** 新增按钮操作 */
handleAdd(row) {
this.currentId=null;
this.openForm= true;
this.titleForm = "新增";
},
handleShowMoreInput(){
this.moreInputVisible = !this.moreInputVisible;
},
/** 修改按钮操作 */
handleUpdate(row) {
this.currentId= row.id;
this.openForm = true;
this.titleForm = "修改";
},
handleView(row) {
this.id=row.id;
this.titleView="查看";
this.openView=true;
// this.router.push({ path: '/emis/emisWarehouseInDtl/viewDetail', query: { id: row.id }})
},
handleFormChanged(){
this.openForm = false;
this.getList();
},
cancelForm(){
this.openForm = false;
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除').then(function() {
return delEmisWarehouseInDtl(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// this.download('emis/emisWarehouseInDtl/export', {
// ...this.queryParams
// }, `emisWarehouseInDtl_${new Date().getTime()}.xlsx`)
const loadingInstance = this.$loading({
text: '正在导出...'
})
var qParam = {...this.queryParams};
qParam.pageNum=1;
qParam.pageSize=5000;
listEmisWarehouseInDtl(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
this.downloadLoading = false
if (response.code === 200) {
const curList = response.rows
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['id','进仓主单号','进仓子单号','货物编码','货物名称','实际数量','异常数量','出库数量','单位','重量','货物单价','货物币种','原产国','行邮税号','海关编码','品牌','材质','用途','成分','厂家','供应商','功能','规格型号','毛重','净重','长','宽','高','体积','条码','排序','备注','租户ID','删除标志(0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
const filterVal = ['id','inNo','inChildNo','goodsCode','goodsName','cargoQty','abnormalQty','outQty','unit','weight','price','currency','nationArea','taxNo','hscode','brand','material','purpose','ingredients','manufacturer','supplier','function','goodsModel','grossWeight','netWeight','length','width','height','volume','barcode','orderNum','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
const data = this.formatJson(filterVal, curList, response.rows)
excel.export_json_to_excel({
header: tHeader,
data,
filename: '进仓单明细',
autoWidth: true
})
loadingInstance.close()
})
}
});
},
formatJson(filterVal, jsonData, resData) {
let index = 0
return jsonData.map(v => filterVal.map(j => {
if (j === 'index') {
return ++index
}
if (j === 'status') {
var statusStr='xxx'
if(v[j] == 10){
statusStr='xxx'
}
return statusStr;
}
return v[j]
}))
},
/** 列索引函数 */
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
},
/** 时间搜索响应函数 */
dateTimeChange(value){
this.dateTimeRange=value;
},
}
};
</script>
<style scoped>
.el-divider{
margin-top: 0px;
background: 0 0;
border-top: 1px solid #E6EBF5;
}
.el-divider__text {
color: #0955ee;
cursor: pointer;
}
</style>

View File

@ -0,0 +1,240 @@
<template>
<div >
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-form-item label="运单号" prop="billCode">
<el-input v-model="form.billCode" placeholder="请输入运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="转件单号" prop="transferBillCode">
<el-input v-model="form.transferBillCode" placeholder="请输入转件单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="转件日期" prop="transferDate">
<el-date-picker clearable
v-model="form.transferDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择转件日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="转件公司" prop="transferExpress">
<el-input v-model="form.transferExpress" placeholder="请输入转件公司" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="联系人" prop="linkMan">
<el-input v-model="form.linkMan" placeholder="请输入联系人" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="联系电话" prop="linkPhone">
<el-input v-model="form.linkPhone" placeholder="请输入联系电话" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="转件费" prop="transferFee">
<el-input v-model="form.transferFee" placeholder="请输入转件费" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="转件重量" prop="transferWeight">
<el-input v-model="form.transferWeight" placeholder="请输入转件重量" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="转件体积" prop="transferVolume">
<el-input v-model="form.transferVolume" placeholder="请输入转件体积" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="转件原因" prop="transferResean">
<el-input v-model="form.transferResean" placeholder="请输入转件原因" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="转件城市" prop="transferCity">
<el-input v-model="form.transferCity" placeholder="请输入转件城市" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="数据来源" prop="dataFrom">
<el-input v-model="form.dataFrom" placeholder="请输入数据来源" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="删除标志(0代表存在" prop="delFlag">
<el-input v-model="form.delFlag" placeholder="请输入删除标志(0代表存在" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
<!--
<el-form-item label="上级字典">
<treeselect
ref="tree"
v-model="form.parentId"
:options="emisWaybillTransferOptions"
:normalizer="normalizer"
:default-expand-level="1"
:show-count="true"
placeholder="选择上级"
/>
</el-form-item>
-->
</el-row>
</el-form>
<div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</div>
</template>
<script>
import { listEmisWaybillTransfer, getEmisWaybillTransfer, delEmisWaybillTransfer, addEmisWaybillTransfer, updateEmisWaybillTransfer } from "@/api/emis/emisWaybillTransfer";
export default {
name: "emisWaybillTransferForm",
props:{
id:{
type:Number
}
},
components: { },
dicts: [
],
data() {
return {
emisWaybillTransferOptions: [],
// 遮罩层
loading: true,
// 表单参数
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "id不能为空", trigger: "blur" }
],
delFlag: [
{ required: true, message: "删除标志(0代表存在不能为空", trigger: "blur" }
],
}
};
},
watch: {
"id": {
handler (newValue, oldValue) {
this.id = newValue;
this.initData();
},
deep: true
}
},
created() {
this.initData();
},
methods: {
initData() {
if(this.id !=null) {
this.loading = true;
getEmisWaybillTransfer(this.id).then(response => {
this.form = response.data;
this.loading = false;
});
}else{
this.reset();
}
// this.getTreeselect();
},
// 取消按钮
cancel() {
this.reset();
this.$emit("on-cancel");
},
// 表单重置
reset() {
this.form = {
id: null,
billCode: null,
transferBillCode: null,
transferDate: null,
transferExpress: null,
linkMan: null,
linkPhone: null,
transferFee: null,
transferWeight: null,
transferVolume: null,
transferResean: null,
transferCity: null,
dataFrom: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: null,
createSite: null,
updateSite: null
};
this.resetForm("form");
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateEmisWaybillTransfer(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$emit("on-changed");
});
} else {
addEmisWaybillTransfer(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$emit("on-changed");
});
}
}
});
},
// /** 转换菜单数据结构 */
// normalizer(node) {
// if (node.children && !node.children.length) {
// delete node.children;
// }
// return {
// id: node.id,
// label: node.idName,
// children: node.children
// };
// },
// /** 查询菜单下拉树结构 */
// getTreeselect() {
// const queryParams = {}
// listEmisWaybillTransfer(queryParams).then(response => {
// this.emisWaybillTransferOptions = [];
// const rootItem = { idId: 0, emisWaybillTransferName: '-', children: [] };
// rootItem.children = this.handleTree(response.data, "id");
// this.emisWaybillTransferOptions.push(rootItem);
// if(this.parentId != undefined) {
// this.form.parentId = this.parentId;
// }
// });
// },
}
};
</script>

View File

@ -0,0 +1,488 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="billCode">
<el-input
v-model="queryParams.billCode"
:placeholder="$t('运单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="transferBillCode">
<el-input
v-model="queryParams.transferBillCode"
:placeholder="$t('转件单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="transferDate">
<el-date-picker clearable
v-model="queryParams.transferDate"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="$t('转件日期')">
</el-date-picker>
</el-form-item>
<el-form-item label="" prop="transferExpress">
<el-input
v-model="queryParams.transferExpress"
:placeholder="$t('转件公司')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="linkMan">
<el-input
v-model="queryParams.linkMan"
:placeholder="$t('联系人')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="linkPhone">
<el-input
v-model="queryParams.linkPhone"
:placeholder="$t('联系电话')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="transferFee">
<el-input
v-model="queryParams.transferFee"
:placeholder="$t('转件费')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="transferWeight">
<el-input
v-model="queryParams.transferWeight"
:placeholder="$t('转件重量')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="transferVolume">
<el-input
v-model="queryParams.transferVolume"
:placeholder="$t('转件体积')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="transferResean">
<el-input
v-model="queryParams.transferResean"
:placeholder="$t('转件原因')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="transferCity">
<el-input
v-model="queryParams.transferCity"
:placeholder="$t('转件城市')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="dataFrom">
<el-input
v-model="queryParams.dataFrom"
:placeholder="$t('数据来源')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="delFlag">
<el-input
v-model="queryParams.delFlag"
:placeholder="$t('删除标志(0代表存在')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="remark">
<el-input
v-model="queryParams.remark"
:placeholder="$t('备注')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</SearchForm>
<XdTable v-loading="loading"
border stripe
size="small"
:data="emisWaybillTransferList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<div slot="toolbar">
<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="['emis:emisWaybillTransfer:add']"
>新增</el-button>
</el-col>
<!--
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['emis:emisWaybillTransfer:edit']"
>修改</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['emis:emisWaybillTransfer:remove']"
>删除</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['emis:emisWaybillTransfer:export']"
>导出</el-button>
</el-col> -->
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
</template>
</el-table-column>
<el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom" min-width="80">
<template slot-scope="scope">
<div v-if="scope.row.settleStatus == 0" style="color:red;">
<span class="el-tag el-tag--info">未结算</span>
</div>
<div v-if="scope.row.settleStatus == 10" style="color:red;">
<span class="el-tag">待确认</span>
</div>
<div v-if="scope.row.settleStatus == 11" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已确认</span>
</div>
<div v-if="scope.row.settleStatus == 20" >
<span class="el-tag el-tag--warning el-tag--light">待打款</span>
</div>
<div v-if="scope.row.settleStatus == 21" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已打款</span>
</div>
<div v-if="scope.row.settleStatus == 40" style="color:red;">
<span class="el-tag el-tag--danger">已拒绝</span>
</div>
</template>
</el-table-column>
-->
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
<el-table-column :label="$t('转件单号')" align="center" prop="transferBillCode" min-width="100" />
<el-table-column :label="$t('转件日期')" align="center" prop="transferDate" min-width="100" />
<el-table-column :label="$t('转件公司')" align="center" prop="transferExpress" min-width="100" />
<el-table-column :label="$t('联系人')" align="center" prop="linkMan" min-width="100" />
<el-table-column :label="$t('联系电话')" align="center" prop="linkPhone" min-width="100" />
<el-table-column :label="$t('转件费')" align="center" prop="transferFee" min-width="100" />
<el-table-column :label="$t('转件重量')" align="center" prop="transferWeight" min-width="100" />
<el-table-column :label="$t('转件体积')" align="center" prop="transferVolume" min-width="100" />
<el-table-column :label="$t('转件原因')" align="center" prop="transferResean" min-width="100" />
<el-table-column :label="$t('转件城市')" align="center" prop="transferCity" min-width="100" />
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
<el-table-column :label="$t('删除标志(0代表存在')" align="center" prop="delFlag" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<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="handleUpdate(scope.row)"
v-hasPermi="['emis:emisWaybillTransfer:edit']"
>修改</el-button>
<!--
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['emis:emisWaybillTransfer:remove']"
>删除</el-button> -->
</template>
</el-table-column>
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisWaybillTransferForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWaybillTransferForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisWaybillTransferView :id="id" ></EmisWaybillTransferView>
</el-dialog>
-->
</div>
</template>
<script>
import { listEmisWaybillTransfer, getEmisWaybillTransfer, delEmisWaybillTransfer, addEmisWaybillTransfer, updateEmisWaybillTransfer } from "@/api/emis/emisWaybillTransfer";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
// import emisWaybillTransferView from '@/views/emis/emisWaybillTransfer/emisWaybillTransferView';
import emisWaybillTransferForm from '@/views/emis/emisWaybillTransfer/emisWaybillTransferForm';
export default {
name: "emisWaybillTransfer",
components: { elDateSimplePicker,emisWaybillTransferForm },
dicts: [
],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 创建时间搜索
dateTimeRange:[],
// 总条数
total: 0,
// 运单转件表表格数据
emisWaybillTransferList: [],
currentId:null,
openForm: false,
titleForm: "",
// 弹出展示层
id:null,
titleView:"",
openView: false,
// 更新网点时间范围
daterangeTransferDate: [],
// 更新网点时间范围
daterangeCreateTime: [],
// 更新网点时间范围
daterangeUpdateTime: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
billCode: null,
transferBillCode: null,
transferDate: null,
transferExpress: null,
linkMan: null,
linkPhone: null,
transferFee: null,
transferWeight: null,
transferVolume: null,
transferResean: null,
transferCity: null,
dataFrom: null,
delFlag: null,
remark: null,
},
};
},
created() {
this.getList();
},
methods: {
/** 查询运单转件表列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeTransferDate && '' != this.daterangeTransferDate) {
this.queryParams.params["beginTransferDate"] = this.daterangeTransferDate[0];
this.queryParams.params["endTransferDate"] = this.daterangeTransferDate[1];
}
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
}
if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
}
listEmisWaybillTransfer(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisWaybillTransferList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
// 排序 查询字段是表格中字段名字 动态取值排序顺序
handleSortChange(column) {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order;
this.getList();
},
/** 新增按钮操作 */
handleAdd(row) {
this.currentId=null;
this.openForm= true;
this.titleForm = "新增";
},
handleShowMoreInput(){
this.moreInputVisible = !this.moreInputVisible;
},
/** 修改按钮操作 */
handleUpdate(row) {
this.currentId= row.id;
this.openForm = true;
this.titleForm = "修改";
},
handleView(row) {
this.id=row.id;
this.titleView="查看";
this.openView=true;
// this.router.push({ path: '/emis/emisWaybillTransfer/viewDetail', query: { id: row.id }})
},
handleFormChanged(){
this.openForm = false;
this.getList();
},
cancelForm(){
this.openForm = false;
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除').then(function() {
return delEmisWaybillTransfer(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// this.download('emis/emisWaybillTransfer/export', {
// ...this.queryParams
// }, `emisWaybillTransfer_${new Date().getTime()}.xlsx`)
const loadingInstance = this.$loading({
text: '正在导出...'
})
var qParam = {...this.queryParams};
qParam.pageNum=1;
qParam.pageSize=5000;
listEmisWaybillTransfer(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
this.downloadLoading = false
if (response.code === 200) {
const curList = response.rows
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['id','运单号','转件单号','转件日期','转件公司','联系人','联系电话','转件费','转件重量','转件体积','转件原因','转件城市','数据来源','删除标志(0代表存在','创建者','创建时间','更新者','更新时间','备注','创建网点','更新网点',];
const filterVal = ['id','billCode','transferBillCode','transferDate','transferExpress','linkMan','linkPhone','transferFee','transferWeight','transferVolume','transferResean','transferCity','dataFrom','delFlag','createBy','createTime','updateBy','updateTime','remark','createSite','updateSite',];
const data = this.formatJson(filterVal, curList, response.rows)
excel.export_json_to_excel({
header: tHeader,
data,
filename: '运单转件表',
autoWidth: true
})
loadingInstance.close()
})
}
});
},
formatJson(filterVal, jsonData, resData) {
let index = 0
return jsonData.map(v => filterVal.map(j => {
if (j === 'index') {
return ++index
}
if (j === 'status') {
var statusStr='xxx'
if(v[j] == 10){
statusStr='xxx'
}
return statusStr;
}
return v[j]
}))
},
/** 列索引函数 */
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
},
/** 时间搜索响应函数 */
dateTimeChange(value){
this.dateTimeRange=value;
},
}
};
</script>
<style scoped>
.el-divider{
margin-top: 0px;
background: 0 0;
border-top: 1px solid #E6EBF5;
}
.el-divider__text {
color: #0955ee;
cursor: pointer;
}
</style>