From 419a56790ff55f15d50c3f7e80f29696a7583ac6 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 14 十二月 2023 19:46:37 +0800
Subject: [PATCH] modified: src/views/admin/user/info.vue modified: src/views/quality/processInspect/processInspect-form.vue
---
src/views/admin/user/info.vue | 6 +++---
src/views/quality/processInspect/processInspect-form.vue | 21 ++++++++++++++++++---
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/views/admin/user/info.vue b/src/views/admin/user/info.vue
index 481dfd8..b7fb0b1 100644
--- a/src/views/admin/user/info.vue
+++ b/src/views/admin/user/info.vue
@@ -19,7 +19,7 @@
<div class="app-container calendar-list-container">
<basic-container>
<template>
- <el-tabs @tab-click="switchTab">
+ <el-tabs v-model="switchStatus" @tab-click="switchTab" style="padding-left:20px">
<el-tab-pane label="淇℃伅绠＄悊" name="userManager"/>
<el-tab-pane label="瀵嗙爜绠＄悊" name="passwordManager"/>
</el-tabs>
@@ -56,7 +56,7 @@
<i v-else class="el-icon-plus avatar-uploader-icon"/>
</el-upload>
</el-form-item>
- <el-form-item
+ <!-- <el-form-item
label="绀句氦鐧诲綍"
prop="social">
<a
@@ -71,7 +71,7 @@
href="#"
style="color: blue"
@click="handleClick('osc')">寮�婧愪腑鍥�</a>
- </el-form-item>
+ </el-form-item> -->
<el-form-item>
<el-button
type="primary"
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 2d674d4..0bbd0f0 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -113,7 +113,7 @@
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)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ @blur="changeState(scope.row,true)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
<span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.empiricalValueAddss[index]"></span>
</el-tooltip>
@@ -417,7 +417,23 @@
this.processInspectVo.material = sample.material
this.technologyList = sample.children
},
- changeState(row) {
+ changeState(row,isChecked) {
+ console.log(row);
+ const _than = this
+ if(isChecked){
+ let isNumber = true
+ for(var i=0;i<row.empiricalValueAddss.length;i++){
+ let val = row.empiricalValueAddss[i]
+ if(!/^[0-9]*[1-9][0-9]*$/.test(val)){
+ row.empiricalValueAddss[i] = null
+ _than.$message.error("璇疯緭鍏ユ暟瀛�")
+ isNumber = false
+ }
+ }
+ if(!isNumber){
+ return
+ }
+ }
if (row.iid != null && row.iid != '') {
let str = ""
row.empiricalValueAddss.forEach(e => {
@@ -433,7 +449,6 @@
ppid: row.iid,
inspectionValue: str,
note : row.inote
-
}
updateProcessInsProduct(obj).then(res => {
if (res.data.code == 0) {
--
Gitblit v1.9.3