From b5397c4f12baf35a3200ce4d053d549ffa7ec2e4 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 01 七月 2024 17:24:09 +0800
Subject: [PATCH] 修改打印样式
---
src/components/do/b1-ins-order/add.vue | 67 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 13 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 2b66a27..66c5d90 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -256,14 +256,14 @@
<el-col class="search_thing" :span="6">
<div class="search_label">宸ョ▼鍚嶇О锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.engineering"
+ <el-input size="small" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable v-model="addObj.engineering"
:readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
<div class="search_label">宸ョ▼鍚嶇ОEN锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.engineeringEn"
+ <el-input size="small" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable v-model="addObj.engineeringEn"
:readonly="active>1"></el-input>
</div>
</el-col>
@@ -302,19 +302,19 @@
<el-col class="search_thing" :span="6">
<div class="search_label">OTC璁㈠崟鍙凤細</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.otcCode" :readonly="active>1"></el-input>
+ <el-input size="small" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable v-model="addObj.otcCode" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
<div class="search_label">濮旀墭浜猴細</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.prepareUser" :readonly="active>1"></el-input>
+ <el-input size="small" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable v-model="addObj.prepareUser" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;">
<div class="search_label">澶囨敞锛�</div>
<div class="search_input">
- <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 2}" size="small" clearable
+ <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 2}" size="small" clearable :placeholder="active>1 ? '' : '璇疯緭鍏�'"
v-model="addObj.remark" :readonly="active>1"></el-input>
</div>
</el-col>
@@ -331,7 +331,7 @@
<div class="search_thing">
<div class="search_label">鏍峰搧鍨嬪彿锛�</div>
<div class="search_input">
- <el-select v-model="model" placeholder="璇烽�夋嫨" filterable allow-create default-first-option size="small"
+ <el-select v-model="model" :placeholder="active>1 ? '' : '璇疯緭鍏�'" filterable allow-create default-first-option size="small"
@change="changeModel">
<el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
</el-option>
@@ -341,7 +341,7 @@
<div class="search_thing">
<div class="search_label">妫�楠屾爣鍑嗭細</div>
<div class="search_input">
- <el-select v-model="standardMethodListId" placeholder="璇烽�夋嫨" size="small" @focus="methodFocus"
+ <el-select v-model="standardMethodListId" :placeholder="active>1 ? '' : '璇疯緭鍏�'" size="small" @focus="methodFocus"
:loading="methodLoad" @change="changeStandardMethodListId">
<el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
</el-option>
@@ -414,7 +414,17 @@
@selection-change="selectProduct" style="margin-bottom: 10px;" @select="upProductSelect"
:row-class-name="tableRowClassName" v-loading="getProductLoad" @select-all="handleAll">
<el-table-column type="selection" width="65" :selectable="selectable" v-if="active==1"></el-table-column>
- <el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip>
+ <template slot="header" slot-scope="scope">
+ <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
+ <span>妫�楠岄」</span>
+ <el-input
+ v-model="inspectionItem"
+ size="mini"
+ placeholder="璇疯緭鍏�"/>
+ </div>
+ </template>
+ </el-table-column>
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140"
show-overflow-tooltip></el-table-column>
<el-table-column prop="sonLaboratory" label="瀛愬疄楠屽" min-width="130" show-overflow-tooltip :filters="filters"
@@ -702,6 +712,28 @@
</el-row>
</span>
</el-dialog>
+ <el-dialog title="娓╁害寰幆瑕佹眰濉啓" :visible.sync="circulateShow" width="800px" :show-close="false">
+ <div class="search" style="display: flex;background: transparent;">
+ <div class="search_thing">
+ <div class="search_label">淇濇俯鏃堕棿锛�</div>
+ <div class="search_input">
+ <el-input v-model="circulateForm.entrustCode" size="small" placeholder=""></el-input>
+ </div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">寰幆娆℃暟锛�</div>
+ <div class="search_input">
+ <el-input v-model="circulateForm.entrustCode" size="small" placeholder=""></el-input>
+ </div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">娓╁害鐐癸細</div>
+ <div class="search_input">
+ <el-input v-model="circulateForm.entrustCode" size="small" placeholder=""></el-input>
+ </div>
+ </div>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -865,7 +897,11 @@
model: null,
standardMethodListId: null,
symbolList:[
- 'RTS','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z']
+ 'RTS','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'],
+ inspectionItem:null,
+ circulateShow:false,
+ circulateForm:{},
+ isBsm2Val2:false
}
},
watch: {
@@ -1295,7 +1331,8 @@
this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
state,
id: this.currentId,
- companyId:this.addObj.companyId
+ companyId:this.addObj.companyId,
+ laboratory:this.addObj.laboratory
}, {
headers: {
'Content-Type': 'application/json'
@@ -1554,7 +1591,6 @@
this.$refs.productTable.toggleRowSelection(row, true);
},
upProductSelect(selection, row) {
- console.log('danxuan', row)
this.bsm1DiaList = []
row.state = row.state == 1 ? 0 : 1
if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1) {
@@ -1567,7 +1603,7 @@
} else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) {
row.bsm1 = false
}
- if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && row.state === 1) {
+ if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && row.state === 1&&!this.isBsm2Val2) {
this.bsm2 = true
this.bsm1Dia = true
if (this.bsm2Val2.length === 0) {
@@ -1603,6 +1639,10 @@
}
return item
})
+ if (row.inspectionItem === '娓╁害寰幆') {
+ this.circulateShow = true;
+ return
+ }
this.getProNum()
},
permute(nums) {
@@ -1849,7 +1889,7 @@
} else if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 0) {
p.bsm1 = false
}
- if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && p.state === 1) {
+ if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && p.state === 1&&!this.isBsm2Val2) {
this.bsm2 = true
this.bsm1Dia = true
if (this.bsm2Val2.length === 0) {
@@ -2102,6 +2142,7 @@
return
}
}
+ this.isBsm2Val2 = true;
}
// if(this.bsm3){
// if(!this.bsm3Val){
--
Gitblit v1.9.3