From 6053611a5bc0ff27eb57d1ec10979cbcccd44ad6 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 19 Sep 2022 17:58:53 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=A0=E9=99=A4=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=88=97=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E5=A4=87=E6=B3=A8=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/userManage/admin/authAdmin.vue   |  1 +
 src/views/userManage/userAccountManage.vue | 19 ++-----------------
 src/views/warehouse/stockOrderDelete.vue   |  5 -----
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/src/views/userManage/admin/authAdmin.vue b/src/views/userManage/admin/authAdmin.vue
index 3ffff03..1ac8916 100644
--- a/src/views/userManage/admin/authAdmin.vue
+++ b/src/views/userManage/admin/authAdmin.vue
@@ -208,6 +208,7 @@ const formJson = {
     id: "",
     passWord: "",
     userName: "",
+    comments: "",
     checkPassword: "",
     employeeName: "",
     userFlag: 1,
diff --git a/src/views/userManage/userAccountManage.vue b/src/views/userManage/userAccountManage.vue
index 5b9c630..3f6232a 100644
--- a/src/views/userManage/userAccountManage.vue
+++ b/src/views/userManage/userAccountManage.vue
@@ -4,14 +4,6 @@
             <el-form-item class="query-form-item">
                 <el-input v-model="query.userName" placeholder="用户账号"></el-input>
             </el-form-item>
-            <!-- <el-form-item class="query-form-item">
-                 <el-select v-model="query.userFlag" placeholder="状态">
-                     <el-option label="全部" value=""></el-option>
-                     <el-option label="禁用" value="0"></el-option>
-                     <el-option label="正常" value="1"></el-option>
-                     <el-option label="未验证" value="2"></el-option>
-                 </el-select>
-             </el-form-item>-->
             <el-form-item>
                 <el-button-group>
                     <el-button
@@ -35,14 +27,6 @@
             <el-table-column label="用户账号" prop="userName" fixed></el-table-column>
             <el-table-column label="用户名称" prop="employeeName" fixed>
             </el-table-column>
-            <!-- <el-table-column label="状态" fixed="">
-                 <template slot-scope="scope">
-                     <el-tag :type="scope.row.userFlag | statusFilterType">{{
-                             scope.row.userFlag | statusFilterName
-                         }}
-                     </el-tag>
-                 </template>
-             </el-table-column>-->
             <el-table-column label="备注" prop="comments" fixed></el-table-column>
             <el-table-column
                 label="登录时间"
@@ -52,7 +36,6 @@
                 <template slot-scope="scope">
                     <i class="el-icon-time"></i>
                     <span> {{ scope.row.lastLoginTime }}</span>
-                    <!-- <span>{{ formatTime(scope.row.lastLoginTime,"yyyy-MM-dd") }}</span> -->
                 </template>
             </el-table-column>
 
@@ -181,6 +164,7 @@ const formJson = {
     userName: "",
     checkPassword: "",
     employeeName: "",
+    comments: "",
     userFlag: 1,
     customerId: "",
     roles: [],
@@ -381,6 +365,7 @@ export default {
                         checkPassword: this.formData.checkPassword,
                         userName: this.formData.userName,
                         employeeName: this.formData.employeeName,
+                        comments: this.formData.comments
                     };
                     authAdminSave(savequery, this.formName).then((response) => {
                         this.formLoading = false;
diff --git a/src/views/warehouse/stockOrderDelete.vue b/src/views/warehouse/stockOrderDelete.vue
index b61a1e0..14fa224 100644
--- a/src/views/warehouse/stockOrderDelete.vue
+++ b/src/views/warehouse/stockOrderDelete.vue
@@ -143,11 +143,6 @@
                 ></el-table-column>
 
                 <el-table-column label="扫码数量" prop="count"></el-table-column>
-                <el-table-column
-                    label="供应商"
-                    prop="supName"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
                 <el-table-column
                     label="生产企业"
                     prop="productCompany"