Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue

src/api/business/returnTurnover.js

@@ -42,6 +42,13 @@ export function getProcessInspectionList(data) {
     data: data
   })
 }
+export function getProcessInspectionLists(data) {
+  return request({
+    url: baseUrl + '/business/returnTurnover/getProcessInspectionLists',
+    method: 'post',
+    data: data
+  })
+}
 export function getNowBindCarriers(data) {
   return request({
     url: baseUrl + '/business/returnTurnover/getNowBindCarriers',

src/views/business/daywork/index.vue

@@ -83,15 +83,14 @@
               <template #default="scope">
                 <el-button v-show="scope.row.deptProcessStatus &&
         (scope.row.status == 2 || scope.row.status == 3) &&
-        scope.row.id == latestProcessId && scope.row.deptId == latestDeptId && !(lastStatus == 4 || lastStatus == 5 ||lastStatus ==7)
+        scope.row.id == latestProcessId && scope.row.deptId == latestDeptId && !(lastStatus == 4 || lastStatus == 5 || lastStatus == 7)
         " link type="warning" icon="Edit" @click="handleUpdateDayworkItem(scope.row)">编辑
                 </el-button>
-                <el-button  link type="primary" icon="View"
-                  @click="handleCheckDayworkItem(scope.row)">查看
+                <el-button link type="primary" icon="View" @click="handleCheckDayworkItem(scope.row)">查看
                 </el-button>
                 <el-button v-show="scope.row.deptProcessStatus &&
         (scope.row.status == 2 || scope.row.status == 3) &&
-        scope.row.id == latestProcessId&& scope.row.deptId == latestDeptId &&!(lastStatus == 4 || lastStatus == 5 ||lastStatus ==7) &&
+        scope.row.id == latestProcessId && scope.row.deptId == latestDeptId && !(lastStatus == 4 || lastStatus == 5 || lastStatus == 7) &&
         (scope.row.processStepNumber != lastProcessStepNumber)
         " v-hasPermi="['business:daywork:remove']" link type="danger" icon="Delete"
                   @click="handleDeletedItem(scope.row.id)">删除
@@ -375,58 +374,52 @@ function getDayworkItems() {
   listDeptProcess({ deptId: queryDayworkParams.value.deptId, flag: 1 }).then(
     (res) => {
       deptProcessList.value = res.rows;
-    }
-  );
-  listDayworkItem(queryItemParams.value).then((res) => {
-    console.log(currentDaywork.value);
-    for (let i = 0; i < res.rows.length; i++) {
-      //如果时首序，投产数是单批数
-      if (res.rows[i].prodNum == 0) {
-        if (currentDaywork.value.isLast == 1) {
-          res.rows[i].prodNum = currentDaywork.value.lastLotQuantity;
-        } else {
-          res.rows[i].prodNum = currentDaywork.value.oneLotQuantity;
+      listDayworkItem(queryItemParams.value).then((res) => {
+        console.log(currentDaywork.value);
+        for (let i = 0; i < res.rows.length; i++) {
+          //如果时首序，投产数是单批数
+          if (res.rows[i].prodNum == 0) {
+            if (currentDaywork.value.isLast == 1) {
+              res.rows[i].prodNum = currentDaywork.value.lastLotQuantity;
+            } else {
+              res.rows[i].prodNum = currentDaywork.value.oneLotQuantity;
+            }
+          }
+          //拿到最新一条报工信息的工序id，只能编辑当前序
+          // if (res.rows[i] == res.rows[res.rows.length - 1]) {
+          //   latestProcessId.value = res.rows[i].processId;
+          // }
         }
-      }
-      //拿到最新一条报工信息的工序id，只能编辑当前序
-      // if (res.rows[i] == res.rows[res.rows.length - 1]) {
-      //   latestProcessId.value = res.rows[i].processId;
-      // }
-    }
-    if (res.others != null && res.others.latestProcessId != null) {
-      latestProcessId.value = res.others.latestProcessId
-    }
-    if (res.others != null && res.others.lastItem != null) {
-      latestDeptId.value = res.others.lastItem.deptId
-      lastStatus.value = res.others.lastItem.status
-    }
-    //该工艺的最后一个工序步骤编码
-    if (res.others != null && res.others.lastProcessStepNumber != null) {
-      lastProcessStepNumber.value = res.others.lastProcessStepNumber
-      console.log(lastProcessStepNumber.value)
-    }
-    for (var i = 0; i < res.rows.length; i++) {
-      let timeStamp = res.rows[i].workingHours;
-      let seconds = Math.floor((timeStamp / 1000) % 60);
-      let minutes = Math.floor((timeStamp / (1000 * 60)) % 60);
-      let hours = Math.floor(timeStamp / (1000 * 60 * 60));
-      let time = `${hours}小时${minutes}分钟${seconds}秒`;
-      res.rows[i].workingHours = time;
-      res.rows[i].deptProcessStatus = false;
-      //报工记录的工序id是该工段绑定的工序时，允许编辑
-      for (var item = 0; item < deptProcessList.value.length; item++) {
-        if (res.rows[i].processId == deptProcessList.value[item].processId) {
-          res.rows[i].deptProcessStatus = true;
+        if (res.others != null && res.others.latestProcessId != null) {
+          latestProcessId.value = res.others.latestProcessId
         }
-      }
-      console.log(res.rows[i].deptProcessStatus)
+        if (res.others != null && res.others.lastItem != null) {
+          latestDeptId.value = res.others.lastItem.deptId
+          lastStatus.value = res.others.lastItem.status
+        }
+        for (var i = 0; i < res.rows.length; i++) {
+          let timeStamp = res.rows[i].workingHours;
+          let seconds = Math.floor((timeStamp / 1000) % 60);
+          let minutes = Math.floor((timeStamp / (1000 * 60)) % 60);
+          let hours = Math.floor(timeStamp / (1000 * 60 * 60));
+          let time = `${hours}小时${minutes}分钟${seconds}秒`;
+          res.rows[i].workingHours = time;
+          res.rows[i].deptProcessStatus = false;
+          //报工记录的工序id是该工段绑定的工序时，允许编辑
+          for (var item = 0; item < deptProcessList.value.length; item++) {
+            if (res.rows[i].processId == deptProcessList.value[item].processId) {
+              res.rows[i].deptProcessStatus = true;
+            }
+          }
+          console.log(res.rows[i].deptProcessStatus)
+        }
+        dayworkItemList.value = res.rows;
+        getProcess();
+        itemTotal.value = res.total;
+        dayworkItemLoading.value = false;
+      });
     }
-    dayworkItemList.value = res.rows;
-    console.log( dayworkItemList.value)
-    getProcess();
-    itemTotal.value = res.total;
-    dayworkItemLoading.value = false;
-  });
+  );
 }
 //工序信息
 function getProcess() {

src/views/business/equipment/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="page-container row-container">
-    
+
     <section class="list-part-container" style="flex: 2">
       <!-- 搜索区域 -->
       <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
@@ -10,20 +10,19 @@
             placeholder="设备类别" @change="handleRefreshEquipment" />
         </el-form-item>
         <el-form-item label="设备名称：">
-          <el-input placeholder="请输入设备名称" v-model.trim="queryParams.categoryName" @keydown.enter.prevent
-            clearable style="width: 180px" />
+          <el-input placeholder="请输入设备名称" v-model.trim="queryParams.equipmentName" @keydown.enter.prevent clearable
+            style="width: 180px" />
         </el-form-item>
         <el-form-item label="设备编码：">
-          <el-input placeholder="请输入设备编码" v-model.trim="queryParams.equipmentCode" @keydown.enter.prevent
-            clearable style="width: 180px" />
+          <el-input placeholder="请输入设备编码" v-model.trim="queryParams.equipmentCode" @keydown.enter.prevent clearable
+            style="width: 180px" />
         </el-form-item>
         <el-form-item>
-          <el-button type="info" icon="Search" 
-            @click="handleRefreshEquipment">搜索</el-button>
+          <el-button type="info" icon="Search" @click="handleRefreshEquipment">搜索</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="Plus" 
-            @click="handleShowEquipmentDetailDialog(null)" v-hasPermi="['business:equipment:add']">新增</el-button>
+          <el-button type="primary" icon="Plus" @click="handleShowEquipmentDetailDialog(null)"
+            v-hasPermi="['business:equipment:add']">新增</el-button>
         </el-form-item>
         <!-- <el-form-item>
           <el-button
@@ -60,11 +59,11 @@
             <el-table-column label="备注" prop="remark" align="center" />
             <el-table-column label="操作" width="150" align="center">
               <template #default="scope">
-                <el-button v-hasPermi="['business:equipmentDetail:edit']" link type="warning" icon="Edit"
+                <el-button v-hasPermi="['business:equipment:edit']" link type="warning" icon="Edit"
                   @click="handleShowEquipmentDetailDialog(scope.row.id)">
                   编辑
                 </el-button>
-                <el-button v-hasPermi="['business:equipmentDetail:remove']" link type="danger" icon="Delete"
+                <el-button v-hasPermi="['business:equipment:remove']" link type="danger" icon="Delete"
                   @click="handleDeleteEquipmentDetail(scope.row.id)">
                   删除
                 </el-button>
@@ -161,14 +160,14 @@ function handleRefreshEquipment() {
 /** 获取设备档案列表 */
 const getEquipmentList = () => {
   equipmentLoading.value = true;
-    detailList(queryParams.value).then((res) => {
-      equipmentDetailList.value = res.rows;
-      equipmentLoading.value = false;
-      equipmentTotal.value = res.total;
-    });
-    listCategories({}).then(response=>{
-      parentCategories.value = response.data
-    })
+  detailList(queryParams.value).then((res) => {
+    equipmentDetailList.value = res.rows;
+    equipmentLoading.value = false;
+    equipmentTotal.value = res.total;
+  });
+  listCategories({}).then(response => {
+    parentCategories.value = response.data
+  })
 };
 //刷新设备档案管理
 function handleRefreshDetail() {

src/views/business/returnTurnover/index.vue

@@ -99,7 +99,7 @@
 </template>
 
 <script setup name="ReturnTurnover">
-import { getFinishedReturnList, getProcessInspectionList, checkCarriers } from '@/api/business/returnTurnover'
+import { getFinishedReturnList, getProcessInspectionList, checkCarriers, getProcessInspectionLists } from '@/api/business/returnTurnover'
 import { getP2NeedCheckProcess } from '@/api/business/p2'
 import dialogReturnTurnover from './DialogReturnTurnover.vue';
 import DialogReturnTurnoverBatch from './DialogReturnTurnoverBatch.vue';
@@ -170,7 +170,7 @@ function handleShowTurnoverDialog(row) {
 	console.log(row)
 	//proxy.$refs.dialogReturnTurnoverRef.open(row)
 	//判断该批次的工序是否需要审核
-	/* 
+	// /* 
 	getP2NeedCheckProcess("Y").then(res => {
 		if (res.code == 200) {
 			//需要序检的工序
@@ -205,7 +205,7 @@ function handleShowTurnoverDialog(row) {
 	})
 	// */
 
-	proxy.$refs.dialogReturnTurnoverRef.open(row)
+	// proxy.$refs.dialogReturnTurnoverRef.open(row)
 }
 
 /** 导出按钮操作 */
@@ -253,25 +253,34 @@ async function handleBatchTurnover() {
 		proxy.$modal.msgError('请不要选择外协箱外协单进行批量周转')
 		return
 	}
-	/* 
+	// /* 
 	getP2NeedCheckProcess("Y").then(res => {
 		if (res.code == 200) {
 			//需要序检的工序
 			var process = []
 			let needCheckProcessCodeList = res.rows.map(item => item.prcode.trim())
-			let returnReceiptProcessCodeList = row.finishedProcesses.map(v => ({ processCode: v.processCode, processStepNumber: v.processStepNumber, returnReceiptDetailId: v.returnReceiptDetailId }))
-			for (let i = 0; i < needCheckProcessCodeList.length; i++) {
-				for (let j = 0; j < returnReceiptProcessCodeList.length; j++) {
-					if (needCheckProcessCodeList[i] == returnReceiptProcessCodeList[j].processCode) {
-						process.push(returnReceiptProcessCodeList[j])
-					}
+			let returnReceiptProcessCodeList = []
+			selections.value.forEach(e => {
+				let itemReturnCodes = e.finishedProcesses.map(v => ({ processCode: v.processCode, processStepNumber: v.processStepNumber, returnReceiptDetailId: v.returnReceiptDetailId }))
+				let item = itemReturnCodes.reverse().find(e => needCheckProcessCodeList.some(t => t === e.processCode))
+				if (item != null) {
+					returnReceiptProcessCodeList.push(item)
 				}
-			}
-			console.log(needCheckProcessCodeList)
-			console.log(returnReceiptProcessCodeList)
-			console.log(process)
+			})
+			process.push(...returnReceiptProcessCodeList)
+			// let returnReceiptProcessCodeList = row.finishedProcesses.map(v => ({ processCode: v.processCode, processStepNumber: v.processStepNumber, returnReceiptDetailId: v.returnReceiptDetailId }))
+			// for (let i = 0; i < needCheckProcessCodeList.length; i++) {
+			// 	for (let j = 0; j < returnReceiptProcessCodeList.length; j++) {
+			// 		if (needCheckProcessCodeList[i] == returnReceiptProcessCodeList[j].processCode) {
+			// 			process.push(returnReceiptProcessCodeList[j])
+			// 		}
+			// 	}
+			// }
+			console.log('needCheckProcessCodeList', needCheckProcessCodeList)
+			console.log('returnReceiptProcessCodeList', returnReceiptProcessCodeList)
+			console.log('process', process)
 			if (process.length > 0) {
-				getProcessInspectionList(process[process.length - 1]).then(res => {
+				getProcessInspectionLists(process).then(res => {
 					if (res.code == 200) {
 						if (res.data) {
 							proxy.$refs.dialogReturnTurnoverRef.openBatch(selections.value)
@@ -288,7 +297,7 @@ async function handleBatchTurnover() {
 	})
 	// */
 
-	proxy.$refs.dialogReturnTurnoverBatchRef.openBatch(selections.value)
+	// proxy.$refs.dialogReturnTurnoverBatchRef.openBatch(selections.value)
 }
 
 getList();