Merge remote-tracking branch 'origin/master'

src/views/business/check/form.vue

@@ -9,7 +9,7 @@
                 <el-row :gutter="30">
                     <el-col :span="24">
                         <el-form-item label="检查类别编码" prop="code">
-                            <el-input disabled="true" v-model="form.code" placeholder="请输入检查类别编码" />
+                            <el-input :disabled="!editStatus" v-model="form.code" placeholder="请输入检查类别编码" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">

src/views/business/check/index.vue

@@ -16,8 +16,8 @@
             <el-button type="info" icon="Search" @click="handleQuery">搜索</el-button>
           </el-form-item>
           <el-form-item>
-            <!-- <el-button type="primary" icon="Plus" @click="handleAdd(null)"
-              v-hasPermi="['business:check:add']">新增</el-button> -->
+            <el-button type="primary" icon="Plus" @click="handleAdd(null)"
+              v-hasPermi="['business:check:add']">新增</el-button>
           </el-form-item>
         
         </el-form>

src/views/business/specialDaywork/form.vue

@@ -635,7 +635,7 @@
           :inline="true"
           style="margin-right: 0px; font-size: 15px; padding-top: 10px"
         >
-          <el-form-item label="工序：" prop="lotCode">
+          <el-form-item label="工序：" prop="selectedProcess">
             <el-select
               v-model="selectedProcess"
               placeholder="请选择"
@@ -977,7 +977,6 @@ const { daywork, daywoerkItem, rules } = toRefs(data);
 /***********************  方法区  ****************************/
 /** 打开抽屉 */
 const open = (row, deptInfo) => {
-  // reset();
   visible.value = true;
   dept.value = deptInfo;
   deptId.value = dept.value.deptId;
@@ -1010,7 +1009,7 @@ function firstOrderClick() {
   batchNo.value = {};
   lotList.value = [];
   daywork.value = {};
-  selectedProcess.value = {};
+  selectedProcess.value = null;
   furnaceNoInfo.value = {};
   processList.value = [];
   processAlias.value = {};
@@ -1057,6 +1056,8 @@ function handleFirstSelectProduction(row) {
       getFurnaceInfo(batchNo.value);
     } else {
       batchNo.value = res.rows[0];
+      proxy.$modal.msgError("该计划单无可用批次");
+      return;
     }
   });
 }
@@ -1159,6 +1160,10 @@ function handleFirstLotClick() {
     .then(function () {
       certainLotInfo(batchNo.value).then((res) => {
         if ((res.code = 200)) {
+          // 使用 filter 方法来保留那些 id 等于 specifiedId 的项目
+          productList.value = productList.value.filter(
+            (item) => item.id === lot.productionPlanDetailId
+          );
           batchNo.value = lot;
           daywork.value.lotId = lot.id;
           daywork.value.lotCode = lot.lotCode;
@@ -1198,7 +1203,6 @@ function getFurnaceInfo(data) {
       });
       furnaceNoInfo.value = furnaceNumberInfoList.value[0].value;
       daywork.value.furnaceNoInfo = furnaceNumberInfoList.value[0].value;
-      console.log("daywork.value.furnaceNoInfo", daywork.value.furnaceNoInfo);
     }
   });
 }
@@ -1208,7 +1212,7 @@ function remoteCarriers(queryString, choiced) {
   loadingCarrier.value = true;
   listCarriers({
     isAbandoned: 0,
-    pageSize: 200,
+    pageSize: 50,
     code: queryString != "" ? queryString : null,
   }).then((res) => {
     if (res.code === 200) {
@@ -1342,8 +1346,9 @@ function reset() {
   processList.value = [];
   lotList.value = [];
   lotClick.value = false;
-  selectedProcess.value = {};
+  selectedProcess.value = null;
   daywork.value = {};
+  furnaceNumberInfoList.value = [];
   dayworkItemList.value = [];
   processAlias.value = [];
   furnaceNoInfo.value = {};
@@ -1551,17 +1556,10 @@ function handleProcessChange(arg) {
   const selectedProcessItem = processList.value.find(
     (item) => item.value === arg
   );
-  console.log(
-    "daywork.value.technologicalProcessId开始",
-    daywork.value.technologicalProcessId
-  );
+
   daywork.value.processId = selectedProcessItem.processId;
   daywork.value.technologicalProcessId =
     selectedProcessItem.technologicalProcessId;
-  console.log(
-    "daywork.value.technologicalProcessId",
-    daywork.value.technologicalProcessId
-  );
   daywork.value.technologicalProcessDetailId = arg;
   daywork.value.processStepNumber = selectedProcessItem.processStepNumber;
 }
@@ -1666,7 +1664,7 @@ function handleNoFirstSelect(row) {
     .then(function () {
       lotClick.value = true;
       daywork.value = row;
-      console.log(daywork.value.itemStatus);
+      console.log(daywork.value);
       daywork.value.itemStatus = performance.value ? 3 : 2;
       Promise.all([
         getProcessList({
@@ -1680,6 +1678,10 @@ function handleNoFirstSelect(row) {
         }),
         getDayworkItemAndFurnace({ id: row.id }),
       ]).then(([res, response, furnace]) => {
+        // 创建一个新数组，只包含要保留的数据
+        const product = [row];
+        productList.value = product;
+
         /**
          * res查询工段内所有工序信息
          * response查询批次的工序信息
@@ -1688,18 +1690,6 @@ function handleNoFirstSelect(row) {
         let curProcessSequence = response.data;
         let daywoerkItem = furnace.data.dayworkItemList;
 
-        dayworkItem.value.prodNum =
-          row.processQualifiedNum == 0
-            ? daywoerkItem[0].qualifiedNum
-            : row.processQualifiedNum;
-        dayworkItem.value.productionPlanDetailId =
-          furnace.data.productionPlanDetailId;
-        dayworkItem.value.technologicalProcessId =
-          furnace.data.technologicalProcessId;
-        dayworkItem.value.deptId = deptId.value;
-        dayworkItem.value.deptName = dept.value.deptName;
-        dayworkItem.value.lotId = furnace.data.lotId;
-
         // 过滤前序 用最新一条报工的工序排序来进行筛选筛选出后面的工序
         curProcessSequence = curProcessSequence.filter(
           (v) => v.processStepNumber > daywoerkItem[0].processStepNumber
@@ -1718,12 +1708,17 @@ function handleNoFirstSelect(row) {
             : v.id,
           processId: v.processId,
           processStepNumber: v.processStepNumber,
+          technologicalProcessId: v.technologicalProcessId
+            ? v.technologicalProcessId
+            : v.lotTechnologicalProcessId,
           index: index,
         }));
+
         selectedProcess.value = processList.value[0].value;
         daywork.value.processId = processList.value[0].processId;
         daywork.value.technologicalProcessId =
           processList.value[0].technologicalProcessId;
+
         daywork.value.technologicalProcessDetailId = selectedProcess.value;
         daywork.value.processStepNumber =
           processList.value.findIndex(
@@ -1733,6 +1728,15 @@ function handleNoFirstSelect(row) {
                 .processStepNumber
             : null;
 
+        dayworkItem.value.prodNum =
+          row.processQualifiedNum == 0
+            ? daywoerkItem[0].qualifiedNum
+            : row.processQualifiedNum;
+        dayworkItem.value.productionPlanDetailId =
+          furnace.data.furnaceNoInfo.productionPlanDetailId;
+        dayworkItem.value.deptId = deptId.value;
+        dayworkItem.value.deptName = dept.value.deptName;
+        dayworkItem.value.lotId = daywork.value.lotId;
         //赋值炉号数据
         furnaceNoInfo.value = furnace.data.furnaceNoInfo;