1228

src/api/system/user.js

@@ -38,7 +38,7 @@ export function getUsersByDeptId(query) {
 export function getUsersItemByDeptId(data) {
   return request({
     url: baseUrl + '/system/user/getUsersItemByDeptId',
-    method: 'post',
+    method: 'get',
     data: data
   })
 }

src/views/business/department/index.vue

@@ -16,6 +16,7 @@
           <el-table ref="departmentTable" v-loading="loading" :data="deptList" row-key="id" height="100%" :indent="20" default-expand-all highlight-current-row @current-change="handleGetUser">
             <el-table-column label="行号" type="index" width="50" align="center" />
             <el-table-column label="部门名称" prop="label" header-align="center" />
+            <el-table-column label="部门编码" prop="deptCode" align="center" />
             <el-table-column label="是否企业" prop="deptType" width="70" align="center">
               <template #default="scope">
                 <dict-tag :options="dept_type" :value="scope.row.deptType" />
@@ -54,10 +55,10 @@
           <el-table v-loading="loading" :data="userList" row-key="id" height="100%" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="40" align="center" />
             <el-table-column type="index" label="行号" width="50" align="center" />
-            <el-table-column label="员工编码" width="100" prop="userName" align="center" />
-            <el-table-column label="员工姓名" width="100" prop="nickName" align="center" />
-            <el-table-column label="性别" width="50" prop="sex" align="center" />
-            <el-table-column label="手机号码" width="120" prop="phoneNumber" align="center" />
+            <el-table-column label="员工编码" width="100" prop="user.userName" align="center" />
+            <el-table-column label="员工姓名" width="100" prop="user.nickName" align="center" />
+            <el-table-column label="性别" width="50" prop="user.sex" align="center" />
+            <el-table-column label="手机号码" width="120" prop="user.phoneNumber" align="center" />
             <el-table-column label="部门负责人" width="90" align="center">
               <template #default="scope">
                 <dict-tag :options="yesOrNo" :value="scope.row.isLeader" />
@@ -99,7 +100,7 @@
 </template>
 
 <script setup name="Process">
-import { getUsersByDeptId, saveDeptUser, deptTreeSelect, delDeptUser } from '@/api/system/user'
+import { getUsersByDeptId, saveDeptUser, deptTreeSelect, delDeptUser,getDeptUser,getUsersItemByDeptId} from '@/api/system/user'
 import { delDept, getDept } from '@/api/system/dept'
 import deptForm from './form'
 import userForm from './formUser'
@@ -111,6 +112,7 @@ const { work_section_status } = proxy.useDict('work_section_status')
 
 const deptList = ref([])
 const userList = ref([])
+const userInfoList = ref([])
 const loading = ref(true)
 const ids = ref([])
 const deptName = ref('')
@@ -162,27 +164,23 @@ const openUser = () => {
 function handleAddBatchUsers() {
   multiple.value = true
   const userInfo = {}
-  const userListIds = []
-  for (let i = 0; i < userList.value.length; i++) {
-    userListIds.push(userList.value[i].userName)
-  }
   userInfo.identifying = true
-  userInfo.userListIds = userListIds
   userInfo.deptId = currentDept.value.id
   proxy.$refs.personRef.open(userInfo)
 }
 
 function handleMultipleSelected(selection) {
-  const newList = []
+  var newList = []
   for (var i = 0; i < selection.length; ++i) {
-    const newPerson = {}
+    var newPerson = {}
 
     newPerson.userId = selection[i].userId
     newPerson.deptId = currentDept.value.id
 
-    userList.value.push(newPerson)
+    newList.push(newPerson)
+   
   }
-  saveDeptUser(userList.value).then((response) => {
+  saveDeptUser(newList).then((response) => {
     if (response.code == 200) {
       proxy.$modal.msgSuccess('操作成功')
       handleGetUser(currentDept.value)
@@ -192,14 +190,9 @@ function handleMultipleSelected(selection) {
 
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  for (var i = 0; i < selection.length; ++i) {
-    var newDeptUser = {}
-    newDeptUser.userId = selection[i].userId
-    newDeptUser.deptId = currentDept.value.id
-    deptUser.value.push(newDeptUser)
-  }
-
-  ids.value = selection.map((item) => item.id)
+  ids.value  = selection.map((item) => {
+  return { userId: item.userId, deptId: currentDept.value.id };
+});
   single.value = selection.length != 1
   multiple.value = !selection.length
 }
@@ -219,14 +212,15 @@ function handleUpdate(row) {
 function handleGetUser(row) {
   if (row) {
     currentDept.value = row
+    console.log(row)
   }
-  getUsers()
+  getUserList()
 }
 
 /** 获取员工列表 */
 function getUsers() {
   queryParams.value.deptId = currentDept.value.id
-  getUsersByDeptId(queryParams.value).then((response) => {
+  getDeptUser(queryParams.value).then((response) => {
     if (response.code == 200) {
       userList.value = response.rows
       total.value = response.total
@@ -235,12 +229,15 @@ function getUsers() {
 }
 
 function getUserList() {
-  getUsersByDeptId(queryParams.value).then((response) => {
+  queryParams.value.deptId = currentDept.value.id
+
+  getDeptUser(queryParams.value).then((response) => {
     if (response.code == 200) {
       userList.value = response.rows
       total.value = response.total
     }
   })
+  console.log(currentDept.value)
 }
 
 /** 修改按钮操作 */
@@ -268,13 +265,14 @@ function handleDelete(row) {
 }
 /** 人员删除按钮操作 */
 function handleUserDelete(row) {
+  console.log(ids.value)
   proxy.$modal
     .confirm('是否确认删除选中的数据项？')
     .then(function () {
-      return delDeptUser(deptUser.value)
+      return delDeptUser(ids.value)
     })
     .then(() => {
-      getList()
+      handleGetUser(currentDept.value)
       proxy.$modal.msgSuccess('删除成功！')
     })
     .catch(() => {})

src/views/business/deptEquipment/index.vue

@@ -35,6 +35,29 @@
           <el-form-item>
             <el-button type="primary" icon="Plus" @click="handleShowEquipmentFormDialog()">新增</el-button>
           </el-form-item>
+          <el-form-item label="设备名称：">
+          <el-input
+            placeholder="请输入设备名称"
+            v-model.trim="queryParams.equipmentName"
+            @keydown.enter.prevent
+            @keyup.enter="handleRefreshEquipment"
+            clearable
+            style="width: 180px"
+          />
+        </el-form-item>
+        <el-form-item label="设备编码：">
+          <el-input
+            placeholder="请输入设备编码"
+            v-model.trim="queryParams.equipmentCode"
+            @keydown.enter.prevent
+            @keyup.enter="handleRefreshEquipment"
+            clearable
+            style="width: 180px"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="info" icon="Search" @click="handleRefreshEquipment">搜索</el-button>
+        </el-form-item>
         </el-form>
 
         <!-- 列表区 -->
@@ -105,7 +128,9 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10
+    pageSize: 10,
+    equipmentName:'',
+    equipmentCode: ''
   },
   queryDeptProcessParams: {
     pageNum: 1,

src/views/business/employee/index.vue

@@ -7,7 +7,7 @@
         <el-input v-model.trim="queryParams.userName" placeholder="请输入员工编码" clearable style="width: 130px" @keyup.enter="handleQueryUser" />
       </el-form-item>
       <el-form-item label="员工姓名：" prop="nickName">
-        <el-input v-model.trim="queryParams.nickname" placeholder="请输入员工姓名" clearable style="width: 130px" @keyup.enter="handleQueryUser" />
+        <el-input v-model.trim="queryParams.nickName" placeholder="请输入员工姓名" clearable style="width: 130px" @keyup.enter="handleQueryUser" />
       </el-form-item>
       <el-form-item label="手机号码：" prop="phoneNumber">
         <el-input v-model.trim="queryParams.phoneNumber" placeholder="请输入手机号码" clearable style="width: 130px" @keyup.enter="handleQueryUser" />
@@ -69,7 +69,7 @@
           </el-form-item>
           <el-form-item label="用户性别">
             <el-select v-model="form.sex" placeholder="请选择">
-              <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+              <el-option v-for="dict in manOrWoman" :key="dict.value" :label="dict.label" :value="dict.label"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="角色">
@@ -110,6 +110,10 @@ const total = ref(0)
 const roleOptions = ref([])
 const deptOptions = ref(undefined)
 const initPassword = ref(undefined)
+const manOrWoman = [
+  { label: '男', value: '1'},
+  { label: '女', value: '0' }
+]
 
 // 列显隐信息
 const columns = ref([
@@ -270,6 +274,7 @@ open.value = true
 
 /** 提交按钮 */
 function handleSave() {
+  console.log(form.value)
   proxy.$refs['userRef'].validate((valid) => {
     if (valid) {
       for (var i = 0; i < contractCompanyList.value.length; i++) {

src/views/business/equipment/formDetail.vue

@@ -3,10 +3,10 @@
     <div class="form-container">
       <el-form ref="formDetailRef" v-loading="loading" class="master-container" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="设备编码" prop="equipmentCode">
-          <el-input v-model.trim="form.equipmentCode" placeholder="请输入设备名称" />
+          <el-input v-model.trim="form.equipmentCode" placeholder="请输入设备编码" />
         </el-form-item>
         <el-form-item label="使用部门" prop="usageDeptAlias">
-          <el-input v-model.trim="form.usageDeptAlias" placeholder="请选择使用部门">
+          <el-input v-model.trim="form.usageDeptAlias" :disabled="true" placeholder="请选择使用部门">
             <template #append>
               <el-button icon="Search" @click="handleSelectDeptSingle" />
             </template>

src/views/business/equipment/index.vue

@@ -64,7 +64,7 @@
       <!-- 搜索区域 -->
       <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
         <el-form-item class="section-title" label="设备档案管理" />
-        <el-form-item>
+        <el-form-item label="设备名称：">
           <el-input
             placeholder="请输入设备名称"
             v-model.trim="queryParams.keywords"
@@ -249,6 +249,7 @@ function handleDeleteEquipmentDoc(id) {
     .then(() => {
       delEquipment(id).then(() => {
         proxy.$modal.msgSuccess('删除成功！')
+        handleCurrentCategoryChange(currentCategory.value)
       })
     })
     .catch(() => {})

src/views/business/equipment/listDetail.vue

@@ -27,7 +27,7 @@
             <el-table-column label="设备编码" prop="equipmentCode" width="150" align="center" />
             <el-table-column label="归属部门" prop="belongingDeptAlias" width="150" align="center" />
             <el-table-column label="使用部门" prop="usageDeptAlias" width="150" align="center" />
-            <el-table-column label="备注" prop="remark" header-align="center" />
+            <el-table-column label="备注" prop="remark" align="center" />
             <el-table-column label="操作" width="150" align="center">
               <template #default="scope">
                 <el-button

src/views/business/product/DialogProcessChoice.vue

@@ -1,7 +1,18 @@
 <template>
-  <el-dialog title="添加工序" v-model="visible" width="800px" @close="close" append-to-body draggable>
+  <el-dialog title="添加工序" v-model="visible" width="800px" height="400px"   @close="close" append-to-body draggable>
     <el-form ref="dialogForm" class="master-container" :model="queryParams" style="align-items: center;" >
       <div style="display: flex;">
+        <el-form-item label="工序编码：" prop="processCode" label-width="100px" style="margin-top: 20px;">
+          <el-input
+            v-model.trim="queryParams.processCode"
+            type="text"
+            @keydown.enter.prevent
+            style="width: 180px"
+            placeholder="请输入工序编码"
+            :clearable="true"
+            @keyup.enter="handleSearch"
+          />
+        </el-form-item>
         <el-form-item label="工序简称：" prop="processAlias" label-width="100px" style="margin-top: 20px;">
           <el-input
             v-model.trim="queryParams.processAlias"
@@ -16,7 +27,7 @@
   
         <el-form-item label-width="20px" style="margin-top: 20px;">
           <el-button type="info" icon="Search" @click="handleSearch">搜索</el-button>
-          <el-button type="primary" icon="Delete"  plain @click="handleSearch('clear')">清空</el-button>
+          <!-- <el-button type="primary" icon="Delete"  plain @click="handleSearch('clear')">清空</el-button> -->
         </el-form-item>
       </div>
     </el-form>
@@ -28,7 +39,7 @@
       size="small"
       v-loading="loading"
       border
-      height="100%"
+      height="370px"
       header-row-class-name="list-header-row"
       row-class-name="list-row"
       @selection-change="handleSelectionChange"
@@ -146,6 +157,7 @@ function selectable(row, index) {
 function handleSearch(type) {
   if (type && type === 'clear') {
     queryParams.value = {
+      processCode:'',
       processAlias: '',
       total: 0,
       pageSize: 10,

src/views/business/product/index.vue

@@ -157,7 +157,7 @@
               <el-table-column label="工序编码" align="center" prop="processCode" />
               <el-table-column label="工序简称"  align="center" prop="processAlias" />
               <!-- <el-table-column label="图纸" prop="drawingFile" align="center" /> -->
-              <el-table-column label="操作" width="140px" align="center">
+              <el-table-column v-if="!editStatus" label="操作" width="140px" align="center">
                 <template #default="scope">
                   <el-button v-if="scope.row.editStatus && !editStatus" link type="primary" icon="Check" @click="handleSaveTechnologicalProcessDetail(scope.row)" v-hasPermi="['business:processDetail:add']">
                     保存
@@ -534,6 +534,7 @@ function handledelTechnologicalProcessDetail() {
         if (response.code == 200) {
           technologicalprocessDetailList.value = response.rows
           proxy.$modal.msgSuccess('删除成功！')
+          handleCurrentTechnologicalProcessChange(currentTechnologicalProcess.value)
         }
       })
     })

src/views/dialog/person.vue

@@ -12,7 +12,7 @@
       </el-form-item>
     </el-form>
     <el-table ref="dialogTable" :data="list" v-loading="personLoading" height="400px" row-key="id" @selection-change="handleSelectionChange" align="center">
-      <el-table-column v-if="multiple" type="selection" :selectable="selectable" width="40" :reserve-selection="true" align="center" />
+      <el-table-column v-if="multiple" type="selection"  width="40" :reserve-selection="true" align="center" />
       <el-table-column type="index" label="行号" width="50" align="center" />
       <el-table-column label="员工编码" prop="userName" width="100" align="center" />
       <el-table-column label="员工姓名" prop="nickName" width="100" align="center" />
@@ -87,7 +87,6 @@ function open(userInfo) {
   if (userInfo.identifying) {
     identifying.value = userInfo.identifying
     //queryParams.value.deptId = userInfo.deptId;
-    userIds.value = userInfo.userListIds
   } else {
     queryParams.value.deptId = userInfo.deptId
   }
@@ -166,14 +165,6 @@ function handleMultipleSelected() {
   close()
 }
 
-function selectable(row, index) {
-  if (userIds.value.length > 0) {
-    return !userIds.value.includes(row.userName)
-  } else {
-    return true
-  }
-}
-
 defineExpose({
   open
 })