From 59e95d5f3925067359c907c90c7c96a3e259e97e Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Mon, 1 Apr 2024 10:32:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=BB=84=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/materialGroup.js              |  8 ++++++++
 .../checkTypeProject/MaterialGroupAdd.vue     |  4 ++++
 .../checkTypeProject/selectProject.vue        | 19 +++++++++++--------
 src/views/quality/qcProjectType/data.vue      | 16 ++++++++--------
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/api/quality/materialGroup.js b/src/api/quality/materialGroup.js
index 0c639650..3db129ef 100644
--- a/src/api/quality/materialGroup.js
+++ b/src/api/quality/materialGroup.js
@@ -50,3 +50,11 @@ export function delMaterialGroup(id) {
 		method: 'delete'
 	});
 }
+
+export function getOriginalGroupList(query) {
+	return request({
+		url: '/quality/materialGroup/getOriginalGroupList',
+		method: 'get',
+		params: query
+	});
+}
diff --git a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
index 7457be5f..12a13750 100644
--- a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
+++ b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
@@ -58,6 +58,9 @@
         <el-form-item label="物料组名称" prop="groupName">
           <el-input v-model="form.groupName" placeholder="请输入物料组名称" />
         </el-form-item>
+        <el-form-item label="物料组编码" prop="groupCode">
+          <el-input v-model="form.groupCode" placeholder="请输入物料组编码" disabled/>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -75,6 +78,7 @@
 
 <script>
 import {
+  getGroupList,
   addMaterialGroup,
   delMaterialGroup,
   updateMaterialGroup,
diff --git a/src/views/quality/checkTypeProject/selectProject.vue b/src/views/quality/checkTypeProject/selectProject.vue
index e04d4525..d24b4516 100644
--- a/src/views/quality/checkTypeProject/selectProject.vue
+++ b/src/views/quality/checkTypeProject/selectProject.vue
@@ -8,8 +8,8 @@
     <el-row :gutter="20">
 
       <el-col :span="24" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="left">
-          <el-form-item label="检测项目名称">
+        <el-form :model="queryParams" ref="queryProjectForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="left">
+          <el-form-item label="检测项目名称" prop="ruleName">
             <el-input
               v-model="queryParams.ruleName"
               placeholder="检测项目名称"
@@ -19,11 +19,11 @@
             />
           </el-form-item>
 
-          <el-form-item label="检测方案名称">
+          <el-form-item label="检测方案名称" prop="projectType">
             <el-select v-model="queryParams.projectType" filterable clearable placeholder="请选择检测方案">
               <el-option
-              v-for="item in projectTypeOptions"
-              :key="item.projectTypeCode"
+              v-for="(item,index) in projectTypeOptions"
+              :key="index"
               :label="item.projectTypeName"
               :value="item.projectTypeCode">
               </el-option>
@@ -66,7 +66,7 @@
           </el-table-column>
           <el-table-column label="测量单位"  align="left" prop="unitCode" width="90"/>
           <el-table-column label="抽样方案"  align="left" prop="samplePlan" width="100" :show-overflow-tooltip="true"/>
-          <el-table-column label="合格判定"  align="left" prop="judge"/ width="100">
+          <el-table-column label="合格判定"  align="left" prop="judge" width="100" />
           <el-table-column label="缺陷等级"  align="left" prop="defectLevel" width="90"/>
           <el-table-column label="检验方式"  align="left" prop="checkMode" width="90" :show-overflow-tooltip="true"/>
           <el-table-column label="检验工具"  align="left" prop="checkTool" width="90"/>
@@ -107,7 +107,8 @@ export default {
       total: 0,
       // BOM产品表格数据
       itemList: null,
-
+      ruleName: null,
+      projectType:null,
       //树名称
       bomCode: undefined,
       defaultProps: {
@@ -164,7 +165,7 @@ export default {
 
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm("queryProjectForm");
       this.handleQuery();
     },
 
@@ -183,6 +184,8 @@ export default {
 
       this.$emit('onSelected', this.$refs.myTable.selection);
       this.showFlag = false;
+      this.ruleName = '';
+      this.projectType = '';
     },
   }
 };
diff --git a/src/views/quality/qcProjectType/data.vue b/src/views/quality/qcProjectType/data.vue
index c23f816c..00abfa89 100644
--- a/src/views/quality/qcProjectType/data.vue
+++ b/src/views/quality/qcProjectType/data.vue
@@ -10,8 +10,8 @@
 				/>
 			</el-form-item>
 			<el-form-item label="检验规则属性" prop="propertyCode">
-				<el-select 
-					v-model="queryParams.propertyCode" 
+				<el-select
+					v-model="queryParams.propertyCode"
 					placeholder="请选择检验规则属性"
 					clearable >
 						<el-option
@@ -139,7 +139,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -243,8 +243,8 @@
 							<el-input type='textarea' v-model="form.judge" placeholder="合格判定" />
 						</el-form-item>
 					</el-col>
-				</el-row>	
-				
+				</el-row>
+
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -281,7 +281,7 @@
 				<el-button @click="upload.open = false">取 消</el-button>
 			</div>
 		</el-dialog>
-		
+
 	</div>
 </template>
 
@@ -340,7 +340,7 @@ export default {
 				// 是否更新已经存在的检测项目数据
 				updateSupport: 0,
 				// 设置上传的请求头部
-				headers: { 
+				headers: {
 					Authorization: "Bearer " + getToken(),
 					poolName: localStorage.getItem('USER_POOL_NAME_CURRENT'),
 				},
@@ -483,7 +483,7 @@ export default {
 		/** 下载模板操作 */
 		importTemplate() {
 			this.download('quality/project/importTemplate', {
-			}, `user_template_${new Date().getTime()}.xlsx`)
+			}, `check_project_template_${new Date().getTime()}.xlsx`)
 		},
 		// 文件上传中处理
 		handleFileUploadProgress(event, file, fileList) {