From 44f5fadd6a669405cd8a7608aa510bd62688a750 Mon Sep 17 00:00:00 2001
From: wyg <wu1555611@163.com>
Date: 星期一, 17 六月 2024 11:35:11 +0800
Subject: [PATCH] 去除若依化
---
src/views/basicData/warehouse/index.vue | 119 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 63 insertions(+), 56 deletions(-)
diff --git a/src/views/basicData/warehouse/index.vue b/src/views/basicData/warehouse/index.vue
index a62d7f3..f1a2275 100644
--- a/src/views/basicData/warehouse/index.vue
+++ b/src/views/basicData/warehouse/index.vue
@@ -1,25 +1,35 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form-item label="宸ュ巶" prop="werks">
+ <el-input
+ v-model.trim="queryParams.werks"
+ placeholder="璇疯緭鍏ュ伐鍘�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<el-form-item label="鍚嶇О" prop="warehouseName">
<el-input
- v-model="queryParams.warehouseName"
+ v-model.trim="queryParams.warehouseName"
placeholder="璇疯緭鍏ュ悕绉�"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="宸ュ巶" prop="werks">
+
+ <el-form-item label="缂栧彿" prop="lgort">
<el-input
- v-model="queryParams.werks"
- placeholder="璇疯緭鍏ュ伐鍘�"
+ v-model.trim="queryParams.lgort"
+ placeholder="璇疯緭鍏ョ紪鍙�"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+
<el-form-item label="鐘舵��" prop="state">
<el-input
- v-model="queryParams.state"
+ v-model.trim="queryParams.state"
placeholder="璇疯緭鍏ョ姸鎬�"
clearable
@keyup.enter.native="handleQuery"
@@ -77,21 +87,30 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="warehouseList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" border :data="warehouseList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="浠撳簱ID" align="center" prop="warehouseId" v-if="true"/>
+ <el-table-column
+ label="搴忓彿"
+ type="index"
+ fixed
+ width="50" />
+ <!-- <el-table-column label="浠撳簱ID" align="center" prop="warehouseId" v-if="true"/> -->
<el-table-column label="浠撳簱缂栧彿" align="center" prop="lgort" />
<el-table-column label="鍚嶇О" align="center" prop="warehouseName" />
<el-table-column label="宸ュ巶" align="center" prop="werks" />
<el-table-column label="绫诲埆" align="center" prop="type" />
- <el-table-column label="0,涓嶅惎鐢�
- 1,鍚敤" align="center" prop="isUseLocation" />
- <el-table-column label="绠＄悊鍛業D" align="center" prop="userId" />
+ <el-table-column label="鏄惁鍚敤" align="center" prop="isUseLocation" >
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.isenable" :value="scope.row.isUseLocation"/>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column label="绠＄悊鍛業D" align="center" prop="userId" /> -->
+ <el-table-column label="绠＄悊鍛樺悕绉�" align="center" prop="userName" />
<el-table-column label="绠＄悊鍛樼數璇�" align="center" prop="userPhone" />
<el-table-column label="鍧愭爣X" align="center" prop="coordinateX" />
<el-table-column label="鍧愭爣Y" align="center" prop="coordinateY" />
<el-table-column label="鎻忚堪" align="center" prop="description" />
- <el-table-column label="鐘舵��" align="center" prop="state" />
+ <!-- <el-table-column label="鐘舵��" align="center" prop="state" /> -->
<el-table-column label="鏈�鍚庢洿鏂颁汉id" align="center" prop="lastUpdatedUserId" />
<el-table-column label="鏈�鍚庢洿鏂颁汉濮撳悕" align="center" prop="lastUpdatedUserName" />
<el-table-column label="鏈�鍚庢洿鏂版椂闂�" align="center" prop="lastUpdatedDateTime" width="180">
@@ -128,45 +147,55 @@
/>
<!-- 娣诲姞鎴栦慨鏀逛粨搴撳璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+ <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="浠撳簱缂栧彿" prop="lgort">
- <el-input v-model="form.lgort" placeholder="璇疯緭鍏ヤ粨搴撶紪鍙�" />
+ <el-input v-model.trim="form.lgort" placeholder="璇疯緭鍏ヤ粨搴撶紪鍙�" />
</el-form-item>
<el-form-item label="鍚嶇О" prop="warehouseName">
- <el-input v-model="form.warehouseName" placeholder="璇疯緭鍏ュ悕绉�" />
+ <el-input v-model.trim="form.warehouseName" placeholder="璇疯緭鍏ュ悕绉�" />
</el-form-item>
<el-form-item label="宸ュ巶" prop="werks">
- <el-input v-model="form.werks" placeholder="璇疯緭鍏ュ伐鍘�" />
+ <el-input v-model.trim="form.werks" placeholder="璇疯緭鍏ュ伐鍘�" />
</el-form-item>
- <el-form-item label="0,涓嶅惎鐢�
- 1,鍚敤" prop="isUseLocation">
- <el-input v-model="form.isUseLocation" placeholder="璇疯緭鍏�0,涓嶅惎鐢�
- 1,鍚敤" />
+ <el-form-item label="绫诲埆" prop="type">
+ <el-input v-model.trim="form.type" placeholder="璇疯緭鍏ョ被鍒�" />
</el-form-item>
- <el-form-item label="绠＄悊鍛業D" prop="userId">
- <el-input v-model="form.userId" placeholder="璇疯緭鍏ョ鐞嗗憳ID" />
+ <el-form-item label="鏄惁鍚敤" prop="isUseLocation">
+ <!-- <el-input v-model.trim="form.isUseLocation" placeholder="璇疯緭鍏�0,涓嶅惎鐢�
+ 1,鍚敤" /> -->
+ <el-select v-model="form.isUseLocation" placeholder="鏄惁鍚敤" clearable>
+ <el-option
+ v-for="dict in dict.type.isenable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="绠＄悊鍛樺悕绉�" prop="userId">
+ <el-input v-model.trim="form.userName" placeholder="璇疯緭鍏ョ鐞嗗憳鍚嶇О" />
</el-form-item>
<el-form-item label="绠＄悊鍛樼數璇�" prop="userPhone">
- <el-input v-model="form.userPhone" placeholder="璇疯緭鍏ョ鐞嗗憳鐢佃瘽" />
+ <el-input v-model.trim="form.userPhone" placeholder="璇疯緭鍏ョ鐞嗗憳鐢佃瘽" />
</el-form-item>
<el-form-item label="鍧愭爣X" prop="coordinateX">
- <el-input v-model="form.coordinateX" placeholder="璇疯緭鍏ュ潗鏍嘪" />
+ <el-input v-model.trim="form.coordinateX" placeholder="璇疯緭鍏ュ潗鏍嘪" />
</el-form-item>
<el-form-item label="鍧愭爣Y" prop="coordinateY">
- <el-input v-model="form.coordinateY" placeholder="璇疯緭鍏ュ潗鏍嘫" />
+ <el-input v-model.trim="form.coordinateY" placeholder="璇疯緭鍏ュ潗鏍嘫" />
</el-form-item>
<el-form-item label="鎻忚堪" prop="description">
- <el-input v-model="form.description" placeholder="璇疯緭鍏ユ弿杩�" />
+ <el-input v-model.trim="form.description" placeholder="璇疯緭鍏ユ弿杩�" />
</el-form-item>
- <el-form-item label="鐘舵��" prop="state">
- <el-input v-model="form.state" placeholder="璇疯緭鍏ョ姸鎬�" />
- </el-form-item>
- <el-form-item label="鏈�鍚庢洿鏂颁汉id" prop="lastUpdatedUserId">
- <el-input v-model="form.lastUpdatedUserId" placeholder="璇疯緭鍏ユ渶鍚庢洿鏂颁汉id" />
+ <!-- <el-form-item label="鐘舵��" prop="state">
+ <el-input v-model.trim="form.state" placeholder="璇疯緭鍏ョ姸鎬�" />
+ </el-form-item> -->
+ <!-- <el-form-item label="鏈�鍚庢洿鏂颁汉id" prop="lastUpdatedUserId">
+ <el-input v-model.trim="form.lastUpdatedUserId" placeholder="璇疯緭鍏ユ渶鍚庢洿鏂颁汉id" />
</el-form-item>
<el-form-item label="鏈�鍚庢洿鏂颁汉濮撳悕" prop="lastUpdatedUserName">
- <el-input v-model="form.lastUpdatedUserName" placeholder="璇疯緭鍏ユ渶鍚庢洿鏂颁汉濮撳悕" />
+ <el-input v-model.trim="form.lastUpdatedUserName" placeholder="璇疯緭鍏ユ渶鍚庢洿鏂颁汉濮撳悕" />
</el-form-item>
<el-form-item label="鏈�鍚庢洿鏂版椂闂�" prop="lastUpdatedDateTime">
<el-date-picker clearable
@@ -175,7 +204,7 @@
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="璇烽�夋嫨鏈�鍚庢洿鏂版椂闂�">
</el-date-picker>
- </el-form-item>
+ </el-form-item> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -190,6 +219,7 @@
export default {
name: "Warehouse",
+ dicts: ['isenable'],
data() {
return {
// 鎸夐挳loading
@@ -262,30 +292,7 @@
state: [
{ required: true, message: "鐘舵�佷笉鑳戒负绌�", trigger: "blur" }
],
- displayOrder: [
- { required: true, message: "鎺掑簭涓嶈兘涓虹┖", trigger: "blur" }
- ],
- createdUserId: [
- { required: true, message: "鍒涘缓浜篿d涓嶈兘涓虹┖", trigger: "blur" }
- ],
- createdUserName: [
- { required: true, message: "鍒涘缓浜哄鍚嶄笉鑳戒负绌�", trigger: "blur" }
- ],
- createdDateTime: [
- { required: true, message: "鍒涘缓鏃ユ湡鏃堕棿涓嶈兘涓虹┖", trigger: "blur" }
- ],
- lastUpdatedUserId: [
- { required: true, message: "鏈�鍚庢洿鏂颁汉id涓嶈兘涓虹┖", trigger: "blur" }
- ],
- lastUpdatedUserName: [
- { required: true, message: "鏈�鍚庢洿鏂颁汉濮撳悕涓嶈兘涓虹┖", trigger: "blur" }
- ],
- lastUpdatedDateTime: [
- { required: true, message: "鏈�鍚庢洿鏂版椂闂翠笉鑳戒负绌�", trigger: "blur" }
- ],
- isDeleted: [
- { required: true, message: "鏄惁鍒犻櫎涓嶈兘涓虹┖", trigger: "blur" }
- ]
+
}
};
},
--
Gitblit v1.9.3