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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
搜 索
- 清 空
+
@@ -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',