0425

src/views/business/lot/index.vue

@@ -102,7 +102,6 @@
         >
       </el-form-item>
       <div style="margin-top: 20px">
-        <el-button type="primary" @click="handleFallback">回退</el-button>
         <el-button
           type="primary"
           @click="handleWasteRecycling"
@@ -375,7 +374,6 @@ function getLot() {
     if (res.code == 200) {
       lotList.value = res.rows;
       total.value = res.total;
-      lotInfo.value = res.rows;
       loading.value = false;
     }
   });
@@ -408,16 +406,7 @@ function getPassDate() {
         dateTemp = myDate.getFullYear() + "-" + (month < 10 ? '0' + month : '' + month) + "-" + day;
     queryParams.value.startTime = dateTemp
 }
-/**工序切换 */
-function handleProcessChange() {
-  console.log(processList.value[processAlias.value].label);
 
-  // 使用 some 方法检查是否存在于 processList 中
-  lotList.value = lotInfo.value.filter((item) => {
-    // 检查当前对象的 processAlias 是否等于目标值
-    return item.processAlias == processList.value[processAlias.value].label;
-  });
-}
 
 /**搜索 */
 function handleQuerydaywork() {

src/views/business/reviseBath/index.vue

@@ -250,6 +250,10 @@ function handleColumnClick(row) {
 function handleView(row) {
   proxy.$refs.producedLotFormRef.open(row);
 }
+function handleFresh() {
+  console.log(queryParams.value)
+  getP2Plan(queryParams.value)
+}
 
 /** 搜索按钮操作 */
 function handleQuery() {

src/views/business/reviseBath/lotFormParticulars.vue

@@ -399,7 +399,8 @@ function handleStandardProcess(processId) {
 
 //批废
 function handlelotWaste(lotCode) {
-  let row = {};
+  if(lot.value.daywork) {
+     let row = {};
   row.lotCode = lotCode;
   row.lotId = lot.value.id;
   row.companyAlias = lot.value.productionPlanDetail.companyAlias;
@@ -414,6 +415,10 @@ function handlelotWaste(lotCode) {
   row.temporaryProcessQualifiedNum =
     lot.value.daywork.temporaryProcessQualifiedNum;
   proxy.$refs.lotWasteDialogRef.open(row);
+  }else {
+    proxy.$modal.msgError("该批未投产，不能进行批废");
+  }
+ 
 }
 
 init();