From cdf986d7321208634387a8ab5eafa8e8e3d872f8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 九月 2023 15:00:17 +0800
Subject: [PATCH] modified: src/components/view/processInspectionUpdate.vue modified: src/components/view/rawInsDetail.vue
---
src/components/view/processInspectionUpdate.vue | 9 ++++++---
src/components/view/rawInsDetail.vue | 27 +++++++++++++++++++--------
2 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/components/view/processInspectionUpdate.vue b/src/components/view/processInspectionUpdate.vue
index 53bafbb..7f9d4a5 100644
--- a/src/components/view/processInspectionUpdate.vue
+++ b/src/components/view/processInspectionUpdate.vue
@@ -126,7 +126,7 @@
<el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
scope.row.dname == null ? "璇烽�夋嫨" : scope.row.dname
}}</el-button>
- <el-select v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)"
+ <el-select v-if="scope.row.isSelectDevice" style="width: 100%;" onchange="clickNodeSure(scope.row)"
v-model="filterText" placeholder="璇烽�夋嫨">
<el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
</el-option>
@@ -171,10 +171,10 @@
</div>
<el-dialog title="璇烽�夋嫨璁惧" :visible.sync="centerDialogVisible" width="20%">
<div class="div_device_dialog">
- <el-select style="width: 100%;" @change="clickNodeSure()" v-model="filterText" placeholder="璇烽�夋嫨">
+ <!-- <el-select style="width: 100%;" @change="clickNodeSure()" v-model="filterText" placeholder="璇烽�夋嫨">
<el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
</el-option>
- </el-select>
+ </el-select> -->
</div>
<!-- <span slot="footer" class="dialog-footer">
<el-button @click="centerDialogVisible = false">鍙� 娑�</el-button>
@@ -367,6 +367,7 @@
},
// 鑾峰彇璁惧鏍戝唴瀹�
getOptions(row) {
+ this.filterText=0
this.$axios.get(this.$api.url.inspectionItemChooseDev, {
params: {
father: row.father,
@@ -392,6 +393,7 @@
},
// 鐐瑰嚮鏍戦噷闈㈢殑纭畾
clickNodeSure(row) {
+ console.log(row);
let select = this.materialOptions.filter(item => {
return item.id === this.filterText
})[0]
@@ -414,6 +416,7 @@
})
.then(res => {
row.isSelectDevice = false
+ console.log("row",row);
this.filterText=0
this.getTableData()
this.centerDialogVisible = false;
diff --git a/src/components/view/rawInsDetail.vue b/src/components/view/rawInsDetail.vue
index 13741d8..a028670 100644
--- a/src/components/view/rawInsDetail.vue
+++ b/src/components/view/rawInsDetail.vue
@@ -479,11 +479,12 @@
console.log(this.projectTable);
if(this.projectTable.length>0){
let filterTable= this.projectTable.filter(item=>{
- return item.required===''||item.internal===''||item.required===null||item.internal===null
+ return item.required===''||item.internal===''||
+ item.required===null||item.internal===null||item.name===''
})
if(filterTable.length>0) {
this.$message({
- message: "鏍囧噯鍊煎拰鍐呮帶鍊间笉鑳戒负绌猴紒",
+ message: "椤圭洰鍚嶇О锛屾爣鍑嗗�煎拰鍐呮帶鍊间笉鑳戒负绌猴紒",
type: 'warning'
});
return
@@ -494,15 +495,25 @@
i.testValue = i.testValueList.join(",");
});
this.detailInfo.rawInsProducts = this.projectTable;
- const res = await this.$axios.post(
+ this.$axios.post(
this.$api.url.addRawInspects,
{ ...this.detailInfo },
{ headers: { "Content-Type": "application/json" } }
- );
- this.detailId = res.data;
- this.getDetailInfo();
- this.$message.success(res.message);
- this.goBack();
+ ).then(res=>{
+ console.log(res);
+ if(res.code=="201"){
+ this.$message({
+ message: res.message,
+ type: 'warning'
+ });
+ return
+ }else{
+ // this.detailId = res.data;
+ // this.getDetailInfo();
+ // // this.$message.success(res.message);
+ // this.goBack();
+ }
+ });
},
// 淇敼椤圭洰鐨勬娴嬪�兼敼鍙樼粨璁�
--
Gitblit v1.9.3