From 387199d0dcb269f77420be983fe69f9aaa07a41e Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Tue, 18 Jun 2024 15:53:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Crud/UD.operation.vue | 6 ++----
 src/views/base-data/point/index.vue  | 9 ++++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/Crud/UD.operation.vue b/src/components/Crud/UD.operation.vue
index 1d6774c..f7c0cfd 100644
--- a/src/components/Crud/UD.operation.vue
+++ b/src/components/Crud/UD.operation.vue
@@ -3,7 +3,7 @@
     <el-button v-if="showEdit" v-permission="permission.edit" :loading="crud.status.cu === 2" :disabled="disabledEdit"
                size="mini" type="primary" icon="el-icon-edit" @click="crud.toEdit(data)"></el-button>
 
-    <el-popover v-model="pop" v-permission="permission.del" placement="top" width="180" trigger="click"
+    <el-popover v-model="pop" v-permission="permission.del" placement="top" width="180" trigger="manual"
                 @show="onPopoverShow" @hide="onPopoverHide">
       <p>{{ msg }}</p>
       <div style="text-align: right; margin: 0">
@@ -15,12 +15,11 @@
       <el-button slot="reference" :disabled="disabledDle" v-if="showDle" type="danger" icon="el-icon-delete" size="mini"
                  @click="toDelete"/>
     </el-popover>
+
   </div>
 </template>
 <script>
 import CRUD, {crud} from '@crud/crud'
-import stockUrl from "@/api/stock";
-import ContainerIn from "@/views/base-data/stock/containerIn.vue";
 
 export default {
   mixins: [crud()],
@@ -58,7 +57,6 @@ export default {
     return {
       pop: false,
     }
-
   },
   methods: {
     doCancel() {
diff --git a/src/views/base-data/point/index.vue b/src/views/base-data/point/index.vue
index 2a3bc77..125498f 100644
--- a/src/views/base-data/point/index.vue
+++ b/src/views/base-data/point/index.vue
@@ -138,7 +138,7 @@
 
           <el-form-item label="库区" prop="area">
             <el-select v-model="form.area"
-                       value-key="id"  filterable
+                       value-key="id" filterable
                        placeholder="请选择" style="width: 370px;">
               <el-option
                 v-for="item in areas"
@@ -149,7 +149,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="高度" v-if="showItemHeight">
+          <el-form-item label="高度" prop="itemHeight" v-if="showItemHeight">
             <el-select
               v-model="form.itemHeight"
               clearable
@@ -237,7 +237,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column v-if="checkPer(['admin','point:edit'])" label="操作" align="center">
+        <el-table-column v-if="checkPer(['admin','point:edit','point:del'])" label="操作" align="center">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
@@ -342,6 +342,9 @@ export default {
         ],
         area: [
           {required: true, message: '库区不能为空', trigger: 'blur'}
+        ],
+        itemHeight: [
+          {required: true, message: '高度不能为空', trigger: 'blur'}
         ]
       },
       //呼叫空车的弹出按钮