1229

src/views/business/daywork/index.vue

@@ -48,7 +48,7 @@
         <div class="el-table-inner-container">
           <el-table :data="dayworkItemList" v-loading="dayworkItemLoading" height="100%">
             <el-table-column label="操作者" prop="nickName" width="60" align="center" />
-            <el-table-column label="工序" prop="nickName" align="center" />
+            <el-table-column label="工序名称" prop="processAlias" align="center" />
             <el-table-column label="投产量" prop="productionNum" width="60" align="center" />
             <el-table-column label="合格数" prop="qualifiedNum" width="60" align="center" />
             <el-table-column label="废品数" prop="rejectNum" width="60" align="center" />
@@ -113,6 +113,7 @@ const getDayworkItems = () => {
   dayworkItemLoading.value = true
   listDayworkItem(queryItemParams.value).then((res) => {
     dayworkItemList.value = res.rows
+    console.log(dayworkItemList.value)
     itemTotal.value = res.total
     dayworkItemLoading.value = false
   })

src/views/business/productionBatch/form.vue

@@ -56,7 +56,7 @@ const validateLotNumber = (rule, value, callback) => {
   if (value <= min) {
     callback(new Error('当前投产批数应大于0'))
   } else if (value > max) {
-    callback(new Error(`当前投产批数不能超过总批数`))
+    callback(new Error(`当前投产批数不能超过`+ max))
   } else {
     callback()
   }
@@ -94,13 +94,15 @@ function reset() {
 }
 
 /** 打开抽屉 */
-function open(row) {
+function open(row,Info) {
   reset()
   visible.value = true
   loading.value = true
 
   if (row) {
     var totalLot = 0
+    //生产计划投产总批数
+    var totalLotNumber = Info.totalLotNumber
     detailsRow.value = row
     form.value.productionPlanNo = row.productionPlanNo
     form.value.productionPlanDetailId = row.productionPlanDetailId
@@ -108,25 +110,26 @@ function open(row) {
     form.value.productId = row.productId
     form.value.deptId = row.deptId
     form.value.technologicalProcessId = row.technologicalProcessId
-    form.value.technologyVersion = row.technologyVersion
+    form.value.technologyVersion = row.technologyVersion 
+   //查询生产子计划投产批数
     listPlanDetailSubDetail({
       productionPlanDetailId: row.productionPlanDetailId,
       deptId: row.deptId
     }).then((res) => {
       var subDetail = []
       subDetail = res.rows
-      console.log(subDetail,"777")
    if(subDetail.length>0) {
+    //子计划投产数量totalLot
    for(var i = 0;i<subDetail.length;i++) {
   totalLot+=subDetail[i].lotNumber
  }
-   if(row.lotNumber - totalLot > 0) {
-      detailsRow.value.lotNumber = row.lotNumber - totalLot
-      form.value.lotNumber = detailsRow.value.lotNumber
+ //通过editStatus判断是否是编辑状态
+ if(Info.editStatus) {
+     form.value.lotNumber = row.lotNumber
+     detailsRow.value.lotNumber =totalLotNumber-totalLot + row.lotNumber
     }
     else {
-      detailsRow.value.lotNumber = 0
-      form.value.lotNumber = detailsRow.value.lotNumber
+       detailsRow.value.lotNumber = totalLotNumber - totalLot
     }
 }
     })

src/views/business/productionBatch/index.vue

@@ -377,12 +377,18 @@ function handleAddSubDetail(row) {
   newDetail.technologicalProcessId = row.technologicalProcessId
   newDetail.technologyVersion = row.technologyVersion
   // 打开 生产子计划 对话框
-  handleShowSubDetailDialog(newDetail)
+  var Info = {}
+  Info.totalLotNumber = row.totalLotNumber
+  Info.editStatus = false
+  proxy.$refs.productionRef.open(newDetail,Info)
 }
 
 /** 修改 生产子计划 事件 */
 function handleShowSubDetailDialog(row) {
-  proxy.$refs.productionRef.open(row)
+  var Info = {}
+  Info.totalLotNumber = currentPlanDetail.value.totalLotNumber
+  Info.editStatus = true
+  proxy.$refs.productionRef.open(row,Info)
 }
 
 /** 生产子计划 保存事件 */

src/views/business/productionTask/index.vue

@@ -6,7 +6,7 @@
       <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
         <el-form-item class="section-title" label="生产子计划" />
         <el-form-item label="产品描述：">
-          <el-input placeholder="请输入" @keyup.enter="handleQuery" @keydown.enter.prevent clearable v-model.trim="queryParams.planningNumber" />
+          <el-input placeholder="请输入" style="width: 180px" @keyup.enter="handleQuery" @keydown.enter.prevent clearable v-model.trim="queryParams.productDescription" />
         </el-form-item>
         <!-- <el-form-item class="section-title" label="当前工段：">
           <el-select-v2 v-model="queryParams.deptId" filterable :options="deptList" placeholder="请选择工段" @change="handleDeptChange" />
@@ -22,11 +22,11 @@
           <el-table ref="subDetailsTable" :data="subDetailsList" v-loading="subDetailsLoading" highlight-current-row height="100%" @current-change="handleSubDetailChange">
             <el-table-column type="index" label="行号" width="50px" align="center" />
             <el-table-column label="生产计划单号" prop="productionPlanNo" width="110" align="center" />
-            <el-table-column label="产品描述" prop="productDescription" width="182" align="center" />
+            <el-table-column label="产品描述" prop="productDescription" width="auto" align="center" />
             <el-table-column label="图纸版本" prop="technologyVersion" width="108" align="center" />
             <el-table-column label="当前投产量" prop="productionVolume" width="80" align="center" />
             <el-table-column label="当前投产批数" prop="lotNumber" width="180" align="center" />
-            <el-table-column label="下达日期" prop="issuanceDate" align="center">
+            <el-table-column label="下达日期" prop="issuanceDate" width="100px" align="center">
               <template #default="scope">
                 <el-date-picker v-if="scope.row.editStatus" clearable v-model="scope.row.issuanceDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择实际开始 时间" />
                 <span v-else>{{ scope.row.issuanceDate }}</span>
@@ -47,7 +47,8 @@
         <div class="el-table-inner-container">
           <el-table ref="processTable" :data="processList" v-loading="processLoading" highlight-current-row height="100%" @current-change="handleProcessChange">
             <el-table-column type="index" label="行号" width="50" align="center" />
-            <el-table-column label="工序" prop="processCode" align="center" />
+            <el-table-column label="工序名称" prop="processAlias" align="center" />
+            <el-table-column label="工序编码" prop="processCode" align="center" />
           </el-table>
         </div>
       </div>

src/views/system/role/authUser.vue

@@ -9,11 +9,11 @@
     </div>
 
     <el-form class="list-search-container" :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">
-      <el-form-item label="用户名称：" prop="userName">
-        <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter="handleQuery" />
+      <el-form-item label="员工编号：" prop="userName">
+        <el-input v-model="queryParams.userName" placeholder="请输入员工编号" clearable style="width: 240px" @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="手机号码：" prop="phonenumber">
-        <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px" @keyup.enter="handleQuery" />
+      <el-form-item label="员工姓名：" prop="nickName">
+        <el-input v-model="queryParams.nickName" placeholder="请输入员工姓名" clearable style="width: 240px" @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="info" icon="Search" @click="handleQuery">搜索</el-button>
@@ -23,8 +23,8 @@
 
     <el-table v-loading="loading" border :data="userList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="40" align="center" />
-      <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
-      <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+      <el-table-column label="员工编号" prop="userName" :show-overflow-tooltip="true" />
+      <el-table-column label="员工姓名" prop="nickName" :show-overflow-tooltip="true" />
       <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
       <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
       <el-table-column label="状态" align="center" prop="status">
@@ -67,14 +67,15 @@ const userIds = ref([])
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
-  roleId: route.params.roleId,
+  roleId : route.params.roleId,
   userName: undefined,
-  phonenumber: undefined
+  nickName: undefined
 })
 
 /** 查询授权用户列表 */
 function getList() {
   loading.value = true
+
   allocatedUserList(queryParams).then((response) => {
     userList.value = response.rows
     total.value = response.total

src/views/system/role/selectUser.vue

@@ -2,21 +2,21 @@
   <!-- 授权用户 -->
   <el-dialog title="选择用户" v-model="visible" width="1200px" top="5vh" append-to-body draggable>
     <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
-      <el-form-item label="员工姓名：" prop="userName">
-        <el-input v-model.trim="queryParams.userName" placeholder="请输入员工姓名" clearable style="width: 150px" @keyup.enter="handleQuery" />
+      <el-form-item label="员工编号：" prop="userName">
+        <el-input v-model.trim="queryParams.userName" placeholder="请输入员工编号" clearable style="width: 150px" @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="手机号码：" prop="phonenumber">
-        <el-input v-model.trim="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 150px" @keyup.enter="handleQuery" />
+      <el-form-item label="员工姓名：" prop="nickName">
+        <el-input v-model.trim="queryParams.nickName" placeholder="请输入员工姓名" clearable style="width: 150px" @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="info" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        <!-- <el-button icon="Refresh" @click="resetQuery">重置</el-button> -->
       </el-form-item>
     </el-form>
-    <el-table @row-click="clickRow" ref="refTable" :data="userList" @selection-change="handleSelectionChange" height="350px">
+    <el-table @row-click="clickRow" ref="refTable" :data="userList" @selection-change="handleSelectionChange" height="400px">
       <el-table-column type="selection" width="40"></el-table-column>
-      <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
-      <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+      <el-table-column label="员工编号" prop="userName" :show-overflow-tooltip="true" />
+      <el-table-column label="员工姓名" prop="nickName" :show-overflow-tooltip="true" />
       <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
       <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
       <!-- <el-table-column label="状态" align="center" prop="status">
@@ -38,8 +38,8 @@
     <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="handleSelectUser">确 定</el-button>
-        <el-button @click="visible = false">取 消</el-button>
+        <el-button type="primary" icon="Check" @click="handleSelectUser">确 定</el-button>
+        <el-button icon="Close" @click="visible = false">取 消</el-button>
       </div>
     </template>
   </el-dialog>