From 8432b41a82dc1b82d101390798ad39390da816cf Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 26 Dec 2024 17:10:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A3=80=E6=B5=8B=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E6=B7=BB=E5=8A=A0=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/scFormTable/index.vue |   6 +-
 src/views/qm/qctDetail.vue           | 208 ++++++++++++++++++---------
 2 files changed, 149 insertions(+), 65 deletions(-)

diff --git a/src/components/scFormTable/index.vue b/src/components/scFormTable/index.vue
index 9217981e..16fa394b 100644
--- a/src/components/scFormTable/index.vue
+++ b/src/components/scFormTable/index.vue
@@ -9,7 +9,7 @@
 
 <template>
 	<div class="sc-form-table" ref="scFormTable">
-		<el-table :data="data" ref="table" border >
+		<el-table :data="data" ref="table" border :height="tableHeight">
 			<el-table-column type="index" width="50" fixed="left">
 				<template #header>
 					<el-button v-if="!hideAdd" type="primary" icon="el-icon-plus" size="small" circle @click="rowAdd"></el-button>
@@ -39,6 +39,10 @@
 
 	export default {
 		props: {
+			tableHeight:{
+				type: [Number, String],
+				default: 300
+			},
 			modelValue: { type: Array, default: () => [] },
 			addTemplate: { type: Object, default: () => {} },
 			placeholder: { type: String, default: "暂无数据" },
diff --git a/src/views/qm/qctDetail.vue b/src/views/qm/qctDetail.vue
index b7396092..4c420ae8 100644
--- a/src/views/qm/qctDetail.vue
+++ b/src/views/qm/qctDetail.vue
@@ -26,17 +26,19 @@
                     <sc-form-table
                     hideDelete
                     hideIndex
+                    :tableHeight="200"
                     v-model="qctmatlist"
                     :addTemplate="mataddTemplate"
                     placeholder="暂无数据"
                     >
                         <el-table-column prop="type" label="物料">
                             <template #default="scope">
-                                <span v-if="scope.row.id">{{ scope.row.material_name }}</span>
+                                <span v-if="!scope.row.isEdit">{{ scope.row.material_name }}</span>
                                 <xtSelect
                                     v-else
                                     :apiObj="apiObj"
                                     v-model="scope.row.material"
+                                    v-model:label="scope.row.material_name"
                                     style="width:100%"
                                 >
                                     <el-table-column label="名称" prop="name"></el-table-column>
@@ -47,7 +49,7 @@
                         </el-table-column>
                         <el-table-column prop="time" label="追溯层级">
                             <template #default="scope">
-                                <span v-if="scope.row.id">{{ tracing_[scope.row.tracing] }}</span>
+                                <span v-if="!scope.row.isEdit">{{ tracing_[scope.row.tracing] }}</span>
                                 <el-select
                                     v-else
                                     v-model="scope.row.tracing"
@@ -63,10 +65,18 @@
                                 </el-select>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="open" label="操作" width="80" align="center">
+                        <el-table-column prop="open" label="操作" width="125" align="center">
                             <template #default="scope">
                                 <el-button
-                                    v-if="!scope.row.edit"
+                                    v-if="scope.row.isEdit"
+                                    text
+                                    type="primary"
+                                    size="small"
+                                    @click="formTableAdd(scope.row,'mat')"
+                                    >保存</el-button
+                                >
+                                <el-button
+                                    v-else
                                     text
                                     type="primary"
                                     size="small"
@@ -74,21 +84,14 @@
                                     >编辑</el-button
                                 >
                                 <el-button
-                                    v-if="scope.row.id"
+                                     v-if="!scope.row.isEdit"
                                     text
                                     type="danger"
                                     size="small"
                                     @click="formTableDel(scope.row.id,'mat')"
                                     >删除</el-button
                                 >
-                                <el-button
-                                    v-if="scope.row.edit"
-                                    text
-                                    type="primary"
-                                    size="small"
-                                    @click="formTableAdd(scope.row,'mat')"
-                                    >保存</el-button
-                                >
+                                
                             </template>
                         </el-table-column>
                     </sc-form-table>
@@ -97,23 +100,25 @@
 				<el-card style="width: 100%" header="检测项" shadow="hover">
                     <sc-form-table
                     hideIndex
+                    :tableHeight="300"
                     v-model="qcttestitemlist"
                     :addTemplate="defectaddTemplate"
                     placeholder="暂无数据"
                     >
                         <el-table-column prop="val" label="排序" width="80">
                             <template #default="scope">
-                                <span v-if="scope.row.id">{{ scope.row.sort }}</span>
+                                <span v-if="!scope.row.isEdit">{{ scope.row.sort }}</span>
                                 <el-input v-else v-model="scope.row.sort" placeholder="排序"></el-input>
                             </template>
                         </el-table-column>
                         <el-table-column prop="time" label="检测项">
                             <template #default="scope">
-                                <span v-if="scope.row.id">{{scope.row.testitem_name}}</span>
+                                <span v-if="!scope.row.isEdit">{{scope.row.testitem_name}}</span>
                                 <xtSelect
                                     v-else
                                     :apiObj="apiObj2"
                                     v-model="scope.row.testitem"
+                                     v-model:label="scope.row.testitem_name"
                                     v-model:obj="testitemrow"
                                     style="width:100%"
                                 >
@@ -124,14 +129,22 @@
                         </el-table-column>
                         <el-table-column prop="type" label="备注">
                             <template #default="scope">
-                            <span v-if="scope.row.id">{{ scope.row.note }}</span>
+                            <span v-if="!scope.row.isEdit">{{ scope.row.note }}</span>
                             <el-input v-else v-model="testitemrow.description" placeholder="备注"></el-input>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="open" label="操作" width="80" align="center">
+                        <el-table-column prop="open" label="操作" width="125" align="center">
                             <template #default="scope">
                                 <el-button
-                                    v-if="!scope.row.edit"
+                                    v-if="scope.row.isEdit"
+                                    text
+                                    type="primary"
+                                    size="small"
+                                    @click="formTableAdd(scope.row,'testitem')"
+                                    >保存</el-button
+                                >
+                                <el-button
+                                    v-else
                                     text
                                     type="primary"
                                     size="small"
@@ -139,21 +152,14 @@
                                     >编辑</el-button
                                 >
                                 <el-button
-                                    v-if="scope.row.id"
+                                    v-if="!scope.row.isEdit"
                                     text
                                     type="danger"
                                     size="small"
                                     @click="formTableDel(scope.row.id,'testitem')"
                                     >删除</el-button
                                 >
-                                <el-button
-                                    v-if="scope.row.edit"
-                                    text
-                                    type="primary"
-                                    size="small"
-                                    @click="formTableAdd(scope.row,'testitem')"
-                                    >保存</el-button
-                                >
+                                
                             </template>
                         </el-table-column>
                     </sc-form-table>
@@ -162,24 +168,26 @@
                 <el-card style="width: 100%" header="检测缺陷项" shadow="hover">
                     <sc-form-table
                     hideIndex
+                    :tableHeight="300"
                     v-model="qctdefectlist"
                     :addTemplate="testitemaddTemplate"
                     placeholder="暂无数据"
                     >
                         <el-table-column prop="val" label="排序" width="80">
                             <template #default="scope">
-                                <span v-if="scope.row.edit">{{ scope.row.sort }}</span>
+                                <span v-if="!scope.row.isEdit">{{ scope.row.sort }}</span>
                                 <el-input v-else v-model="scope.row.sort" placeholder="排序"></el-input>
                             </template>
                         </el-table-column>
                         <el-table-column prop="time" label="缺陷项">
                             <template #default="scope">
-                                <span v-if="scope.row.edit">{{scope.row.defect_name}}</span>
+                                <span v-if="!scope.row.isEdit">{{scope.row.defect_name}}</span>
                                 <xtSelect
                                     v-else
                                     :apiObj="apiObj3"
                                     v-model="scope.row.defect"
                                     v-model:obj="defectrow"
+                                     v-model:label="scope.row.defect_name"
                                     style="width:100%"
                                 >
                                     <el-table-column label="名称" prop="name"></el-table-column>
@@ -189,42 +197,42 @@
                         </el-table-column>
                         <el-table-column prop="val" label="判定表达式" min-width="150">
                             <template #default="scope">
-                                <span v-if="scope.row.edit">{{ scope.row.rule_expression }}</span>
+                                <span v-if="!scope.row.isEdit">{{ scope.row.rule_expression }}</span>
                                 <el-input v-else v-model="scope.row.rule_expression" placeholder="请输入判定表达式"></el-input>
                             </template>
                         </el-table-column>
                         <el-table-column prop="type" label="备注">
                             <template #default="scope">
-                                <span v-if="scope.row.edit">{{ scope.row.note }}</span>
+                                <span v-if="!scope.row.isEdit">{{ scope.row.note }}</span>
                                 <el-input v-else v-model="scope.row.note" placeholder="备注"></el-input>
                             </template>
                         </el-table-column>
                         <el-table-column prop="open" label="操作" width="125" align="center">
                             <template #default="scope">
                                 <el-button
-                                    v-if="!scope.row.edit"
-                                    text
-                                    type="danger"
-                                    size="small"
-                                    @click="formTableDel(scope.row.id,'defect')"
-                                    >删除</el-button
-                                >
-                                <el-button
-                                    v-if="scope.row.id"
-                                    text
-                                    type="primary"
-                                    size="small"
-                                    @click="formTableEdit(scope.row.id,'defect')"
-                                    >编辑</el-button
-                                >
-                                <el-button
-                                     v-if="scope.row.edit"
+                                    v-if="scope.row.isEdit"
                                     text
                                     type="primary"
                                     size="small"
                                     @click="formTableAdd(scope.row,'defect')"
                                     >保存</el-button
                                 >
+                                <el-button
+                                    v-else
+                                    text
+                                    type="primary"
+                                    size="small"
+                                    @click="formTableEdit(scope.row,'defect')"
+                                    >编辑</el-button
+                                >
+                                <el-button
+                                    v-if="!scope.row.isEdit"
+                                    text
+                                    type="danger"
+                                    size="small"
+                                    @click="formTableDel(scope.row.id,'defect')"
+                                    >删除</el-button
+                                >
                             </template>
                         </el-table-column>
                     </sc-form-table>
@@ -323,23 +331,23 @@ export default {
             that.qctmatlist = [],that.qctdefectlist =[],that.qcttestitemlist =[];
             that.$API.qm.qctmat.list.req({qct:that.qctItem.id,page:0}).then(res=>{
                 res.forEach(item=>{
-                    let obj = object.assign({},item);
-                    obj.edit = false;
+                    let obj = Object.assign({},item);
+                    obj.isEdit = false;
                     that.qctmatlist.push(obj);
                 })
             });
             that.$API.qm.qctdefect.list.req({qct:that.qctItem.id,page:0}).then(res=>{
                 res.forEach(item=>{
-                    let obj = object.assign({},item);
-                    obj.edit = false;
+                    let obj = Object.assign({},item);
+                    obj.isEdit = false;
                     that.qctdefectlist.push(obj);
                 })
                 // that.qctdefectlist = res;
             });
             that.$API.qm.qcttestitem.list.req({qct:that.qctItem.id,page:0}).then(res=>{
                 res.forEach(item=>{
-                    let obj = object.assign({},item);
-                    obj.edit = false;
+                    let obj = Object.assign({},item);
+                    obj.isEdit = false;
                     that.qcttestitemlist.push(obj);
                 })
                 // that.qcttestitemlist = res;
@@ -347,30 +355,102 @@ export default {
         },
 		//添加
 		formTableAdd(row,type) {
+            console.log('formTableAdd',row);
+			let that = this,api = '';
+            if(type=='defect'){
+                if(row.id!==''&&row.id!==undefined&&row.id!==null){
+                    api = that.$API.qm.qctdefect.update;
+                }else{
+                    row.note = that.defectrow.note;
+                    api = that.$API.qm.qctdefect.create;
+                }
+            }else if(type=='mat'){
+                if(row.id!==''&&row.id!==undefined&&row.id!==null){
+                    api = that.$API.qm.qctmat.update;
+                }else{
+                    api = that.$API.qm.qctmat.create;
+                }
+            }else if(type=='testitem'){
+                if(row.id!==''&&row.id!==undefined&&row.id!==null){
+                    api = that.$API.qm.qcttestitem.update;
+                }else{
+                    row.note = that.testitemrow.description;
+                    api = that.$API.qm.qcttestitem.create;
+                }
+            }
+            this.$nextTick(() => {
+                if(row.id!==''&&row.id!==undefined&&row.id!==null){
+                    api.req(row.id,row).then((res) => {
+                        that.$message.success("编辑成功");
+                        that.getLists();
+                        return res;
+                    }).catch((err) => {
+                        return err;
+                    });
+                }else{
+                    api.req(row).then((res) => {
+                        that.$message.success("添加成功");
+                        that.getLists();
+                        return res;
+                    }).catch((err) => {
+                        return err;
+                    });
+                }
+            })
+		},
+        //添加
+		formTableSave(row,type) {
 			let that = this,api = '';
             if(type=='defect'){
-                // console.log(that.defectrow);
                 row.note = that.defectrow.note;
                 api = that.$API.qm.qctdefect.create;
             }else if(type=='mat'){
                 api = that.$API.qm.qctmat.create;
             }else if(type=='testitem'){
-                // console.log(that.testitemrow);
                 row.note = that.testitemrow.description;
                 api = that.$API.qm.qcttestitem.create;
             }
             this.$nextTick(() => {
-                api.req(row).then((res) => {
-                    that.$message.success("添加成功");
-                    that.getLists();
-                    return res;
-                }).catch((err) => {
-                    return err;
-                });
+                if(row.id!==''&&row.id!==undefined&&row.id!==null){
+                    api.req(row).then((res) => {
+                        that.$message.success("添加成功");
+                        that.getLists();
+                        return res;
+                    }).catch((err) => {
+                        return err;
+                    });
+                }else{
+                    api.req(row).then((res) => {
+                        that.$message.success("添加成功");
+                        that.getLists();
+                        return res;
+                    }).catch((err) => {
+                        return err;
+                    });
+                }
             })
 		},
         formTableEdit(row,type) {
-
+           if(type=='mat'){
+                this.qctmatlist.forEach((item, index) => {
+                    if (item.id == row.id) {
+                        this.qctmatlist[index].isEdit = true;
+                    }
+                });
+            }else if(type=='testitem'){
+                this.qcttestitemlist.forEach((item, index) => {
+                    if (item.id == row.id) {
+                        this.qcttestitemlist[index].isEdit = true;
+                    }
+                });
+            }else  if(type=='defect'){
+                this.qctdefectlist.forEach((item, index) => {
+                    if (item.id == row.id) {
+                        this.qctdefectlist[index].isEdit = true;
+                    }
+                });
+            }
+            
         },
 		//删除
 		formTableDel(id,type) {