From cf922d1545a642af81c30b8da063d747af072c41 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202303>
Date: Thu, 27 Jul 2023 11:34:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=AE=A1=E7=90=86-=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E5=B7=A5=E5=BA=8F-=E8=AE=BE=E5=A4=87=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/pro/process/index.vue | 65 ++++++++++-------------------
 1 file changed, 23 insertions(+), 42 deletions(-)

diff --git a/src/views/mes/pro/process/index.vue b/src/views/mes/pro/process/index.vue
index 933fa79..5572026 100644
--- a/src/views/mes/pro/process/index.vue
+++ b/src/views/mes/pro/process/index.vue
@@ -255,14 +255,6 @@
 			<el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="6">
-            <!-- <el-input
-              v-model="equipmentTypeName"
-              clearable
-              placeholder="请输入设备类别"
-              prefix-icon="el-icon-search"
-              size="small"
-              :props="defaultProps"
-            /> -->
             <el-tree
               ref="tree"
               :check-strictly="true"
@@ -300,7 +292,7 @@
               <el-button icon="el-icon-refresh" size="mini" @click="resetEquipmentQuery">重置</el-button>
             </el-form-item>
             </el-form>
-            <el-table v-loading="loading" :data="equipmentList" @selection-change="handleEquipmentSelectionChange">
+            <el-table v-loading="loading" :data="equipmentList" @selection-change="handleEquipmentSelectionChange" ref="myTable">
 			        <el-table-column type="selection" width="55" align="center" />
 						  <!-- 序号 -->
               <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
@@ -320,16 +312,17 @@
           />
           </el-col>
         </el-row>
-
 			</el-form>
-			<el-tabs type="border-card" v-if="form.equipmentCode != null">
+			<!-- <el-tabs type="border-card" v-if="form.equipmentCode != null">
         <el-tab-pane label="设备绑定物料">
           <EquipmentBoundMaterials v-if="form.equipmentCode != null" :optType="optType" :equipmentCode="form.equipmentCode"></EquipmentBoundMaterials>
         </el-tab-pane>
-      </el-tabs>
+      </el-tabs> -->
 			<div slot="footer" class="dialog-footer">
+        <el-table-column label="操作">
 				<el-button type="primary" @click="submitEquipmentForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel">取 消</el-button>
+</el-table-column>
 			</div>
 		</el-dialog>
   </div>
@@ -522,6 +515,12 @@ export default {
       this.reset();
     },
 
+    // 取消按钮
+    equipmentCancel() {
+      this.boundeEuipmentOpen = false;
+      this.reset();
+    },
+
     // 表单重置
     reset() {
       this.form = {
@@ -536,7 +535,7 @@ export default {
         updateTime: null,
         fileList:'',
         equipmentTypeName:'',
-        equipmentId :this.equipmentId,
+        equipmentId :null,
         equipmentTypeName :null,
         equipmentTypeCode:null,
         equipmentName :null,
@@ -638,34 +637,16 @@ export default {
       });
     },
 
-    submitEquipmentForm(row) {
-      //正确
-      // this.reset();
-      // const processId = row.processId;
-      // this.form.processId = processId;
-      // const equipmentId = row.equipmentId || this.ids;
-      // console.log(equipmentId,1);
-      // if (equipmentId != null) {
-      //   this.form.equipmentId = equipmentId.toString();
-      //   updateProcess(this.form,processId).then(response => {
-      //       this.$modal.msgSuccess("关联成功");
-      //   });
-      //   }
-      //this.reset();
-      const processId = this.ids1;
-      this.queryEquipmentParams.processId = processId;
-      const equipmentId = row.equipmentId || this.ids;
-      console.log(equipmentId,1);
-      if (equipmentId != null) {
-        this.queryEquipmentParams.processId = processId.toString();
-        this.queryEquipmentParams.equipmentId = equipmentId.toString();
-        updateProcess(this.queryEquipmentParams).then(response => {
-            this.$modal.msgSuccess("关联成功");
-            this.boundeEuipmentOpen = false;
-            this.activated();
-            this.getList();
-        });
-        }
+    //
+    submitEquipmentForm() {
+      const table = this.$refs.myTable;
+      const data = table.data;
+      console.log(data);
+      for (const one of data) {
+      const equipmentCode = one.equipmentCode;
+      this.form.workCenter = this.form.workCenter + ','+ equipmentCode;
+      this.boundeEuipmentOpen = false;
+     }
     },
 
     /** 删除按钮操作 */