From 8893af2478c83599b393481f35bb07ae1ce085ca Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 28 Feb 2024 16:48:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=80=83=E6=A0=B8=E7=BF=BB?=
 =?UTF-8?q?=E9=A1=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basicdata/basicdataWarehouse.js       |  11 +-
 .../basicdata/basicdataWarehouseTemp.js       |   2 +-
 .../warehouse/basicdataWarehouseTemp.vue      | 178 +++++++++++++++++-
 src/views/supervise/IndicatorList.vue         |   2 +-
 src/views/supervise/classify.vue              |   2 +-
 src/views/supervise/management.vue            |   2 +-
 6 files changed, 185 insertions(+), 12 deletions(-)

diff --git a/src/api/basicdata/basicdataWarehouse.js b/src/api/basicdata/basicdataWarehouse.js
index 1f59aae9..9fb7c602 100644
--- a/src/api/basicdata/basicdataWarehouse.js
+++ b/src/api/basicdata/basicdataWarehouse.js
@@ -129,4 +129,13 @@ export const $_getList = (params) => {
     method: 'get',
     params
   })
-}
\ No newline at end of file
+}
+// 获取地区
+export const $_ObtainRegion = (params) => {
+  return request({
+    url: '/api/blade-system/region/lazy-listAll',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/option/basicdata/basicdataWarehouseTemp.js b/src/option/basicdata/basicdataWarehouseTemp.js
index e7d81ce9..f1eebd62 100644
--- a/src/option/basicdata/basicdataWarehouseTemp.js
+++ b/src/option/basicdata/basicdataWarehouseTemp.js
@@ -300,7 +300,7 @@ export const columnList = [
       label: '操作',
       type: 6,
       values: '',
-      width: '160',
+      width: '150',
       checkarr: [],
       fixed: 'right',
       sortable: false,
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue
index f98a2b93..11168f0d 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue
@@ -8,11 +8,18 @@
       </el-form>
     </el-row>
     <!-- 头部右侧按钮模块 -->
-    <div class="avue-crud__right">
+    <div class="el_top_btn"> 
+        <div> 
+            <el-button type="primary" @click="newlyadd"  icon="el-icon-plus">新增</el-button>
+            <el-button type="primary"  icon="el-icon-delete">删除</el-button>
+        </div>
+        <div class="avue-crud__right">
       <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
       <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
       <el-button icon="Search" @click="searchHide" circle></el-button>
     </div>
+    </div>
+
 
     <el-row>
       <!-- 列表模块 -->
@@ -29,12 +36,11 @@
       >
         <template #default="slotProps">
           <template v-if="slotProps.scope.column.label === '操作'">
-            <div class="ElBtnClass">
-              <div>
-                <el-button type="text" @click="view(slotProps.scope)">查看</el-button>
+        <div class="ElBtnClass"> 
+                <el-button @click="view(slotProps.scope)">查看</el-button>
                 <el-button @click="view(slotProps.scope)">编辑</el-button>
                 <el-button @click="view(slotProps.scope)">删除</el-button>
-              </div>
+            
             </div>
           </template>
         </template>
@@ -59,6 +65,123 @@
         </el-pagination>
       </div>
     </el-row>
+    <!-- 新增弹窗  -->
+    <el-dialog
+    v-model="newlyaddload"
+    title="新增"
+    width="800"
+  >
+  <el-form  inline="true" :model="Addform" >
+    <el-form-item label="仓库名称">
+      <el-input v-model="Addform.name"  placeholder="请输入仓库名称"/>
+    </el-form-item>
+    <el-form-item label="仓库编码">
+      <el-input v-model="Addform.name" placeholder="请输入仓库编码"/>
+    </el-form-item>
+    <el-form-item label="仓库简称">
+      <el-input v-model="Addform.name" placeholder="请输入仓库简称"/>
+    </el-form-item>
+
+    <el-form-item label="联系人">
+      <el-input v-model="Addform.name" placeholder="请输入联系人"/>
+    </el-form-item>
+
+    <el-form-item label="联系电话">
+      <el-input v-model="Addform.name" placeholder="请输入联系电话"/>
+    </el-form-item>
+
+    <el-form-item label="管理区域">
+      <el-input v-model="Addform.name" placeholder="请输入管理区域"/>
+    </el-form-item>
+
+    <el-form-item label="职能类型">
+      <el-input v-model="Addform.name" placeholder="请选择职能类型"/>
+    </el-form-item>
+
+    <el-form-item label="仓库地区">
+        <el-cascader :options="areaoptions" :props="props1" clearable placeholder="省/市/区"/>
+    </el-form-item>
+
+    <el-form-item label="仓库地址">
+      <el-input v-model="Addform.name" placeholder="请输入仓库地址"/>
+    </el-form-item>
+
+    <el-form-item label="所属部门">
+      <el-input v-model="Addform.name" placeholder="请选择所属部门"/>
+    </el-form-item>
+
+    <el-form-item label="仓库类型">
+      <el-input v-model="Addform.name" placeholder="请选择仓库类型"/>
+    </el-form-item>
+
+    <el-form-item label="消防等级">
+      <el-input v-model="Addform.name" placeholder="请选择消防等级"/>
+    </el-form-item>
+
+    <el-form-item label="是否具有消防等级">
+      <el-input v-model="Addform.name" placeholder="请选择是否具有消防等级"/>
+    </el-form-item>
+
+    <el-form-item label="仓库结构">
+      <el-input v-model="Addform.name" placeholder="请选择仓库结构"/>
+    </el-form-item>
+
+    <el-form-item label="是否高架">
+      <el-input v-model="Addform.name" placeholder="请选择是否高架"/>
+    </el-form-item>
+
+    
+    <el-form-item label="仓库层高">
+      <el-input v-model="Addform.name" placeholder="请输入仓库层高"/>
+    </el-form-item>
+
+    <el-form-item label="电力类型">
+      <el-input v-model="Addform.name" placeholder="请输入仓库层高"/>
+    </el-form-item>
+
+    <el-form-item label="租金单价">
+      <el-input v-model="Addform.name" placeholder="请输入租金单价"/>
+    </el-form-item>
+
+    <el-form-item label="面积">
+      <el-input v-model="Addform.name" placeholder="请输入面积"/>
+    </el-form-item>
+
+    <el-form-item label="租金类型">
+      <el-input v-model="Addform.name" placeholder="请输入租金类型"/>
+    </el-form-item>    
+
+    <el-form-item label="仓库等级">
+      <el-input v-model="Addform.name" placeholder="请输入仓库等级"/>
+    </el-form-item>  
+
+    <el-form-item label="管理费">
+      <el-input v-model="Addform.name" placeholder="请输入管理费"/>
+    </el-form-item>  
+
+    <el-form-item label="库位数">
+      <el-input v-model="Addform.name" placeholder="请输入库位数"/>
+    </el-form-item>  
+
+    <el-form-item label="日期范围">
+      <el-input v-model="Addform.name" placeholder="请输入日期范围"/>
+    </el-form-item>  
+    <el-form-item label="备注">
+      <el-input v-model="Addform.name" placeholder="请输入日期范围"/>
+    </el-form-item>  
+    <el-form-item label="收款码">
+      <el-input v-model="Addform.name" placeholder="请输入日期范围"/>
+    </el-form-item>  
+   </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="newlyaddload = false">取消</el-button>
+        <el-button type="primary" @click="newlyaddSubmit">
+          确定
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
   </basic-container>
     <!-- 列表配置显示 -->
     <edittablehead
@@ -81,15 +204,31 @@ import {
   getCurrentInstance,
 } from 'vue';
 import { columnList } from '@/option/basicdata/basicdataWarehouseTemp.js';
-import { $_getList } from '@/api/basicdata/basicdataWarehouse';
+import { $_getList ,$_ObtainRegion} from '@/api/basicdata/basicdataWarehouse';
 import { ElMessage } from 'element-plus'
 const search = ref(false); //搜索展开
 const query = ref({}); //顶部搜索参数
+const newlyaddload=ref(false);//新增弹窗
+const Addform=ref({});//表格新增数据表单
+// 刷新数据
 const searchChangeS = () => {
     query.value={}
     onLoad()
 };
+const initialization=()=>{
+    $_ObtainRegion().then(res=>{
+        if(res.data.code =200){
+            areaoptions.value  =res.data.data
+        }
+        console.log(res,'获取地区');
+    })
+}
+initialization()
 const searchHide = () => {};
+const props1 = {
+  checkStrictly: true,
+}
+const areaoptions = ref([])
 const details = reactive({
   /** 是否开启搜索 */
   search: false,
@@ -205,6 +344,31 @@ const currentChange = val => {
     page.currentPage=val
     onLoad()
 };
+// 新增数据
+const newlyadd=()=>{
+    newlyaddload.value=true;//开启新增弹窗
+}
+// 新增数据确定
+const newlyaddSubmit=()=>{
+
+}
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.ElBtnClass {
+  button {
+    border: none;
+    padding: 0;
+    background-color: transparent;
+  }
+  button:hover {
+    background-color: transparent;
+  }
+}
+.el_top_btn{
+    margin-bottom: 4px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+</style>
diff --git a/src/views/supervise/IndicatorList.vue b/src/views/supervise/IndicatorList.vue
index a99bf3e7..07b5c03a 100644
--- a/src/views/supervise/IndicatorList.vue
+++ b/src/views/supervise/IndicatorList.vue
@@ -134,7 +134,7 @@
           background
           @size-change="sizeChange"
           @current-change="currentChange"
-          :current-page="currentPage"
+          :current-page="current"
           :page-sizes="[30, 50, 80, 120]"
           :page-size="pageSize"
           layout="total, sizes, prev, pager, next, jumper"
diff --git a/src/views/supervise/classify.vue b/src/views/supervise/classify.vue
index b7a977d0..61a4fb43 100644
--- a/src/views/supervise/classify.vue
+++ b/src/views/supervise/classify.vue
@@ -76,7 +76,7 @@
             background
             @size-change="sizeChange"
             @current-change="currentChange"
-            :current-page="currentPage"
+            :current-page="current"
             :page-sizes="[30, 50, 80, 120]"
             :page-size="pageSize"
             layout="total, sizes, prev, pager, next, jumper"
diff --git a/src/views/supervise/management.vue b/src/views/supervise/management.vue
index faeb8f10..a45327dc 100644
--- a/src/views/supervise/management.vue
+++ b/src/views/supervise/management.vue
@@ -131,7 +131,7 @@
             background
             @size-change="sizeChange"
             @current-change="currentChange"
-            :current-page="currentPage"
+            :current-page="current"
             :page-sizes="[30, 50, 80, 120]"
             :page-size="pageSize"
             layout="total, sizes, prev, pager, next, jumper"