From 40a9a9f647fcef08baec1dc63331a199b691a385 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Fri, 16 Aug 2024 09:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/storagecost/index.js | 51 ++- .../Warehouseinformationconfiguration.js | 350 --------------- .../storagecost/Warehouserentalmanagement.js | 22 +- .../Financialreview.vue | 6 +- .../OrderTotalCostDetail.vue | 6 +- .../Traincostbreakdown.vue | 6 +- .../WarehouseDeliveryCost.vue | 6 +- .../WarehouseTemplate.vue | 21 +- .../storagecost/OrderTotalTransferDetails.vue | 6 +- .../storagecost/Transferwarehouseorders.vue | 6 +- .../Transferwarehousestatistics.vue | 18 +- .../Warehouseinformationconfiguration.vue | 373 ---------------- .../storagecost/Warehouserentalmanagement.vue | 422 +++++++++++++++++- 13 files changed, 517 insertions(+), 776 deletions(-) delete mode 100644 src/option/storagecost/Warehouseinformationconfiguration.js delete mode 100644 src/views/cost/storagecost/Warehouseinformationconfiguration.vue diff --git a/src/api/storagecost/index.js b/src/api/storagecost/index.js index 0d9b9730..9f41cb75 100644 --- a/src/api/storagecost/index.js +++ b/src/api/storagecost/index.js @@ -336,4 +336,53 @@ export const $_Warehouseinformationconfiguration = params => { method: 'get', params, }); -}; \ No newline at end of file +}; +// 仓储-仓库租用管理-列表 +export const $_Warehouserentalmanagement = params => { + return request({ + url: '/api/logpm-basicdata/logpm-basicdata/warehouseLeasing/page', + method: 'get', + params, + }); +}; +// 客户表 +export const $_listNameLike = params => { + return request({ + url: '/api/logpm-basicdata/basicdataClient/listNameLike', + method: 'get', + params, + }); +}; +// 查询剩余面积 +export const $_residualArea = params => { + return request({ + url: '/api/logpm-basicdata/logpm-basicdata/warehouseLeasing/residualArea', + method: 'get', + params, + }); +}; +// 仓储-仓储租用管理新增 +export const $_Warehouserentalmanagementsave = data => { + return request({ + url: '/api/logpm-basicdata/logpm-basicdata/warehouseLeasing/save', + method: 'post', + data, + }); +}; + +// 仓储-仓储租用管理修改 +export const $_Warehouserentalmanagementupdate = data => { + return request({ + url: '/api/logpm-basicdata/logpm-basicdata/warehouseLeasing/update', + method: 'post', + data, + }); +}; +// 仓储-仓储租用管理删除 +export const $_Warehouserentalmanagementremove = params => { + return request({ + url: '/api/logpm-basicdata/logpm-basicdata/warehouseLeasing/remove', + method: 'post', + params, + }); +}; diff --git a/src/option/storagecost/Warehouseinformationconfiguration.js b/src/option/storagecost/Warehouseinformationconfiguration.js deleted file mode 100644 index 87947c16..00000000 --- a/src/option/storagecost/Warehouseinformationconfiguration.js +++ /dev/null @@ -1,350 +0,0 @@ -export const columnList = [ - { - prop: '', - label: '复选框', - type: 0, - width: 55, - fixed: true, - }, - { - prop: '', - label: '序号', - type: 12, - values: '', - width: 55, - fixed: true, - }, - { - prop: 'name', - label: '仓库名称', - type: 3, - values: '', - width: '100', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'warehouseCode', - label: '仓库编码', - type: 1, - values: '', - width: '100', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'abbreviation', - label: '仓库简称', - type: 1, - values: '', - width: '120', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'linkman', - label: '联系人', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'contactNumber', - label: '联系电话', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'administrativeAreas', - label: '管理区域', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'functionType', - label: '职能类型', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'warehouseAddress', - label: '仓库地址', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'departmentName', - label: '所属部门', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'warehouseType', - label: '仓库类型', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'fireGrade', - label: '消防等级', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'fireRatingNot', - label: '是否有消防等级', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'warehouseStructure', - label: '仓库结构', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'elevatedNot', - label: '是否高架', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'storeyHeight', - label: '仓库层高', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - - { - prop: 'powerCondition', - label: '电力类型', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'unitPrice', - label: '租金单价', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - - { - prop: 'acreage', - label: '面积', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'startDate', - label: '开始时间', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'endDate', - label: '到期时间', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - - { - prop: 'rentType', - label: '租金类型', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - - { - prop: 'grade', - label: '仓库等级', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'administrativeFee', - label: '管理费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'seating', - label: '库位数', - type: 1, - values: '', - width: '170', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'temporaryTurnoverArea', - label: '临时周转面积(m²)', - type: 1, - values: '', - width: '170', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'a', - label: '单库位面积(m²)', - type: 1, - values: '', - width: '170', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'handlingStorageEntranceFee', - label: '代作业入库费(元/件)', - type: 1, - values: '', - width: '170', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'handlingStorageExitFee', - label: '代作业出库费(元/件)', - type: 1, - values: '', - width: '170', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'remarks', - label: '备注', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'createUserName', - label: '操作', - type: 6, - values: '', - width: '150', - checkarr: [], - fixed: 'right', - sortable: false, - }, -]; diff --git a/src/option/storagecost/Warehouserentalmanagement.js b/src/option/storagecost/Warehouserentalmanagement.js index 246b9e58..b7f70169 100644 --- a/src/option/storagecost/Warehouserentalmanagement.js +++ b/src/option/storagecost/Warehouserentalmanagement.js @@ -15,7 +15,7 @@ export const columnList = [ fixed: true, }, { - prop: 'a1', + prop: 'clientName', label: '客户名称', type: 2, values: '', @@ -26,7 +26,7 @@ export const columnList = [ head: false, }, { - prop: 'a2', + prop: 'expired', label: '是否过期 ', type: 3, values: '', @@ -46,7 +46,7 @@ export const columnList = [ head: false, }, { - prop: 'a3', + prop: 'warehouseName', label: '租用仓库', type: 1, values: '', @@ -57,7 +57,7 @@ export const columnList = [ head: false, }, { - prop: 'a4', + prop: 'type', label: '租用类型', type: 1, values: '', @@ -68,7 +68,7 @@ export const columnList = [ head: false, }, { - prop: 'a5', + prop: 'leasedArea', label: '客户租用面积(㎡)', type: 1, values: '', @@ -79,7 +79,7 @@ export const columnList = [ head: false, }, { - prop: 'a6', + prop: 'storageLocationCount', label: '客户租用库位数', type: 1, values: '', @@ -90,7 +90,7 @@ export const columnList = [ head: false, }, { - prop: 'a7', + prop: 'monthlyRent', label: '月租金(元/月)', type: 1, values: '', @@ -101,7 +101,7 @@ export const columnList = [ head: false, }, { - prop: 'a8', + prop: 'leaseCommencementDate', label: '租赁合同开始时间', type: 1, values: '', @@ -112,7 +112,7 @@ export const columnList = [ head: false, }, { - prop: 'a9', + prop: 'leaseTerminationDate', label: '租赁合同结束时间', type: 1, values: '', @@ -123,7 +123,7 @@ export const columnList = [ head: false, }, { - prop: 'a11', + prop: 'updateTime', label: '修改时间', type: 1, values: '', @@ -134,7 +134,7 @@ export const columnList = [ head: false, }, { - prop: 'a12', + prop: 'updateUserName', label: '修改人', type: 1, values: '', diff --git a/src/views/cost/Deliverycostmanagement/Financialreview.vue b/src/views/cost/Deliverycostmanagement/Financialreview.vue index d6e09bfa..5222431c 100644 --- a/src/views/cost/Deliverycostmanagement/Financialreview.vue +++ b/src/views/cost/Deliverycostmanagement/Financialreview.vue @@ -311,11 +311,13 @@ const searchChange = () => { }; // 每页多少条 const sizeChange = val => { - page.value.pageSize = val; + details.page.pageSize = val; + onLoad(); }; /** 页码改变执行的回调 */ const currentChange = val => { - page.value.currentPage = val; + details.page.currentPage = val; + onLoad(); }; // 刷新按钮 const searchChangeS = () => { diff --git a/src/views/cost/Deliverycostmanagement/OrderTotalCostDetail.vue b/src/views/cost/Deliverycostmanagement/OrderTotalCostDetail.vue index 1d3ab02f..c7a80ec9 100644 --- a/src/views/cost/Deliverycostmanagement/OrderTotalCostDetail.vue +++ b/src/views/cost/Deliverycostmanagement/OrderTotalCostDetail.vue @@ -257,11 +257,13 @@ const searchChange = () => { }; // 每页多少条 const sizeChange = val => { - page.value.pageSize = val; + details.page.pageSize = val; + onLoad(); }; /** 页码改变执行的回调 */ const currentChange = val => { - page.value.currentPage = val; + details.page.currentPage = val; + onLoad(); }; // 刷新按钮 const searchChangeS = () => { diff --git a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue index 6c563244..c558f8e9 100644 --- a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue +++ b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue @@ -236,11 +236,13 @@ const searchChange = () => { }; // 每页多少条 const sizeChange = val => { - page.value.pageSize = val; + details.page.pageSize = val; + onLoad(); }; /** 页码改变执行的回调 */ const currentChange = val => { - page.value.currentPage = val; + details.page.currentPage = val; + onLoad(); }; // 刷新按钮 const searchChangeS = () => { diff --git a/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue b/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue index 3a2b0ec1..08c57275 100644 --- a/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue +++ b/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue @@ -284,11 +284,13 @@ const searchChange = () => { }; // 每页多少条 const sizeChange = val => { - page.value.pageSize = val; + details.page.pageSize = val; + onLoad(); }; /** 页码改变执行的回调 */ const currentChange = val => { - page.value.currentPage = val; + details.page.currentPage = val; + onLoad(); }; // 刷新按钮 const searchChangeS = () => { diff --git a/src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue b/src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue index 9e15ff1d..2eecb3ee 100644 --- a/src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue +++ b/src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue @@ -81,16 +81,16 @@ - + - + - + - + @@ -129,7 +129,7 @@ const $router = useRouter(); //跳转 const $useStore = useStore(); //权限 const $route = useRoute(); //获取地址栏参数 const dialogedit = ref(false); //编辑弹窗 -const form=ref({}) +const form = ref({}); const details = reactive({ /** 是否开启搜索 */ search: false, @@ -267,15 +267,18 @@ const searchChange = () => { }; // 每页多少条 const sizeChange = val => { - page.value.pageSize = val; + details.page.pageSize = val; + onLoad(); }; /** 页码改变执行的回调 */ const currentChange = val => { - page.value.currentPage = val; + details.page.currentPage = val; + onLoad(); }; // 刷新按钮 const searchChangeS = () => { details.search = false; //关闭搜索 + onLoad(); }; // 顶部搜索 const searchHide = () => { @@ -331,10 +334,10 @@ const handleEdit = row => { display: flex; flex-direction: column; } -.elform{ +.elform { display: flex; flex-wrap: wrap; - :deep(.el-form-item ){ + :deep(.el-form-item) { width: 29%; display: flex; flex-direction: column; diff --git a/src/views/cost/storagecost/OrderTotalTransferDetails.vue b/src/views/cost/storagecost/OrderTotalTransferDetails.vue index c0151506..31846db7 100644 --- a/src/views/cost/storagecost/OrderTotalTransferDetails.vue +++ b/src/views/cost/storagecost/OrderTotalTransferDetails.vue @@ -302,11 +302,13 @@ const searchChange = () => { }; // 每页多少条 const sizeChange = val => { - page.value.pageSize = val; + details.page.pageSize = val; + onLoad(); }; /** 页码改变执行的回调 */ const currentChange = val => { - page.value.currentPage = val; + details.page.currentPage = val; + onLoad(); }; // 刷新按钮 const searchChangeS = () => { diff --git a/src/views/cost/storagecost/Transferwarehouseorders.vue b/src/views/cost/storagecost/Transferwarehouseorders.vue index b8a4fc47..58f4beaf 100644 --- a/src/views/cost/storagecost/Transferwarehouseorders.vue +++ b/src/views/cost/storagecost/Transferwarehouseorders.vue @@ -305,11 +305,13 @@ const searchChange = () => { }; // 每页多少条 const sizeChange = val => { - page.value.pageSize = val; + details.page.pageSize = val; + onLoad(); }; /** 页码改变执行的回调 */ const currentChange = val => { - page.value.currentPage = val; + details.page.currentPage = val; + onLoad(); }; // 刷新按钮 const searchChangeS = () => { diff --git a/src/views/cost/storagecost/Transferwarehousestatistics.vue b/src/views/cost/storagecost/Transferwarehousestatistics.vue index cef35675..d510af16 100644 --- a/src/views/cost/storagecost/Transferwarehousestatistics.vue +++ b/src/views/cost/storagecost/Transferwarehousestatistics.vue @@ -278,14 +278,16 @@ const searchChange = () => { details.search = false; //关闭搜索 }; - // 每页多少条 - const sizeChange = val => { - page.value.pageSize = val; - }; - /** 页码改变执行的回调 */ - const currentChange = val => { - page.value.currentPage = val; - }; +// 每页多少条 +const sizeChange = val => { + details.page.pageSize = val; + onLoad(); +}; +/** 页码改变执行的回调 */ +const currentChange = val => { + details.page.currentPage = val; + onLoad(); +}; // 刷新按钮 const searchChangeS = () => { details.search = false; //关闭搜索 diff --git a/src/views/cost/storagecost/Warehouseinformationconfiguration.vue b/src/views/cost/storagecost/Warehouseinformationconfiguration.vue deleted file mode 100644 index fb815182..00000000 --- a/src/views/cost/storagecost/Warehouseinformationconfiguration.vue +++ /dev/null @@ -1,373 +0,0 @@ - - - - - diff --git a/src/views/cost/storagecost/Warehouserentalmanagement.vue b/src/views/cost/storagecost/Warehouserentalmanagement.vue index eb21912f..b57ecfdd 100644 --- a/src/views/cost/storagecost/Warehouserentalmanagement.vue +++ b/src/views/cost/storagecost/Warehouserentalmanagement.vue @@ -8,10 +8,24 @@
- + + +
- 导出 @@ -100,6 +114,110 @@
+ + + +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue'; import { columnList } from '@/option/storagecost/Warehouserentalmanagement.js'; -import { $_getMyWarehouseList } from '@/api/storagecost/index.js'; +import { + $_getMyWarehouseList, + $_Warehouserentalmanagement, + $_listNameLike, + $_residualArea, + $_Warehouserentalmanagementsave, + $_Warehouserentalmanagementremove, + $_Warehouserentalmanagementupdate, +} from '@/api/storagecost/index.js'; import { getDictionaryBiz } from '@/api/system/dict'; //字典 import { processRowProperty, setNodeHeight } from '@/utils/util'; import functions from '@/utils/functions.js'; @@ -122,16 +248,32 @@ import { ElMessageBox, ElMessage } from 'element-plus'; import { downloadXls } from '@/utils/util'; import { useStore } from 'vuex'; import dayjs from 'dayjs'; +import error from '@/error'; const $router = useRouter(); //跳转 const $useStore = useStore(); //权限 const $route = useRoute(); //获取地址栏参数 const queryTop = ref({}); +const clientloading = ref(false); +const formloading = ref(false); +const DataRwo = ref({}); +const ruleFormRef = ref(null); +const Customertitle = ref('客户租仓信息新增'); +const dictList = ref([]); //客户 +const form = ref({ + type: 2, +}); //表单 +const dialogCustomer = ref(false); //弹窗 const warehouseList = ref([]); +const CustomerrentalList = ref([ + { label: '库位', value: 2 }, + { label: '面积', value: 1 }, +]); //客户租用类型 const details = reactive({ /** 是否开启搜索 */ search: false, /** 表格搜索条件 */ query: {}, + defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00' /** 时间快捷选择设置 */ shortcuts: [ { @@ -168,7 +310,7 @@ const details = reactive({ columnList, /** 列表数据 */ - data: [{}], + data: [], /** 页面loading */ loadingObj: { /** 列表加载loading */ @@ -219,8 +361,14 @@ const { zeroAdditionalRecordingInfo, popUpShow, recorddata, + defaultTime2, } = toRefs(details); - +const rules = reactive({ + name: [ + { required: true, message: 'Please input Activity name', trigger: 'blur' }, + { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' }, + ], +}); /** 展开列表控件 */ const showdrawer = _flag => { details.drawerShow = _flag; @@ -264,11 +412,13 @@ const searchChange = () => { }; // 每页多少条 const sizeChange = val => { - page.value.pageSize = val; + details.page.pageSize = val; + onLoad(); }; /** 页码改变执行的回调 */ const currentChange = val => { - page.value.currentPage = val; + details.page.currentPage = val; + onLoad(); }; // 刷新按钮 const searchChangeS = () => { @@ -293,20 +443,75 @@ function updateDictionary(targetArray, dictionaryType) { }); }); } +// 获取客户 +const changeclientId = value => { + if (value) { + let data = { + name: value, + }; + clientloading.value = true; //开启客户搜索加载 + $_listNameLike(data) + .then(res => { + console.log(res, '客户'); + if (res.data.code == 200 && res.data.data?.length) { + res.data.data.forEach(item => { + dictList.value.push({ + label: item.clientName, + value: item.id, + }); + }); + } else { + dictList.value = []; + } + }) + .catch(error => { + console.log(error); + }) + .finally(() => { + clientloading.value = false; //关闭客户搜索加载; + }); + } else { + dictList.value = []; + } +}; +// 查询客户 + // 获取仓库 const MyWarehouseList = () => { $_getMyWarehouseList().then(res => { console.log(res, '仓库列表'); res.data.data.forEach(item => { warehouseList.value.push({ - value: item.name, + value: item.id, label: item.name, }); }); }); }; // 页面初始化 -const onLoad = () => {}; +const onLoad = value => { + let data = { + current: details.page.currentPage, + size: details.page.pageSize, + ...details.query, + ...value, + }; + details.loadingObj.list = true; + $_Warehouserentalmanagement(data) + .then(res => { + console.log(res, '初始化数据'); + if (res.data.code == 200) { + details.data = res.data.data.records || []; + details.page.total = res.data.data.total; //页码 + } + }) + .catch(error => { + console.log(error); + }) + .finally(() => { + details.loadingObj.list = false; + }); +}; const PageOnload = () => { onLoad(); //获取列表参数 @@ -315,7 +520,175 @@ const PageOnload = () => { //页面初始化方法 PageOnload(); -// 页面初始化方法 +// 新增 +const AddInfo = () => { + Customertitle.value = '客户租仓信息新增'; + dialogCustomer.value = true; //开启弹窗 +}; +// 客户租用类型计算 +const changetype = () => { + form.value.storageLocationCount = null; //客户租用库位数 + form.value.leasedArea = null; //客户租用库位数 + // form.value.residualArea = null; //剩余库位面积 + // form.value.singleStorageArea = null; //单库位面积 +}; +const changewarehouse = async () => { + let data = { + warehouseId: form.value.warehouseId, + }; + formloading.value = true; + await $_residualArea(data) + .then(res => { + console.log(res, '剩余可租用面积'); + if (res.data.code == 200) { + form.value.residualArea = Number(res.data.data.residualArea); //剩余库位面积 + form.value.singleStorageArea = Number(res.data.data.singleStorageArea); //单库位面积 + if ((Customertitle.value = '客户租仓信息编辑')) { + form.value.leasedArea = Number(form.value.leasedArea); + form.value.residualArea = form.value.residualArea + form.value.leasedArea; //剩余库位面积 //租用面积 + } + } + }) + .catch(error => { + console.log(error); + }) + .finally(() => { + formloading.value = false; + }); +}; + +// 计算租用数面积 +const changestorageLocationCount = () => { + // 租用库位数 *单库位面积 =客户租用面积 + form.value.leasedArea = form.value.storageLocationCount * form.value.singleStorageArea; +}; +// 最后提交 +const Customeradded = () => { + if (form.value.type == 2 && form.value.leasedArea > form.value.residualArea) { + ElMessage({ + message: '客户租用面积不能大于剩余可租用面积,请重新填写客户租用库位数', + type: 'warning', + }); + return; + } + + if (form.value.type == 1 && form.value.leasedArea > form.value.residualArea) { + ElMessage({ + message: '客户租用面积不能大于剩余可租用面积', + type: 'warning', + }); + return; + } + + // clientId: '', //客户名称ID + // warehouseId: '', //租用仓库ID + // leaseCommencementDate: '', //租赁合同开始时间 + // leaseTerminationDate: '', //租赁合同结束时间 + // monthlyRent: '', //月租金 + // leasedArea: '', //客户租用面积 + // type: '', //租用类型 + // storageLocationCount: '', //客户租用库位数 + let data = { + ...form.value, + }; + data.leaseCommencementDate = data.LeasecontractDate[0]; + data.leaseTerminationDate = data.LeasecontractDate[1]; + console.log(data, '准备提交的数据'); + formloading.value = true; + if (Customertitle.value == '客户租仓信息编辑') { + data.id = DataRwo.value.id; + $_Warehouserentalmanagementupdate(data) + .then(res => { + if (res.data.code == 200) { + ElMessage({ + message: res.data.msg, + type: 'success', + }); + dialogCustomer.value = false; + onLoad(); + } + }) + .catch(error => { + console.log(error); + }) + .finally(() => { + formloading.value = false; + }); + } else { + $_Warehouserentalmanagementsave(data) + .then(res => { + console.log(res, '新增'); + if (res.data.code == 200) { + ElMessage({ + message: res.data.msg, + type: 'success', + }); + dialogCustomer.value = false; + onLoad(); + } + }) + .catch(error => { + console.log(error); + }) + .finally(() => { + formloading.value = false; + }); + } +}; +// 编辑 +const edit = row => { + DataRwo.value = row; + console.log(row); + Customertitle.value = '客户租仓信息编辑'; + dialogCustomer.value = true; + form.value.clientId = row.clientId; //客户名称ID + dictList.value = [ + { + label: row.clientName, + value: row.clientId, + }, + ]; + // 租用仓库 + form.value.warehouseId = row.warehouseId; //仓库 + form.value.type = row.type; //租用类型 + form.value.leasedArea = row.leasedArea; //租用面积 + form.value.storageLocationCount = row.storageLocationCount; //客户租用库位数 + form.value.monthlyRent = row.monthlyRent; //月租金 + changewarehouse(); //获取剩余可租用面积 + form.value.LeasecontractDate = []; + form.value.LeasecontractDate[0] = row.leaseCommencementDate; //开始时间 + form.value.LeasecontractDate[1] = row.leaseTerminationDate; //结束时间 +}; +// 删除数据 +const Viewdelete = rwo => { + console.log(rwo); + ElMessageBox.confirm('是否确认删除该数据?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }) + .then(() => { + console.log(rwo); + let data={ + ids:rwo.id + } + details.loadingObj.list = true; + $_Warehouserentalmanagementremove(data).then(res => { + if (res.data.code == 200) { + ElMessage({ + type: 'success', + message: '删除成功', + }); + onLoad(); + } + }).catch(error=>{ + console.log(error) + }).finally(()=>{ + details.loadingObj.list = false; + }); + }) + .catch(() => {}); +};