From d389d02439b024f7ca6d993ce156eef702840524 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期三, 08 十一月 2023 11:29:25 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/processInspect/processInspect-form.vue | 53 ++++++++++++++++-------------------------------------
1 files changed, 16 insertions(+), 37 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 19a9326..b94fef5 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -130,17 +130,10 @@
<span v-if="resultVal != null && scope.row.iname != null"
v-text="scope.row.ename"></span>
<div v-else>
-<<<<<<< HEAD
- <el-select style="width:100%" v-model="scope.row.eId"
- v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row,scope.$index)">
- <el-option v-for="(item,index) in deviceList"
- :key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
-=======
<el-select style="width:100%" v-model="scope.row.eId" v-if="scope.row.iname != null"
filterable @change="updateDevice(scope.row, scope.$index)">
<el-option v-for="(item, index) in deviceList" :key="index" :value="item.id"
:label="item.code + '-' + item.name"></el-option>
->>>>>>> c36b81234cff45a92a096a94e844041cc1a31f2a
</el-select>
</div>
</template>
@@ -253,33 +246,6 @@
beforeUpdate() {
this.$nextTick(() => {
this.$refs.table.doLayout();
-<<<<<<< HEAD
- })
- },
- created() {
- },
- mounted() {
- this.getDeviceList()
- this.processInspectVo.id = this.$route.query.id
- this.resultVal = this.$route.query.resultVal
- if(this.resultVal == null){
- let val = sessionStorage.getItem("process-resultVal-"+this.processInspectVo.id);
- val == undefined ? this.resultVal=null : this.resultVal = val
- }
- this.init()
- },
- methods: {
-
- submitSave(){
- let pro = 0
- console.log(this.inspectionItems);
- this.inspectionItems.forEach(item => {
- if(item.children){
- let arr = item.children.filter(obj=>{
- return obj.iresult == 0;
- })
- pro+=arr.length
-=======
})
},
created() {
@@ -316,7 +282,6 @@
let data = {
id: this.processInspectVo.id,
number: value
->>>>>>> c36b81234cff45a92a096a94e844041cc1a31f2a
}
updateProcessInspectsById(data).then(res => {
let data = res.data.data
@@ -387,6 +352,9 @@
arr = obj.inspectionValue.split(",")
}
obj.empiricalValueAddss = arr
+ if(obj.note){
+ snote=obj.inote
+ }
if (arr.length > this.empiricalValueAdd) {
this.empiricalValueAdd = arr.length
}
@@ -608,20 +576,31 @@
this.technologyList = sample.children
},
changeState(row, index) {
+ console.log(row)
if (row.iid != null && row.iid != '') {
let str = ""
row.empiricalValueAddss.forEach(e => {
str += e + ","
})
+
+ // if (note === undefined || note === '' || note === null) {
+ // return
+ // }
+ console.log(str)
str = str.slice(0, -1);
if (str === undefined || str === '' || str === null) {
return
}
+
+
let obj = {
devideId: row.eId,
ppid: row.iid,
- inspectionValue: str
+ inspectionValue: str,
+ note : row.inote
+
}
+ console.log(obj)
updateProcessInsProduct(obj).then(res => {
if (res.data.code == 0) {
this.$message.success("鏇存柊鎴愬姛")
@@ -663,7 +642,6 @@
}).then(res => {
if (res.data.data != null) {
this.optionsSamplename = res.data.data.children
->>>>>>> c36b81234cff45a92a096a94e844041cc1a31f2a
} else {
this.$message({
message: '娌℃湁璇ヨ鍗曞彿锛�',
@@ -722,6 +700,7 @@
flex-wrap: wrap;
}
+
.finishedProduct-basic {
background-color: #fff;
height: 155px;
--
Gitblit v1.9.3