From 8ba7a12c8838aa1a9f82f79f9a5d07a62fd7532c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 19 Jan 2024 15:12:28 +0800
Subject: [PATCH] =?UTF-8?q?AVG=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/otherlog_form.vue |  2 +-
 src/views/wpm/worktask_form.vue | 25 +++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/views/wpm/otherlog_form.vue b/src/views/wpm/otherlog_form.vue
index 1474aa9e..aeec5396 100644
--- a/src/views/wpm/otherlog_form.vue
+++ b/src/views/wpm/otherlog_form.vue
@@ -54,7 +54,7 @@ export default {
                 show: "查看",
             },
             form: {
-                product: 'AVG',
+                product: '18AVG',
                 count_real: 0,
                 count_ok: 0,
                 count_delivered: 0
diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue
index 20dcccc3..7f65e39e 100644
--- a/src/views/wpm/worktask_form.vue
+++ b/src/views/wpm/worktask_form.vue
@@ -520,7 +520,7 @@
               @change="equipmenChange"
             >
               <el-option
-                v-for="item in equipmentOptions"
+                v-for="item in equipmentOptions1"
                 :key="item.id"
                 :label="item.full_name"
                 :value="item.id"
@@ -597,7 +597,7 @@
               style="width: 100%"
             >
               <el-option
-                v-for="item in equipmentOptions"
+                v-for="item in equipmentOptions2"
                 :key="item.id"
                 :label="item.full_name"
                 :value="item.id"
@@ -1112,7 +1112,8 @@ export default {
       cateOptions: [],
       mgroupOptions: [],
       materialOptions: [],
-      equipmentOptions: [],
+      equipmentOptions1: [],
+      equipmentOptions2: [],
       wMaterialOptions: [],
       shiftOptions: [],
       routeOptions:[],
@@ -1122,6 +1123,7 @@ export default {
       handle_name: "",
       leader_name: "",
       count_n_all: null,
+      equipment_number: "",
       rules:{
 
       },
@@ -1211,16 +1213,16 @@ export default {
       });
     },
     equipmenChange(val){
-      this.equipmentOptions.forEach(item=>{
+      let that = this;
+      that.equipmentOptions1.forEach(item=>{
         if(item.id == val){
           let number = item.number;
-          let equipment_number = number.substring(number.length - 1);
-          this.equipment_number = equipment_number;
-          let index= this.form.index
+          that.equipment_number = number.substring(number.length - 1);
+          let index= that.form.index;
           if(index==undefined||index==''||index==null){
             index=''
           }
-          this.form.batch=this.material_model+'-'+equipment_number+'-'+this.dateNow+'-'+index;
+          that.form.batch=that.material_model+'-'+that.equipment_number+'-'+that.dateNow+'-'+index;
         }
       })
     },
@@ -1258,8 +1260,11 @@ export default {
     },
     //获取设备列表
     getEquipment() {
-      this.$API.em.equipment.list.req({ page: 0, type: 10 }).then((res) => {
-        this.equipmentOptions = res;
+      this.$API.em.equipment.list.req({ page: 0, type: 10,name__contains:'单坩埚熔化炉' }).then((res1) => {
+        this.equipmentOptions1 = res1;
+      });	
+      this.$API.em.equipment.list.req({ page: 0, type: 10,name__contains:'网带式退火炉' }).then((res2) => {
+        this.equipmentOptions2 = res2;
       });
     },
     getMaterial(mgroupId) {