Browse Source

Merge remote-tracking branch 'origin/qingban' into qingban

# Conflicts:
#	src/views/system/user/index.vue
lupeng 10 tháng trước cách đây
mục cha
commit
13ea075730

+ 1 - 1
src/views/quality/faultHandle/components/fault-page.vue

@@ -265,7 +265,7 @@ const faultHandle=ref({});
     }else{
       row.enabled = true
     }
-    row.reworkProcessId = undefined
+    //row.reworkProcessId = undefined
   }
   const option2=ref(null);
   const value=ref([]);

+ 62 - 78
src/views/system/user/index.vue

@@ -28,8 +28,8 @@
                 clearable
                 class="!w-[100px]"
               >
-                <el-option label="启用" value="0" />
-                <el-option label="禁用" value="1" />
+                <el-option label="启用" value=0 />
+                <el-option label="禁用" value=1 />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -96,22 +96,27 @@
               prop="userName"
             />
             <el-table-column
-              label="姓名"
-              width="120"
-              align="center"
-              prop="nickName"
+                label="姓名"
+                width="120"
+                align="center"
+                prop="nickName"
             />
             <el-table-column
-              key="employeeCode"
-              label="员工编号"
-              align="center"
-              prop="employeeCode"
+                key="employeeCode"
+                label="员工编号"
+                align="center"
+                prop="employeeCode"
             />
-            <el-table-column label="性别" width="100" align="center" prop="sex">
+            <el-table-column
+              label="性别"
+              width="100"
+              align="center"
+              prop="sex"
+            >
               <template #default="scope">
                 <el-tag :type="scope.row.sex == 0 ? 'info' : 'success'">{{
-                  scope.row.sex == 0 ? "未知" : scope.row.sex == 1 ? "男" : "女"
-                }}</el-tag>
+                    scope.row.sex == 0 ? "未知" : scope.row.sex == 1 ? "男" : "女"
+                  }}</el-tag>
               </template>
             </el-table-column>
 
@@ -206,18 +211,15 @@
           <el-col :span="11">
             <el-form-item label="用户名" prop="userName">
               <el-input
-                v-model="formData.userName"
-                :disabled="!!formData.id"
-                placeholder="请输入用户名"
+                  v-model="formData.userName"
+                  :disabled="!!formData.id"
+                  placeholder="请输入用户名"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="11">
+            <el-col :span="11">
             <el-form-item label="用户昵称" prop="nickName">
-              <el-input
-                v-model="formData.nickName"
-                placeholder="请输入用户昵称"
-              />
+              <el-input v-model="formData.nickName" placeholder="请输入用户昵称" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -226,17 +228,17 @@
           <el-col :span="11">
             <el-form-item label="员工编号" prop="employeeCode">
               <el-input
-                v-model="formData.employeeCode"
-                placeholder="请输入员工编号"
+                  v-model="formData.employeeCode"
+                  placeholder="请输入员工编号"
               />
             </el-form-item>
           </el-col>
           <el-col :span="11">
             <el-form-item label="性别" prop="sex">
               <el-radio-group v-model="formData.sex">
-                <el-radio :value="0">未知</el-radio>
-                <el-radio :value="1">男</el-radio>
-                <el-radio :value="2">女</el-radio>
+                <el-radio :value=0>未知</el-radio>
+                <el-radio :value=1>男</el-radio>
+                <el-radio :value=2>女</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -245,22 +247,17 @@
           <el-col :span="22">
             <el-form-item label="所属部门" prop="deptIds">
               <el-tree-select
-                v-model="formData.deptIds"
-                placeholder="请选择所属部门"
-                :data="deptList"
-                :multiple="true"
-                filterable
-                show-checkbox
-                load-key="deptName"
-                value-key="id"
-                :props="{
-                  children: 'children',
-                  label: 'deptName',
-                  value: 'id',
-                  disabled: '',
-                }"
-                check-strictly
-                :render-after-expand="false"
+                  v-model="formData.deptIds"
+                  placeholder="请选择所属部门"
+                  :data="deptList"
+                  :multiple="true"
+                  filterable
+                  show-checkbox
+                  load-key="deptName"
+                  value-key="id"
+                  :props="{ children: 'children', label: 'deptName',value: 'id', disabled: '' }"
+                  check-strictly
+                  :render-after-expand="false"
               />
             </el-form-item>
           </el-col>
@@ -269,16 +266,12 @@
         <el-row :gutter="22">
           <el-col :span="22">
             <el-form-item label="角色" prop="roleIds">
-              <el-select
-                v-model="formData.roleIds"
-                multiple
-                placeholder="请选择"
-              >
+              <el-select v-model="formData.roleIds" multiple placeholder="请选择">
                 <el-option
-                  v-for="item in roleList"
-                  :key="item.id"
-                  :label="item.roleName"
-                  :value="item.id"
+                    v-for="item in roleList"
+                    :key="item.id"
+                    :label="item.roleName"
+                    :value="item.id"
                 />
               </el-select>
             </el-form-item>
@@ -288,16 +281,12 @@
         <el-row :gutter="22">
           <el-col :span="22">
             <el-form-item label="岗位" prop="postIds">
-              <el-select
-                v-model="formData.postIds"
-                multiple
-                placeholder="请选择"
-              >
+              <el-select v-model="formData.postIds" multiple placeholder="请选择">
                 <el-option
-                  v-for="item in postList"
-                  :key="item.id"
-                  :label="item.postName"
-                  :value="item.id"
+                    v-for="item in postList"
+                    :key="item.id"
+                    :label="item.postName"
+                    :value="item.id"
                 />
               </el-select>
             </el-form-item>
@@ -307,18 +296,18 @@
           <el-col :span="11">
             <el-form-item label="手机号码" prop="phone">
               <el-input
-                v-model="formData.phone"
-                placeholder="请输入手机号码"
-                maxlength="11"
+                  v-model="formData.phone"
+                  placeholder="请输入手机号码"
+                  maxlength="11"
               />
             </el-form-item>
           </el-col>
           <el-col :span="11">
             <el-form-item label="邮箱" prop="email">
               <el-input
-                v-model="formData.email"
-                placeholder="请输入邮箱"
-                maxlength="50"
+                  v-model="formData.email"
+                  placeholder="请输入邮箱"
+                  maxlength="50"
               />
             </el-form-item>
           </el-col>
@@ -326,8 +315,8 @@
 
         <el-form-item label="状态" prop="state">
           <el-radio-group v-model="formData.state">
-            <el-radio :value="0">正常</el-radio>
-            <el-radio :value="1">禁用</el-radio>
+            <el-radio :value=0>正常</el-radio>
+            <el-radio :value=1>禁用</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -345,12 +334,7 @@
             :data="deptList"
             load-key="deptName"
             value-key="id"
-            :props="{
-              children: 'children',
-              label: 'deptName',
-              value: 'id',
-              disabled: '',
-            }"
+            :props="{ children: 'children', label: 'deptName',value: 'id', disabled: '' }"
             filterable
             check-strictly
           />
@@ -431,6 +415,7 @@ const deptList = ref(); // 部门下拉数据源
 const roleList = ref(); // 角色下拉数据源
 const postList = ref(); // 岗位下拉数据源
 
+
 // 弹窗对象
 const dialog = reactive({
   visible: false,
@@ -443,7 +428,7 @@ const dialog = reactive({
 const formData = reactive({
   state: 0,
   sex: 0,
-  email: "",
+  email: '',
 });
 
 // 用户导入数据
@@ -457,9 +442,7 @@ const importData = reactive({
 const rules = reactive({
   userName: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
   nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
-  employeeCode: [
-    { required: true, message: "员工编号不能为空", trigger: "blur" },
-  ],
+  employeeCode: [{ required: true, message: "员工编号不能为空", trigger: "blur" }],
   deptIds: [{ required: true, message: "所属部门不能为空", trigger: "blur" }],
   roleIds: [{ required: true, message: "用户角色不能为空", trigger: "blur" }],
   postIds: [{ required: true, message: "用户岗位不能为空", trigger: "blur" }],
@@ -634,6 +617,7 @@ const handleSubmit = useThrottleFn(() => {
 
 /** 删除用户 */
 function handleDelete(id) {
+
   ElMessageBox.confirm("确认删除用户?", "警告", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",