From d7d34e856948552bf30bce6d11541d3ea01fe61e Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 28 Feb 2024 15:24:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8D=E5=AD=97=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basicdata/basicdataWarehouse.js       |   7 +
 .../basicdata/basicdataWarehouseTemp.js       | 308 ++++++++++++++++++
 src/router/views/index.js                     |  18 +
 .../basicdata/brand/basicStoreContact.vue     |   2 +-
 .../warehouse/basicdataWarehouse.vue          |   2 +-
 .../warehouse/basicdataWarehouseTemp.vue      | 188 +++++++++++
 .../signdetail/packageNodeSearch.vue          |   8 +-
 .../warehouseStock/warehouseStock.vue         |   5 +-
 vite.config.js                                |   2 +-
 9 files changed, 535 insertions(+), 5 deletions(-)
 create mode 100644 src/option/basicdata/basicdataWarehouseTemp.js
 create mode 100644 src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue

diff --git a/src/api/basicdata/basicdataWarehouse.js b/src/api/basicdata/basicdataWarehouse.js
index df0b7f4b..1f59aae9 100644
--- a/src/api/basicdata/basicdataWarehouse.js
+++ b/src/api/basicdata/basicdataWarehouse.js
@@ -123,3 +123,10 @@ export const getWarehouseList = () => {
 };
 
 
+export const $_getList = (params) => {
+  return request({
+    url: '/api/logpm-basicdata/warehouse/list',
+    method: 'get',
+    params
+  })
+}
\ No newline at end of file
diff --git a/src/option/basicdata/basicdataWarehouseTemp.js b/src/option/basicdata/basicdataWarehouseTemp.js
new file mode 100644
index 00000000..d8c76bb7
--- /dev/null
+++ b/src/option/basicdata/basicdataWarehouseTemp.js
@@ -0,0 +1,308 @@
+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: 3,
+      values: '',
+      width: '100',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'abbreviation',
+      label: '仓库简称',
+      type: 13,
+      values: '',
+      width: '120',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'linkman',
+      label: '联系人',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'contactNumber',
+      label: '联系电话',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'administrativeAreas',
+      label: '管理区域',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'functionType',
+      label: '职能类型',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'warehouseAddress',
+      label: '仓库地址',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'departmentName',
+      label: '所属部门',
+      type: 3,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'warehouseType',
+      label: '仓库类型',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'fireGrade',
+      label: '消防等级',
+      type: 2,
+      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: 4,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'elevatedNot',
+      label: '是否高架',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'storeyHeight',
+      label: '仓库层高',
+      type: 4,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+  
+    {
+      prop: 'powerCondition',
+      label: '电力类型',
+      type: 4,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'unitPrice',
+      label: '租金单价',
+      type: 4,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+  
+    {
+      prop: 'acreage',
+      label: '面积',
+      type: 4,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'startDate',
+      label: '开始时间',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'endDate',
+      label: '到期时间',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    }, 
+  
+    {
+      prop: 'rentType',
+      label: '租金类型',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+  
+  
+  
+    {
+      prop: 'grade',
+      label: '仓库等级',
+      type: 4,
+      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: 2,
+      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: '130',
+      checkarr: [],
+      fixed: 'right',
+      sortable: false,
+    },
+]
\ No newline at end of file
diff --git a/src/router/views/index.js b/src/router/views/index.js
index b790d565..940aef19 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -1421,6 +1421,24 @@ export default [
       },
     ],
   },
+
+  {
+    path: '/basicdata/warehouse/warehouse/basicdataWarehouseTemp',
+    component: Layout,
+    redirect: '/basicdata/warehouse/warehouse/basicdataWarehouseTemp',
+    children: [
+      {
+        meta: {
+          i18n: 'dict',
+          keepAlive: false,
+        },
+        path: '/basicdata/warehouse/warehouse/basicdataWarehouseTemp',
+        name: '仓库信息重构',
+        component: () => import('@/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue'),
+      },
+    ],
+  },
+  
   // {
   //   path: '/aftersales/aftersalesWorkOrderSS',
   //   component: Layout,
diff --git a/src/views/basicdata/brand/basicStoreContact.vue b/src/views/basicdata/brand/basicStoreContact.vue
index ab68f675..e6370277 100644
--- a/src/views/basicdata/brand/basicStoreContact.vue
+++ b/src/views/basicdata/brand/basicStoreContact.vue
@@ -162,7 +162,7 @@ export default {
       rules: {
         linkman: [
           { required: true, message: '请输入联系人', trigger: 'blur' },
-          { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+          { min: 2, max: 25, message: '长度在 2 到 25 个字符', trigger: 'blur' }
         ],
         phone: [
           { required: true, message: '请输入电话', trigger: 'change' }
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index a4d5db04..dcc61045 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -111,7 +111,7 @@ export default {
           },
           {
             label: '创建时间',
-            prop: 'createTime',
+            prop: 'operatorTime',
             type: 'input',
             addDisplay: false,
             editDisplay: false,
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue
new file mode 100644
index 00000000..8e1d8a72
--- /dev/null
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue
@@ -0,0 +1,188 @@
+<template>
+  <basic-container>
+    <el-row v-if="search">
+      <el-form :inline="true" :model="query" class="el-fr-d">
+        <el-form-item label="工单号" class="el-times">
+          <el-input type="text" v-model="query.workOrderNumber" placeholder="请输入工单号" />
+        </el-form-item>
+      </el-form>
+    </el-row>
+    <!-- 头部右侧按钮模块 -->
+    <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>
+
+    <el-row>
+      <!-- 列表模块 -->
+      <tablecmt
+        :columnList="details.columnList"
+        :tableData="data"
+        :loading="loadingObj.list"
+        :checkselect="selectList"
+        @inputTxt="inputsc"
+        @timeCheck="timesc"
+        @btnCheck="btnsc"
+        @selectCheck="selectsc"
+        @selection="selectionChange"
+      >
+        <template #default="slotProps">
+          <template v-if="slotProps.scope.column.label === '操作'">
+            <div class="ElBtnClass">
+              <div>
+                <!-- <el-button @click="view(slotProps.scope)">查看</el-button> -->
+              </div>
+            </div>
+          </template>
+        </template>
+      </tablecmt>
+    </el-row>
+
+    <!-- 分页模块 -->
+    <el-row class="el-fy">
+      <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+        <div></div>
+        <el-pagination
+          align="right"
+          background
+          @size-change="sizeChange"
+          @current-change="currentChange"
+          :current-page="page.currentPage"
+          :page-sizes="[30, 50, 80, 120]"
+          :page-size="page.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="page.total"
+        >
+        </el-pagination>
+      </div>
+    </el-row>
+  </basic-container>
+    <!-- 列表配置显示 -->
+    <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="details.columnList"
+  ></edittablehead>
+</template>
+
+<script setup>
+import {
+  ref,
+  reactive,
+  toRefs,
+  computed,
+  onMounted,
+  nextTick,
+  watch,
+  getCurrentInstance,
+} from 'vue';
+import { columnList } from '@/option/basicdata/basicdataWarehouseTemp.js';
+import { $_getList } from '@/api/basicdata/basicdataWarehouse';
+const search = ref(false); //搜索展开
+const query = ref({}); //顶部搜索参数
+const searchChangeS = () => {};
+const searchHide = () => {};
+const details = reactive({
+  /** 是否开启搜索 */
+  search: false,
+  /** 时间选择器数据 */
+  stockupDate: [],
+  /** 列表 */
+  columnList,
+
+  /** 列表数据 */
+  data: [{}],
+  /** 页面loading */
+  loadingObj: {
+    /** 列表加载loading */
+    list: false,
+    packageListLoading: false,
+  },
+  /** 列表复选框选中的数据 */
+  selectionList: [],
+  /** 是否显示设置表格 */
+  drawerShow: false,
+  /** 分页参数 */
+  page: {
+    currentPage: 1,
+    pageSize: 50,
+    total: 0,
+  },
+
+  /** 弹出层显示 */
+  popUpShow: {
+    /** 包件明细 */
+    packageOrderListlVisited: false,
+    /** 二维码 */
+    QRCodeVisible: false,
+    /** 修改客户信息 */
+    editClientInfoVisible: false,
+  },
+  /** 列表Dom节点 */
+  listNode: '',
+  form: {},
+  /** 全屏 */
+  fullscreenObj: {
+    /** 包明细 */
+    packageOrderListlVisited: false,
+  },
+});
+
+const {
+  shortcuts,
+  stockupDate,
+  data,
+  loadingObj,
+  selectionList,
+  drawerShow,
+  page,
+  trickleLoadingPage,
+  zeroAdditionalRecordingInfo,
+  popUpShow,
+  recorddata,
+} = toRefs(details);
+
+/**
+ * 设置列表 -- 固定函数
+ * 弹窗的勾选回调，用于更改头部数组
+ * 固定搭配，只需要更换   columnList
+ *  */
+ const setnewcolum = (newarr, headarr, type) => {
+  if (type == 1) {
+    details.columnList = newarr;
+    functions.setStorage(window.location.pathname + 'checkList', headarr);
+  } else if (type == 2) {
+    details.columnList = newarr;
+    functions.setStorage(window.location.pathname + 'flexList', headarr);
+  } else if (type == 3) {
+    details.columnList = newarr;
+    functions.setStorage(window.location.pathname + 'sortlist', headarr);
+  }
+};
+details.columnList = columnList;//菜单配置
+/** 展开列表控件 */
+const showdrawer = _flag => {
+  details.drawerShow = _flag;
+};
+// 页面初始化
+const onLoad=()=>{
+    let data={
+        current: 1,
+        size: 30
+    }
+    $_getList(data).then(res=>{
+        console.log(res);
+    })
+}
+onLoad()
+// 每页多少条
+const sizeChange = val => {
+};
+/** 页码改变执行的回调 */
+const currentChange = val => {  
+};
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/distribution/signdetail/packageNodeSearch.vue b/src/views/distribution/signdetail/packageNodeSearch.vue
index f3952fdb..a22470d0 100644
--- a/src/views/distribution/signdetail/packageNodeSearch.vue
+++ b/src/views/distribution/signdetail/packageNodeSearch.vue
@@ -31,7 +31,7 @@
               <el-button type="primary" icon="el-icon-search" @click="searchChange"
                 >搜 索</el-button
               >
-              <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+              <!-- <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button> -->
             </el-form-item>
           </el-form>
         </el-row>
@@ -206,6 +206,9 @@ const showdrawer = _flag => {
   details.drawerShow = _flag;
 };
 const onload = () => {
+  if(!details.query.packageCode){
+    return
+  }
   details.loadingObj.list=true
   console.log(details.query);
   let data = {
@@ -239,6 +242,9 @@ searchChange()
 watch($route, (newValue, oldValue) => {
   // 确保用户ID确实发生了变化
   details.query.packageCode = $route.query.orderPackageCode
+  if(!details.query.packageCode){
+    return
+  }
   searchChange()
 });
 
diff --git a/src/views/warehouse/warehouseStock/warehouseStock.vue b/src/views/warehouse/warehouseStock/warehouseStock.vue
index d7ed75be..4e6bf3dd 100644
--- a/src/views/warehouse/warehouseStock/warehouseStock.vue
+++ b/src/views/warehouse/warehouseStock/warehouseStock.vue
@@ -285,7 +285,7 @@ export default {
         {
           prop: 'createTime',
           label: '操作时间',
-          type: 2,
+          type: 4,
           values: '',
           width: '130',
           checkarr: [],
@@ -475,6 +475,9 @@ export default {
     },
     timesc(index, row) {
       console.log(index, row);
+      console.log(index, row);
+      this.query[row.prop] = index;
+      this.onLoad(this.page);
     },
     inputsc(index, row) {
       console.log(index, row);
diff --git a/vite.config.js b/vite.config.js
index 8ad784e1..44164c17 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -23,7 +23,7 @@ export default ({ mode, command }) => {
           // 新zyc
           // target: 'http://192.168.6.116:8777',
           // target: 'http://192.168.6.122:8777',
-          // target: 'http://192.168.3.14:13000',
+          // target: 'http://192.168.3.14:13000',  
           // target: 'http://192.168.10.25:2888',
           // target: 'http://192.168.6.161:9777',//CY
           // target: 'http://192.168.10.57:13000',