From 8b5c8e1639a1faf32d8c450a67667585a8c323d0 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 29 十一月 2023 10:45:03 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/processInspect/processInspect-form.vue | 249 ++++++++++---------------------------------------
1 files changed, 54 insertions(+), 195 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index b94fef5..60b4afb 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -18,6 +18,12 @@
<div class="formwrapper">
<el-row>
<el-col :span="6">
+ <el-form-item label="杩囩▼妫�楠岀紪鍙凤細">
+ <el-input @blur="selectInfoByOrderId" disabled
+ v-model="processInspectVo.proInsNo" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="璁㈠崟鍙凤細">
<el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
v-model="processInspectVo.orderNumber" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
@@ -40,14 +46,15 @@
autocomplete="off" />
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="6">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
<el-input disabled v-model="processInspectVo.specs" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
autocomplete="off" />
</el-form-item>
</el-col>
- </el-row>
- <el-row>
+
<el-col :span="6">
<el-form-item label="宸ュ簭鍚嶇О">
<el-select style="width: 100%" :disabled="processInspectVo.id != null"
@@ -64,8 +71,6 @@
autocomplete="off" />
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="6">
<el-form-item label="鏁伴噺锛�">
<el-input v-model="processInspectVo.quantity" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off"
@@ -86,10 +91,15 @@
</el-row>
<el-row style="width:100%;">
<el-col :span="24">
- <el-table border :data="inspectionItems" height="400"
+ <el-table border
+ :data="inspectionItems"
+ height="400"
:header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
- :cell-style="{ textAlign: 'center' }" row-key="iid" default-expand-all style="width: 100%"
- ref="table" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+ :cell-style="{ textAlign: 'center' }"
+ row-key="iid"
+ default-expand-all style="width: 100%"
+ ref="table"
+ :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
<el-table-column label="椤圭洰" prop="father" width="240"></el-table-column>
<el-table-column prop="iname" label="鎸囨爣" width="240"></el-table-column>
@@ -138,21 +148,36 @@
</div>
</template>
</el-table-column>
- <el-table-column label="妫�楠屾弿杩�"
- width="240" style="text-align: center;">
+ <el-table-column
+ label="妫�楠屾弿杩�" width="240" style="text-align: center;">
<template slot-scope="scope">
- <el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null"
- class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�"
- placement="top-start">
- <el-input :disabled="scope.row.eId == null" v-model="scope.row.inote"
- placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
- <span v-if="resultVal != null && processInspectVo.id!=null" v-text="scope.row.inote"></span>
+ <el-col v-if="scope.row.itype === '1'">
+ <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
+ class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
+ <el-input :disabled="scope.row.eId == null"
+ v-model="scope.row.inote"
+ @blur="changeState(scope.row, inote)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
+ <span v-if="resultVal != null && processInspectVo.id != null"
+ v-text="scope.row.inote"></span>
</el-tooltip>
+ </el-col>
+ <el-col v-else>
+ <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
+ class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
+ <el-input :disabled="scope.row.eId == null"
+ v-model="scope.row.inote"
+ @blur="changeState(scope.row, inote)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ <!-- <el-select style="width: 100%;" @change="changeState(scope.row, inote)" :disabled="scope.row.eId == null" v-model="scope.row.inote" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select> -->
+ <span v-if="resultVal != null && processInspectVo.id != null"
+ v-text="scope.row.inote"></span>
+ </el-tooltip>
+ </el-col>
</template>
</el-table-column>
-
-
-
<el-table-column label="缁撹" fixed="right" min-width="100">
<template slot-scope="scope">
<div v-if="scope.row.iname != null">
@@ -229,6 +254,7 @@
empiricalValueAddMaxNumber: 0,
processInspectVo: {
id: null,
+ proInsNo: null,
material: null,
materialCode: null,
orderNumber: "ZTTIC20230001",
@@ -263,7 +289,7 @@
methods: {
submitSave() {
let pro = 0
- console.log(this.inspectionItems);
+ console.log(this.inspectionItems);
this.inspectionItems.forEach(item => {
if (item.children) {
let arr = item.children.filter(obj => {
@@ -332,6 +358,7 @@
if (id != null) {
queryById(id).then(res => {
let result = res.data.data
+ this.processInspectVo.proInsNo = result.proInsNo
this.processInspectVo.orderNumber = result.orderNumber
this.processInspectVo.materialCode = result.materialCode
this.processInspectVo.material = result.material
@@ -362,6 +389,7 @@
}
})
this.inspectionItems = result.children
+ console.log(this.inspectionItems);
this.inspectionResultForm = [{
materialCode: result.materialCode,
material: result.material,
@@ -379,187 +407,18 @@
})
},
updateDevice(row, index) {
+ let rowId=JSON.stringify(row.iid)
updateDeviceBypppId({ deviceId: row.eId, ppid: row.iid }).then(res => {
this.inspectionItems.forEach(obj => {
- console.log(obj);
- if (obj.children) {
- obj.children[index - 1].inspectionValue = null
- obj.children[index - 1].iresult = null
- obj.children[index - 1].empiricalValueAddss = []
- }
- })
-<<<<<<< HEAD
- this.resultVal = resultVal
- this.inspectionResultForm[0].result = resultVal
- sessionStorage.setItem("process-resultVal-"+this.processInspectVo.id,resultVal)
- },
- init(){
- let id = this.processInspectVo.id
- if(id != null){
- queryById(id).then(res=>{
- console.log(res)
- let result = res.data.data
- this.processInspectVo.orderNumber = result.orderNumber
- this.processInspectVo.materialCode = result.materialCode
- this.processInspectVo.material = result.material
- this.processInspectVo.technologyOperationId = result.technologyOperationName
- this.processInspectVo.specs = result.specs
- this.processInspectVo.unit = result.punit
- this.processInspectVo.quantity = result.quantity
- let userList = []
- result.children.forEach(item=>{
- item.iid = Math.random()
- if(item.children != undefined){
-
- item.children.forEach(obj=>{
- let arr = []
- if(obj.userName){
- userList.push(obj.userName)
- }
- if(obj.inspectionValue){
- arr = obj.inspectionValue.split(",")
- }
- obj.empiricalValueAddss = arr
- if(obj.note){
- snote=obj.inote
- }
- if(arr.length > this.empiricalValueAdd){
- this.empiricalValueAdd = arr.length
- }
- })
- }
- })
- this.inspectionItems = result.children
- console.log(result.children)
- this.inspectionResultForm = [{
- materialCode: result.materialCode,
- material: result.material,
- userName: Array.from(new Set(userList)).join(","),
- result: this.resultVal == null ? '' : this.resultVal,
- }]
- }).catch(error=>{
- console.log(error)
- })
- }
- },
- getDeviceList(){
- selectDevice(null).then(res=>{
- this.deviceList = res.data.data
- console.log(this.deviceList);
- })
- },
- updateDevice(row,index){
- console.log(row);
- updateDeviceBypppId({equiomentId:row.eId,ppid:row.iId}).then(res=>{
- this.inspectionItems.forEach(obj=>{
- if(obj.children){
- obj.children[index-1].inspectionValue = ''
- obj.children[index-1].iresult = null
- obj.children[index-1].empiricalValueAddss = []
- obj.children[index-1].inote=''
+ obj.children.forEach(c=>{
+ if(c.iid==rowId){
+ c.inspectionValue = null
+ c.iresult = null
+ c.empiricalValueAddss = []
+ c.inote=''
}
})
- }).catch(error=>{
- console.log(error)
})
- },
- //浜у搧鍚嶇О锛岄�夋嫨
- changeOptionsSamplename(val) {
- let sample = this.optionsSamplename.filter(o=>{
- return o.materialCode == val
- })[0]
- this.processInspectVo.materialCode = sample.materialCode
- this.processInspectVo.specs = sample.specs
- this.processInspectVo.unit = sample.unit
- this.processInspectVo.material = sample.material
- this.technologyList = sample.children
- },
- changeState(row, index) {
- console.log(row)
-
- if (row.iid != null && row.iid != '') {
- let str = ""
- row.empiricalValueAddss.forEach(e => {
- str += e + ","
- })
- str = str.slice(0,-1);
- if (str === undefined || str === '' || str === null ) {
- return
- }
-
- // if ( note === undefined || str === '' || str === null ) {
- // return
- // }
-
- let obj = {
- equiomentId: row.eId,
- ppid: row.iid,
- inspectionValue: str,
- note:row.inote,
-
- }
-
- updateProcessInsProduct(obj).then(res=>{
- if(res.data.code == 0){
- this.$message.success("鏇存柊鎴愬姛")
- }else{
- this.$message.error("鏇存柊澶辫触")
- }
- this.init()
- })
- }
- },
- addTestProject() {
- let val = this.processInspectVo
- addProcess(val).then(res=>{
- let id = res.data.data
- if(id != null){
- queryById(id).then(response=>{
- console.log(response.data.data.children)
- let proList = response.data.data.children
- proList.forEach(item=>{
- item.iid = Math.random();
- if(item.children != undefined){
- item.children.forEach(obj=>{
- obj.empiricalValueAddss = []
- // obj.note=[];
- })
- }
- })
- this.inspectionItems = proList
- }).catch(error=>{
- console.log(error);
- })
- }
- }).catch(error=>{
- console.log(error)
- })
- },
- selectInfoByOrderId() {
- chooseMater({
- orderNumber: this.processInspectVo.orderNumber
- }).then(res => {
-
- if (res.data.data != null) {
- this.optionsSamplename = res.data.data.children
-
- } else {
- this.$message({
- message: '娌℃湁璇ヨ鍗曞彿锛�',
- type: 'warning'
- });
- this.optionsSamplename = []
- this.processInspectVo.materialCode = null
- this.processInspectVo.material = null
- this.processInspectVo.specs = null
- this.processInspectVo.unit = null
- }
- })
- },
- // 鍒犻櫎妫�楠屽�煎垪
- clickDeleteInspectionColumn() {
- if (this.empiricalValueAdd - 1 === 0) {
-=======
}).catch(error => {
console.log(error)
})
--
Gitblit v1.9.3