|
|
@@ -616,7 +616,7 @@
|
|
|
|
|
|
<div style="display: flex;margin-top: 20px;">
|
|
|
<div style="flex: 0.1;">
|
|
|
- <el-aside width="25vh" style="margin: 0;">
|
|
|
+ <el-aside width="32vh" style="margin: 0;">
|
|
|
<div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">
|
|
|
<el-tree :data="zhichengtreeData" :props="defaultProps" highlight-current="true"
|
|
|
@node-click="zhichengNodeClick"></el-tree>
|
|
|
@@ -633,9 +633,8 @@
|
|
|
highlight-current-row="true"
|
|
|
:show-overflow-tooltip="true"
|
|
|
border
|
|
|
- style="width:140vh; height:310px;"
|
|
|
- :row-class-name="rowClassName"
|
|
|
- >
|
|
|
+ style="width:140vh; height:60vh;"
|
|
|
+ :row-class-name="rowClassName">
|
|
|
<el-table-column prop="检验项目" label="检验项目" width="110" />
|
|
|
|
|
|
<el-table-column label="不检测" width="70">
|
|
|
@@ -669,36 +668,36 @@
|
|
|
</el-tab-pane>
|
|
|
|
|
|
<el-tab-pane label="附加检验记录" @click="showTable('附加检验记录')" name="second">
|
|
|
- <el-table
|
|
|
- tooltip-effect="dark"
|
|
|
+ <el-table tooltip-effect="dark"
|
|
|
:data="fujiaselectData"
|
|
|
row-key="ID"
|
|
|
highlight-current-row="true"
|
|
|
- :show-overflow-tooltip="true"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
border @row-click="dianjianhandle"
|
|
|
- style="width:70vh; height:40vh;"
|
|
|
+ style="width:140vh; height:60vh;"
|
|
|
@row-dblclick="handleSelectClick"
|
|
|
- :row-class-name="rowClassName"
|
|
|
- >
|
|
|
- <el-table-column
|
|
|
- v-slot="scope"
|
|
|
- label="不检测"
|
|
|
- width="75"
|
|
|
- >
|
|
|
+
|
|
|
+ :row-class-name="rowClassName">
|
|
|
+ <el-table-column v-slot="scope" label="不检测" width="75" >
|
|
|
<el-checkbox v-model="scope.row.notjc"></el-checkbox>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="缺陷备注"
|
|
|
- label="缺陷及记录"
|
|
|
- width="720"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- prop="编号"
|
|
|
- label="编号"
|
|
|
- width="80"
|
|
|
- />
|
|
|
+
|
|
|
+ <!-- 缺陷及记录列，转换为输入框 -->
|
|
|
+ <el-table-column label="缺陷及记录" width="720">
|
|
|
+ <template #default="scope">
|
|
|
+ <el-input v-model="scope.row['缺陷备注']" placeholder="请输入缺陷及记录"></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ <!-- <el-table-column prop="缺陷备注" label="缺陷及记录" width="720" /> -->
|
|
|
+
|
|
|
+ <el-table-column prop="编号" label="编号" width="80" />
|
|
|
+
|
|
|
</el-table>
|
|
|
</el-tab-pane>
|
|
|
+
|
|
|
</el-tabs>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -3417,8 +3416,9 @@ const dianjianDialog = async () => {
|
|
|
dianjianVisible.value=false
|
|
|
}
|
|
|
}
|
|
|
+//制程检验记录提交按钮
|
|
|
const zhichengDialog = async () => {
|
|
|
- console.log(fujiaselectData.value)
|
|
|
+ // console.log(fujiaselectData.value)
|
|
|
let arr =[]
|
|
|
zhibiaoselectData.value.map(item=>{
|
|
|
if(item.zc==true){
|
|
|
@@ -3466,8 +3466,9 @@ const zhichengDialog = async () => {
|
|
|
// arr.push(item)
|
|
|
return item
|
|
|
}
|
|
|
-
|
|
|
})
|
|
|
+ console.log(fujiaselectData.value)
|
|
|
+
|
|
|
let arrs=[]
|
|
|
let fujiastatus=0
|
|
|
fujiaselectData.value.map(item=>{
|
|
|
@@ -3482,12 +3483,13 @@ const zhichengDialog = async () => {
|
|
|
arrs.push(item)
|
|
|
return item
|
|
|
}
|
|
|
-
|
|
|
})
|
|
|
+ console.log(arrs)
|
|
|
if(fujiastatus==1){
|
|
|
const responses = await AdditionalInspectionRecordAdd(arrs);
|
|
|
fujiastatus=0
|
|
|
}
|
|
|
+
|
|
|
const response = await ProcessInspectionRecordsItemAdd(zhibiaoselectData.value);
|
|
|
if (response.code === 0) {
|
|
|
ElMessage({type: 'success',message: '成功'})
|
|
|
@@ -3860,7 +3862,7 @@ const dianjianselectData = reactive([])
|
|
|
|
|
|
const dianjianNodeClick = (node, check, nodeData) => {
|
|
|
|
|
|
- console.log('111')
|
|
|
+ // console.log('111')
|
|
|
if (node.children && node.children.length > 0) {
|
|
|
// 点击的是父节点，且有子节点
|
|
|
// 执行相应的父节点单击事件处理逻辑
|
|
|
@@ -3881,6 +3883,7 @@ const zhichengNodeClick = (node, check) => {
|
|
|
};
|
|
|
const processInspectionRecordsItem = async (value) => {
|
|
|
const response = await ProcessInspectionRecordsItem({ process: xunchaData.value.gxmc });
|
|
|
+
|
|
|
if (response.code === 0) {
|
|
|
zhibiaoselectData.value=response.data.首件.指标检验.map(item=>{
|
|
|
item.notjc=true;
|
