优化用户和生产准备。

src/views/plan/prepareTemplate/index.vue

@@ -65,7 +65,7 @@
     <el-dialog
       v-model="dialog1.visible"
       :title="dialog1.title"
-      width="45%"
+      width="900"
       @close="dialog1.visible = false"
     >
       <el-form
@@ -151,7 +151,9 @@
     <el-dialog
       v-model="dialog.visible"
       :title="dialog.title"
-      width="80%"
+      append-to-body
+      :close-on-click-modal="false"
+      width="90%"
       @close="dialog.visible = false"
     >
       <choice-item-page @material-info="materialInfo" />
@@ -204,9 +206,9 @@ const openDialog = (type, row) => {
     form.value.materialName = "";
     form.value.materialModel = "";
     form.value.template = [];
-    templates.value.forEach((item)=>{
-      form.value.template.push(item.dictValue)
-    })
+    templates.value.forEach((item) => {
+      form.value.template.push(item.dictValue);
+    });
     clickTemplates.value = [];
     dialog1.visible = true;
   } else if (type === 1) {

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,27 +96,22 @@
               prop="userName"
             />
             <el-table-column
-                label="姓名"
-                width="120"
-                align="center"
-                prop="nickName"
-            />
-            <el-table-column
-                key="employeeCode"
-                label="工作证号"
-                align="center"
-                prop="employeeCode"
+              label="姓名"
+              width="120"
+              align="center"
+              prop="nickName"
             />
             <el-table-column
-              label="性别"
-              width="100"
+              key="employeeCode"
+              label="工作证号"
               align="center"
-              prop="sex"
-            >
+              prop="employeeCode"
+            />
+            <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>
 
@@ -209,36 +204,36 @@
       >
         <el-row :gutter="22">
           <el-col :span="11">
+            <el-form-item label="姓名" prop="nickName">
+              <el-input v-model="formData.nickName" placeholder="请输入姓名" />
+            </el-form-item>
+          </el-col>
+          <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-form-item label="姓名" prop="nickName">
-              <el-input v-model="formData.nickName" placeholder="请输入姓名" />
-            </el-form-item>
-          </el-col>
         </el-row>
 
         <el-row :gutter="22">
           <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>
@@ -247,17 +242,20 @@
           <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"
+                filterable
+                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>
@@ -266,12 +264,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" 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>
@@ -281,12 +279,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" 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>
@@ -296,18 +294,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>
@@ -315,8 +313,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>
@@ -334,7 +332,12 @@
             :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
           />
@@ -415,7 +418,6 @@ const deptList = ref(); // 部门下拉数据源
 const roleList = ref(); // 角色下拉数据源
 const postList = ref(); // 岗位下拉数据源
 
-
 // 弹窗对象
 const dialog = reactive({
   visible: false,
@@ -428,7 +430,7 @@ const dialog = reactive({
 const formData = reactive({
   state: 0,
   sex: 0,
-  email: '',
+  email: "",
 });
 
 // 用户导入数据
@@ -442,10 +444,12 @@ 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" }],
+  // postIds: [{ required: true, message: "用户岗位不能为空", trigger: "blur" }],
   email: [
     {
       pattern: /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/,
@@ -465,7 +469,7 @@ const rules = reactive({
 /** 查询 */
 function handleQuery() {
   loading.value = true;
-  queryParams.deptQuery = queryParams.deptId
+  queryParams.deptQuery = queryParams.deptId;
   getUserPage(queryParams)
     .then(({ data }) => {
       pageData.value = data.records;
@@ -617,7 +621,6 @@ const handleSubmit = useThrottleFn(() => {
 
 /** 删除用户 */
 function handleDelete(id) {
-
   ElMessageBox.confirm("确认删除用户?", "警告", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",