From f3015f58bf9c12371130f5bdbd7980fb667dc01e Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 23 Dec 2024 09:25:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=80=E4=BA=9B=E5=B0=8F=E6=94=B9?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qm/defect.vue        | 10 ++++------
 src/views/qm/qct.vue           |  8 +++-----
 src/views/qm/testItem.vue      |  8 +++-----
 src/views/qm/testItem_form.vue |  6 ++++++
 src/views/wpm_bx/index.vue     |  1 +
 src/views/wpm_bx/mlog_bx.vue   |  1 +
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/views/qm/defect.vue b/src/views/qm/defect.vue
index 9877887f..2f4a74d6 100644
--- a/src/views/qm/defect.vue
+++ b/src/views/qm/defect.vue
@@ -3,17 +3,15 @@
 		<el-header>
 			<div class="left-panel">
 				<!--  v-auth="'defect.create'" -->
-				<el-button type="primary" icon="el-icon-plus" @click="defectAdd"></el-button>
+				<el-button type="primary" icon="el-icon-plus" @click="defectAdd" v-auth="'defect.create'"></el-button>
 			</div>
 			<div class="right-panel">
-				<div class="right-panel-search">
-					<el-input v-model="query.search" placeholder="名称" clearable @keyup.enter="handleQuery"></el-input>
-					<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
-				</div>
+				<el-input v-model="query.search" placeholder="名称" clearable @keyup.enter="handleQuery"></el-input>
+				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
-			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination>
+			<scTable ref="table" :apiObj="apiObj" row-key="id">
 				<el-table-column label="#" type="index"></el-table-column>
 				<el-table-column label="名称" prop="name"></el-table-column>
 				<el-table-column label="标识" prop="code"></el-table-column>
diff --git a/src/views/qm/qct.vue b/src/views/qm/qct.vue
index 00f5ea25..d60d94b9 100644
--- a/src/views/qm/qct.vue
+++ b/src/views/qm/qct.vue
@@ -5,10 +5,8 @@
 				<el-button type="primary" icon="el-icon-plus" @click="tableAdd" v-auth="'qct.create'"></el-button>
 			</div>
 			<div class="right-panel">
-				<div class="right-panel-search">
-					<el-input v-model="query.search" placeholder="检验表名称" clearable @keyup.enter="handleQuery"></el-input>
-					<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
-				</div>
+				<el-input v-model="query.search" placeholder="检验表名称" clearable @keyup.enter="handleQuery"></el-input>
+				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -28,7 +26,7 @@
 						<el-divider direction="vertical"></el-divider>
 						<el-button link size="small" @click="tableEdit(scope.row)" v-auth="'qct.update'" type="primary">编辑</el-button>
 						<el-divider direction="vertical"></el-divider>
-						<el-popconfirm title="确定删除吗？" @confirm="roleDel(scope.row, scope.$index)">
+						<el-popconfirm title="确定删除吗？" @confirm="tableDel(scope.row, scope.$index)">
 							<template #reference>
 								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
 							</template>
diff --git a/src/views/qm/testItem.vue b/src/views/qm/testItem.vue
index d8cf99ee..d1025aec 100644
--- a/src/views/qm/testItem.vue
+++ b/src/views/qm/testItem.vue
@@ -5,14 +5,12 @@
 				<el-button type="primary" icon="el-icon-plus" @click="testitemAdd" v-auth="'role.create'"></el-button>
 			</div>
 			<div class="right-panel">
-				<div class="right-panel-search">
-					<el-input v-model="query.search" placeholder="名称" clearable @keyup.enter="handleQuery"></el-input>
-					<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
-				</div>
+				<el-input v-model="query.search" placeholder="名称" clearable @keyup.enter="handleQuery"></el-input>
+				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
-			<scTable ref="table" :apiObj="apiObj" row-key="id" hidePagination>
+			<scTable ref="table" :apiObj="apiObj" row-key="id">
 				<el-table-column label="#" type="index" width="50"></el-table-column>
 				<el-table-column label="名称" prop="name"></el-table-column>
 				<el-table-column label="检验类型" prop="field_type">
diff --git a/src/views/qm/testItem_form.vue b/src/views/qm/testItem_form.vue
index 0b0dfefe..9b1cae06 100644
--- a/src/views/qm/testItem_form.vue
+++ b/src/views/qm/testItem_form.vue
@@ -55,7 +55,9 @@
 							<el-form-item label="关联检测项">
 								<xtSelect
                                     :apiObj="apiObj"
+									:options="itemOptions"
                                     v-model="form.affects"
+									v-model:label="form.affects_name"
                                     style="width:100%"
 									:multiple="true"
                                 >
@@ -190,6 +192,7 @@ export default {
 					{ required: true, message: "请输入名称", trigger: "blur" },
 				],
 			},
+			// itemOptions:null,
 			visible: false,
 			isSaveing: false,
 			options: [
@@ -240,6 +243,9 @@ export default {
 		//表单注入数据
 		setData(data) {
 			Object.assign(this.form, data);
+			// if(data.affects.length>0){
+			// 	this.itemOptions
+			// }
 		},
 		//表单提交方法
 		submit() {
diff --git a/src/views/wpm_bx/index.vue b/src/views/wpm_bx/index.vue
index 92cf2724..2328121f 100644
--- a/src/views/wpm_bx/index.vue
+++ b/src/views/wpm_bx/index.vue
@@ -1,3 +1,4 @@
+<!-- 最新版生产执行页面 -->
 <template>
 	<el-container>
 		<el-header>
diff --git a/src/views/wpm_bx/mlog_bx.vue b/src/views/wpm_bx/mlog_bx.vue
index 281fe1d7..47b38b16 100644
--- a/src/views/wpm_bx/mlog_bx.vue
+++ b/src/views/wpm_bx/mlog_bx.vue
@@ -1,3 +1,4 @@
+<!-- 左侧工段列表的 生产执行页面 -->
 <template>
 	<el-container>	
 		<el-aside style="width: 100px;background: #ffffff;">