feat(manage): 添加发货记录管理功能- 新增发货记录的增删改查接口
- 实现发货记录列表页面及操作功能 - 添加发货清单导入导出功能 - 实现发货记录详情查看功能 - 添加关联合同选择功能 - 实现发货状态和物流信息管理- 添加发货记录搜索和筛选功能master
chenhao
parent
18fe750dab
commit
f6f66e1627
|
|
@ -0,0 +1,19 @@
|
||||||
|
import request from '@/utils/request'
|
||||||
|
|
||||||
|
// 获取商机管理数据
|
||||||
|
export function getProjectData(day) {
|
||||||
|
return request({
|
||||||
|
url: '/homepage/project',
|
||||||
|
method: 'get',
|
||||||
|
params: { day }
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取合同信息数据
|
||||||
|
export function getOrderData(month) {
|
||||||
|
return request({
|
||||||
|
url: '/homepage/order',
|
||||||
|
method: 'get',
|
||||||
|
params: { month }
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,96 @@
|
||||||
|
import request from '@/utils/request'
|
||||||
|
|
||||||
|
// 查询发货记录列表
|
||||||
|
export function listDelivery(query) {
|
||||||
|
return request({
|
||||||
|
url: '/manage/delivery/vue/list',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 查询发货记录详细
|
||||||
|
export function getDelivery(id) {
|
||||||
|
return request({
|
||||||
|
url: '/manage/delivery/vue/' + id,
|
||||||
|
method: 'get'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 新增发货记录
|
||||||
|
export function addDelivery(data) {
|
||||||
|
return request({
|
||||||
|
url: '/manage/delivery/vue',
|
||||||
|
method: 'post',
|
||||||
|
data: data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 修改发货记录
|
||||||
|
export function updateDelivery(data) {
|
||||||
|
return request({
|
||||||
|
url: '/manage/delivery/vue',
|
||||||
|
method: 'put',
|
||||||
|
data: data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 删除发货记录
|
||||||
|
export function delDelivery(id) {
|
||||||
|
return request({
|
||||||
|
url: '/manage/delivery/vue/' + id,
|
||||||
|
method: 'delete'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 导出发货记录
|
||||||
|
export function exportDelivery(query) {
|
||||||
|
return request({
|
||||||
|
url: '/manage/delivery/vue/export',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 查询关联合同列表
|
||||||
|
export function listOrder(query) {
|
||||||
|
return request({
|
||||||
|
url: '/manage/order/vue/list',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 查询发货清单列表
|
||||||
|
export function listDeliveryItems(query) {
|
||||||
|
return request({
|
||||||
|
url: '/sip/list/vue/list',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 导入发货清单
|
||||||
|
export function importDeliveryItems(data) {
|
||||||
|
return request({
|
||||||
|
url: '/sip/list/vue/importData',
|
||||||
|
method: 'post',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'multipart/form-data'
|
||||||
|
},
|
||||||
|
data: data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 下载发货清单模板
|
||||||
|
export function downloadTemplate() {
|
||||||
|
return request({
|
||||||
|
url: '/sip/list/vue/export',
|
||||||
|
method: 'post',
|
||||||
|
data: {
|
||||||
|
deliveryId: -1,
|
||||||
|
productCode: '',
|
||||||
|
serialNumber: ''
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,61 @@
|
||||||
|
import request from '@/utils/request'
|
||||||
|
|
||||||
|
const baseURL = '/manage/order/vue'
|
||||||
|
|
||||||
|
// 查询合同档案列表
|
||||||
|
export function listOrder(query) {
|
||||||
|
return request({
|
||||||
|
url: `${baseURL}/list`,
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 查询合同档案详细
|
||||||
|
export function getOrder(id) {
|
||||||
|
return request({
|
||||||
|
url: `${baseURL}/${id}`,
|
||||||
|
method: 'get'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 新增合同档案
|
||||||
|
export function addOrder(data) {
|
||||||
|
return request({
|
||||||
|
url: baseURL,
|
||||||
|
method: 'post',
|
||||||
|
data: data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 修改合同档案
|
||||||
|
export function updateOrder(data) {
|
||||||
|
return request({
|
||||||
|
url: baseURL,
|
||||||
|
method: 'put',
|
||||||
|
data: data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 删除合同档案
|
||||||
|
export function delOrder(id) {
|
||||||
|
return request({
|
||||||
|
url: `${baseURL}/${id}`,
|
||||||
|
method: 'delete'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 导出合同档案
|
||||||
|
export function exportOrder(query) {
|
||||||
|
return request({
|
||||||
|
url: `${baseURL}/export`,
|
||||||
|
method: 'post',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
export function getOrderDetails(query) {
|
||||||
|
return request({
|
||||||
|
url: `/project/order/query/`+query,
|
||||||
|
method: 'get'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
import request from '@/utils/request'
|
||||||
|
|
||||||
|
// 查询产品信息
|
||||||
|
export function getProductInfo(serialNumber) {
|
||||||
|
return request({
|
||||||
|
url: '/manage/service/product',
|
||||||
|
method: 'get',
|
||||||
|
params: { serialNumber }
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 查询相关合同信息
|
||||||
|
export function getOrderInfo(serialNumber) {
|
||||||
|
return request({
|
||||||
|
url: '/manage/service/order',
|
||||||
|
method: 'get',
|
||||||
|
params: { serialNumber }
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 查询标准保修信息
|
||||||
|
export function getWarrantyInfo(serialNumber) {
|
||||||
|
return request({
|
||||||
|
url: '/manage/service/query',
|
||||||
|
method: 'get',
|
||||||
|
params: { serialNumber }
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,215 @@
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<el-dialog :title="title" :visible.sync="visible" width="800px" append-to-body @close="cancel">
|
||||||
|
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="关联合同" prop="orderName">
|
||||||
|
<el-input v-model="form.orderName" placeholder="请选择关联合同" readonly/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="出库单号" prop="deliveryCode">
|
||||||
|
<el-input v-model="form.deliveryCode" placeholder="保存后自动生成" disabled />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="发货日期" prop="deliveryDate">
|
||||||
|
<el-date-picker
|
||||||
|
v-model="form.deliveryDate"
|
||||||
|
style="width: 100%"
|
||||||
|
value-format="yyyy-MM-dd"
|
||||||
|
type="date"
|
||||||
|
placeholder="选择发货日期"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="发货方式" prop="deliveryType">
|
||||||
|
<el-select v-model="form.deliveryType" placeholder="请选择发货方式" style="width: 100%">
|
||||||
|
<el-option
|
||||||
|
v-for="dict in deliveryTypeOptions"
|
||||||
|
:key="dict.dictValue"
|
||||||
|
:label="dict.dictLabel"
|
||||||
|
:value="dict.dictValue"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="物流公司" prop="logisticsCompany">
|
||||||
|
<el-select v-model="form.logisticsCompany" placeholder="请选择物流公司" style="width: 100%">
|
||||||
|
<el-option
|
||||||
|
v-for="dict in logisticsCompanyOptions"
|
||||||
|
:key="dict.dictValue"
|
||||||
|
:label="dict.dictLabel"
|
||||||
|
:value="dict.dictValue"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="物流单号" prop="logisticsCode">
|
||||||
|
<el-input v-model="form.logisticsCode" placeholder="请输入物流单号" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="发货状态" prop="deliveryStatus">
|
||||||
|
<el-radio-group v-model="form.deliveryStatus">
|
||||||
|
<el-radio
|
||||||
|
v-for="dict in deliveryStatusOptions"
|
||||||
|
:key="dict.dictValue"
|
||||||
|
:label="dict.dictValue"
|
||||||
|
>{{dict.dictLabel}}</el-radio>
|
||||||
|
</el-radio-group>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="签收时间" prop="signTime">
|
||||||
|
<el-date-picker
|
||||||
|
v-model="form.signTime"
|
||||||
|
style="width: 100%"
|
||||||
|
value-format="yyyy-MM-dd"
|
||||||
|
type="date"
|
||||||
|
placeholder="选择签收时间"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="24">
|
||||||
|
<el-form-item label="备注" prop="remark">
|
||||||
|
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</el-form>
|
||||||
|
<div slot="footer" class="dialog-footer">
|
||||||
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||||
|
<el-button @click="cancel">取 消</el-button>
|
||||||
|
</div>
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
|
<select-order ref="selectOrder" @selected="onOrderSelected"></select-order>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { getDelivery, addDelivery, updateDelivery } from "@/api/manage/delivery";
|
||||||
|
import SelectOrder from "./SelectOrder";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "DeliveryForm",
|
||||||
|
components: { SelectOrder },
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
// 弹窗标题
|
||||||
|
title: "",
|
||||||
|
// 是否显示弹窗
|
||||||
|
visible: false,
|
||||||
|
// 表单参数
|
||||||
|
form: {},
|
||||||
|
// 表单校验
|
||||||
|
rules: {
|
||||||
|
orderName: [
|
||||||
|
{ required: true, message: "关联合同不能为空", trigger: "blur" }
|
||||||
|
],
|
||||||
|
deliveryDate: [
|
||||||
|
{ required: true, message: "发货日期不能为空", trigger: "blur" }
|
||||||
|
],
|
||||||
|
deliveryType: [
|
||||||
|
{ required: true, message: "发货方式不能为空", trigger: "change" }
|
||||||
|
],
|
||||||
|
logisticsCode: [
|
||||||
|
{ required: true, message: "物流单号不能为空", trigger: "blur" }
|
||||||
|
],
|
||||||
|
deliveryStatus: [
|
||||||
|
{ required: true, message: "发货状态不能为空", trigger: "blur" }
|
||||||
|
],
|
||||||
|
},
|
||||||
|
// 字典
|
||||||
|
deliveryTypeOptions: [],
|
||||||
|
deliveryStatusOptions: [],
|
||||||
|
logisticsCompanyOptions: [],
|
||||||
|
// 模式
|
||||||
|
mode: 'add'
|
||||||
|
};
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
this.getDicts("delivery_type").then(response => {
|
||||||
|
this.deliveryTypeOptions = response.data;
|
||||||
|
});
|
||||||
|
this.getDicts("delivery_status").then(response => {
|
||||||
|
this.deliveryStatusOptions = response.data;
|
||||||
|
});
|
||||||
|
this.getDicts("logistics_company").then(response => {
|
||||||
|
this.logisticsCompanyOptions = response.data;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
// 打开弹窗
|
||||||
|
open(mode, id) {
|
||||||
|
this.reset();
|
||||||
|
this.mode = mode;
|
||||||
|
if (mode === 'edit') {
|
||||||
|
this.title = "修改发货记录";
|
||||||
|
getDelivery(id).then(response => {
|
||||||
|
this.form = response.data;
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
this.title = "新增发货记录";
|
||||||
|
}
|
||||||
|
this.visible = true;
|
||||||
|
},
|
||||||
|
// 取消按钮
|
||||||
|
cancel() {
|
||||||
|
this.visible = false;
|
||||||
|
this.reset();
|
||||||
|
},
|
||||||
|
// 表单重置
|
||||||
|
reset() {
|
||||||
|
this.form = {
|
||||||
|
id: null,
|
||||||
|
orderId: null,
|
||||||
|
orderName: null,
|
||||||
|
deliveryCode: null,
|
||||||
|
deliveryDate: null,
|
||||||
|
deliveryType: null,
|
||||||
|
logisticsCompany: null,
|
||||||
|
logisticsCode: null,
|
||||||
|
deliveryStatus: "0",
|
||||||
|
signTime: null,
|
||||||
|
remark: null
|
||||||
|
};
|
||||||
|
this.resetForm("form");
|
||||||
|
},
|
||||||
|
/** 提交按钮 */
|
||||||
|
submitForm() {
|
||||||
|
this.$refs["form"].validate(valid => {
|
||||||
|
if (valid) {
|
||||||
|
if (this.form.id != null) {
|
||||||
|
updateDelivery(this.form).then(response => {
|
||||||
|
this.$modal.msgSuccess("修改成功");
|
||||||
|
this.visible = false;
|
||||||
|
this.$emit("ok");
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
addDelivery(this.form).then(response => {
|
||||||
|
this.$modal.msgSuccess("新增成功");
|
||||||
|
this.visible = false;
|
||||||
|
this.$emit("ok");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// 打开选择合同弹窗
|
||||||
|
handleSelectOrder() {
|
||||||
|
this.$refs.selectOrder.open();
|
||||||
|
},
|
||||||
|
// 选中合同
|
||||||
|
onOrderSelected(order) {
|
||||||
|
this.form.orderId = order.id;
|
||||||
|
this.form.orderName = order.orderName;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
@ -0,0 +1,157 @@
|
||||||
|
<template>
|
||||||
|
<el-dialog title="发货清单" :visible.sync="visible" width="80%" @close="cancel">
|
||||||
|
<div class="dialog-content-wrapper">
|
||||||
|
<el-row :gutter="10" class="mb8">
|
||||||
|
<el-col :span="1.5">
|
||||||
|
<el-button
|
||||||
|
type="info"
|
||||||
|
plain
|
||||||
|
icon="el-icon-download"
|
||||||
|
size="mini"
|
||||||
|
@click="handleDownloadTemplate"
|
||||||
|
>下载模板</el-button>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="1.5">
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
plain
|
||||||
|
icon="el-icon-upload2"
|
||||||
|
size="mini"
|
||||||
|
@click="handleImport"
|
||||||
|
>导入清单</el-button>
|
||||||
|
</el-col>
|
||||||
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
|
</el-row>
|
||||||
|
|
||||||
|
<el-table v-loading="loading" :data="deliveryItemsList" height="calc(100% - 50px)">
|
||||||
|
<el-table-column label="主键" align="center" prop="id" />
|
||||||
|
<el-table-column label="合同编号" align="center" prop="orderCode" />
|
||||||
|
<el-table-column label="产品编码" align="center" prop="productCode" />
|
||||||
|
<el-table-column label="产品型号" align="center" prop="model" />
|
||||||
|
<el-table-column label="产品名称" align="center" prop="productName" />
|
||||||
|
<el-table-column label="产品描述" align="center" prop="description" show-overflow-tooltip />
|
||||||
|
<el-table-column label="产品序列号" align="center" prop="serialNumber" />
|
||||||
|
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
|
||||||
|
</el-table>
|
||||||
|
|
||||||
|
<pagination
|
||||||
|
v-show="total>0"
|
||||||
|
:total="total"
|
||||||
|
:page.sync="queryParams.pageNum"
|
||||||
|
:limit.sync="queryParams.pageSize"
|
||||||
|
@pagination="getList"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 导入对话框 -->
|
||||||
|
<input type="file" ref="uploadInput" @change="onFileChange" accept=".xls,.xlsx" style="display: none" />
|
||||||
|
</el-dialog>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { listDeliveryItems, downloadTemplate, importDeliveryItems } from "@/api/manage/delivery";
|
||||||
|
import { getToken } from "@/utils/auth";
|
||||||
|
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "DeliveryItems",
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
visible: false,
|
||||||
|
loading: true,
|
||||||
|
showSearch: true,
|
||||||
|
total: 0,
|
||||||
|
deliveryItemsList: [],
|
||||||
|
deliveryId: null,
|
||||||
|
queryParams: {
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
deliveryId: null
|
||||||
|
},
|
||||||
|
// 导入参数
|
||||||
|
upload: {
|
||||||
|
open: false,
|
||||||
|
title: "",
|
||||||
|
// 是否禁用上传
|
||||||
|
isUploading: false,
|
||||||
|
// 是否更新已经存在的用户数据
|
||||||
|
updateSupport: 0,
|
||||||
|
// 设置上传的请求头部
|
||||||
|
headers: { Authorization: "Bearer " + getToken() },
|
||||||
|
// 上传的地址
|
||||||
|
url: process.env.VUE_APP_BASE_API + "/sip/list/vue/importData?deliveryId=" + this.deliveryId
|
||||||
|
}
|
||||||
|
};
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
open(deliveryId) {
|
||||||
|
this.deliveryId = deliveryId;
|
||||||
|
this.queryParams.deliveryId = deliveryId;
|
||||||
|
this.visible = true;
|
||||||
|
this.getList();
|
||||||
|
// 更新上传URL，确保deliveryId正确传递
|
||||||
|
this.upload.url = process.env.VUE_APP_BASE_API + "/sip/list/vue/importData?deliveryId=" + this.deliveryId;
|
||||||
|
},
|
||||||
|
cancel() {
|
||||||
|
this.visible = false;
|
||||||
|
this.deliveryId = null;
|
||||||
|
this.deliveryItemsList = [];
|
||||||
|
this.total = 0;
|
||||||
|
this.$refs.uploadInput.value = ''; // 清空文件列表
|
||||||
|
},
|
||||||
|
getList() {
|
||||||
|
this.loading = true;
|
||||||
|
listDeliveryItems(this.queryParams).then(response => {
|
||||||
|
this.deliveryItemsList = response.rows;
|
||||||
|
this.total = response.total;
|
||||||
|
this.loading = false;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
/** 下载模板操作 */
|
||||||
|
handleDownloadTemplate() {
|
||||||
|
downloadTemplate().then(response => {
|
||||||
|
window.location.href = process.env.VUE_APP_BASE_API + "/common/download?fileName=" + encodeURIComponent(response.msg) + "&delete=" + true;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
/** 导入按钮操作 */
|
||||||
|
handleImport() {
|
||||||
|
this.$refs.uploadInput.click();
|
||||||
|
},
|
||||||
|
onFileChange(event) {
|
||||||
|
const file = event.target.files[0];
|
||||||
|
if (!file) return;
|
||||||
|
|
||||||
|
const formData = new FormData();
|
||||||
|
formData.append('file', file);
|
||||||
|
formData.append('deliveryId', this.deliveryId);
|
||||||
|
importDeliveryItems(formData).then(response => {
|
||||||
|
if (response.code === 0) {
|
||||||
|
this.$message.success('上传成功');
|
||||||
|
this.getList();
|
||||||
|
} else {
|
||||||
|
this.$alert(response.msg || '导入失败', "导入结果", {
|
||||||
|
dangerouslyUseHTMLString: true,
|
||||||
|
type: 'error'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}).catch(() => {
|
||||||
|
this.$alert('导入失败', "导入结果", {
|
||||||
|
dangerouslyUseHTMLString: true,
|
||||||
|
type: 'error'
|
||||||
|
});
|
||||||
|
}).finally(() => {
|
||||||
|
this.$refs.uploadInput.value = ''; // Reset file input
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.dialog-content-wrapper {
|
||||||
|
height: calc(100vh - 200px); /* 估算值，扣除头部和底部 */
|
||||||
|
/* 移除 overflow: auto; 以消除滚动条 */
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
@ -0,0 +1,86 @@
|
||||||
|
<template>
|
||||||
|
<el-drawer
|
||||||
|
title="发货记录详情"
|
||||||
|
:visible.sync="visible"
|
||||||
|
direction="rtl"
|
||||||
|
size="50%"
|
||||||
|
:before-close="handleClose">
|
||||||
|
<div class="app-container">
|
||||||
|
<el-form :model="form" label-width="100px">
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="关联合同：">{{ form.orderName }}</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="出库单号：">{{ form.deliveryCode }}</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="发货日期：">{{ form.deliveryDate }}</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="发货方式：">{{ selectDictLabel(deliveryTypeOptions, form.deliveryType) }}</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="物流公司：">{{ selectDictLabel(logisticsCompanyOptions, form.logisticsCompany) }}</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="物流单号：">{{ form.logisticsCode }}</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="发货状态：">{{ selectDictLabel(deliveryStatusOptions, form.deliveryStatus) }}</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="签收时间：">{{ form.signTime }}</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="24">
|
||||||
|
<el-form-item label="备注：">{{ form.remark }}</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</el-form>
|
||||||
|
</div>
|
||||||
|
</el-drawer>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { getDelivery } from "@/api/manage/delivery";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "DeliveryDetail",
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
visible: false,
|
||||||
|
form: {},
|
||||||
|
deliveryTypeOptions: [],
|
||||||
|
deliveryStatusOptions: [],
|
||||||
|
logisticsCompanyOptions: [],
|
||||||
|
};
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
this.getDicts("delivery_type").then(response => {
|
||||||
|
this.deliveryTypeOptions = response.data;
|
||||||
|
});
|
||||||
|
this.getDicts("delivery_status").then(response => {
|
||||||
|
this.deliveryStatusOptions = response.data;
|
||||||
|
});
|
||||||
|
this.getDicts("logistics_company").then(response => {
|
||||||
|
this.logisticsCompanyOptions = response.data;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
open(id) {
|
||||||
|
this.reset();
|
||||||
|
getDelivery(id).then(response => {
|
||||||
|
this.form = response.data;
|
||||||
|
this.visible = true;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
handleClose() {
|
||||||
|
this.visible = false;
|
||||||
|
this.reset();
|
||||||
|
},
|
||||||
|
reset() {
|
||||||
|
this.form = {};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
@ -0,0 +1,120 @@
|
||||||
|
<template>
|
||||||
|
<el-dialog title="选择合同" :visible.sync="visible" width="800px" append-to-body @close="cancel">
|
||||||
|
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
|
||||||
|
<el-form-item label="合同编号" prop="orderCode">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.orderCode"
|
||||||
|
placeholder="请输入合同编号"
|
||||||
|
clearable
|
||||||
|
size="small"
|
||||||
|
@keyup.enter.native="handleQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="合同名称" prop="orderName">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.orderName"
|
||||||
|
placeholder="请输入合同名称"
|
||||||
|
clearable
|
||||||
|
size="small"
|
||||||
|
@keyup.enter.native="handleQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item>
|
||||||
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||||
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
|
||||||
|
<el-table v-loading="loading" :data="orderList" @row-click="handleRowClick" @selection-change="handleSelectionChange">
|
||||||
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
|
<el-table-column label="主键" align="center" prop="id" />
|
||||||
|
<el-table-column label="合同编号" align="center" prop="orderCode" />
|
||||||
|
<el-table-column label="版本号" align="center" prop="versionCode" />
|
||||||
|
<el-table-column label="合同名称" align="center" prop="orderName" />
|
||||||
|
</el-table>
|
||||||
|
|
||||||
|
<pagination
|
||||||
|
v-show="total>0"
|
||||||
|
:total="total"
|
||||||
|
:page.sync="queryParams.pageNum"
|
||||||
|
:limit.sync="queryParams.pageSize"
|
||||||
|
@pagination="getList"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div slot="footer" class="dialog-footer">
|
||||||
|
<el-button type="primary" @click="submitSelection">确 定</el-button>
|
||||||
|
<el-button @click="cancel">取 消</el-button>
|
||||||
|
</div>
|
||||||
|
</el-dialog>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { listOrder } from "@/api/manage/delivery";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "SelectOrder",
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
visible: false,
|
||||||
|
loading: true,
|
||||||
|
total: 0,
|
||||||
|
orderList: [],
|
||||||
|
queryParams: {
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
orderCode: null,
|
||||||
|
orderName: null
|
||||||
|
},
|
||||||
|
selectedOrder: null
|
||||||
|
};
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
this.getList();
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
open() {
|
||||||
|
this.visible = true;
|
||||||
|
this.getList();
|
||||||
|
},
|
||||||
|
cancel() {
|
||||||
|
this.visible = false;
|
||||||
|
this.selectedOrder = null;
|
||||||
|
},
|
||||||
|
getList() {
|
||||||
|
this.loading = true;
|
||||||
|
listOrder(this.queryParams).then(response => {
|
||||||
|
this.orderList = response.rows;
|
||||||
|
this.total = response.total;
|
||||||
|
this.loading = false;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
handleQuery() {
|
||||||
|
this.queryParams.pageNum = 1;
|
||||||
|
this.getList();
|
||||||
|
},
|
||||||
|
resetQuery() {
|
||||||
|
this.resetForm("queryForm");
|
||||||
|
this.handleQuery();
|
||||||
|
},
|
||||||
|
handleRowClick(row) {
|
||||||
|
this.$refs.multipleTable.toggleRowSelection(row);
|
||||||
|
},
|
||||||
|
handleSelectionChange(selection) {
|
||||||
|
if (selection.length > 1) {
|
||||||
|
this.$refs.multipleTable.clearSelection();
|
||||||
|
this.$refs.multipleTable.toggleRowSelection(selection.pop());
|
||||||
|
} else {
|
||||||
|
this.selectedOrder = selection.length > 0 ? selection[0] : null;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
submitSelection() {
|
||||||
|
if (this.selectedOrder) {
|
||||||
|
this.$emit("selected", this.selectedOrder);
|
||||||
|
this.visible = false;
|
||||||
|
} else {
|
||||||
|
this.msgWarning("请选择一条合同记录");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
@ -0,0 +1,338 @@
|
||||||
|
<template>
|
||||||
|
<div class="app-container">
|
||||||
|
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
||||||
|
<el-form-item label="出库单号" prop="deliveryCode">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.deliveryCode"
|
||||||
|
placeholder="请输入出库单号"
|
||||||
|
clearable
|
||||||
|
size="small"
|
||||||
|
@keyup.enter.native="handleQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="发货日期" prop="deliveryDate">
|
||||||
|
<el-date-picker
|
||||||
|
v-model="queryParams.deliveryDate"
|
||||||
|
size="small"
|
||||||
|
style="width: 240px"
|
||||||
|
value-format="yyyy-MM-dd"
|
||||||
|
type="date"
|
||||||
|
placeholder="选择发货日期"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="发货方式" prop="deliveryType">
|
||||||
|
<el-select v-model="queryParams.deliveryType" placeholder="请选择发货方式" clearable size="small">
|
||||||
|
<el-option
|
||||||
|
v-for="dict in deliveryTypeOptions"
|
||||||
|
:key="dict.dictValue"
|
||||||
|
:label="dict.dictLabel"
|
||||||
|
:value="dict.dictValue"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="物流公司" prop="logisticsCompany">
|
||||||
|
<el-select v-model="queryParams.logisticsCompany" placeholder="请选择物流公司" clearable size="small">
|
||||||
|
<el-option
|
||||||
|
v-for="dict in logisticsCompanyOptions"
|
||||||
|
:key="dict.dictValue"
|
||||||
|
:label="dict.dictLabel"
|
||||||
|
:value="dict.dictValue"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="物流单号" prop="logisticsCode">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.logisticsCode"
|
||||||
|
placeholder="请输入物流单号"
|
||||||
|
clearable
|
||||||
|
size="small"
|
||||||
|
@keyup.enter.native="handleQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="发货状态" prop="deliveryStatus">
|
||||||
|
<el-select v-model="queryParams.deliveryStatus" placeholder="请选择发货状态" clearable size="small">
|
||||||
|
<el-option
|
||||||
|
v-for="dict in deliveryStatusOptions"
|
||||||
|
:key="dict.dictValue"
|
||||||
|
:label="dict.dictLabel"
|
||||||
|
:value="dict.dictValue"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="合同名称" prop="orderName">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.orderName"
|
||||||
|
placeholder="请输入合同名称"
|
||||||
|
clearable
|
||||||
|
size="small"
|
||||||
|
@keyup.enter.native="handleQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item>
|
||||||
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||||
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
|
||||||
|
<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="['manage:delivery: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="['manage:delivery: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="['manage:delivery: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="['manage:delivery:export']"
|
||||||
|
>导出</el-button>
|
||||||
|
</el-col>
|
||||||
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
|
</el-row>
|
||||||
|
|
||||||
|
<el-table v-loading="loading" :data="deliveryList" @selection-change="handleSelectionChange">
|
||||||
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
|
<el-table-column label="合同编号" align="center" prop="orderCode" />
|
||||||
|
<el-table-column label="合同名称" align="center" prop="orderName" show-overflow-tooltip>
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span style="color: #1686d8;cursor:pointer;" @click="handleOrderDetail(scope.row)">{{ scope.row.orderName }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="出库单号" align="center" prop="deliveryCode" />
|
||||||
|
<el-table-column label="发货数量" align="center" prop="total" width="100">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span :style="{color: scope.row.total ? '' : 'red'}">{{ scope.row.total || 0 }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="发货日期" align="center" prop="deliveryDate" />
|
||||||
|
<el-table-column label="发货方式" align="center" prop="deliveryType" width="100" >
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<dict-tag :options="dict.type.delivery_type" :value="scope.row.deliveryType" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="发货状态" align="center" prop="deliveryStatus" width="100" >
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<dict-tag :options="dict.type.delivery_status" :value="scope.row.deliveryStatus" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="创建人" align="center" prop="createByName" width="100" />
|
||||||
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="190">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-document"
|
||||||
|
@click="handleItems(scope.row)"
|
||||||
|
v-hasPermi="['manage:delivery:list']"
|
||||||
|
>发货清单</el-button>
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-edit"
|
||||||
|
@click="handleUpdate(scope.row)"
|
||||||
|
v-hasPermi="['manage:delivery:edit']"
|
||||||
|
>修改</el-button>
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-delete"
|
||||||
|
@click="handleDelete(scope.row)"
|
||||||
|
v-hasPermi="['manage:delivery:remove']"
|
||||||
|
>删除</el-button>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
|
||||||
|
<pagination
|
||||||
|
v-show="total>0"
|
||||||
|
:total="total"
|
||||||
|
:page.sync="queryParams.pageNum"
|
||||||
|
:limit.sync="queryParams.pageSize"
|
||||||
|
@pagination="getList"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<!-- 添加或修改发货记录对话框 -->
|
||||||
|
<delivery-form ref="form" @ok="getList"></delivery-form>
|
||||||
|
<!-- 发货清单对话框 -->
|
||||||
|
<delivery-items ref="items"></delivery-items>
|
||||||
|
<!-- 合同详情抽屉 -->
|
||||||
|
<order-detail ref="orderDetail"></order-detail>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { listDelivery, delDelivery, exportDelivery } from "@/api/manage/delivery";
|
||||||
|
import DeliveryForm from "./components/DeliveryForm";
|
||||||
|
import DeliveryItems from "./components/DeliveryItems";
|
||||||
|
// import OrderDetail from "@/views/manage/order/components/OrderDetail"; // Assuming this component exists
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "Delivery",
|
||||||
|
components: {
|
||||||
|
DeliveryForm,
|
||||||
|
DeliveryItems,
|
||||||
|
// OrderDetail
|
||||||
|
},
|
||||||
|
dicts: ['delivery_type','delivery_status','logistics_company'],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
// 遮罩层
|
||||||
|
loading: true,
|
||||||
|
// 选中数组
|
||||||
|
ids: [],
|
||||||
|
// 非单个禁用
|
||||||
|
single: true,
|
||||||
|
// 非多个禁用
|
||||||
|
multiple: true,
|
||||||
|
// 显示搜索条件
|
||||||
|
showSearch: true,
|
||||||
|
// 总条数
|
||||||
|
total: 0,
|
||||||
|
// 发货记录表格数据
|
||||||
|
deliveryList: [],
|
||||||
|
// 弹出层标题
|
||||||
|
title: "",
|
||||||
|
// 是否显示弹出层
|
||||||
|
open: false,
|
||||||
|
// 查询参数
|
||||||
|
queryParams: {
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
deliveryCode: null,
|
||||||
|
deliveryDate: null,
|
||||||
|
deliveryType: null,
|
||||||
|
logisticsCompany: null,
|
||||||
|
logisticsCode: null,
|
||||||
|
deliveryStatus: null,
|
||||||
|
orderName: null
|
||||||
|
},
|
||||||
|
// 字典
|
||||||
|
deliveryTypeOptions: [],
|
||||||
|
deliveryStatusOptions: [],
|
||||||
|
logisticsCompanyOptions: [],
|
||||||
|
};
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
this.getList();
|
||||||
|
this.getDicts("delivery_type").then(response => {
|
||||||
|
this.deliveryTypeOptions = response.data;
|
||||||
|
});
|
||||||
|
this.getDicts("delivery_status").then(response => {
|
||||||
|
this.deliveryStatusOptions = response.data;
|
||||||
|
});
|
||||||
|
this.getDicts("logistics_company").then(response => {
|
||||||
|
this.logisticsCompanyOptions = response.data;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
/** 查询发货记录列表 */
|
||||||
|
getList() {
|
||||||
|
this.loading = true;
|
||||||
|
listDelivery(this.queryParams).then(response => {
|
||||||
|
this.deliveryList = response.rows;
|
||||||
|
this.total = response.total;
|
||||||
|
this.loading = false;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// 字典翻译
|
||||||
|
deliveryTypeFormat(row, column) {
|
||||||
|
return this.selectDictLabel(this.deliveryTypeOptions, row.deliveryType);
|
||||||
|
},
|
||||||
|
deliveryStatusFormat(row, column) {
|
||||||
|
return this.selectDictLabel(this.deliveryStatusOptions, row.deliveryStatus);
|
||||||
|
},
|
||||||
|
/** 搜索按钮操作 */
|
||||||
|
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;
|
||||||
|
},
|
||||||
|
/** 新增按钮操作 */
|
||||||
|
handleAdd() {
|
||||||
|
this.$refs.form.open('add');
|
||||||
|
},
|
||||||
|
/** 修改按钮操作 */
|
||||||
|
handleUpdate(row) {
|
||||||
|
const id = row.id || this.ids[0];
|
||||||
|
this.$refs.form.open('edit', id);
|
||||||
|
},
|
||||||
|
/** 删除按钮操作 */
|
||||||
|
handleDelete(row) {
|
||||||
|
const ids = row.id || this.ids;
|
||||||
|
this.$confirm('是否确认删除发货记录编号为"' + ids + '"的数据项?', "警告", {
|
||||||
|
confirmButtonText: "确定",
|
||||||
|
cancelButtonText: "取消",
|
||||||
|
type: "warning"
|
||||||
|
}).then(function() {
|
||||||
|
return delDelivery(ids);
|
||||||
|
}).then(() => {
|
||||||
|
this.getList();
|
||||||
|
this.msgSuccess("删除成功");
|
||||||
|
}).catch(() => {});
|
||||||
|
},
|
||||||
|
/** 导出按钮操作 */
|
||||||
|
handleExport() {
|
||||||
|
const queryParams = this.queryParams;
|
||||||
|
this.$confirm('是否确认导出所有发货记录数据项?', "警告", {
|
||||||
|
confirmButtonText: "确定",
|
||||||
|
cancelButtonText: "取消",
|
||||||
|
type: "warning"
|
||||||
|
}).then(function() {
|
||||||
|
return exportDelivery(queryParams);
|
||||||
|
}).then(response => {
|
||||||
|
window.location.href = process.env.VUE_APP_BASE_API + "/common/download?fileName=" + encodeURIComponent(response.msg) + "&delete=" + true;
|
||||||
|
}).catch(() => {});
|
||||||
|
},
|
||||||
|
/** 发货清单按钮操作 */
|
||||||
|
handleItems(row) {
|
||||||
|
this.$refs.items.open(row.id);
|
||||||
|
},
|
||||||
|
/** 合同详情 */
|
||||||
|
handleOrderDetail(row) {
|
||||||
|
// this.$refs.orderDetail.open(row.orderId);
|
||||||
|
this.$message.info("合同详情功能待实现");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
@ -0,0 +1,472 @@
|
||||||
|
<template>
|
||||||
|
<el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
|
||||||
|
<div class="dialog-body-scroll">
|
||||||
|
<el-form ref="form" :model="form" :rules="rules"
|
||||||
|
label-width="120px">
|
||||||
|
<el-tabs v-model="activeName">
|
||||||
|
<el-tab-pane label="合同档案信息" name="first">
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="项目编号" prop="projectCode">
|
||||||
|
<el-input v-model="form.projectCode" readonly placeholder="请输入项目编号" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="合同编号" prop="orderCode">
|
||||||
|
<el-input v-model="form.orderCode" placeholder="请输入合同编号">
|
||||||
|
<el-button slot="append" icon="el-icon-refresh" @click="syncInfo"></el-button>
|
||||||
|
</el-input>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="版本号" prop="versionCode">
|
||||||
|
<el-input v-model="form.versionCode" readonly controls-position="right" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="合同名称" prop="orderName">
|
||||||
|
<el-input v-model="form.orderName" readonly placeholder="请输入合同名称" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="合同类型" prop="orderType">
|
||||||
|
<el-select v-model="form.orderType" readonly placeholder="请选择合同类型" @change="changeOrderType">
|
||||||
|
<el-option v-for="dict in dict.type.order_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="代表处" prop="orderAgentName">
|
||||||
|
<el-input v-model="form.orderAgentName" readonly placeholder="请选择代表处">
|
||||||
|
|
||||||
|
</el-input>
|
||||||
|
<input type="hidden" v-model="form.orderAgentCode" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="代理商" prop="orderPartnerName">
|
||||||
|
<el-input v-model="form.orderPartnerName" readonly placeholder="请选择代理商">
|
||||||
|
</el-input>
|
||||||
|
<input type="hidden" v-model="form.orderPartnerCode" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="签定日期" prop="orderDate">
|
||||||
|
<el-date-picker clearable size="small" v-model="form.orderDate" type="date" value-format="yyyy-MM-dd" placeholder="选择合同签定日期">
|
||||||
|
</el-date-picker>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="最终客户名称" prop="customerName">
|
||||||
|
<el-input v-model="form.customerName" readonly placeholder="请选择最终客户">
|
||||||
|
|
||||||
|
</el-input>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="客户编码" prop="customerCode">
|
||||||
|
<el-input v-model="form.customerCode" readonly placeholder="客户编码" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="客户联系人" prop="customerContact">
|
||||||
|
<el-input v-model="form.customerContact" placeholder="请输入客户联系人" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="客户邮箱" prop="customerEmail">
|
||||||
|
<el-input v-model="form.customerEmail" placeholder="请输入客户邮箱" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="客户电话" prop="customerPhone">
|
||||||
|
<el-input v-model="form.customerPhone" placeholder="请输入客户电话" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="备注" prop="remark">
|
||||||
|
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</el-tab-pane>
|
||||||
|
<el-tab-pane label="合同清单列表" name="second">
|
||||||
|
<!-- <el-row :gutter="10" class="mb8">-->
|
||||||
|
<!-- <el-col :span="1.5">-->
|
||||||
|
<!-- <el-button type="primary" plain icon="el-icon-upload" size="mini" @click="importList">导入</el-button>-->
|
||||||
|
<!-- </el-col>-->
|
||||||
|
<!-- <el-col :span="1.5">-->
|
||||||
|
<!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="downloadTem">下载模板</el-button>-->
|
||||||
|
<!-- </el-col>-->
|
||||||
|
<!-- </el-row>-->
|
||||||
|
<el-table :data="form.orderListList" style="height: calc(40vh - 20px);overflow-y: auto" :row-class-name="rowOrderListIndex" @selection-change="handleOrderListSelectionChange" ref="orderList">
|
||||||
|
<el-table-column type="selection" width="50" align="center" />
|
||||||
|
<el-table-column label="序号" align="center" prop="index" width="50"/>
|
||||||
|
<el-table-column label="BOM编码" prop="productCode" min-width="120">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input v-model="scope.row.productCode" placeholder="请输入BOM编码" readonly />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="产品名称" prop="productName" min-width="150">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input v-model="scope.row.productName" placeholder="请输入产品名称" readonly />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="数量" prop="quantity" width="100">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input-number v-model="scope.row.quantity" :min="0" controls-position="right" readonly />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="单价" prop="price" width="120">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input-number v-model="scope.row.price" :min="0" :precision="2" controls-position="right" readonly />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="折扣" prop="discount" width="100">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input-number v-model="scope.row.discount" :min="0" :max="1" :precision="4" :step="0.0001" controls-position="right" @change="e => changeTotal(e, scope.row)" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="总价" prop="amount" width="120">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input-number v-model="scope.row.amount" :min="0" :precision="2" controls-position="right" readonly />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="备注" prop="remark" min-width="150">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input v-model="scope.row.remark" placeholder="请输入备注" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="80">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-delete"
|
||||||
|
@click="handleDeleteOrderList(scope.row)"
|
||||||
|
>删除</el-button>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
</el-tab-pane>
|
||||||
|
</el-tabs>
|
||||||
|
</el-form>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div slot="footer" class="dialog-footer">
|
||||||
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||||
|
<el-button @click="cancel">取 消</el-button>
|
||||||
|
</div>
|
||||||
|
</el-dialog>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { addOrder, getOrder, updateOrder } from "@/api/manage/order";
|
||||||
|
import { getToken } from "@/utils/auth";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "OrderForm",
|
||||||
|
dicts: ['order_type'],
|
||||||
|
props: {
|
||||||
|
orderId: {
|
||||||
|
type: Number,
|
||||||
|
default: null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
open: false,
|
||||||
|
activeName: 'first', // Added for tab control
|
||||||
|
form: {
|
||||||
|
orderListList: []
|
||||||
|
},
|
||||||
|
rules: {
|
||||||
|
orderCode: [
|
||||||
|
{ required: true, message: "合同编号不能为空", trigger: "blur" }
|
||||||
|
],
|
||||||
|
versionCode: [
|
||||||
|
{ required: true, message: "版本号不能为空", trigger: "blur" }
|
||||||
|
],
|
||||||
|
orderName: [
|
||||||
|
{ required: true, message: "合同名称不能为空", trigger: "blur" }
|
||||||
|
],
|
||||||
|
orderType: [
|
||||||
|
{ required: true, message: "合同类型不能为空", trigger: "change" }
|
||||||
|
],
|
||||||
|
orderAgentName: [
|
||||||
|
{ required: true, message: "代表处不能为空", trigger: "blur" }
|
||||||
|
],
|
||||||
|
orderPartnerName: [
|
||||||
|
{ required: true, message: "代理商不能为空", trigger: "blur" }
|
||||||
|
],
|
||||||
|
orderDate: [
|
||||||
|
{ required: true, message: "签定日期不能为空", trigger: "change" }
|
||||||
|
],
|
||||||
|
customerName: [
|
||||||
|
{ required: true, message: "最终客户名称不能为空", trigger: "blur" }
|
||||||
|
],
|
||||||
|
customerCode: [
|
||||||
|
{ required: true, message: "客户编码不能为空", trigger: "blur" }
|
||||||
|
],
|
||||||
|
},
|
||||||
|
// 代理商/客户选择器相关
|
||||||
|
agentOpen: false,
|
||||||
|
customerOpen: false,
|
||||||
|
partnerOpen: false,
|
||||||
|
// 导入相关
|
||||||
|
upload: {
|
||||||
|
open: false,
|
||||||
|
title: "",
|
||||||
|
isUploading: false,
|
||||||
|
updateSupport: 0,
|
||||||
|
headers: { Authorization: "Bearer " + getToken() },
|
||||||
|
url: process.env.VUE_APP_BASE_API + "/manage/order/importData"
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
title() {
|
||||||
|
return this.orderId ? "修改合同档案" : "添加合同档案";
|
||||||
|
}
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
orderId(val) {
|
||||||
|
if (val) {
|
||||||
|
this.reset();
|
||||||
|
this.getOrderDetail(val);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
show(id) {
|
||||||
|
this.reset();
|
||||||
|
if (id) {
|
||||||
|
this.getOrderDetail(id);
|
||||||
|
}
|
||||||
|
this.open = true;
|
||||||
|
},
|
||||||
|
cancel() {
|
||||||
|
this.open = false;
|
||||||
|
this.reset();
|
||||||
|
},
|
||||||
|
reset() {
|
||||||
|
this.form = {
|
||||||
|
id: null,
|
||||||
|
orderCode: null,
|
||||||
|
versionCode: 0,
|
||||||
|
orderName: null,
|
||||||
|
customerName: null,
|
||||||
|
customerCode: null,
|
||||||
|
customerContact: null,
|
||||||
|
customerEmail: null,
|
||||||
|
customerPhone: null,
|
||||||
|
orderType: null,
|
||||||
|
projectCode: null,
|
||||||
|
orderDate: null,
|
||||||
|
orderAgentCode: null,
|
||||||
|
orderAgentName: null,
|
||||||
|
orderPartnerCode: null,
|
||||||
|
orderPartnerName: null,
|
||||||
|
remark: null,
|
||||||
|
createBy: null,
|
||||||
|
createTime: null,
|
||||||
|
updateBy: null,
|
||||||
|
updateTime: null,
|
||||||
|
orderListList: []
|
||||||
|
};
|
||||||
|
if (this.$refs["form"]) {
|
||||||
|
this.$refs["form"].resetFields();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
submitForm() {
|
||||||
|
this.$refs["form"].validate(valid => {
|
||||||
|
if (valid) {
|
||||||
|
if (this.form.id != null) {
|
||||||
|
updateOrder(this.form).then(response => {
|
||||||
|
this.$modal.msgSuccess("修改成功");
|
||||||
|
this.open = false;
|
||||||
|
this.$emit("success");
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
addOrder(this.form).then(response => {
|
||||||
|
this.$modal.msgSuccess("新增成功");
|
||||||
|
this.open = false;
|
||||||
|
this.$emit("success");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
getOrderDetail(id) {
|
||||||
|
getOrder(id).then(response => {
|
||||||
|
this.form = response.data;
|
||||||
|
this.changeOrderType(this.form.orderType); // Apply rules based on initial orderType
|
||||||
|
});
|
||||||
|
},
|
||||||
|
/** 同步信息 */
|
||||||
|
syncInfo() {
|
||||||
|
if (!this.form.orderCode) {
|
||||||
|
this.$modal.alertWarning("请填写订单编号");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Placeholder for API call to get order details
|
||||||
|
getOrder(this.form.orderCode).then(response => {
|
||||||
|
const data = response.data;
|
||||||
|
if (!data) {
|
||||||
|
this.form.projectCode = null;
|
||||||
|
this.form.versionCode = 0;
|
||||||
|
this.form.orderName = null;
|
||||||
|
this.form.orderType = null;
|
||||||
|
this.form.orderAgentCode = null;
|
||||||
|
this.form.orderAgentName = null;
|
||||||
|
this.form.orderPartnerCode = null;
|
||||||
|
this.form.orderPartnerName = null;
|
||||||
|
this.form.customerName = null;
|
||||||
|
this.form.customerCode = null;
|
||||||
|
this.form.customerContact = null;
|
||||||
|
this.form.customerEmail = null;
|
||||||
|
this.form.customerPhone = null;
|
||||||
|
this.form.orderListList = [];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.form.projectCode = data.projectCode;
|
||||||
|
this.form.versionCode = data.versionCode;
|
||||||
|
this.form.orderName = data.projectName;
|
||||||
|
this.form.orderType = data.orderChannel === '2' ? 'zq' : 'dls';
|
||||||
|
this.form.orderAgentCode = data.agentCode;
|
||||||
|
this.form.orderAgentName = data.agentName;
|
||||||
|
this.form.orderPartnerCode = data.partnerCode;
|
||||||
|
this.form.orderPartnerName = data.partnerName;
|
||||||
|
this.form.customerName = data.customerName;
|
||||||
|
this.form.customerCode = data.customerCode;
|
||||||
|
this.form.customerContact = data.customerUserName;
|
||||||
|
this.form.customerPhone = data.customerPhone;
|
||||||
|
this.form.orderListList = [];
|
||||||
|
if (data.softwareProjectProductInfoList) {
|
||||||
|
data.softwareProjectProductInfoList.forEach(item => {
|
||||||
|
this.addRow({
|
||||||
|
productCode: item.productBomCode,
|
||||||
|
amount: item.allPrice,
|
||||||
|
productName: item.productName,
|
||||||
|
quantity: item.quantity,
|
||||||
|
price: item.price,
|
||||||
|
discount: item.discount,
|
||||||
|
remark: item.remark,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (data.hardwareProjectProductInfoList) {
|
||||||
|
data.hardwareProjectProductInfoList.forEach(item => {
|
||||||
|
this.addRow({
|
||||||
|
productCode: item.productBomCode,
|
||||||
|
amount: item.allPrice,
|
||||||
|
productName: item.productName,
|
||||||
|
quantity: item.quantity,
|
||||||
|
price: item.price,
|
||||||
|
discount: item.discount,
|
||||||
|
remark: item.remark,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (data.maintenanceProjectProductInfoList) {
|
||||||
|
data.maintenanceProjectProductInfoList.forEach(item => {
|
||||||
|
this.addRow({
|
||||||
|
productCode: item.productBomCode,
|
||||||
|
amount: item.allPrice,
|
||||||
|
productName: item.productName,
|
||||||
|
quantity: item.quantity,
|
||||||
|
price: item.price,
|
||||||
|
discount: item.discount,
|
||||||
|
remark: item.remark,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
/** 选择客户 */
|
||||||
|
selectCustomer() {
|
||||||
|
this.$modal.msgWarning("请自行实现客户选择逻辑");
|
||||||
|
// this.customerOpen = true;
|
||||||
|
},
|
||||||
|
/** 选择代表处 */
|
||||||
|
selectAgent() {
|
||||||
|
this.$modal.msgWarning("请自行实现代表处选择逻辑");
|
||||||
|
// this.agentOpen = true;
|
||||||
|
},
|
||||||
|
/** 选择代理商 */
|
||||||
|
selectPartner() {
|
||||||
|
this.$modal.msgWarning("请自行实现代理商选择逻辑");
|
||||||
|
// this.partnerOpen = true;
|
||||||
|
},
|
||||||
|
/** 设置客户信息 */
|
||||||
|
setCustomer() {
|
||||||
|
// This logic seems to be tied to partner selection in the original HTML.
|
||||||
|
// Need to clarify if it's still needed or how it integrates with Vue.
|
||||||
|
this.$modal.msgWarning("请自行实现设置客户信息逻辑");
|
||||||
|
},
|
||||||
|
/** 导入清单 */
|
||||||
|
importList() {
|
||||||
|
this.$modal.msgWarning("请自行实现导入清单逻辑");
|
||||||
|
// this.$refs.upload.click();
|
||||||
|
},
|
||||||
|
/** 下载模板 */
|
||||||
|
downloadTem() {
|
||||||
|
this.$modal.msgWarning("请自行实现下载模板逻辑");
|
||||||
|
// window.location.href = process.env.VUE_APP_BASE_API + "/manage/order/list/export";
|
||||||
|
},
|
||||||
|
/** 改变合同类型 */
|
||||||
|
changeOrderType(val) {
|
||||||
|
if (val === 'zq') {
|
||||||
|
this.rules.orderPartnerName[0].required = false;
|
||||||
|
} else {
|
||||||
|
this.rules.orderPartnerName[0].required = true;
|
||||||
|
}
|
||||||
|
this.$refs.form.validateField('orderPartnerName');
|
||||||
|
},
|
||||||
|
/** 订单产品列表序号 */
|
||||||
|
rowOrderListIndex({ row, rowIndex }) {
|
||||||
|
row.index = rowIndex + 1;
|
||||||
|
},
|
||||||
|
/** 订单产品列表多选框选中数据 */
|
||||||
|
handleOrderListSelectionChange(selection) {
|
||||||
|
this.orderListListSelection = selection;
|
||||||
|
},
|
||||||
|
/** 删除订单产品 */
|
||||||
|
handleDeleteOrderList(row) {
|
||||||
|
const index = this.form.orderListList.indexOf(row);
|
||||||
|
if (index > -1) {
|
||||||
|
this.form.orderListList.splice(index, 1);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
/** 添加订单产品行 */
|
||||||
|
addRow(row) {
|
||||||
|
this.form.orderListList.push(row);
|
||||||
|
},
|
||||||
|
/** 计算总价 */
|
||||||
|
changeTotal(value, row) {
|
||||||
|
const price = row.price || 0;
|
||||||
|
const quantity = row.quantity || 0;
|
||||||
|
const discount = value || 0;
|
||||||
|
row.amount = (price * quantity * discount).toFixed(2); // Assuming 2 decimal places
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
<style lang="scss">
|
||||||
|
.dialog-scroll-body .el-dialog__body {
|
||||||
|
height: 70vh;
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
@ -0,0 +1,220 @@
|
||||||
|
<template>
|
||||||
|
<div class="app-container">
|
||||||
|
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
|
||||||
|
<el-form-item label="合同编号" prop="orderCode">
|
||||||
|
<el-input v-model="queryParams.orderCode" placeholder="请输入合同编号" clearable size="small" @keyup.enter.native="handleQuery"/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="合同名称" prop="orderName">
|
||||||
|
<el-input v-model="queryParams.orderName" placeholder="请输入合同名称" clearable size="small" @keyup.enter.native="handleQuery"/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="最终客户名称" prop="customerName">
|
||||||
|
<el-input v-model="queryParams.customerName" placeholder="请输入最终客户名称" clearable size="small" @keyup.enter.native="handleQuery"/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="合同类型" prop="orderType">
|
||||||
|
<el-select v-model="queryParams.orderType" placeholder="请选择合同类型" clearable size="small">
|
||||||
|
<el-option v-for="dict in dict.type.order_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="项目编号" prop="projectCode">
|
||||||
|
<el-input v-model="queryParams.projectCode" placeholder="请输入项目编号" clearable size="small" @keyup.enter.native="handleQuery"/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="代表处" prop="orderAgentName">
|
||||||
|
<el-input v-model="queryParams.orderAgentName" placeholder="请输入代表处" clearable size="small" @keyup.enter.native="handleQuery"/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="代理商" prop="orderPartnerName">
|
||||||
|
<el-input v-model="queryParams.orderPartnerName" placeholder="请输入代理商" clearable size="small" @keyup.enter.native="handleQuery"/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item>
|
||||||
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||||
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
|
||||||
|
<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="['manage:order:add']">新增</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="['manage:order: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="['manage:order:export']">导出</el-button>
|
||||||
|
</el-col>
|
||||||
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
|
</el-row>
|
||||||
|
|
||||||
|
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
|
||||||
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
|
<el-table-column label="合同编号" align="center" prop="orderCode" :show-overflow-tooltip="true" />
|
||||||
|
<el-table-column label="版本号" align="center" prop="versionCode" width="80" />
|
||||||
|
<el-table-column label="合同名称" align="center" prop="orderName" :show-overflow-tooltip="true" />
|
||||||
|
<el-table-column label="项目编号" align="center" prop="projectCode" width="100" :show-overflow-tooltip="true" />
|
||||||
|
<el-table-column label="最终客户名称" align="center" prop="customerName" :show-overflow-tooltip="true" />
|
||||||
|
<el-table-column label="合同类型" align="center" prop="orderType" width="100">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<dict-tag :options="dict.type.order_type" :value="scope.row.orderType"/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="合同签定日期" align="center" prop="orderDate" width="100">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{ parseTime(scope.row.orderDate, '{y}-{m}-{d}') }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="创建人" align="center" prop="createByName" width="100" />
|
||||||
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="120">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['manage:order:edit']">修改</el-button>
|
||||||
|
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:order:remove']">删除</el-button>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
|
||||||
|
<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<OrderForm ref="orderForm" :orderId="orderId" @success="getList" />
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { listOrder, delOrder, exportOrder } from "@/api/manage/order";
|
||||||
|
import OrderForm from "./OrderForm";
|
||||||
|
import Treeselect from "@riophae/vue-treeselect";
|
||||||
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||||
|
import { getToken } from "@/utils/auth"; // Import getToken for upload headers
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "Order",
|
||||||
|
dicts: ['order_type'],
|
||||||
|
components: {
|
||||||
|
OrderForm,
|
||||||
|
Treeselect
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
// 遮罩层
|
||||||
|
loading: true,
|
||||||
|
// 选中数组
|
||||||
|
ids: [],
|
||||||
|
// 非单个禁用
|
||||||
|
single: true,
|
||||||
|
// 非多个禁用
|
||||||
|
multiple: true,
|
||||||
|
// 显示搜索条件
|
||||||
|
showSearch: true,
|
||||||
|
// 总条数
|
||||||
|
total: 0,
|
||||||
|
// 合同档案表格数据
|
||||||
|
orderList: [],
|
||||||
|
// 当前操作的订单ID
|
||||||
|
orderId: null,
|
||||||
|
|
||||||
|
// 查询参数
|
||||||
|
queryParams: {
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
orderCode: null,
|
||||||
|
orderName: null,
|
||||||
|
customerName: null,
|
||||||
|
orderType: null,
|
||||||
|
projectCode: null,
|
||||||
|
orderAgentName: null,
|
||||||
|
orderPartnerName: null
|
||||||
|
},
|
||||||
|
// 导入相关
|
||||||
|
upload: {
|
||||||
|
open: false,
|
||||||
|
title: "",
|
||||||
|
isUploading: false,
|
||||||
|
updateSupport: 0,
|
||||||
|
headers: { Authorization: "Bearer " + getToken() },
|
||||||
|
url: process.env.VUE_APP_BASE_API + "/manage/order/importData"
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
this.getList();
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
/** 查询合同档案列表 */
|
||||||
|
getList() {
|
||||||
|
this.loading = true;
|
||||||
|
listOrder(this.queryParams).then(response => {
|
||||||
|
this.orderList = 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
|
||||||
|
},
|
||||||
|
/** 新增按钮操作 */
|
||||||
|
handleAdd() {
|
||||||
|
this.orderId = null; // Clear orderId for new entry
|
||||||
|
this.$refs.orderForm.show();
|
||||||
|
},
|
||||||
|
/** 修改按钮操作 */
|
||||||
|
handleUpdate(row) {
|
||||||
|
this.orderId = row.id || this.ids[0];
|
||||||
|
this.$refs.orderForm.show(this.orderId);
|
||||||
|
},
|
||||||
|
/** 删除按钮操作 */
|
||||||
|
handleDelete(row) {
|
||||||
|
const ids = row.id || this.ids;
|
||||||
|
this.$modal.confirm('是否确认删除合同档案编号为"' + ids + '"的数据项？').then(function() {
|
||||||
|
return delOrder(ids);
|
||||||
|
}).then(() => {
|
||||||
|
this.getList();
|
||||||
|
this.$modal.msgSuccess("删除成功");
|
||||||
|
}).catch(() => {});
|
||||||
|
},
|
||||||
|
/** 导出按钮操作 */
|
||||||
|
handleExport() {
|
||||||
|
const queryParams = this.queryParams;
|
||||||
|
this.$modal.confirm('是否确认导出所有合同档案数据项？').then(() => {
|
||||||
|
return exportOrder(queryParams);
|
||||||
|
}).then(response => {
|
||||||
|
const fileName = response.msg;
|
||||||
|
window.location.href = process.env.VUE_APP_BASE_API + "/common/download?fileName=" + encodeURIComponent(fileName) + "&delete=" + true;
|
||||||
|
}).catch(() => {});
|
||||||
|
},
|
||||||
|
/** 导入按钮操作 */
|
||||||
|
handleImport() {
|
||||||
|
this.upload.title = "合同档案导入";
|
||||||
|
this.upload.open = true;
|
||||||
|
},
|
||||||
|
// 文件上传中处理
|
||||||
|
handleFileUploadProgress(event, file, fileList) {
|
||||||
|
this.upload.isUploading = true;
|
||||||
|
},
|
||||||
|
// 文件上传成功处理
|
||||||
|
handleFileSuccess(response, file, fileList) {
|
||||||
|
this.upload.open = false;
|
||||||
|
this.upload.isUploading = false;
|
||||||
|
this.$refs.upload.clearFiles();
|
||||||
|
this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
|
||||||
|
this.getList();
|
||||||
|
},
|
||||||
|
// 提交上传文件
|
||||||
|
submitFileForm() {
|
||||||
|
this.$refs.upload.submit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
@ -0,0 +1,179 @@
|
||||||
|
<template>
|
||||||
|
<div class="service-container">
|
||||||
|
<div class="top-box">
|
||||||
|
<div class="title">产品维保查询 <span>(不支持第三方信息查询)</span></div>
|
||||||
|
</div>
|
||||||
|
<div class="search-box">
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="serialNumber">序列号</label>
|
||||||
|
<el-input id="serialNumber" v-model="serialNumber" placeholder="请输入产品序列号" clearable @keyup.enter.native="handleQuery"></el-input>
|
||||||
|
</div>
|
||||||
|
<el-button type="primary" @click="handleQuery">查询</el-button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="result-section">
|
||||||
|
<div class="result-title">查询结果</div>
|
||||||
|
|
||||||
|
<div class="sub-title">
|
||||||
|
<blockquote style="border-left-color: #1c84c6">产品信息</blockquote>
|
||||||
|
</div>
|
||||||
|
<el-table :data="productData" class="table-box" :header-cell-style="{background:'#f5f5f5'}">
|
||||||
|
<el-table-column prop="serialNumber" label="序列号"></el-table-column>
|
||||||
|
<el-table-column prop="productCode" label="产品编码"></el-table-column>
|
||||||
|
<el-table-column prop="description" label="产品描述"></el-table-column>
|
||||||
|
<el-table-column prop="productName" label="产品名称"></el-table-column>
|
||||||
|
<el-table-column label="区域" fixed="right">
|
||||||
|
<template slot-scope="scope">CN</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
|
||||||
|
<el-tabs v-model="activeTab" class="tabs-section">
|
||||||
|
<el-tab-pane label="相关合同" name="contract">
|
||||||
|
<el-table :data="orderData" class="table-box" :header-cell-style="{background:'#f5f5f5'}">
|
||||||
|
<el-table-column prop="orderCode" label="合同识别号"></el-table-column>
|
||||||
|
<el-table-column prop="versionCode" label="版本号"></el-table-column>
|
||||||
|
<el-table-column prop="orderName" label="合同名称"></el-table-column>
|
||||||
|
<el-table-column prop="saleName" label="销售人员姓名"></el-table-column>
|
||||||
|
<el-table-column prop="saleEmail" label="销售人员邮箱"></el-table-column>
|
||||||
|
<el-table-column prop="customerName" label="最终客户名称"></el-table-column>
|
||||||
|
<el-table-column prop="contactPerson" label="联系人"></el-table-column>
|
||||||
|
<el-table-column prop="contactPhone" label="电话"></el-table-column>
|
||||||
|
<el-table-column prop="contactEmail" label="客户邮箱"></el-table-column>
|
||||||
|
</el-table>
|
||||||
|
</el-tab-pane>
|
||||||
|
<el-tab-pane label="标准保修" name="warranty">
|
||||||
|
<el-table :data="warrantyData" class="table-box" :header-cell-style="{background:'#f5f5f5'}">
|
||||||
|
<el-table-column prop="serviceLevel" label="服务项"></el-table-column>
|
||||||
|
<el-table-column prop="serviceDescribe" label="服务项描述"></el-table-column>
|
||||||
|
<el-table-column prop="serviceStartTime" label="开始时间"></el-table-column>
|
||||||
|
<el-table-column prop="serviceEndTime" label="结束时间"></el-table-column>
|
||||||
|
<el-table-column label="状态" fixed="right">
|
||||||
|
<template slot-scope="scope">有效</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
</el-tab-pane>
|
||||||
|
</el-tabs>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { getProductInfo, getOrderInfo, getWarrantyInfo } from '@/api/manage/service'
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'ServiceQuery',
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
serialNumber: '',
|
||||||
|
productData: [],
|
||||||
|
orderData: [],
|
||||||
|
warrantyData: [],
|
||||||
|
activeTab: 'contract'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
const sn = this.$route.query.sn
|
||||||
|
if (sn) {
|
||||||
|
this.serialNumber = sn
|
||||||
|
this.handleQuery()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
handleQuery() {
|
||||||
|
if (!this.serialNumber) {
|
||||||
|
this.$message.warning('请输入产品序列号')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
this.getProductData()
|
||||||
|
this.getOrderData()
|
||||||
|
this.getWarrantyData()
|
||||||
|
},
|
||||||
|
getProductData() {
|
||||||
|
getProductInfo(this.serialNumber).then(res => {
|
||||||
|
this.productData = res.data
|
||||||
|
})
|
||||||
|
},
|
||||||
|
getOrderData() {
|
||||||
|
getOrderInfo(this.serialNumber).then(res => {
|
||||||
|
this.orderData = res.data
|
||||||
|
})
|
||||||
|
},
|
||||||
|
getWarrantyData() {
|
||||||
|
getWarrantyInfo(this.serialNumber).then(res => {
|
||||||
|
this.warrantyData = res.data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped lang="scss">
|
||||||
|
.service-container {
|
||||||
|
padding: 20px;
|
||||||
|
background-color: #f9f9f9;
|
||||||
|
font-family: Arial, sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
|
.top-box {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
gap: 20px;
|
||||||
|
margin: 10px 0;
|
||||||
|
align-items: center;
|
||||||
|
.title {
|
||||||
|
font-size: 24px;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.search-box {
|
||||||
|
margin: 0;
|
||||||
|
padding: 20px;
|
||||||
|
background-color: white;
|
||||||
|
border-radius: 8px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
gap: 30px;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
label {
|
||||||
|
width: 80px;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.result-section {
|
||||||
|
margin-top: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.result-title {
|
||||||
|
font-size: 20px;
|
||||||
|
text-align: left;
|
||||||
|
width: 100%;
|
||||||
|
margin: 10px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sub-title {
|
||||||
|
font-size: 16px;
|
||||||
|
text-align: left;
|
||||||
|
width: 100%;
|
||||||
|
font-weight: 600;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.table-box {
|
||||||
|
width: 100%;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tabs-section {
|
||||||
|
margin-top: 20px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
@ -0,0 +1,63 @@
|
||||||
|
package com.ruoyi.sip.controller.vue;
|
||||||
|
|
||||||
|
import com.ruoyi.common.annotation.Log;
|
||||||
|
import com.ruoyi.common.core.controller.BaseController;
|
||||||
|
import com.ruoyi.common.core.domain.AjaxResult;
|
||||||
|
import com.ruoyi.common.core.page.TableDataInfo;
|
||||||
|
import com.ruoyi.common.enums.BusinessType;
|
||||||
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||||
|
import com.ruoyi.sip.domain.DeliveryList;
|
||||||
|
import com.ruoyi.sip.service.IDeliveryListService;
|
||||||
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 发货清单Controller (Vue)
|
||||||
|
*
|
||||||
|
* @author ruoyi
|
||||||
|
* @date 2025-04-11
|
||||||
|
*/
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/sip/list/vue")
|
||||||
|
public class VueDeliveryListController extends BaseController {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IDeliveryListService deliveryListService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询发货清单列表
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("sip:list:list")
|
||||||
|
@GetMapping("/list")
|
||||||
|
public TableDataInfo list(DeliveryList deliveryList) {
|
||||||
|
startPage();
|
||||||
|
List<DeliveryList> list = deliveryListService.selectDeliveryListList(deliveryList);
|
||||||
|
return getDataTable(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 导入数据
|
||||||
|
*/
|
||||||
|
@PostMapping("/importData")
|
||||||
|
public AjaxResult importData(MultipartFile file, Long deliveryId) throws Exception {
|
||||||
|
ExcelUtil<DeliveryList> util = new ExcelUtil<>(DeliveryList.class);
|
||||||
|
List<DeliveryList> deliveryList = util.importExcel(file.getInputStream());
|
||||||
|
return deliveryListService.importData(deliveryList, deliveryId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 导出发货清单列表
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("sip:list:export")
|
||||||
|
@Log(title = "发货清单", businessType = BusinessType.EXPORT)
|
||||||
|
@PostMapping("/export")
|
||||||
|
public AjaxResult export(@RequestBody DeliveryList deliveryList) {
|
||||||
|
List<DeliveryList> list = deliveryListService.selectDeliveryListList(deliveryList);
|
||||||
|
ExcelUtil<DeliveryList> util = new ExcelUtil<>(DeliveryList.class);
|
||||||
|
return util.exportExcel(list, "发货清单数据");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,93 @@
|
||||||
|
package com.ruoyi.sip.controller.vue;
|
||||||
|
|
||||||
|
import com.ruoyi.common.core.controller.BaseController;
|
||||||
|
import com.ruoyi.common.core.domain.AjaxResult;
|
||||||
|
import com.ruoyi.common.core.page.TableDataInfo;
|
||||||
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||||
|
import com.ruoyi.sip.domain.OrderInfo;
|
||||||
|
import com.ruoyi.sip.domain.OrderList;
|
||||||
|
import com.ruoyi.sip.service.IOrderInfoService;
|
||||||
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同档案Controller (Vue)
|
||||||
|
*
|
||||||
|
* @author mula
|
||||||
|
* @date 2025-04-11
|
||||||
|
*/
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/manage/order/vue")
|
||||||
|
public class VueOrderController extends BaseController {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IOrderInfoService orderInfoService;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询合同档案列表
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("manage:order:list")
|
||||||
|
@GetMapping("/list")
|
||||||
|
public TableDataInfo list(OrderInfo orderInfo) {
|
||||||
|
startPage();
|
||||||
|
List<OrderInfo> list = orderInfoService.selectOrderInfoList(orderInfo);
|
||||||
|
return getDataTable(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取合同档案详细信息
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("manage:order:query")
|
||||||
|
@GetMapping(value = "/{id}")
|
||||||
|
public AjaxResult getInfo(@PathVariable("id") Long id) {
|
||||||
|
return AjaxResult.success(orderInfoService.selectOrderInfoById(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 新增合同档案
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("manage:order:add")
|
||||||
|
@PostMapping
|
||||||
|
public AjaxResult add(@RequestBody OrderInfo orderInfo) {
|
||||||
|
return toAjax(orderInfoService.insertOrderInfo(orderInfo));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改合同档案
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("manage:order:edit")
|
||||||
|
@PutMapping
|
||||||
|
public AjaxResult edit(@RequestBody OrderInfo orderInfo) {
|
||||||
|
return toAjax(orderInfoService.updateOrderInfo(orderInfo));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除合同档案
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("manage:order:remove")
|
||||||
|
@DeleteMapping("/{ids}")
|
||||||
|
public AjaxResult remove(@PathVariable("ids") String ids) {
|
||||||
|
return toAjax(orderInfoService.deleteOrderInfoByIds(ids));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 导出合同档案列表
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("manage:order:export")
|
||||||
|
@GetMapping("/export")
|
||||||
|
public AjaxResult export(OrderInfo orderInfo) {
|
||||||
|
List<OrderInfo> list = orderInfoService.selectOrderInfoList(orderInfo);
|
||||||
|
ExcelUtil<OrderInfo> util = new ExcelUtil<OrderInfo>(OrderInfo.class);
|
||||||
|
return util.exportExcel(list, "order");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,91 @@
|
||||||
|
package com.ruoyi.sip.controller.vue;
|
||||||
|
|
||||||
|
import com.ruoyi.common.annotation.Log;
|
||||||
|
import com.ruoyi.common.core.controller.BaseController;
|
||||||
|
import com.ruoyi.common.core.domain.AjaxResult;
|
||||||
|
import com.ruoyi.common.core.page.TableDataInfo;
|
||||||
|
import com.ruoyi.common.enums.BusinessType;
|
||||||
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||||
|
import com.ruoyi.sip.domain.OrderDelivery;
|
||||||
|
import com.ruoyi.sip.service.IOrderDeliveryService;
|
||||||
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 发货记录Controller (Vue)
|
||||||
|
*
|
||||||
|
* @author mula
|
||||||
|
* @date 2025-04-11
|
||||||
|
*/
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/manage/delivery/vue")
|
||||||
|
public class VueOrderDeliveryController extends BaseController {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IOrderDeliveryService orderDeliveryService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询发货记录列表
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("manage:delivery:list")
|
||||||
|
@GetMapping("/list")
|
||||||
|
public TableDataInfo list(OrderDelivery orderDelivery) {
|
||||||
|
startPage();
|
||||||
|
List<OrderDelivery> list = orderDeliveryService.selectOrderDeliveryList(orderDelivery);
|
||||||
|
return getDataTable(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 导出发货记录列表
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("manage:delivery:export")
|
||||||
|
@Log(title = "发货记录", businessType = BusinessType.EXPORT)
|
||||||
|
@GetMapping("/export")
|
||||||
|
public AjaxResult export(OrderDelivery orderDelivery) {
|
||||||
|
List<OrderDelivery> list = orderDeliveryService.selectOrderDeliveryList(orderDelivery);
|
||||||
|
ExcelUtil<OrderDelivery> util = new ExcelUtil<>(OrderDelivery.class);
|
||||||
|
return util.exportExcel(list, "发货记录数据");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取发货记录详细信息
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("manage:delivery:list")
|
||||||
|
@GetMapping(value = "/{id}")
|
||||||
|
public AjaxResult getInfo(@PathVariable("id") Long id) {
|
||||||
|
return AjaxResult.success(orderDeliveryService.selectOrderDeliveryById(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 新增发货记录
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("manage:delivery:add")
|
||||||
|
@Log(title = "发货记录", businessType = BusinessType.INSERT)
|
||||||
|
@PostMapping
|
||||||
|
public AjaxResult add(@RequestBody OrderDelivery orderDelivery) {
|
||||||
|
return toAjax(orderDeliveryService.insertOrderDelivery(orderDelivery));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改发货记录
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("manage:delivery:edit")
|
||||||
|
@Log(title = "发货记录", businessType = BusinessType.UPDATE)
|
||||||
|
@PutMapping
|
||||||
|
public AjaxResult edit(@RequestBody OrderDelivery orderDelivery) {
|
||||||
|
return toAjax(orderDeliveryService.updateOrderDelivery(orderDelivery));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除发货记录
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("manage:delivery:remove")
|
||||||
|
@Log(title = "发货记录", businessType = BusinessType.DELETE)
|
||||||
|
@DeleteMapping("/{ids}")
|
||||||
|
public AjaxResult remove(@PathVariable String ids) {
|
||||||
|
return toAjax(orderDeliveryService.deleteOrderDeliveryByIds(ids));
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue