From 5fdedc928cd6970423cf024c43a99e522a44dbcf Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 29 十一月 2023 11:15:28 +0800
Subject: [PATCH] modified: src/views/warehouse/pallettransports/index.vue modified: vue.config.js
---
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 154 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 127 insertions(+), 27 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index ec1d6f6..320ecd9 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -13,10 +13,16 @@
</div>
<div class="page-main">
<div class="finishedProduct-basic">
- <el-form :model="processInspectVo" ref="addInspectionform" class="l-mes"
- label-position="right" label-width="120px" style="width: 100%" size="small">
+ <el-form :model="processInspectVo" ref="addInspectionform" class="l-mes"
+ label-position="right" label-width="120px" style="width: 100%" size="small">
<div class="formwrapper">
<el-row>
+ <el-col :span="6">
+ <el-form-item label="浜у搧妫�楠岀紪鍙凤細">
+ <el-input @blur="selectInfoByOrderId" disabled
+ v-model="processInspectVo.finInsNo" autocomplete="off" />
+ </el-form-item>
+ </el-col>
<el-col :span="6">
<el-form-item label="璁㈠崟鍙凤細">
<el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
@@ -35,6 +41,8 @@
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%" @change="changeOptionsSamplename" :disabled="processInspectVo.id != null"
@@ -45,8 +53,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="6">
<el-form-item label="浜у搧缂栫爜锛�">
<el-input disabled v-model="processInspectVo.mcode"
@@ -65,6 +71,8 @@
placeholder="璇疯緭鍏ュ崟浣�" 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="璇疯緭鍏ユ暟閲�"
@@ -86,7 +94,7 @@
<el-row style="width:100%;">
<el-col :span="24">
<el-table border :data="inspectionItems" height="400"
- :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
+ :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'}">
<el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
@@ -96,28 +104,76 @@
<el-table-column prop="required" label="鏍囧噯鍊�" width="240" ></el-table-column>
<el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" 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.empiricalValueAddss[index]"
- @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
- <span v-if="resultVal != null" v-text="scope.row.empiricalValueAddss[index]"></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.empiricalValueAddss[index]"
+ @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ <span v-if="resultVal != null" v-text="scope.row.empiricalValueAddss[index]"></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-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" 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.empiricalValueAddss[index]"></span>
+ </el-tooltip>
+ </el-col>
</template>
</el-table-column>
<el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="250">
<template slot-scope="scope">
<span v-if="resultVal!=null && processInspectVo.id!=null" v-text="scope.row.ename"></span>
<div v-else>
- <el-select style="width:100%" v-model="scope.row.eId"
- v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row)">
- <el-option v-for="(item,index) in deviceList"
+ <!-- <el-input v-model="scope.row.eId" v-if="scope.row.iname != null" placeholder="璇疯緭鍏ヨ澶囧彿"></el-input> -->
+ <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.number +'-'+ item.name"></el-option>
</el-select>
</div>
</template>
</el-table-column>
+ <el-table-column prop="inspectionValue" :key="index"
+ label="妫�楠屾弿杩�" width="240" style="text-align: center;">
+ <template slot-scope="scope">
+ <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, index)" 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, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ <!-- <el-select style="width: 100%;" @change="changeState(scope.row, index)" :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">
@@ -138,7 +194,7 @@
<el-row style="width:100%;">
<el-col :span="24">
<el-table border height="90" :data="inspectionResultForm"
- :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
+ :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
:cell-style="{textAlign:'center'}">
<el-table-column prop="materialCode" label="鐗╂枡缂栧彿"></el-table-column>
<el-table-column prop="material" label="鐗╂枡鍚嶇О"></el-table-column>
@@ -163,18 +219,26 @@
</template>
<script>
-import {
+import {
chooseMater,
addFinish,
queryById,
updateDeviceById,
updateFinishedInsProduct,
updateFinishedInspectById,
+ selectDeviceAPI,
} from '@/api/quality/finishedProduct'
import { selectDevice } from '@/api/quality/rawMaterial'
export default {
data() {
return {
+ dataVal: [{
+ label: '鏄�',
+ value: '鏄�'
+ }, {
+ label: '鍚�',
+ value: '鍚�'
+ }],
resultVal: null,
deviceList: [],
hasChildren: true,
@@ -185,6 +249,7 @@
empiricalValueAddMaxNumber: 0,
processInspectVo: {
id: null,
+ finInsNo: null,
material: null,
mcode: null,
prname: null,
@@ -194,7 +259,8 @@
quantity: null,
specificationsModel: null,
unit: null,
- technologyId: null
+ technologyId: null,
+ documentId: null
},
inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
inspectionResultForm: [],
@@ -214,12 +280,13 @@
this.processInspectVo.id = this.$route.query.id
this.resultVal = this.$route.query.resultVal
if(this.resultVal == null){
- let val = sessionStorage.getItem("finished-resultVal");
+ let val = sessionStorage.getItem("finished-resultVal-"+this.processInspectVo.id);
val == undefined ? this.resultVal=null : this.resultVal = val
}
this.init()
},
methods: {
+
submitSave(){
let pro = 0
this.inspectionItems.forEach(item => {
@@ -275,13 +342,14 @@
})
this.resultVal = resultVal
this.inspectionResultForm[0].result = resultVal
- sessionStorage.setItem("finished-resultVal",resultVal)
+ sessionStorage.setItem("finished-resultVal-"+this.processInspectVo.id,resultVal)
},
init(){
let id = this.processInspectVo.id
if(id != null){
queryById(id).then(res=>{
let result = res.data.data
+ this.processInspectVo.finInsNo = result.finInsNo
this.processInspectVo.orderNumber = result.orderNumber
this.processInspectVo.mcode = result.materialCode
this.processInspectVo.prname = result.customerName
@@ -290,6 +358,7 @@
this.processInspectVo.specificationsModel = result.specs
this.processInspectVo.unit = result.punit
this.processInspectVo.quantity = result.quantity
+ this.processInspectVo.documentId = result.documentId
let userList = []
result.children.forEach(item=>{
item.iid = Math.random()
@@ -303,6 +372,9 @@
arr = obj.inspectionValue.split(",")
}
obj.empiricalValueAddss = arr
+ if(obj.note){
+ snote=obj.inote
+ }
if(arr.length > this.empiricalValueAdd){
this.empiricalValueAdd = arr.length
}
@@ -322,12 +394,35 @@
}
},
getDeviceList(){
- selectDevice(null).then(res=>{
+ selectDeviceAPI(null).then(res=>{
+ // this.deviceList = res.data.data
+ console.log(res);
this.deviceList = res.data.data
+
})
},
- updateDevice(row){
- updateDeviceById({equiomentId:row.eId,fpid:row.iId}).then(res=>{
+ updateDevice(row,index){
+ let rowId=JSON.stringify(row.iid)
+ console.log(row);
+ updateDeviceById({deviceId:row.eId,fpid:row.iid}).then(res=>{
+ this.inspectionItems.forEach(obj=>{
+ obj.children.forEach(c=>{
+ if(c.iid==rowId){
+ c.inspectionValue = null
+ c.iresult = null
+ c.empiricalValueAddss = []
+ c.inote=''
+ }
+ })
+
+ // if(obj.children){
+ // obj.children[index-1].inspectionValue = ''
+ // obj.children[index-1].iresult = null
+ // obj.children[index-1].empiricalValueAddss = []
+ // obj.children[index-1].inote=''
+
+ // }
+ })
}).catch(error=>{
console.log(error)
})
@@ -341,6 +436,7 @@
this.processInspectVo.material = sample.material
this.processInspectVo.specificationsModel = sample.specs
this.processInspectVo.unit = sample.unit
+ this.processInspectVo.documentId = sample.documentId
},
changeState(row, index) {
if (row.iid != null && row.iid != '') {
@@ -353,9 +449,10 @@
return
}
let obj = {
- equiomentId: row.eId,
+ deviceId: row.eId,
fpid: row.iid,
- inspectionValue: str
+ inspectionValue: str,
+ note : row.inote
}
updateFinishedInsProduct(obj).then(res=>{
if(res.data.code == 0){
@@ -370,6 +467,7 @@
addTestProject() {
let val = this.processInspectVo
let data = {
+ finInsNo: val.finInsNo,
customerName: val.prname,
material: val.material,
materialCode: val.mcode,
@@ -378,6 +476,7 @@
quantity: val.quantity,
specs: val.specificationsModel,
unit: val.unit,
+ documentId: val.documentId
}
addFinish(data).then(res=>{
let id = res.data.data
@@ -422,6 +521,7 @@
this.processInspectVo.material = null
this.processInspectVo.specificationsModel = null
this.processInspectVo.unit = null
+ this.processInspectVo.documentId = null
}
})
},
@@ -458,7 +558,7 @@
flex-wrap: wrap;
}
-.finishedProduct-result {
+basic.finishedProduct-result {
width: 100%;
height: 150px;
padding: 10px 20px;
@@ -472,7 +572,7 @@
.finishedProduct-basic {
background-color: #fff;
- height: 120px;
+ height: 155px;
display: flex;
flex-wrap: wrap;
padding: 10px 20px;
@@ -514,4 +614,4 @@
border-top: 0 !important;
cursor: pointer !important;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3