Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-front

src/api/quality/qcProjectType.js

@@ -17,6 +17,14 @@ export function getQcProjectType(id) {
 		});
 }
 
+// 查询检验方案维护详细
+export function getQcProjectTypeByCode(projectTypeCode) {
+	return request({
+		url: '/quality/qcProjectType/getProjectTypeInfoByCode/' + projectTypeCode,
+		method: 'get'
+		});
+}
+
 // 新增检验方案维护
 export function addQcProjectType(data) {
 	return request({

src/views/mes/machineProduction/index.vue

@@ -44,7 +44,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
+      <el-form-item label="成型机名称" prop="equName">
+				<el-input
+					v-model="queryParams.equName"
+					placeholder="请输入成型机名称"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
       <el-form-item>
         <el-button
           type="primary"

src/views/quality/qcProjectType/projectTypeTree.vue

@@ -55,7 +55,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="120px">
 				<el-form-item label="检测项方案编号" prop="projectTypeCode">
-					<el-input v-model="form.projectTypeCode" placeholder="请输入检测项方案编号" />
+					<el-input v-model="form.projectTypeCode" placeholder="请输入检测项方案编号" disabled/>
 				</el-form-item>
 				<el-form-item label="检测项方案名称" prop="projectTypeName">
 					<el-input v-model="form.projectTypeName" placeholder="请输入检测项方案名称" />
@@ -77,7 +77,7 @@
 </template>
 
 <script>
-import { listQcProjectType, projectTypeTree, getQcProjectType, delQcProjectType, addQcProjectType, updateQcProjectType } from "@/api/quality/qcProjectType";
+import { listQcProjectType, projectTypeTree, getQcProjectType,getQcProjectTypeByCode, delQcProjectType, addQcProjectType, updateQcProjectType } from "@/api/quality/qcProjectType";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import ItemSelectMaterial from "../qcIncome/selectMaterial.vue";
@@ -201,8 +201,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(typeCode) {
       this.reset();
-      const obj = this.projectList.find(obj => obj.projectTypeCode === typeCode);
+      getQcProjectTypeByCode(typeCode).then((response) => {
-      getQcProjectType(obj.id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改方案";