From dbb5a82402707c83d53fae9f6a9bccecf79be9aa Mon Sep 17 00:00:00 2001 From: kilo Date: Fri, 2 Jun 2023 11:40:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=A2=9E=E5=8A=A0=E7=A7=9F?= =?UTF-8?q?=E8=B5=81=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/basicdata/basicdataWarehouse.js | 133 +++++++++++++----- .../warehouse/basicdataWarehouse.vue | 34 +++-- 2 files changed, 118 insertions(+), 49 deletions(-) diff --git a/src/option/basicdata/basicdataWarehouse.js b/src/option/basicdata/basicdataWarehouse.js index 4e5c052b..c1dda717 100644 --- a/src/option/basicdata/basicdataWarehouse.js +++ b/src/option/basicdata/basicdataWarehouse.js @@ -217,16 +217,14 @@ export default { }, - { - label: "配送商场", - prop: "distributionMall", - type: "input", - span:12, - labelWidth:'120', - width:'100' - - - }, + // { + // label: "配送商场", + // prop: "distributionMall", + // type: "input", + // span:12, + // labelWidth:'120', + // width:'100' + // }, { label: "事业线", prop: "businessLine", @@ -394,21 +392,20 @@ export default { }, - { - label: "商家仓", - prop: "merchantFactory", - type: "select", - dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no", - props: { - label: "dictValue", - value: "dictKey" - }, - span:12, - labelWidth:'120', - width:'90' - - - }, + // { + // label: "商家仓", + // prop: "merchantFactory", + // type: "select", + // dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no", + // props: { + // label: "dictValue", + // value: "dictKey" + // }, + // span:12, + // labelWidth:'120', + // width:'90' + // + // }, { label: "仓库结构", prop: "warehouseStructure", @@ -489,19 +486,67 @@ export default { span:12, labelWidth:'120', width:'70' - - }, { - label: "单价", + label: "租金单价", prop: "unitPrice", type: "input", span:12, labelWidth:'120', width:'70' - - }, + { + label: "日期范围", + prop: "daterange", + type: "daterange", + format:'YYYY-MM-DD', + valueFormat:'YYYY-MM-DD', + startPlaceholder: '租赁开始日期', + endPlaceholder: '租赁结束日期', + span:12, + labelWidth:'120', + width:'120', + search: true, + searchRange: true, + searchSpan: 12, + rules:[{ + required: true, + message: "请选择租赁时间", + trigger: "change" + }], + viewDisplay: false, + addDisplay: true, + editDisplay: true, + hide: true, + }, + { label: "开始时间", + prop: "startDate", + type: "date", + format:'YYYY-MM-DD', + valueFormat:'YYYY-MM-DD', + placeholder:'请选择租赁开始时间', + span:12, + labelWidth:'120', + width:'120', + viewDisplay: true, + addDisplay: false, + editDisplay: false, + hide: false, + }, + { label: "到期时间", + prop: "endDate", + type: "date", + format:'YYYY-MM-DD', + valueFormat:'YYYY-MM-DD', + placeholder:'请选择租赁结束时间', + span:12, + labelWidth:'120', + width:'120', + viewDisplay: true, + addDisplay: false, + editDisplay: false, + hide: false, + }, { label: "管理费", prop: "administrativeFee", @@ -509,8 +554,6 @@ export default { span:12, labelWidth:'120', width:'90' - - }, { label: "库位数", @@ -519,8 +562,6 @@ export default { span:12, labelWidth:'120', width:'90' - - }, { label: "仓库等级", @@ -540,9 +581,27 @@ export default { message: "请选择仓库等级", trigger: "change" }], - - }, + { + label: "租金类型", + prop: "rentType", + type: "select", + search: true, + dicUrl: "/api/blade-system/dict-biz/dictionary?code=rent_type", + props: { + label: "dictValue", + value: "dictKey" + }, + span:12, + labelWidth:'120', + width:'100', + rules:[{ + required: true, + message: "请选择租金类型", + trigger: "change" + }], + }, + { label: "收款码", prop: "moneyReceivingCode", @@ -562,8 +621,6 @@ export default { message: "请上传收款码", trigger: "blur" }], - - }, // { // label: '坐标', diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue index b3959e9f..0247b1cc 100644 --- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue +++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue @@ -98,7 +98,11 @@ row.latitude = a[1]; row.warehouseAddress = a[2]; } - console.log(">>>>>>",this.from); + if (this.form.daterange){ + let date =this.form.daterange + row.startDate = date[0]; + row.endDate = date[1]; + } add(row).then(() => { this.onLoad(this.page); this.$message({ @@ -113,6 +117,11 @@ }, rowUpdate(row, index, done, loading) { console.log(">>>this.form",this.form); + if (this.form.daterange){ + let date =this.form.daterange + row.startDate = date[0]; + row.endDate = date[1]; + } let a =[]; if (!!this.form.address){ a = this.form.address; @@ -121,7 +130,6 @@ row.warehouseAddress = a[2]; } console.log(">>>row",row); - update(row).then(() => { this.onLoad(this.page); this.$message({ @@ -243,7 +251,7 @@ }, onLoad(page, params = {}) { this.loading = true; - + console.log("this.query>>>",this.query); const { name, linkman, @@ -255,7 +263,8 @@ fireGrade, warehouseStructure, powerCondition, - grade + grade, + daterange } = this.query; let values = { @@ -269,10 +278,13 @@ fireRatingNot:fireRatingNot, warehouseStructure:warehouseStructure, powerCondition:powerCondition, - grade:grade - + grade:grade, }; - + if (this.query.daterange){ + values.startDate = this.query.daterange[0] + values.endDate = this.query.daterange[1] + } + console.log("values>>>>>>>",values); getList(page.currentPage, page.pageSize, values).then(res => { const data = res.data.data; this.page.total = data.total; @@ -286,10 +298,10 @@