From 86fb74eab9bae7ab636c180a7cc5e24ba808e65f Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 29 四月 2024 13:43:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b2-standard.vue | 29 ++++++++++++--
src/components/tool/value-table.vue | 6 ++-
src/main.js | 4 +-
src/components/view/b1-inspection-order.vue | 36 ++++++++++++++++-
4 files changed, 63 insertions(+), 12 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 4b530fc..6e40efb 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -105,7 +105,7 @@
@row-click="rowClick" :show-summary="data.countFleid!=undefined && data.countFleid.length > 0"
:summary-method="getSummaries" :row-class-name="tableRowClassName" :row-key="record=>record.id"
:current-row-key="data.currentId" :highlight-current-row="data.highlight===undefined||data.highlight"
- :span-method="spanMethod">
+ :span-method="spanMethod" :key="specialKey">
<el-table-column type="selection" width="65" v-if="data.showSelect" :key="Math.random()">
</el-table-column>
<el-table-column type="index" align="center" label="搴忓彿" width="65" v-if="data.isIndex" :key="Math.random()">
@@ -448,7 +448,8 @@
// position:0
// }
],
- param: {}
+ param: {},
+ specialKey:'table-'
}
},
beforeUpdate() {
@@ -465,6 +466,7 @@
this.token = {
'token': sessionStorage.getItem('token')
}
+ this.specialKey = this.specialKey+Math.random()*100;
},
methods: {
rowspan(spanArr, position, spanName) {
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 6bd546a..98df458 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -15,16 +15,17 @@
display: flex;
align-items: center;
height: 50px;
+ width: 230px;
}
.search_label {
- width: 120px;
+ width: 90px;
font-size: 14px;
text-align: right;
}
.search_input {
- width: calc(100% - 120px);
+ width: calc(100% - 90px);
}
.table {
@@ -89,6 +90,29 @@
<div class="search_label">鏍峰搧鍚嶇О锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">鏍峰搧缂栧彿锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">鏍峰搧鍨嬪彿锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">涓嬪崟鏃堕棿锛�</div>
+ <div class="search_input">
+ <el-date-picker style="width:100%" v-model="componentData.entity.createTime"
+ type="datetime"
+ size="small"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd"
+ clearable
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </div>
</div>
<div class="search_thing" style="padding-left: 30px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
@@ -482,7 +506,13 @@
},
// 涓嬭浇鎶ュ憡
download(row) {
- console.log(row);
+ // console.log(row);
+ let url = row.url;
+ const link = document.createElement('a');
+ link.href = this.javaApi + url;
+ link.target = '_blank';
+ document.body.appendChild(link);
+ link.click();
},
// 瀹℃牳
handleVerify(row) {
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 6dbb881..093d106 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -142,8 +142,8 @@
<!-- </el-col> -->
</el-row>
<el-row class="standard_table" v-loading="tableLoad">
- <el-table class="el-table" :data="standardList" style="width: 100%;" height="220px" tooltip-effect="dark"
- :highlight-current-row="true" @row-click="rowClick" ref="standard">
+ <el-table class="el-table" :data="standardList" style="width: 100%;height: 220px !important;overflow-y: auto;" tooltip-effect="dark"
+ highlight-current-row @row-click="rowClick" ref="standard">
<el-table-column prop="code" label="鏍囧噯缂栧彿" show-overflow-tooltip width="180">
<template slot-scope="scope">
<span style="color: red;font-size: 14px;">{{scope.row['code']}}</span>
@@ -407,7 +407,7 @@
this.$confirm("鏄惁鍒犻櫎璇ュ眰绾�", "鎻愮ず", {
type: "error"
}).then(() => {
- this.treeLoad = true
+ // this.treeLoad = true
this.selectTree = ''
this.getNodeParent(node)
this.selectTree = this.selectTree.replace(' - ', '')
@@ -422,12 +422,23 @@
}).then(res => {
if (res.code == 201) return
this.$message.success('宸插垹闄�')
- this.selectStandardTreeList()
+ let arr = this.selectTree.split(' - ');
+ this.deleteStandard(this.list, arr[arr.length - 1])
+ // this.selectStandardTreeList()
this.selectTree = ''
this.standardList = []
this.productList = []
})
}).catch(e => {})
+ },
+ deleteStandard(arr, label) {
+ arr.forEach((item, index) => {
+ if(item.label == label){
+ arr.splice(index, 1);
+ }else{
+ item.children&&this.deleteStandard(item.children, label);
+ }
+ })
},
nodeOpen(data, node, el) {
$($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
@@ -581,7 +592,15 @@
}
this.$message.success('娣诲姞鎴愬姛')
this.addDia = false
- this.selectStandardTreeList()
+ this.list
+ .find(a => a.label == this.addOb.factory).children
+ .find(a => a.label == this.addOb.laboratory).children
+ .find(a => a.label == this.addOb.sampleType).children
+ .find(a => a.label == this.addOb.sample).children.push({
+ code:'[5]',
+ label: this.addOb.model,
+ value: this.addOb.model,
+ })
this.addLoad = false
}).catch(e => {
this.addDia = false
diff --git a/src/main.js b/src/main.js
index 43d09d1..4d5253b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,9 +13,9 @@
//鏈湴
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
-// const javaApi = 'http://192.168.11.200:8001';//鏉�
+const javaApi = 'http://192.168.11.200:8001';//鏉�
// const javaApi = 'http://192.168.11.249:8001';//寮�
-const javaApi = 'http://192.168.11.50:8001';//濮�
+// const javaApi = 'http://192.168.11.50:8001';//濮�
// const javaApi = 'http://192.168.11.2:8001';//鏌�
// const javaApi = 'http://114.132.189.42:9006';//娴嬭瘯鏈�
//鑳滀簯鏈嶅姟鍣�
--
Gitblit v1.9.3