From 41066e88fa1ff31c3f692d559afeee2d9afc0cd1 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 06 十一月 2023 09:18:09 +0800
Subject: [PATCH] s
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 81 +++++++++++++++++++++++++++++++++++++---
1 files changed, 75 insertions(+), 6 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index bed230b..b5923d0 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -86,6 +86,12 @@
<el-input v-model="dataForm.createUser" disabled />
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item prop="projectName" label="椤圭洰鍚嶇О">
+ <el-input v-model="dataForm.projectName" disabled >
+ </el-input>
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
</div>
@@ -107,16 +113,18 @@
:data="list" border style="width: 100%;" height="400">
<el-table-column type="index" label="搴忓彿" width="60">
</el-table-column>
+
<el-table-column prop="name" label="椤圭洰" width="260">
<template slot-scope="scope">
<el-select v-if="projectList.length > 0" :disabled="dataForm.id != null" class="inline-input" v-model="scope.row.name"
filterable allow-create placeholder="璇疯緭鍏ユ垨閫夋嫨椤圭洰鍚嶇О" style="width:100%" @change="changeName(scope.$index,scope.row)">
<el-option v-for="(item,index) in projectList" :key="index" :label="item.name" :value="item.name"/>
</el-select>
- <el-input v-else :disabled="dataForm.id != null" class="inline-input" v-model="scope.row.name"
+ <el-input v-else :disabled="dataForm.id != null" class="inline-input" v-model="list.name"
placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input>
</template>
</el-table-column>
+
<el-table-column prop="unit" label="鍗曚綅" width="260">
<template slot-scope="scope">
<el-input :disabled="dataForm.id != null" v-model="scope.row.unit" placeholder="璇疯緭鍏ュ崟浣�"></el-input>
@@ -128,16 +136,29 @@
placeholder="璇疯緭鍏ユ爣鍑嗗��"></el-input>
</template>
</el-table-column>
+
<el-table-column prop="testValue" label="妫�娴嬪��" min-width="260" v-for="(item, index) in empiricalValueAdd"
:key="index">
<template slot-scope="scope">
<el-tooltip :disabled="scope.row.equipmentId != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�"
placement="top-start">
- <el-input :disabled="scope.row.equipmentId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.testValueList[index]"
- @blur="updateTestValue(scope.row,index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
- </el-tooltip>
+
+ <!-- <el-input :disabled="scope.row.equipmentId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.testValueList[index]"
+ @blur="updateTestValue(scope.row,index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input> -->
+
+ <el-autocomplete
+ :disabled="scope.row.equipmentId == null || (dataForm.id!=null&&resultVal!=null)"
+ class="inline-input"
+ v-model="scope.row.testValueList[index]"
+ :fetch-suggestions="querySearch"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ @select="handleSelect"
+ ></el-autocomplete>
+
+ </el-tooltip>
</template>
</el-table-column>
+
<el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="260">
<template slot-scope="scope">
<el-select :disabled="resultVal!=null && dataForm.id!=null" style="width:100%"
@@ -147,6 +168,7 @@
</el-select>
</template>
</el-table-column>
+
<el-table-column fixed="right" v-if="dataForm.id != null" prop="testState" label="缁撹" min-width="150">
<template slot-scope="scope">
<span v-if="scope.row.testState == 0" style="color:#F56C6C">涓嶅悎鏍�</span>
@@ -211,6 +233,7 @@
<el-button type="primary" @click="submitSave()">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <!-- <rawMaterialPartDialog :currentRow ="currentRow" @costPlannedAmountChange="costPlannedAmountChange"/> -->
</div>
</template>
@@ -223,13 +246,17 @@
updateRawInspectsById,
updateDeviceById, } from '@/api/quality/rawMaterial'
import rawMaterialPartDialog from '@/views/common/rawMaterial-part'
+import { log } from 'util'
export default {
+ // props:['currentRow'],
computed:{},
components:{
rawMaterialPartDialog
},
data(){
return{
+ currentRow:[],
+ userlist:[],
fiedNum: null,
unqualifiedNum: null,
dialogVisible:false,
@@ -249,7 +276,7 @@
formTime: '',
message: '',
name: '',
- code: '88.118.1/A0487643',
+ code: '88.118.1/A0498220',
specs: '',
unit: '',
number: '',
@@ -274,6 +301,8 @@
}],
dataRule: {},
deviceList: [],
+ restaurants:[],
+ whetherNot:'',
}
},
beforeUpdate(){
@@ -290,6 +319,8 @@
}
this.init()
this.getDeviceList()
+ this.restaurants = this.loadAll();
+ // this.costPlannedAmountChange()
},
watch:{
dialogVisible(newVal){
@@ -297,9 +328,41 @@
this.unqualifiedNum = null
this.fiedNum = null
}
- }
+ },
+
},
methods:{
+ //椤圭洰
+ // xxxx(){
+ // console.log(currentRow);
+ // },
+ // 浜嬩欢澶勭悊鍑芥暟
+ // costPlannedAmountChange(value) {
+ // console.log("==>");
+ // console.log(value.rawInsProducts);
+ // this.userlist = value.rawInsProducts
+ // this.list = this.userlist
+ // console.log(this.list);
+ // },
+ querySearch(queryString, cb) {
+ var restaurants = this.restaurants;
+ var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+
+ cb(results);
+ },
+ createFilter(queryString) {
+ return (restaurant) => {
+ return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+ };
+ },
+ loadAll(){
+ return [
+ {"value":"鏄�"},
+ {"value":"鍚�"}
+ ];},
+ handleSelect(item) {
+ console.log(item);
+ },
changeName(index,row){
this.projectList.forEach(item=>{
if(row.name == item.name){
@@ -310,6 +373,7 @@
},
// 纭鍥炶皟
selectPart(param, nodePart, index) {
+ console.log("鎴愬姛--",param);
if (typeof param !== 'undefined') {
this.dataForm.code = param.code
this.dataForm.name = param.name
@@ -319,13 +383,18 @@
this.dataForm.supplier = param.supplier
this.dataForm.number = param.number
this.dataForm.message = param.message
+ this.dataForm.projectName = param.projectName
this.projectList = param.rawInsProducts == null ? [] : param.rawInsProducts
+ // param.rawInsProducts.forEach(item=>{
+ // this.list.push(item)
+ // })
}
},
queryCode(){
this.paramObj = {
code: this.dataForm.code
}
+ console.log(this.paramObj);
this.showPart = true
},
updateDevice(row,index){
--
Gitblit v1.9.3