Merge remote-tracking branch 'origin/dev' into dev

src/option/basicdata/basicdataGoodsArea.js

@@ -96,8 +96,8 @@ export default {
     {
       label: "创建人",
       prop: "createUser",
-      display: true,
-      hide: false,
+      display: false,
+      hide: true,
     },
     {
       label: "创建时间",

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: '坐标',

src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue

@@ -133,7 +133,7 @@
 
           <el-row>
             <el-col :span="12">
-              <el-form-item label="标题:" prop="headline" label-width="110px">
+              <el-form-item label="货区名称:" prop="headline" label-width="110px">
                 <el-input v-model="form.headline" placeholder="请输入标题" style="width: 70%" />
               </el-form-item>
             </el-col>

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 @@
 </script>
 
 <style>
-/*  .avue-input-map__content-box {*/
-/*    position: relative;*/
-/*    z-index: -1;*/
-/*  }*/
+  .avue-input-map__content-box {
+    position: relative;
+    z-index: -1;
+  }
 /*.amap-ui-poi-picker-search-results-container, .amap-ui-poi-picker-sugg-container {*/
 /*  position: absolute;*/
 /*  -webkit-box-sizing: border-box;*/