From 49f3321fa839e0ff5fb4d2de75756096a6db7b92 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期日, 24 九月 2023 10:50:08 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mom-before
---
src/components/view/standard.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 00b294b..3cbdff9 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -44,19 +44,19 @@
<div class="choose">
<span>绫诲瀷锛�</span>
<el-select v-model="tableType" size="small" placeholder="璇烽�夋嫨" @change="TYPE"
- style="width: 224px;margin-right: 52px;">
+ style="width: 13vw;margin-right: 15px;">
<el-option :value="0" label="宸ヨ壓璺嚎"></el-option>
<el-option :value="1" label="鎶�鏈寚鏍�"></el-option>
<el-option :value="2" label="鐗╂枡娓呭崟"></el-option>
- <el-option :value="3" label="鐢熶骇宸ヨ壓"></el-option>
+ <!-- <el-option :value="3" label="鐢熶骇宸ヨ壓"></el-option> -->
</el-select>
<span>鐗堟湰锛�</span>
- <el-select v-model="versionVal" @change="verevent" size="small" style="width: 280px;margin-right: 52px;" placeholder="璇烽�夋嫨">
+ <el-select v-model="versionVal" @change="verevent" size="small" style="width: 13vw;margin-right: 15px;" placeholder="璇烽�夋嫨">
<el-option v-for="(item,index) in versionData" :key="index" :label="item.label" :value="item.value">
</el-option>
</el-select>
<span>{{ tableType == 1 ? '椤圭洰锛�' : '宸ヨ壓鍚嶇О锛�' }}</span>
- <el-input v-model="searchName" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right:10px"
+ <el-input v-model="searchName" size="small" placeholder="璇疯緭鍏�" style="width: 13vw;margin-right:15px"
clearable></el-input>
<el-button size="mini" @click="() => { searchName = ''; selectAll() }">
<span>閲� 缃�</span>
@@ -70,7 +70,7 @@
<technology @childData="getChildData" @updateDevice="updateDevice" :tableType="tableType" :tableData="tableData"></technology>
</div>
<div class="contentTable" v-if="this.typeselect == 1">
- <target @childData="getChildData" :tableType="tableType" :tableData="tableData"></target>
+ <target @childData="getChildData" :tableType="tableType" :tableData="tableData"></target>
</div>
<div class="contentTable" v-if="this.typeselect == 2">
<material @childData="getChildData" :tableType="tableType" :tableData="tableData"></material>
@@ -159,7 +159,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鎸囨爣鍚嶇О:" prop="name">
- <el-input size="small" v-model="targetForm.name" placeholder="璇疯緭鍏ユ寚鏍囧悕绉�"/>
+ <el-input size="small" v-model="targetForm.name" placeholder="璇疯緭鍏ユ寚鏍囧悕绉�"/>
</el-form-item>
</el-col>
</el-row>
@@ -226,12 +226,12 @@
<el-table :data="materialForm.tableList" border max-height="470"
:cell-style="{height:'20px',textAlign:'left'}"
:header-cell-style="{height:'20px'}">
- <el-table-column label="渚涘簲鍟嗗悕绉�">
+ <!-- <el-table-column label="渚涘簲鍟嗗悕绉�">
<template slot-scope="scope">
<el-input size="mini" v-model="scope.row.supplier"
placeholder="璇疯緭鍏�"></el-input>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="璐ㄩ噺杩芥函鍙�">
<template slot-scope="scope">
<el-input size="mini" v-model="scope.row.qualityTraceability"
@@ -442,8 +442,8 @@
father:{required:true,message:'椤圭洰涓嶈兘涓虹┖',trigger:'change'},
name:{required:true,message:'鎸囨爣鍚嶇О涓嶈兘涓虹┖',trigger:'blur'},
unit:{required:true,message:'鍗曚綅涓嶈兘涓虹┖',trigger:'change'},
- internal:{validator:checkVal,trigger:'change'},
- required:{validator:checkVal,trigger:'change'}
+ internal:{required:true,message:'鍐呮帶鍊间笉鑳戒负绌�',trigger:'change'},
+ required:{required:true,message:'鏍囧噯鍊间笉鑳戒负绌�',trigger:'change'}
},
//鐗╂枡娓呭崟
materialForm:{
@@ -845,7 +845,7 @@
"num": null,
"qualityTraceability": "",
"specifications": "",
- "supplier": "",
+ // "supplier": "",
"unit": ""
}
this.materialForm.tableList.push(obj);
--
Gitblit v1.9.3