From 70b0536fd16503148d212bf323e68b09e61c3e04 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 23 十月 2024 10:27:08 +0800
Subject: [PATCH] 修改样品班次
---
src/components/tool/file-preview.vue | 10 ++++++++++
src/components/do/b1-ins-order/add.vue | 3 ++-
src/components/view/a5-laboratory-qualifications.vue | 4 ++--
src/components/view/b1-sample.vue | 7 ++++++-
src/components/view/b3-classes.vue | 4 ++--
5 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index daa5066..42a7626 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -2657,7 +2657,8 @@
if(row.section === null) {
row.section = ""
}
- let arr = this.productList.filter(m=>m.state==1&&row.section.includes(m.section)&&m.ask&&m.section.indexOf('[')==-1)
+ // console.log(row,this.productList)
+ let arr = this.productList.filter(m=>m.state==1&&m.bsmRow&&m.bsmRow.section==row.section&&row.section.includes(m.section)&&m.ask&&m.section.indexOf('[')==-1)
if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1&&arr.length==0) {
if (row.section.indexOf('[') > -1) {
row.bsmRow = this.HaveJson(row)
diff --git a/src/components/tool/file-preview.vue b/src/components/tool/file-preview.vue
index 37705f8..d95afab 100644
--- a/src/components/tool/file-preview.vue
+++ b/src/components/tool/file-preview.vue
@@ -129,6 +129,7 @@
renderedHandler() {
console.log("娓叉煋瀹屾垚")
this.isDocShow = true
+ this.resetStyle()
},
errorHandler() {
console.log("娓叉煋澶辫触")
@@ -196,6 +197,15 @@
}
return result
},
+ resetStyle(){
+ const elements = document.querySelectorAll('[style*="pt"]');
+ for (const element of elements) {
+ const style = element.getAttribute('style');
+ if (!!style) {
+ element.setAttribute('style', style.replace(/pt/g, 'px'));
+ }
+ }
+ }
}
}
</script>
diff --git a/src/components/view/a5-laboratory-qualifications.vue b/src/components/view/a5-laboratory-qualifications.vue
index 29ae866..0bd8ef2 100644
--- a/src/components/view/a5-laboratory-qualifications.vue
+++ b/src/components/view/a5-laboratory-qualifications.vue
@@ -100,7 +100,7 @@
</div>
<div class="search_thing" style="padding-left: 30px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
+ <el-button size="small" type="primary" @click="list=[],refreshTable()">鏌� 璇�</el-button>
</div>
</div>
<div class="table" v-if="radio==1" v-loading="pageLoading" @scroll="scrollFn">
@@ -405,7 +405,7 @@
this.list=[];
this.entity={
name: null,
- orderBy: {field: "id", order: "asc"}
+ // orderBy: {field: "id", order: "asc"}
};
this.refreshTable()
}
diff --git a/src/components/view/b1-sample.vue b/src/components/view/b1-sample.vue
index 537951d..b964720 100644
--- a/src/components/view/b1-sample.vue
+++ b/src/components/view/b1-sample.vue
@@ -195,7 +195,7 @@
<div class="search_thing">
<div class="search_label">鏍峰搧缂栧彿锛�</div>
<div class="search_input">
- <el-input placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�" v-model="searchSampleCode" size="small" autocomplete="off">
+ <el-input placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�" v-model="searchSampleCode" size="small">
<el-button slot="append" icon="el-icon-search" @click="handleSearch"></el-button>
</el-input>
</div>
@@ -439,6 +439,11 @@
clearInterval(this.startTime)
}
},
+ isEdit(newVal){
+ if(!newVal){
+ this.shelves = {}
+ }
+ }
},
mounted() {
this.selectList()
diff --git a/src/components/view/b3-classes.vue b/src/components/view/b3-classes.vue
index eca7f12..f20bb20 100644
--- a/src/components/view/b3-classes.vue
+++ b/src/components/view/b3-classes.vue
@@ -29,14 +29,14 @@
</el-option>
</el-select>
<el-input v-model="query.userName" placeholder="璇疯緭鍏ヤ汉鍛樺悕绉�" size="small" style="width: 140px;margin: 0 16px;" clearable @keyup.enter.native="refreshTable()"></el-input>
- <el-select v-model="query.laboratory" placeholder="璇烽�夋嫨瀹為獙瀹�" style="width: 140px;" size="small" clearable @change="refreshTable()">
+ <!-- <el-select v-model="query.laboratory" placeholder="璇烽�夋嫨瀹為獙瀹�" style="width: 140px;" size="small" clearable @change="refreshTable()">
<el-option
v-for="item in laboratory"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
- </el-select>
+ </el-select> -->
</div>
</div>
<div class="search_thing" style="padding-left: 30px;">
--
Gitblit v1.9.3