From 63116158434214f23d1318f54b78de1d0f47ab4e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 15 五月 2024 15:28:39 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/b2-standard.vue | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 61f447d..ff51e17 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -144,7 +144,10 @@
</div>
<div class="right">
<el-row class="title">
- <el-col :span="24" style="font-size: 14px;color: #999;">{{selectTree}}</el-col>
+ <el-col :span="20" style="font-size: 14px;color: #999;">{{selectTree}}</el-col>
+ <!-- <el-col :span="4">
+ <el-button size="small" type="primary" @click="handleMore">鎵归噺缂栬緫</el-button>
+ </el-col> -->
</el-row>
<el-row class="standard_table" v-loading="tableLoad">
<el-table class="el-table" :data="standardList" style="width: 100%;height: 220px !important;" height="220" tooltip-effect="dark"
@@ -288,6 +291,46 @@
<span slot="footer" class="dialog-footer">
<el-button @click="addDia = false">鍙� 娑�</el-button>
<el-button type="primary" @click="addStandardTree" :loading="addLoad">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog title="鎵归噺缂栬緫" :visible.sync="moreEdit" width="90%">
+ <div class="body">
+ <!-- <el-row style="line-height: 50px;">
+ <el-col :span="6" style="text-align: right;">宸ュ巶锛�</el-col>
+ <el-col :span="16" :offset="1">
+ <el-input size="small" readonly v-model="addOb.factory"></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 50px;">
+ <el-col :span="6" style="text-align: right;">瀹為獙瀹わ細</el-col>
+ <el-col :span="16" :offset="1">
+ <el-input size="small" readonly v-model="addOb.laboratory"></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 50px;">
+ <el-col :span="6" style="text-align: right;">鏍峰搧澶х被锛�</el-col>
+ <el-col :span="16" :offset="1">
+ <el-input size="small" readonly v-model="addOb.sampleType"></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 50px;">
+ <el-col :span="6" style="text-align: right;">鏍峰搧鍚嶇О锛�</el-col>
+ <el-col :span="16" :offset="1">
+ <el-input v-model="addOb.sample" readonly size="small"></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 50px;">
+ <el-col :span="6" style="text-align: right;">
+ <span class="required-span">* </span>鍨嬪彿锛�
+ </el-col>
+ <el-col :span="16" :offset="1">
+ <el-input v-model="addOb.model" placeholder="璇疯緭鍏ュ瀷鍙�" clearable size="small"></el-input>
+ </el-col>
+ </el-row> -->
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="moreEdit = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="subMoreEdit" :loading="moreEditLoad">纭� 瀹�</el-button>
</span>
</el-dialog>
<!-- <el-dialog title="鏂板鏍囧噯" :visible.sync="addStandardDia" width="400px">
@@ -448,7 +491,9 @@
templateList: [],
total:0,
currentPage:1,
- standardId: 0
+ standardId: 0,
+ moreEdit:false,
+ moreEditLoad:false,
}
},
mounted() {
@@ -1081,6 +1126,10 @@
this.tableLoad2 = false
})
},
+ handleMore(){
+ this.moreEdit = true
+ },
+ subMoreEdit(){}
}
}
</script>
--
Gitblit v1.9.3