From 0f367e985d44f8470e6b15fa06b8fdf22c37c352 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 14 六月 2024 18:09:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-ins-order/add.vue | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index e0749b0..228ecb9 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -153,16 +153,21 @@
<el-col class="search_thing" :span="6">
<div class="search_label"><span class="required-span">* </span>濮旀墭浜猴細</div>
<div class="search_input">
- <el-input readonly size="small" v-model="addObj.custom">
+ <el-input size="small" clearable disabled v-model="addObj.custom"></el-input>
+ <!-- <el-input readonly size="small" v-model="addObj.custom">
<template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true"
:disabled="active>1"></el-button></template>
- </el-input>
+ </el-input> -->
</div>
</el-col>
<el-col class="search_thing" :span="6">
<div class="search_label"><span class="required-span">* </span>濮旀墭鍗曚綅锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="鈫愰�夋嫨濮旀墭瀹㈡埛" clearable disabled v-model="addObj.company"></el-input>
+ <!-- <el-input size="small" placeholder="鈫愰�夋嫨濮旀墭瀹㈡埛" clearable disabled v-model="addObj.company"></el-input> -->
+ <el-input readonly size="small" v-model="addObj.company" placeholder="閫夋嫨濮旀墭鍗曚綅">
+ <template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true"
+ :disabled="active>1"></el-button></template>
+ </el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
@@ -336,13 +341,13 @@
<el-table-column type="index" label="搴忓彿" width="65" align="center"></el-table-column>
<el-table-column prop="sample" label="鏍峰搧鍚嶇О" align="center" min-width="100">
<template slot-scope="scope">
- <el-input size="small" v-model="scope.row.sample" clearable :readonly="active>1"></el-input>
+ <el-input size="small" v-model="scope.row.sample" clearable :disabled="active>1"></el-input>
</template>
</el-table-column>
<el-table-column prop="sampleCode" label="鏍峰搧缂栧彿" min-width="140" align="center">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.sampleCode" clearable placeholder="涓嶅～鍐欏垯绯荤粺鑷姩鐢熸垚"
- :readonly="active>1"></el-input>
+ :disabled="active>1"></el-input>
</template>
</el-table-column>
<el-table-column prop="model" label="鏍峰搧鍨嬪彿" align="center" min-width="100">
@@ -365,7 +370,7 @@
<template slot-scope="scope">
<el-select v-model="scope.row.standardMethodListId" :disabled="scope.row.model==null||active>1"
placeholder="妫�楠屾爣鍑�" size="small" :loading="methodLoad" @change="(value)=>methodChange(value, scope.row)"
- @focus="methodFocus" :readonly="active>1" style="width: 100%;">
+ @focus="methodFocus" :readonly="active>1" style="width: 100%;" clearable @clear="productList = []">
<el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
</el-option>
</el-select>
@@ -389,7 +394,7 @@
:controls="false" style="width: 80%;"></el-input-number>
</template>
</el-table-column>
- <el-table-column prop="proNum" label="妫�楠岄」璁℃暟" width="120" align="center" ></el-table-column>
+ <el-table-column prop="proNum" label="寰呮椤规暟閲�" width="105" align="center" ></el-table-column>
</el-table>
<el-table class="el-table" ref="productTable" :data="productList" height="380px" tooltip-effect="dark" border
@selection-change="selectProduct" style="margin-bottom: 10px;" @select="upProductSelect"
@@ -418,7 +423,7 @@
</el-table-column>
</el-table>
</div>
- <el-dialog title="閫夋嫨瀹㈡埛" :visible.sync="selectUserDia" width="70%">
+ <el-dialog title="閫夋嫨鍗曚綅" :visible.sync="selectUserDia" width="70%">
<div class="body" style="height: 60vh;" v-if="selectUserDia">
<ValueTable ref="ValueTable2" :url="$api.user.selectCustomPageList" :componentData="componentData2" />
</div>
@@ -802,7 +807,7 @@
'addObj.sampleNum'(val){
this.model = null
this.standardMethodListId = null
- },
+ }
},
mounted() {
this.selectEnumByCategoryForType()
@@ -997,7 +1002,7 @@
return a
})),
pairing: JSON.stringify(this.bsm2Val2)
- })
+ })
}).then(res => {
this.saveLoad = false
if (res.code == 201) return
@@ -1119,7 +1124,11 @@
},
getNodeParent(val) {
if (val.parent != null) {
- this.selectTree += ' - ' + val.label
+ if(val.data.children === null){
+ this.selectTree += ' - ' + val.label + ' - ' + ''
+ }else{
+ this.selectTree += ' - ' + val.label
+ }
this.getNodeParent(val.parent)
}
},
@@ -1137,14 +1146,20 @@
},
activeStandardTree() {
let trees = this.selectTree.split(" - ")
- if (trees.length < 4) {
- this.$message.error('鏈�夋嫨浜у搧')
+ if (trees.length < 3) {
+ this.$message.error('鏈�夋嫨瀵硅薄')
return
}
this.addObj.factory = trees[0]
this.addObj.laboratory = trees[1]
this.addObj.sampleType = trees[2]
- this.addObj.sample = trees[3]
+ if(trees[3]===''){
+ this.addObj.sample = (trees[4] == undefined ? null : trees[4])
+ }else if(trees[3]===undefined){
+ this.addObj.sample = trees[2]
+ }else{
+ this.addObj.sample = trees[3]
+ }
this.addObj.model = (trees[4] == undefined ? null : trees[4])
this.selectStandardTree = false
this.sampleList = []
@@ -1159,6 +1174,8 @@
this.sample.insProduct = []
this.sample.id = this.count
this.sample.childSampleList = []
+ this.sample.insulating = null
+ this.sample.sheath = null
this.sampleList.push(this.HaveJson(this.sample))
this.count++
}
@@ -1483,8 +1500,9 @@
this.selectsStandardMethodByFLSSM()
},
handleChangeModel(e) {
+ this.productList = []
let num = this.selectTree.split('-').length;
- if (num == 4) {
+ if (num != 5) {
this.selectTree = this.selectTree + ' - ' + e
} else {
let arr = this.selectTree.split('-')
--
Gitblit v1.9.3