From 3477390f9bc624b3041f1c5be91c16eb4acd8f16 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Fri, 7 Jan 2022 11:31:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=20sxm=202022-1-7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/common/Chooselist.vue              |  1 +
 src/views/modules/common/column.vue                  | 12 +++++++-----
 .../productProcessRoute/searchProcessRouteTool.vue   |  2 +-
 src/views/modules/sys/language/common.vue            |  2 +-
 src/views/modules/sys/menu-add-or-update.vue         |  2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/common/Chooselist.vue b/src/views/modules/common/Chooselist.vue
index 30d3505..57f4a25 100644
--- a/src/views/modules/common/Chooselist.vue
+++ b/src/views/modules/common/Chooselist.vue
@@ -174,6 +174,7 @@ export default {
       })
     },
     getRowData(row) {
+      this.visible = false
       this.$emit('getBaseData',row)
     }
   }
diff --git a/src/views/modules/common/column.vue b/src/views/modules/common/column.vue
index bd365b0..aaae43e 100644
--- a/src/views/modules/common/column.vue
+++ b/src/views/modules/common/column.vue
@@ -13,8 +13,9 @@
                     :prop="item.columnProp">
         <el-form-item>
           排序
-          <el-input-number v-model="item.sortLv" controls-position="right" size="mini" :min="0"
-                           :max="100"></el-input-number>
+          <el-input oninput="value=value.replace(/[^\d]/g, '')" v-model="item.sortLv"  :min="0" ></el-input>
+<!--          <el-input-number v-model="item.sortLv" controls-position="right" size="mini" :min="0"-->
+<!--                           :max="100"></el-input-number>-->
         </el-form-item>
         <el-form-item>
           <el-switch
@@ -39,8 +40,9 @@
         </el-form-item>
         <el-form-item>
           宽度
-          <el-input-number v-model="item.columnWidth" controls-position="right" size="mini" :min="0"
-                           :max="1000"></el-input-number>
+          <el-input oninput="value=value.replace(/[^\d]/g, '')" v-model="item.columnWidth"  :min="0" ></el-input>
+<!--          <el-input-number v-model="item.columnWidth" controls-position="right" size="mini" :min="0"-->
+<!--                           :max="1000"></el-input-number>-->
         </el-form-item>
         <el-form-item>
           类型
@@ -61,7 +63,7 @@
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="updateColumnList()"  v-loading.fullscreen.lock="openFullScreen2">确定</el-button>
+      <el-button type="primary" @click="updateColumnList()"  >确定</el-button>
       <el-button @click="visible = false">取消</el-button>
     </span>
   </el-dialog>
diff --git a/src/views/modules/productProcessRoute/searchProcessRouteTool.vue b/src/views/modules/productProcessRoute/searchProcessRouteTool.vue
index fa68e7c..fba34de 100644
--- a/src/views/modules/productProcessRoute/searchProcessRouteTool.vue
+++ b/src/views/modules/productProcessRoute/searchProcessRouteTool.vue
@@ -196,7 +196,7 @@
             columnSortable: false,
             sortLv: 0,
             status: true,
-            fixed: false,
+            fixed: true,
             columnWidth: 120
           },
           {
diff --git a/src/views/modules/sys/language/common.vue b/src/views/modules/sys/language/common.vue
index a66fdd6..243e4b4 100644
--- a/src/views/modules/sys/language/common.vue
+++ b/src/views/modules/sys/language/common.vue
@@ -134,7 +134,7 @@
 <script>
 
 import column from "../../common/column";
-import list from '@/views/modules/common/Chooselist'
+import Chooselist from '@/views/modules/common/Chooselist'
 import {
   searchSysLanguagePackList,
   searchSysLanguageParam,
diff --git a/src/views/modules/sys/menu-add-or-update.vue b/src/views/modules/sys/menu-add-or-update.vue
index b73d56a..f37f98a 100644
--- a/src/views/modules/sys/menu-add-or-update.vue
+++ b/src/views/modules/sys/menu-add-or-update.vue
@@ -40,7 +40,7 @@
         <el-input style="width: 349px;"  v-model="dataForm.perms" placeholder="多个用逗号分隔, 如: user:list,user:create"></el-input>
       </el-form-item>
       <el-form-item v-if="dataForm.type !== 2" label="排序号" prop="orderNum">
-        <el-input-number v-model="dataForm.orderNum" controls-position="right" :min="0" label="排序号"></el-input-number>
+        <el-input style="width: 349px;" oninput="value=value.replace(/[^\d]/g, '')" v-model="dataForm.orderNum"  :min="0" label="排序号"></el-input>
       </el-form-item>
       <el-form-item  label="菜单类型" prop="menuType">
         <el-select v-model="dataForm.menuType">