From 3d4bf796eb62938ae160318737144f05bba7a15b Mon Sep 17 00:00:00 2001
From: xuxiaoming <xiaoming.xu@le-it.com.cn>
Date: Sun, 2 Jan 2022 14:39:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E6=B7=BB=E5=8A=A0=E8=B5=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/workbench/lookError/index.vue | 197 +++++------
 src/views/system/user/addOrEdit.vue          | 337 ++++++++++---------
 2 files changed, 276 insertions(+), 258 deletions(-)

diff --git a/src/views/plan/workbench/lookError/index.vue b/src/views/plan/workbench/lookError/index.vue
index 6d387d9..535065b 100644
--- a/src/views/plan/workbench/lookError/index.vue
+++ b/src/views/plan/workbench/lookError/index.vue
@@ -1,125 +1,110 @@
 <template>
-  <div ref="tableRef" class="table-height-wrap">
+  <div ref="tableRef"
+      class="table-height-wrap">
     <SearchTemplate>
-      <el-form :inline="true" class="clearfix search-content">
+      <el-form :inline="true"
+          class="clearfix search-content">
         <el-form-item :label="getColumnName('AP_ErrorDatalst-Id')">
-          <el-input
-            v-model.trim="queryParams.Id"
-            placeholder="请输入查询内容"
-            clearable
-            style="width: 240px"
-          />
+          <el-input v-model.trim="queryParams.Id"
+              placeholder="请输入查询内容"
+              clearable
+              style="width: 240px" />
         </el-form-item>
-       <el-form-item :label="getColumnName('AP_ErrorDatalst-ErrorStatus')">
-          <el-select
-              v-model="queryParams.ErrorStatus"
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in statusOptions" 
+        <el-form-item :label="getColumnName('AP_ErrorDatalst-ErrorStatus')">
+          <el-select v-model="queryParams.ErrorStatus"
+              placeholder="请选择">
+            <el-option v-for="item in statusOptions"
                 :key="item['Stdef-StdefTyp']"
                 :label="item['Stdef-Bez']"
-                :value="item['Stdef-StdefTyp']"
-              />
-            </el-select>
+                :value="item['Stdef-StdefTyp']" />
+          </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button
-            icon="el-icon-search"
-            size="mini"
-            class="search-button-style"
-            @click="handleQuery"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            class="reset-button-style"
-            @click="resetQuery"
-            >重置</el-button
-          >
+          <el-button icon="el-icon-search"
+              size="mini"
+              class="search-button-style"
+              @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh"
+              size="mini"
+              class="reset-button-style"
+              @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
     </SearchTemplate>
     <ContentContainer>
-     <el-table
-      :data="tableData"
-      v-loading="loading"
-      size="mini"
-      style="width: 100%"
-      border
-      v-if="tableHeight"
-      :height="tableHeight"
-    >
-      <el-table-column
-        v-for="(item, index) in headers"
-        :key="index"
-        :label="getColumnName(item)"
-        :show-overflow-tooltip="true"
-      >
-        <template #default="scope">
-          <span>{{ scope.row[item] }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      v-show="pagination.total > 0"
-      v-model:pagination="pagination"
-      @change="getList"
-    />
+      <el-table :data="tableData"
+          v-loading="loading"
+          size="mini"
+          style="width: 100%"
+          border
+          v-if="tableHeight"
+          :height="tableHeight">
+        <el-table-column v-for="(item, index) in headers"
+            :key="index"
+            :label="getColumnName(item)"
+            :show-overflow-tooltip="true">
+          <template #default="scope">
+            <span>{{ scope.row[item] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页 -->
+      <Pagination v-show="pagination.total > 0"
+          v-model:pagination="pagination"
+          @change="getList" />
     </ContentContainer>
   </div>
 </template>
 <script>
-import { ListMixin } from "@/mixins/ListMixin";
-export default {
-  mixins: [ListMixin],
-  data() {
-    return {
-      statusOptions:[],
-      queryTableDataUrl: "/admin/ap/errordatalst/query",
-      headers: [
-        "AP_ErrorDatalst-Id",
-        "AP_ErrorDatalst-ErrorInfo",
-        "AP_ErrorDatalst-ErrorType",
-        "AP_ErrorDatalst-ErrorStatus",
-        "AP_ErrorDatalst-TargetSource",
-        "AP_ErrorDatalst-LastModify",
-        "AP_ErrorDatalst-LastUser",
-        "AP_ErrorDatalst-CreateTime",
-      ], // 遍历表头
-      tableHeight: 0,
-    };
-  },
-  methods: {
-    // 搜索按钮操作
-    handleQuery() {
-      this.pagination.pageNumber = 1;
-      this.getList();
+  import { ListMixin } from "@/mixins/ListMixin";
+  export default {
+    mixins: [ListMixin],
+    data() {
+      return {
+        statusOptions: [],
+        queryTableDataUrl: "/admin/ap/errordatalst/query",
+        headers: [
+          "AP_ErrorDatalst-Id",
+          "AP_ErrorDatalst-ErrorInfo",
+          "AP_ErrorDatalst-ErrorType",
+          "AP_ErrorDatalst-ErrorStatus",
+          "AP_ErrorDatalst-TargetSource",
+          "AP_ErrorDatalst-LastModify",
+          "AP_ErrorDatalst-LastUser",
+          "AP_ErrorDatalst-CreateTime",
+        ], // 遍历表头
+        tableHeight: 0,
+      };
     },
-    // 重置按钮操作
-    resetQuery() {
-      this.queryParams.Id = undefined;
-      this.handleQuery();
+    methods: {
+      // 搜索按钮操作
+      handleQuery() {
+        this.pagination.pageNumber = 1;
+        this.getList();
+      },
+      // 重置按钮操作
+      resetQuery() {
+        this.queryParams.Id = undefined;
+        this.handleQuery();
+      },
     },
-  },
-  mounted() {
-    this.getStanderOne({ statid: 'AP_ErrorDatalst-ErrorStatus' }).then((res) => {
-      this.statusOptions = res.data
-    })
-    this.$nextTick(() => {
-      this.tableHeight = this.calculationTableHeight(
-        this.$refs.tableRef,
-        120
-      );
-    })
-  }
-};
+    mounted() {
+      this.getStanderOne({ statid: 'AP_ErrorDatalst-ErrorStatus' }).then((res) => {
+        this.statusOptions = res.data
+      })
+      this.$nextTick(() => {
+        this.tableHeight = this.calculationTableHeight(
+          this.$refs.tableRef,
+          120
+        );
+      })
+    }
+  };
 </script>
-<style lang="less" scoped>
-.table-height-wrap {
-  height: 100%;
-  overflow: hidden;
-}
-</style>
+<style lang="less"
+    scoped>
+  .table-height-wrap {
+    height: 100%;
+    overflow: hidden;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/system/user/addOrEdit.vue b/src/views/system/user/addOrEdit.vue
index ff647b7..b268f6c 100644
--- a/src/views/system/user/addOrEdit.vue
+++ b/src/views/system/user/addOrEdit.vue
@@ -1,166 +1,199 @@
 <template>
-	<el-dialog :title="isShowDialog === 'add' ? '新增' : '修改'" model-value width="1000px" :close-on-click-modal="false" :before-close="cancel">
-		<el-form ref="form" :model="form" :rules="rules" label-width="100px">
-			<el-row>
-				<el-col :span="12">
+  <el-dialog
+    :title="isShowDialog === 'add' ? '新增' : '修改'"
+    model-value
+    width="1000px"
+    :close-on-click-modal="false"
+    :before-close="cancel"
+  >
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-row>
+        <el-col :span="12">
           <el-form-item label="用户编号" prop="User-UserId">
-            <el-input v-model="form['User-UserId']" :disabled="isShowDialog === 'edit'" placeholder="请输入用户编号" />
+            <el-input
+              v-model="form['User-UserId']"
+              :disabled="isShowDialog === 'edit'"
+              placeholder="请输入用户编号"
+            />
           </el-form-item>
         </el-col>
-				<el-col :span="12">
+        <el-col :span="12">
           <el-form-item label="用户名称" prop="User-Name">
             <el-input v-model="form['User-Name']" placeholder="请输入用户名称" />
           </el-form-item>
         </el-col>
-				<el-col :span="12">
-					<el-form-item label="角色" prop="User-RoleId">
-						<el-select v-model="form['User-RoleId']" placeholder="请选择" @change="$forceUpdate()">
-							<el-option
-								v-for="item in roleOptions"
-								:key="item['Role-RoleId']"
-								:label="item['Role-RoleName']"
-								:value="item['Role-RoleId']"
-								:disabled="item['Role-Status'] == 1"
-							/>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item label="手机号码">
-						<el-input v-model="form['User-Phone']" placeholder="请输入手机号码" maxlength="11" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item label="邮箱">
-						<el-input v-model="form['User-Email']" placeholder="请输入邮箱" maxlength="50" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item label="状态">
-						<el-radio-group v-model="form['User-Status']">
-							<el-radio
-								v-for="dict in statusOptions"
-								:key="dict.dictValue"
-								:label="dict.dictValue"
-							>{{ dict.dictLabel }}</el-radio>
-						</el-radio-group>
-					</el-form-item>
-				</el-col>
         <el-col :span="12">
-					<el-form-item label="关联员工" prop="User-CustCommissioner">
-						<el-select clearable v-model="form['User-CustCommissioner']" placeholder="请选择" >
-							<el-option
-								v-for="item in custCommissionerOptions"
-								:key="item['FNumber']"
-								:label="item['FName']"
-								:value="item['FNumber']"
-							/>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24">
-					<el-form-item label="备注">
-						<el-input v-model="form['User-Remark']" type="textarea" placeholder="请输入内容" />
-					</el-form-item>
-				</el-col>
-			</el-row>
-		</el-form>
-		<template #footer>
-			<span class="dialog-footer">
-				<el-button type="primary" class="dialog-submit-button" @click="submitForm">确 定</el-button>
-				<el-button class="dialog-cancel-button" @click="cancel">取 消</el-button>
-			</span>
-		</template>
-	</el-dialog>
+          <el-form-item label="角色" prop="User-RoleId">
+            <el-select
+              v-model="form['User-RoleId']"
+              placeholder="请选择"
+              @change="$forceUpdate()"
+            >
+              <el-option
+                v-for="item in roleOptions"
+                :key="item['Role-RoleId']"
+                :label="item['Role-RoleName']"
+                :value="item['Role-RoleId']"
+                :disabled="item['Role-Status'] == 1"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="手机号码">
+            <el-input
+              v-model="form['User-Phone']"
+              placeholder="请输入手机号码"
+              maxlength="11"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="邮箱">
+            <el-input
+              v-model="form['User-Email']"
+              placeholder="请输入邮箱"
+              maxlength="50"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="状态">
+            <el-radio-group v-model="form['User-Status']">
+              <el-radio
+                v-for="dict in statusOptions"
+                :key="dict.dictValue"
+                :label="dict.dictValue"
+                >{{ dict.dictLabel }}</el-radio
+              >
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="关联员工" prop="User-CustCommissioner">
+            <el-select
+              clearable
+              v-model="form['User-CustCommissioner']"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in custCommissionerOptions"
+                :key="item['FNumber']"
+                :label="item['FName']"
+                :value="item['FNumber']"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input
+              v-model="form['User-Remark']"
+              type="textarea"
+              placeholder="请输入内容"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" class="dialog-submit-button" @click="submitForm"
+          >确 定</el-button
+        >
+        <el-button class="dialog-cancel-button" @click="cancel">取 消</el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 <script>
-import { uplateUser, addUser, getRoles, getUser,getEmpInfo} from "@/server/system/user"
+import { uplateUser, addUser, getRoles, getUser, getEmpInfo } from "@/server/system/user";
 export default {
-	name: 'editField',
-	props: {
-		item: {
-			default: {},
-		},
-		isShowDialog: {
-			default: 'add'
-		}
-	},
-	mounted() {
-		if (this.isShowDialog === 'edit') {
-			this.handleUpdate(this.item)
-		}
-	},
-	data() {
-		return {
-      custCommissionerOptions:[],
+  name: "editField",
+  props: {
+    item: {
+      default: {},
+    },
+    isShowDialog: {
+      default: "add",
+    },
+  },
+  mounted() {
+    if (this.isShowDialog === "edit") {
+      this.handleUpdate(this.item);
+    }
+  },
+  data() {
+    return {
+      custCommissionerOptions: [],
       roleOptions: [], // 角色选项
-      statusOptions: [ // 状态数据字典
-				{ dictLabel: '正常', dictValue: '0' }, 
-				{ dictLabel: '停用', dictValue: '1' }
-			],
-			title: '添加', // 弹框标题
-			form: {
-				'User-Status': '0'
-			}, // 表单参数
-			rules: { // 表单校验
-				'User-UserId': [
-					{ required: true, message: '此项不能为空', trigger: 'blur' }
-				],
-				'User-Name': [
-					{ required: true, message: '此项不能为空', trigger: 'blur' }
-				],
-				'User-RoleId': [
-					{ required: true, message: '此项不能为空', trigger: 'blur' }
-				],
-			},
-		}
-	},
-	created() {
-		// 获取角色数据
-		getRoles().then((res) => {
-			if (res.code === 200) {
-				this.roleOptions = res.data || []
-			}
-		})
-    this.getEmpInfo()
-	},
-	methods: {
-		cancel() { // 取消按钮
-			this.$emit('update:isShowDialog','')
-		},
-		handleUpdate(row) { // 修改按钮操作
-			getUser(row['User-UserId']).then(({code, data = {}}) => {
-				if (code === 200) {
-					this.form = data
-				}
-			})
-		},
-    getEmpInfo(){
-      getEmpInfo().then( ({data = []} ) => {
-        	this.custCommissionerOptions = data
-      })
+      statusOptions: [
+        // 状态数据字典
+        { dictLabel: "正常", dictValue: "0" },
+        { dictLabel: "停用", dictValue: "1" },
+      ],
+      title: "添加", // 弹框标题
+      form: {
+        "User-Status": "0",
+      }, // 表单参数
+      rules: {
+        // 表单校验
+        "User-UserId": [{ required: true, message: "此项不能为空", trigger: "blur" }],
+        "User-Name": [{ required: true, message: "此项不能为空", trigger: "blur" }],
+        "User-RoleId": [{ required: true, message: "此项不能为空", trigger: "blur" }],
+      },
+    };
+  },
+  created() {
+    // 获取角色数据
+    getRoles().then((res) => {
+      if (res.code === 200) {
+        this.roleOptions = res.data || [];
+      }
+    });
+    this.getEmpInfo();
+  },
+  methods: {
+    cancel() {
+      // 取消按钮
+      this.$emit("update:isShowDialog", "");
+    },
+    handleUpdate(row) {
+      // 修改按钮操作
+      getUser(row["User-UserId"]).then(({ code, data = {} }) => {
+        if (code === 200) {
+          this.form = data;
+        }
+      });
+    },
+    getEmpInfo() {
+      getEmpInfo().then(({ data = [] }) => {
+        this.custCommissionerOptions = data;
+      });
+    },
+    submitForm() {
+      // 提交按钮
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.isShowDialog === "edit") {
+            uplateUser(this.form).then((res) => {
+              if (res.code === 200) {
+                this.msgSuccess("修改成功");
+                this.$emit("editCallBack");
+              }
+            });
+          } else {
+            addUser(this.form).then((res) => {
+              if (res.code === 200) {
+                this.msgSuccess("新增成功");
+                this.$emit("editCallBack");
+              }
+            });
+          }
+        }
+      });
     },
-		submitForm() { // 提交按钮
-			this.$refs['form'].validate(valid => {
-				if (valid) {
-					if (this.isShowDialog === 'edit') {
-						uplateUser(this.form).then(res => {
-							if (res.code === 200) {
-								this.msgSuccess('修改成功')
-								this.$emit('editCallBack')
-							}
-						})
-					} else {
-						addUser(this.form).then(res => {
-							if (res.code === 200) {
-								this.msgSuccess('新增成功')
-								this.$emit('editCallBack')
-							}
-						})
-					}
-				}
-			})
-		},
-	}
-}
-</script>
\ No newline at end of file
+  },
+};
+</script>