From 901d81f1c56281bab87044d2ff562d8ed8601efa Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 11 三月 2024 09:25:17 +0800
Subject: [PATCH] 完成包装核对功能
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 169 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 91 insertions(+), 78 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 2e2a60c..c4c60ab 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -92,21 +92,26 @@
</el-row>
<el-row>
<el-col :span="6">
+ <el-form-item label="鎶ユ鏃ユ湡" prop="createTime">
+ <el-date-picker
+ :disabled="dataForm.id!=null"
+ v-model="dataForm.createTime"
+ type="datetime"
+ placeholder="鎶ユ鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎶ユ浜�" prop="createUser" v-if="dataForm.id!=null">
+ <el-input v-model="dataForm.createUser" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item prop="projectName" label="椤圭洰鍚嶇О" v-if="dataForm.id!=null">
<el-tooltip :disabled="dataForm.projectName==null" :content="dataForm.projectName">
<el-input v-model="dataForm.projectName" disabled ></el-input>
</el-tooltip>
</el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎶ユ鏃ユ湡" prop="createTime" v-if="dataForm.id!=null">
- <el-input v-model="dataForm.createTime" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎶ユ浜�" prop="createUser" v-if="dataForm.id!=null">
- <el-input v-model="dataForm.createUser" disabled />
- </el-form-item>
</el-col>
</el-row>
</el-form>
@@ -173,9 +178,21 @@
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
- <el-autocomplete clearable
+ <el-dropdown>
+ <el-input placeholder="妫�娴嬪��"/>
+ <i style="line-height: normal;padding: 10px 7px;" class="el-icon-arrow-down el-icon--right"></i>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item>榛勯噾绯�</el-dropdown-item>
+ <el-dropdown-item>鐙瓙澶�</el-dropdown-item>
+ <el-dropdown-item>铻鸿洺绮�</el-dropdown-item>
+ <el-dropdown-item>鍙岀毊濂�</el-dropdown-item>
+ <el-dropdown-item>铓典粩鐓�</el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
+ <!-- <el-autocomplete clearable
:disabled="scope.row.deviceId == null || (dataForm.id!=null&&(resultVal!=null && resultVal!=''))"
- @input="changeState(scope.row,scope.$index)"
+ @blur.stop="changeState(scope.row,scope.$index)"
+ @select="changeState(scope.row,scope.$index)"
v-model="scope.row.testValueList[index]"
:fetch-suggestions="querySearch"
placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��" >
@@ -183,20 +200,7 @@
<template slot-scope="{ item }">
<div>{{ item.value }}</div>
</template>
- </el-autocomplete>
-
- <!-- <el-select style="width:100%" filterable
- :disabled="scope.row.deviceId == null || (dataForm.id!=null&&(resultVal!=null && resultVal!=''))"
- v-model="scope.row.testValueList[index]"
- placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��"
- allow-create
- default-first-option
- @change="changeState(scope.row,scope.$index)"
- @blur="selectBlur"
- >
- <el-option label="鏄�" value="鏄�"/>
- <el-option label="鍚�" value="鍚�"/>
- </el-select> -->
+ </el-autocomplete> -->
</el-tooltip>
</div>
</template>
@@ -480,7 +484,8 @@
testState: ''
}],
dataRule: {
- code:[{ required: true, message: '璇锋壂鎻忛�夋嫨闆朵欢', trigger: 'blur' }]
+ code:[{ required: true, message: '璇锋壂鎻忛�夋嫨闆朵欢', trigger: 'blur' }],
+ createTime: [{ required: true, message: '璇烽�夋嫨鎶ユ鏃ユ湡', trigger: 'change' }]
},
deviceList: [],
}
@@ -887,43 +892,47 @@
console.log(e.target.value);
},
changeState(row, index) {
- if(row){
- let isTrue = true
- for(var i=0;i<row.testValueList.length;i++){
- let val = row.testValueList[i]
- let reg = /(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/
- if(val.slice(-1)!='.'){
- if(!reg.test(val) && !['鏄�','鍚�'].includes(val)){
- row.testValueList[i] = null
- this.$message.error("璇疯緭鍏�6浣嶆暟瀛楁垨閫夋嫨鏄惁")
- isTrue = false
+ this.$nextTick(()=>{
+ if(row){
+ let isTrue = true
+ for(var i=0;i<row.testValueList.length;i++){
+ let val = row.testValueList[i]
+ if(!['鏄�','鍚�'].includes(val)){
+ let reg = /(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/
+ if(!reg.test(val)){
+ row.testValueList = ''
+ this.$message.error("璇疯緭鍏�6浣嶆暟瀛楁垨閫夋嫨鏄惁")
+ isTrue = false
+ }
}
- }
+ }
+ if(!isTrue){
+ return
+ }
}
- if(!isTrue){
- return
+ console.log(row.testValueList.join(","));
+ return
+ if (row.rpId != null && row.rpId != '') {
+ let val = row.testValueList.join(",")
+ if (val === undefined || val === '' || val === null) {
+ return
+ }
+ let obj = {
+ deviceId: row.deviceId,
+ rpId: row.rpId,
+ testValue: val,
+ note: row.note
+ }
+ updateRawInsProduct(obj).then(res => {
+ if (res.data.code == 0) {
+ this.$message.success("鏇存柊鎴愬姛")
+ } else {
+ this.$message.error("鏇存柊澶辫触")
+ }
+ this.init(this.dataForm.id)
+ })
}
- }
- if (row.rpId != null && row.rpId != '') {
- let val = row.testValueList.join(",")
- if (val === undefined || val === '' || val === null) {
- return
- }
- let obj = {
- deviceId: row.deviceId,
- rpId: row.rpId,
- testValue: val,
- note: row.note
- }
- updateRawInsProduct(obj).then(res => {
- if (res.data.code == 0) {
- this.$message.success("鏇存柊鎴愬姛")
- } else {
- this.$message.error("鏇存柊澶辫触")
- }
- this.init(this.dataForm.id)
- })
- }
+ })
},
// 鍒犻櫎瀛愰」鐩�
delChildren(row,index,isParent) {
@@ -955,7 +964,7 @@
required: null,
rpId: null,
name: null,
- unit: 'mm',
+ unit: '',
userName: null,
testValue: null,
testValueList: [],
@@ -965,22 +974,26 @@
row.children.push(obj)
},
save(){
- const _than = this
- let data = this.dataForm
- this.list.forEach(item=>{
- item.children.forEach(c=>{
- c.testValue=c.testValueList.join(",")
- })
- })
- data.rawInsProducts = this.list
- addRawInspects(data).then(res=>{
- this.$message.success("淇濆瓨鎴愬姛")
- // this.$router.go(-1)
- }).catch(error=>{
- this.$message.error(error)
- })
- _than.$nextTick(()=>{
- _than.init(Number(res.data.msg))
+ this.$refs.dataForm.validate(valid=>{
+ if(valid){
+ const _than = this
+ let data = this.dataForm
+ this.list.forEach(item=>{
+ item.children.forEach(c=>{
+ c.testValue=c.testValueList.join(",")
+ })
+ })
+ data.rawInsProducts = this.list
+ addRawInspects(data).then(res=>{
+ this.$message.success("淇濆瓨鎴愬姛")
+ // this.$router.go(-1)
+ }).catch(error=>{
+ this.$message.error(error)
+ })
+ _than.$nextTick(()=>{
+ _than.init(Number(res.data.msg))
+ })
+ }
})
},
getDeviceList(){
--
Gitblit v1.9.3