From 5fa8dc320c2d2ec68fb0392f7e52cb49874b2bff Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 05 九月 2023 16:47:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.65.113:9001/r/lims-before
---
src/views/experiment/passRateStatistics/index.vue | 2
src/views/laboratory/measure/index.vue | 8 ++-
src/views/standardLibrary/index.vue | 65 ++++++++++++++++++++++++++++----
src/views/experiment/planAssignments/plan.vue | 11 +++++
src/components/experiment/template_testReport/index.vue | 16 ++++----
src/views/laboratory/personnel/index.vue | 2
6 files changed, 81 insertions(+), 23 deletions(-)
diff --git a/src/components/experiment/template_testReport/index.vue b/src/components/experiment/template_testReport/index.vue
index f9bf7f2..fac5c2c 100644
--- a/src/components/experiment/template_testReport/index.vue
+++ b/src/components/experiment/template_testReport/index.vue
@@ -276,7 +276,7 @@
<span>澶囨敞</span><br>
<span>Remark </span>
</td>
- <td colspan="5"></td>
+ <td colspan="5">{{reportData.notes }}</td>
</tr>
<tr>
<td>
@@ -288,7 +288,7 @@
<span>妫�楠�</span><br>
<span>Tester</span>
</td>
- <td colspan="2"></td>
+ <td colspan="2">{{ reportData.iUserName }}</td>
</tr>
<tr>
<td>
@@ -454,21 +454,21 @@
</td>
</tr>
</thead>
- <tr v-for="(item, index) in table" :key="index">
+ <tr v-for="(item, index) in reportData.equipment" :key="index">
<td>
- <span>{{ item.id }}</span>
+ <span>{{ item.eId }}</span>
</td>
<td colspan="2">
- <span>{{ item.equipment_name }}</span>
+ <span>{{ item.eName }}</span>
</td>
<td>
- <span>{{ item.type }}</span><br>
+ <span>{{ item.eType }}</span><br>
</td>
<td colspan="2">
- <span>{{ item.factory_number }}</span>
+ <span>{{ item.eCode }}</span>
</td>
<td colspan="2">
- <span>{{ item.validity }}</span>
+ <span>{{ item.validty }}</span>
</td>
</tr>
</table>
diff --git a/src/views/experiment/passRateStatistics/index.vue b/src/views/experiment/passRateStatistics/index.vue
index ce5fd7a..de4e2ed 100644
--- a/src/views/experiment/passRateStatistics/index.vue
+++ b/src/views/experiment/passRateStatistics/index.vue
@@ -27,7 +27,7 @@
</el-option>
</el-select>
</el-form-item>
- <div class="rightBtn">
+ <div class="rightBtn" style="position: absolute;top: 90px;right: 20px;">
<el-form-item>
<el-button type="primary" @click="clear" plain size="mini">娓呯┖</el-button>
<el-button type="primary" @click="search" size="mini">鏌ヨ</el-button>
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 4be59d6..40bc4d3 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -121,7 +121,7 @@
<el-row style="line-height: 50px;">
<el-col :span="4" style="font-size: 14px;text-align: right;">浜哄憳:</el-col>
<el-col :span="16" :offset="1">
- <el-select v-model="upData.checker" size="medium" clearable style="width: 100%;">
+ <el-select @change="selectChecker" v-model="upData.checker" size="medium" clearable style="width: 100%;">
<el-option v-for="(a, ai) in users" :key="ai" :label="a.name" :value="a.id"></el-option>
</el-select>
</el-col>
@@ -269,14 +269,20 @@
},
openUpDia(row) {
console.log(row);
+ // console.log(row);
this.upDia = true
this.upData = {
id: row.code,
checker: null,
device: null
}
+ this.upData.checker=row.uId
+ this.upData.device=row.isuId
},
submitUpData() {
+ // console.log(this.upData.device);
+ // console.log(this.devices);
+ // return;
if (this.upData.checker == null || this.upData.checker == '') {
this.$message.error('浜哄憳鏈垎閰�')
return
@@ -294,6 +300,9 @@
this.selectDataList()
})
},
+ selectChecker(){
+ // console.log(this.upData.checker);
+ },
openUpInsDia(row) {
this.upInsDia = true
this.upData = this.HaveJson(row)
diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index 427e4d7..5c78cf1 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -8,6 +8,7 @@
</el-input>
</el-form-item>
<el-form-item v-if="this.radioValue === 1">
+ <!-- <el-col :span="12"><span hidden>2121</span></el-col> -->
<el-button type="primary" @click="searchPlan">鏌ヨ</el-button>
</el-form-item>
<el-form-item v-if="this.radioValue === 0" :label="this.radioValue === 0 ? '浠櫒璁惧鍚嶇О:' : '璁惧鍚嶇О'"
@@ -126,7 +127,7 @@
size="mini" plain>杩斿洖</el-button>
<div v-if="addBtn"
style="display: flex;justify-content: center;width: 10%;position: fixed;top: 43px;right: 14px; z-index: 1000;">
- <el-button @click="addTop = -82; addBtn = false" size="mini" style="width: 60px;">杩斿洖</el-button>
+ <el-button @click="addTop = -82; addBtn = false;lookVisible= false" size="mini" style="width: 60px;">杩斿洖</el-button>
<el-button size="mini" @click="measureAdd" style="width: 60px;" type="primary">淇濆瓨</el-button>
</div>
</div>
@@ -396,7 +397,8 @@
});
this.lookVisible = false
this.addBtn = false
- this.limitGetPlanMeasureInstrument()
+ // this.limitGetPlanMeasureInstrument()
+ this.getPlanPageList()
},
async handleSizeChangePlan(num) {
this.pageSizePlan = num
@@ -520,7 +522,7 @@
this.reset()
},
async getPlanPageList() {
- console.log(111);
+ // console.log(111);
let param = {
currentPage: this.currentPage,
pageSize: this.pageSize,
diff --git a/src/views/laboratory/personnel/index.vue b/src/views/laboratory/personnel/index.vue
index f523436..6bec3a2 100644
--- a/src/views/laboratory/personnel/index.vue
+++ b/src/views/laboratory/personnel/index.vue
@@ -203,7 +203,7 @@
}, ],
roleId: [{
required: true,
- message: "璇疯緭鍏ユ潈闄�(0鎴�1)",
+ message: "璇烽�夋嫨浜哄憳鏉冮檺",
trigger: "blur"
}, ],
},
diff --git a/src/views/standardLibrary/index.vue b/src/views/standardLibrary/index.vue
index fc4168a..d4e3125 100644
--- a/src/views/standardLibrary/index.vue
+++ b/src/views/standardLibrary/index.vue
@@ -65,22 +65,22 @@
<el-dialog class="addTree" title="娣诲姞鏍囧噯鎸囨爣" width="28%" :visible.sync="addTreeFormVisible">
<el-form v-model="addTreeForm" label-position="top">
<el-form-item label="鏍囧噯绫诲瀷">
- <el-cascader v-model="addTreeForm.addTypeArr" :options="formTypeOptions"
+ <el-cascader v-model="addTreeForm.addTypeArr" :options="formTypeOptions"
:props="{ ...defaultProps, checkStrictly: true }" clearable @change="changeCascader"/>
</el-form-item>
<el-form-item v-show="addTreeForm.addTypeArr.length < 2" label="鐗╂枡鍚嶇О">
- <el-input v-model="addTreeForm.materialName" />
+ <el-input @change="changeSample" v-model="addTreeForm.materialName" />
</el-form-item>
<el-form-item v-show="addTreeForm.addTypeArr.length < 3" label="鎵ц鏍囧噯">
- <el-input v-model="addTreeForm.standardName" />
+ <el-input v-model="addTreeForm.standardName" />
</el-form-item>
<el-form-item v-show="addTreeForm.addTypeArr.length < 4" label="瑙勬牸鍨嬪彿">
- <el-input v-model="addTreeForm.specificationsName" />
+ <el-input v-model="addTreeForm.specificationsName" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="subAddTreeForm">纭� 瀹�</el-button>
- <el-button @click="addTreeFormVisible = false">鍙� 娑�</el-button>
+ <el-button @click="clear">鍙� 娑�</el-button>
</div>
</el-dialog>
</div>
@@ -146,6 +146,41 @@
},
mounted() {},
methods: {
+ clear(){
+ this.addTreeFormVisible = false;
+ this.addTreeForm.addTypeArr=[];
+ this.addTreeForm.specificationsName='';
+ this.addTreeForm.materialName=''
+ this.addTreeForm.standardName=''
+ },
+ changeSample(){
+ // console.log(this.standardTree);
+ // console.log(this.addTreeForm);
+ // console.log(this.addTreeForm.addTypeArr.length);
+ let selectType=this.standardTree.filter(item=>{
+ return item.id===this.addTreeForm.addTypeArr[0]
+ })[0];
+ if(this.addTreeForm.addTypeArr.length==1){
+ let samples=selectType.children.filter(item=>{
+ return item.name===this.addTreeForm.materialName
+ })[0]
+ if(samples===undefined||samples===[]){
+ this.$message({
+ message: '璇峰厛鍦ㄥ熀纭�鏁版嵁涓坊鍔犺銆�'+this.addTreeForm.materialName+'銆戞牱鍝�',
+ type: 'warning'
+ });
+ return false;
+ }
+ }
+ return true
+ },
+ oneSize(){},
+ twoSize(){
+ return true;
+ },
+ threeSize(){
+ return true;
+ },
async initSelect() {
this.options = [];
this.versionValue = "";
@@ -318,7 +353,17 @@
);
},
async subAddTreeForm() {
- console.log(this.addTreeForm);
+ if(this.addTreeForm.addTypeArr.length==0){
+ this.$message({
+ message: '璇峰厛閫夋嫨鏍囧噯绫诲瀷锛�',
+ type: 'warning'
+ });
+ return
+ }
+ let handelerSample=this.changeSample()
+ if(!handelerSample){
+ return;
+ }
let res = null;
try {
switch (this.addTreeForm.addTypeArr.length) {
@@ -348,8 +393,11 @@
this.addTreeFormVisible = false;
this.getStandardTree();
this.getTableByClick(this.selectData, this.versionValue);
- this.addTreeForm=null
- this.addTreeForm.addTypeArr=[]
+ this.addTreeForm.addTypeArr=[];
+ this.addTreeForm.specificationsName=''
+ this.addTreeForm.materialName=''
+ this.addTreeForm.standardName=''
+ // console.log(this.addTreeForm);
},
changeCascader(data) {
this.addTreeForm.addTypeArr = data;
@@ -381,7 +429,6 @@
});
}
});
- console.log(this.tableData);
},
// 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆
// 鍏ㄩ��/鍙栨秷閫夋搷浣�
--
Gitblit v1.9.3