From 353be10ef4c7241d32c16700c7e6d36287a45f90 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期三, 20 三月 2024 15:48:35 +0800
Subject: [PATCH] 功能调整
---
src/components/view/b2-standard.vue | 1
src/components/do/b1-ins-order/add.vue | 597 ++++++++++++++++++++++++++++++++++++++---------------------
2 files changed, 385 insertions(+), 213 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 1dbec6e..e7e2a54 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -3,6 +3,7 @@
width: 100%;
height: 100%;
overflow-y: auto;
+ overflow-x: hidden;
}
.ins_order_add::-webkit-scrollbar {
@@ -41,12 +42,11 @@
font-size: 18px;
}
- .el-select-dropdown__item {
- display: flex;
- align-items: center;
- justify-content: space-between;
- }
-
+ .el-select-dropdown__item {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
</style>
<style>
.ins_order_add .el-input-group__append,
@@ -77,7 +77,7 @@
font-size: 12px;
}
- .ins_order_add .el-table .warning-row .cell{
+ .ins_order_add .el-table .warning-row .cell {
color: #bababa;
}
</style>
@@ -88,18 +88,21 @@
<el-row class="title">
<el-col :span="6" style="padding-left: 20px;">濮旀墭鍗曚俊鎭�</el-col>
<el-col :span="18" style="text-align: right;">
- <el-select v-model="template" size="medium" placeholder="涓嬪崟妯℃澘" style="margin-right: 10px;" v-show="active==1" @change="selectInsOrderTemplateById">
+ <el-select v-model="template" size="medium" placeholder="涓嬪崟妯℃澘" style="margin-right: 10px;" v-show="active==1"
+ @change="selectInsOrderTemplateById">
<el-option v-for="(a, ai) in templates" :key="ai" :value="a.id" :label="a.name">
- <span style="float: left">{{ a.name }}</span>
- <i class="el-icon-delete" style="float: right; color: #66b1ff; font-size: 16px" @click.stop="handleDelete(a)"></i>
- </el-option>
+ <span style="float: left">{{ a.name }}</span>
+ <i class="el-icon-delete" style="float: right; color: #66b1ff; font-size: 16px"
+ @click.stop="handleDelete(a)"></i>
+ </el-option>
</el-select>
<el-button size="medium" @click="templateDia=true" v-show="active==1">
<span style="color: #3A7BFA;">淇濆瓨妯℃澘</span>
</el-button>
<el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">鎻愪氦</el-button>
- <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3">涓嶉�氳繃</el-button>
- <el-button size="medium" type="primary" @click="upInsOrderOfState(1)" :loading="saveLoad" v-show="active==3">閫氳繃</el-button>
+ <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3">涓嶉�氳繃</el-button>
+ <el-button size="medium" type="primary" @click="upInsOrderOfState(1)" :loading="saveLoad"
+ v-show="active==3">閫氳繃</el-button>
<el-button size="medium" @click="$parent.playOrder(0)">
<span style="color: #3A7BFA;">杩斿洖</span>
</el-button>
@@ -138,6 +141,42 @@
</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 readonly size="small" v-model="addObj.sample">
+ <template slot="append"><el-button slot="append" icon="el-icon-search"
+ @click="selectStandardTree = true"></el-button></template>
+ </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" clearable disabled v-model="addObj.laboratory"></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" clearable disabled v-model="addObj.sampleType"></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-number size="small" v-model="addObj.sampleNum" :min="1" :max="100" :precision="0"
+ style="width: 65%;" @change="addStandardTree"></el-input-number>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6">
+ <div class="search_label">鏍峰搧鍗曚綅锛�</div>
+ <div class="search_input">
+ <el-select v-model="addObj.unit" clearable size="small" style="width: 100%;">
+ <el-option v-for="(a, i) in units" :key="i" :label="a.label" :value="a.value"></el-option>
+ </el-select>
+ </div>
+ </el-col>
+ <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"></el-input>
@@ -162,34 +201,63 @@
</el-row>
</div>
<div>
- <div style="text-align: right;line-height: 45px;" v-if="active<2">
+ <!-- <div style="text-align: right;line-height: 45px;" v-if="active<2">
<el-button type="primary" size="small" @click="addSampleDia = true">娣诲姞鏍峰搧</el-button>
<el-button size="small" @click="delSample">
<span style="color: #3A7BFA;">鍒犻櫎鏍峰搧</span>
</el-button>
- </div>
- <el-table class="el-table sampleTable" ref="sampleTable" :data="sampleList" height="250px" tooltip-effect="dark" border
- @selection-change="selectSample" highlight-current-row @row-click="rowClick" style="margin-top: 10px;">
+ </div> -->
+ <el-table class="el-table sampleTable" ref="sampleTable" :data="sampleList" height="250px" tooltip-effect="dark"
+ border @selection-change="selectSample" highlight-current-row @row-click="rowClick" style="margin-top: 10px;">
<el-table-column type="selection" width="60"></el-table-column>
<el-table-column type="index" label="搴忓彿" width="65" align="center"></el-table-column>
- <el-table-column prop="sample" label="鏍峰搧鍚嶇О" align="center" show-overflow-tooltip
- min-width="100"></el-table-column>
- <el-table-column prop="sampleCode" label="鏍峰搧缂栧彿" width="140" align="center">
+ <el-table-column prop="sample" label="鏍峰搧鍚嶇О" align="center" show-overflow-tooltip min-width="100">
<template slot-scope="scope">
- <el-input size="small" v-model="scope.row.sampleCode" clearable></el-input>
+ <el-input size="small" v-model="scope.row.sample" clearable></el-input>
</template>
</el-table-column>
- <el-table-column prop="factory" label="宸ュ巶" align="center" show-overflow-tooltip min-width="100">
+ <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="涓嶅～鍐欏垯绯荤粺鑷姩鐢熸垚"></el-input>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column prop="factory" label="宸ュ巶" align="center" show-overflow-tooltip min-width="100">
</el-table-column>
<el-table-column prop="laboratory" label="瀹為獙瀹�" align="center" show-overflow-tooltip min-width="100">
</el-table-column>
<el-table-column prop="sampleType" label="鏍峰搧绫诲瀷" align="center" show-overflow-tooltip min-width="100">
- </el-table-column>
+ </el-table-column> -->
<el-table-column prop="model" label="鏍峰搧鍨嬪彿" align="center" show-overflow-tooltip min-width="100">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.model" filterable allow-create default-first-option placeholder="鏍峰搧鍨嬪彿"
+ size="small">
+ <el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="standardMethodListId" label="妫�楠屾爣鍑�" align="center" show-overflow-tooltip min-width="100">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.method" :disabled="scope.row.model==null" filterable placeholder="妫�楠屾爣鍑�" size="small"
+ :loading="methodLoad" @change="(value)=>methodChange(value, scope.row)" @focus="methodFocus">
+ <el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
+ </el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅" align="center" show-overflow-tooltip min-width="100">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.unit" clearable size="small" style="width: 100%;">
+ <el-option v-for="(a, i) in units" :key="i" :label="a.label" :value="a.value"></el-option>
+ </el-select>
+ </template>
</el-table-column>
<el-table-column prop="isLeave" label="鏄惁鐣欐牱" align="center" show-overflow-tooltip min-width="100">
<template slot-scope="scope">
- <span>{{scope.row.isLeave==1?'鏄�':'鍚�'}}</span>
+ <el-select v-model="scope.row.isLeave" size="small">
+ <el-option label="鐣欐牱" :value="1"></el-option>
+ <el-option label="涓嶇暀鏍�" :value="0"></el-option>
+ </el-select>
</template>
</el-table-column>
<el-table-column prop="joinName" label="閰嶅鏍峰搧鍚嶇О" width="140" align="center" v-if="addObj.mating==1">
@@ -210,22 +278,22 @@
:controls="false" style="width: 80%;"></el-input-number>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" width="65" align="center">
+ <!-- <el-table-column label="鎿嶄綔" width="65" align="center">
<template slot-scope="scope">
{{scope.index}}
<el-button type="text" size="small" @click="delSampleAndProduct" :disabled="active!=1">鍒犻櫎</el-button>
</template>
- </el-table-column>
+ </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"
- :row-class-name="tableRowClassName">
+ :row-class-name="tableRowClassName" v-loading="getProductLoad">
<el-table-column type="selection" width="65"></el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip></el-table-column>
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140"
show-overflow-tooltip></el-table-column>
<el-table-column prop="sonLaboratory" label="瀛愬疄楠屽" width="130" show-overflow-tooltip></el-table-column>
- <el-table-column prop="method" label="妫�楠屾爣鍑�" min-width="120" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="method" label="璇曢獙鏂规硶" min-width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="unit" label="璁￠噺鍗曚綅" width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="price" label="鍗曚环" width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="manDay" label="棰勮鏃堕棿(澶�)" width="120" show-overflow-tooltip></el-table-column>
@@ -342,47 +410,47 @@
<el-button type="primary" @click="onSample()" :loading="getProductLoad">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog title="淇濆瓨妯℃澘" :visible.sync="templateDia" width="30%">
+ <el-dialog title="淇濆瓨妯℃澘" :visible.sync="templateDia" width="30%">
<div class="body" style="height: 10vh;display: flex;align-items: center;" v-if="templateDia">
- <div class="search_label"><span class="required-span">* </span>妯℃澘鍚嶇О锛�</div>
- <div class="search_input">
- <el-input size="small" clearable v-model="templateName"></el-input>
- </div>
+ <div class="search_label"><span class="required-span">* </span>妯℃澘鍚嶇О锛�</div>
+ <div class="search_input">
+ <el-input size="small" clearable v-model="templateName"></el-input>
+ </div>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="templateDia = false">鍙� 娑�</el-button>
<el-button type="primary" @click="addTemplateDia" :loading="templateLoading">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog title="妫�楠屼笅鍙�" :visible.sync="issuedDialogVisible" width="400px">
- <div class="body" style="max-height: 60vh;">
- <el-row>
- <el-col class="search_thing" :span="22">
- <div class="search_label"><span class="required-span">* </span>绾﹀畾鏃堕棿锛�</div>
- <div class="search_input">
- <el-date-picker size="small" v-model="distributeData.appointed" type="date" placeholder="閫夋嫨鏃ユ湡"
- value-format="yyyy-MM-dd" style="width: 100%;" format="yyyy-MM-dd">
- </el-date-picker>
- </div>
- </el-col>
- <el-col class="search_thing" :span="22">
- <div class="search_label"><span class="required-span">* </span>鎸囨淳浜哄憳锛�</div>
- <div class="search_input">
- <el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
- <el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </div>
- </el-col>
- </el-row>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-row>
- <el-button @click="issuedDialogVisible=false">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitForm2" :loading="upLoad">纭� 瀹�</el-button>
- </el-row>
- </span>
- </el-dialog>
+ <el-dialog title="妫�楠屼笅鍙�" :visible.sync="issuedDialogVisible" width="400px">
+ <div class="body" style="max-height: 60vh;">
+ <el-row>
+ <el-col class="search_thing" :span="22">
+ <div class="search_label"><span class="required-span">* </span>绾﹀畾鏃堕棿锛�</div>
+ <div class="search_input">
+ <el-date-picker size="small" v-model="distributeData.appointed" type="date" placeholder="閫夋嫨鏃ユ湡"
+ value-format="yyyy-MM-dd" style="width: 100%;" format="yyyy-MM-dd">
+ </el-date-picker>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="22">
+ <div class="search_label"><span class="required-span">* </span>鎸囨淳浜哄憳锛�</div>
+ <div class="search_input">
+ <el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-row>
+ <el-button @click="issuedDialogVisible=false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm2" :loading="upLoad">纭� 瀹�</el-button>
+ </el-row>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -392,16 +460,16 @@
components: {
ValueTable
},
- props:{
- active: {
+ props: {
+ active: {
type: Number,
default: () => 0
},
- currentId:{
- type: Number,
+ currentId: {
+ type: Number,
default: () => 0
- }
- },
+ }
+ },
data() {
return {
template: null,
@@ -416,7 +484,15 @@
appointed: null,
remark: null,
otcCode: null,
- mating: 0
+ mating: 0,
+ sample: null,
+ factory: null,
+ laboratory: null,
+ sampleType: null,
+ sampleNum: 1,
+ unit: null,
+ model: null,
+ method: null
},
sample: {
sampleCode: null,
@@ -427,6 +503,7 @@
model: null,
sampleNum: 1,
isLeave: 0,
+ unit: null
},
type: [],
selectUserDia: false,
@@ -470,43 +547,56 @@
productIds: [],
getProductLoad: false,
saveLoad: false,
- templateDia:false,
- templateLoading:false,
- templateName:'',
- issuedDialogVisible:false,
- distributeData:{
- appointed:'',
- userId:''
- },
- personList:[],
- upLoad:false,
+ templateDia: false,
+ templateLoading: false,
+ templateName: '',
+ issuedDialogVisible: false,
+ distributeData: {
+ appointed: '',
+ userId: ''
+ },
+ personList: [],
+ upLoad: false,
+ units: [],
+ models: [],
+ methods: [],
+ methodLoad: false
+ }
+ },
+ watch: {
+ sampleList() {
+ this.addObj.method = null
+ this.productList = []
}
},
mounted() {
this.selectEnumByCategoryForType()
this.getUserNow()
this.selectStandardTreeList()
- this.selectInsOrderTemplate()
- this.getAuthorizedPerson();
- if(this.active==1){
- // 涓嬪崟娴佺▼
- }else {
- // 鏌ョ湅/瀹℃牳娴佺▼
- // 璇锋眰鎺ュ彛锛屽洖鏄炬暟鎹�
- this.$axios.post(this.$api.insOrder.getInsOrder, {
+ this.selectInsOrderTemplate()
+ this.getAuthorizedPerson();
+ this.selectEnumByCategoryForUnit()
+ if (this.active == 1) {
+ // 涓嬪崟娴佺▼
+ } else {
+ // 鏌ョ湅/瀹℃牳娴佺▼
+ // 璇锋眰鎺ュ彛锛屽洖鏄炬暟鎹�
+ this.$axios.post(this.$api.insOrder.getInsOrder, {
orderId: this.currentId
}).then(res => {
- this.addObj = {...res.data.insOrder};
- this.addObj.type = String(this.addObj.type)
- this.sampleList = this.HaveJson(res.data.sampleProduct);
- this.$nextTick(()=>{
- this.$refs.sampleTable.doLayout()
- })
+ this.addObj = {
+ ...res.data.insOrder
+ };
+ this.addObj.type = String(this.addObj.type)
+ this.sampleList = this.HaveJson(res.data.sampleProduct);
+ this.$nextTick(() => {
+ this.$refs.sampleTable.doLayout()
+ })
})
- }
+ }
},
methods: {
- getAuthorizedPerson() {
+ getAuthorizedPerson() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
let data = []
res.data.forEach(a => {
@@ -517,7 +607,7 @@
})
this.personList = data
})
- },
+ },
selectEnumByCategoryForType() {
this.$axios.post(this.$api.enums.selectEnumByCategory, {
category: "绱ф�ョ▼搴�"
@@ -541,67 +631,67 @@
this.selectUserDia = false
},
save() {
- if(!this.addObj.custom){
- this.$message.error('鏈�夋嫨涓嬪崟瀹㈡埛')
- }else if(!this.addObj.type){
- this.$message.error('鏈�夋嫨绱ф�ョ▼搴�')
- }else if(this.sampleList.length<1){
- this.$message.error('璇锋坊鍔犱竴涓牱鍝�')
- }else if(!this.sampleList.every(m=>m.sampleCode)){
- this.$message.error('杈撳叆鏍峰搧缂栧彿')
- }else{
- this.saveLoad = true
- this.$axios.post(this.$api.insOrder.addInsOrder,{
- insOrder: this.addObj,
- list: this.sampleList
- },{
- headers: {
- 'Content-Type': 'application/json'
- }
- }).then(res=>{
- this.saveLoad = false
- if(res.code==201)return
- this.$message.success('宸叉彁浜�')
- // 濡傛灉绱ф�ョ▼搴︿负绱ф�ワ紝闇�瑕佺洿鎺ヤ笅鍙戜汉鍛�
- if(this.addObj.type==2){
- this.issuedDialogVisible = true;
- this.$axios.post(this.$api.insOrder.selectOrderManDay,{
- id: res.data
- }).then(ress=>{
- // TODO 闇�瑕佸啀纭涓�涓嬭繑鍥炲��
- this.distributeData.orderId = res.data
- // this.distributeData.sampleId = res.data.sampleId
- this.distributeData.appointed = ress.data
- })
- }else{
- this.$parent.playOrder(0)
- }
- })
- }
+ if (!this.addObj.custom) {
+ this.$message.error('鏈�夋嫨涓嬪崟瀹㈡埛')
+ } else if (!this.addObj.type) {
+ this.$message.error('鏈�夋嫨绱ф�ョ▼搴�')
+ } else if (this.sampleList.length < 1) {
+ this.$message.error('璇锋坊鍔犱竴涓牱鍝�')
+ } else if (!this.sampleList.every(m => m.sampleCode)) {
+ this.$message.error('杈撳叆鏍峰搧缂栧彿')
+ } else {
+ this.saveLoad = true
+ this.$axios.post(this.$api.insOrder.addInsOrder, {
+ insOrder: this.addObj,
+ list: this.sampleList
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.saveLoad = false
+ if (res.code == 201) return
+ this.$message.success('宸叉彁浜�')
+ // 濡傛灉绱ф�ョ▼搴︿负绱ф�ワ紝闇�瑕佺洿鎺ヤ笅鍙戜汉鍛�
+ if (this.addObj.type == 2) {
+ this.issuedDialogVisible = true;
+ this.$axios.post(this.$api.insOrder.selectOrderManDay, {
+ id: res.data
+ }).then(ress => {
+ // TODO 闇�瑕佸啀纭涓�涓嬭繑鍥炲��
+ this.distributeData.orderId = res.data
+ // this.distributeData.sampleId = res.data.sampleId
+ this.distributeData.appointed = ress.data
+ })
+ } else {
+ this.$parent.playOrder(0)
+ }
+ })
+ }
},
- upInsOrderOfState(state){
- this.saveLoad = true
- this.$axios.post(this.$api.insOrder.upInsOrderOfState,{
+ upInsOrderOfState(state) {
+ this.saveLoad = true
+ this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
state,
- id:this.currentId
- },{
+ id: this.currentId
+ }, {
headers: {
'Content-Type': 'application/json'
}
- }).then(res=>{
+ }).then(res => {
this.saveLoad = false
- if(res.code==201)return
+ if (res.code == 201) return
this.$message.success('鎻愪氦鎴愬姛')
this.$parent.playOrder(0)
})
- },
- // 涓嬪彂
- submitForm2(){
- if(this.distributeData.appointed==null||this.distributeData.appointed==''){
+ },
+ // 涓嬪彂
+ submitForm2() {
+ if (this.distributeData.appointed == null || this.distributeData.appointed == '') {
this.$message.error('绾﹀畾鏃堕棿鏈～鍐�')
return
}
- if(this.distributeData.userId==null||this.distributeData.userId==''){
+ if (this.distributeData.userId == null || this.distributeData.userId == '') {
this.$message.error('鎸囨淳浜哄憳鏈～鍐�')
return
}
@@ -624,7 +714,7 @@
this.$message.error('淇敼澶辫触')
this.upLoad = false
})
- },
+ },
getUserNow() {
this.$axios.get(this.$api.user.getUserNow).then(res => {
let selects = res.data
@@ -646,6 +736,7 @@
},
handleNodeClick(val, node, el) { //鏍戠殑鍊�
this.selectTree = ''
+ this.models = val.children
this.getNodeParent(node)
this.selectTree = this.selectTree.replace(' - ', '')
let data = this.selectTree.split(' - ')
@@ -681,12 +772,54 @@
this.$message.error('鏈�夋嫨鏍峰搧')
return
}
- this.sample.factory = trees[0]
- this.sample.laboratory = trees[1]
- this.sample.sampleType = trees[2]
- this.sample.sample = trees[3]
- this.sample.model = trees[4]
+ this.addObj.factory = trees[0]
+ this.addObj.laboratory = trees[1]
+ this.addObj.sampleType = trees[2]
+ this.addObj.sample = trees[3]
+ this.addObj.model = (trees[4] == undefined ? null : trees[4])
this.selectStandardTree = false
+ this.sampleList = []
+ for (var i = 0; i < this.addObj.sampleNum; i++) {
+ this.sample.joinName = null
+ this.sample.joinModel = null
+ this.sample.joinNum = 1
+ this.sample.sample = this.addObj.sample
+ this.sample.model = this.addObj.model
+ this.sample.unit = this.addObj.unit
+ this.sample.standardMethodListId = null
+ this.sample.insProduct = []
+ this.sample.id = this.count
+ this.sampleList.push(this.HaveJson(this.sample))
+ this.count++
+ }
+ this.$refs.sampleTable.doLayout()
+ this.selectsStandardMethodByFLSSM()
+ },
+ selectsStandardMethodByFLSSM() {
+ this.methodLoad = true
+ this.$axios.post(this.$api.standardTree.selectsStandardMethodByFLSSM, {
+ tree: this.selectTree
+ }).then(res => {
+ this.methodLoad = false
+ this.methods = res.data.standardMethodList
+ })
+ },
+ addStandardTree() {
+ if (this.selectTree == null) return
+ this.sampleList = []
+ for (var i = 0; i < this.addObj.sampleNum; i++) {
+ this.sample.joinName = null
+ this.sample.joinModel = null
+ this.sample.joinNum = 1
+ this.sample.sample = this.addObj.sample
+ this.sample.model = this.addObj.model
+ this.sample.unit = this.addObj.unit
+ this.sample.standardMethodListId = null
+ this.sample.insProduct = []
+ this.sample.id = this.count
+ this.sampleList.push(this.HaveJson(this.sample))
+ this.count++
+ }
},
selectSample(val) {
this.sampleIds = []
@@ -703,8 +836,8 @@
this.$message.error('璇疯緭鍏ユ牱鍝佸瀷鍙�')
return
}
- this.getProductLoad = true
- this.$axios.post(this.$api.standardTree.selectStandardProductList, {
+ // this.getProductLoad = true
+ /* this.$axios.post(this.$api.standardTree.selectStandardProductList, {
factory: this.sample.factory,
laboratory: this.sample.laboratory,
sampleType: this.sample.sampleType,
@@ -740,7 +873,7 @@
sampleNum: 1,
isLeave: 0,
}
- })
+ }) */
},
delSample() {
this.sampleIds.forEach(a => {
@@ -766,7 +899,7 @@
this.productList.forEach(a => {
if (a.state == 1) this.toggleSelection(a)
})
- }, 300)
+ }, 200)
},
toggleSelection(row) {
this.$refs.productTable.toggleRowSelection(row, true);
@@ -783,68 +916,108 @@
}
return '';
},
- selectInsOrderTemplate(){
- this.$axios.get(this.$api.insOrder.selectInsOrderTemplate).then(res=>{
- if(res.code==201)return
+ selectInsOrderTemplate() {
+ this.$axios.get(this.$api.insOrder.selectInsOrderTemplate).then(res => {
+ if (res.code == 201) return
this.templates = res.data
})
- },
- // 鍒犻櫎妯℃澘--璋冪敤鎺ュ彛
- handleDelete(row){
- this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- this.$axios.post(this.$api.insOrder.delInsOrderTemplate, {
- id: row.id
- }).then(res => {
- if (res.code === 201) {
- return
- }
- this.$message.success('鍒犻櫎鎴愬姛')
- this.selectInsOrderTemplate()
- }).catch(e => {
- this.$message.error('鍒犻櫎澶辫触')
- })
- }).catch(() => {})
- },
- // 淇濆瓨妯℃澘
- addTemplateDia(){
- if(this.templateName){
- this.templateLoading = true;
- this.$axios.post(this.$api.insOrder.addInsOrderTemplate,{
- name:this.templateName,
- thing:JSON.stringify({addObj:this.addObj,sampleList:this.sampleList})
- },{
+ },
+ // 鍒犻櫎妯℃澘--璋冪敤鎺ュ彛
+ handleDelete(row) {
+ this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ }).then(() => {
+ this.$axios.post(this.$api.insOrder.delInsOrderTemplate, {
+ id: row.id
+ }).then(res => {
+ if (res.code === 201) {
+ return
+ }
+ this.$message.success('鍒犻櫎鎴愬姛')
+ this.selectInsOrderTemplate()
+ }).catch(e => {
+ this.$message.error('鍒犻櫎澶辫触')
+ })
+ }).catch(() => {})
+ },
+ // 淇濆瓨妯℃澘
+ addTemplateDia() {
+ if (this.templateName) {
+ this.templateLoading = true;
+ this.$axios.post(this.$api.insOrder.addInsOrderTemplate, {
+ name: this.templateName,
+ thing: JSON.stringify({
+ addObj: this.addObj,
+ sampleList: this.sampleList
+ })
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ if (res.code == 201) return
+ this.templateLoading = false;
+ this.templateDia = false;
+ this.$message.success('淇濆瓨鎴愬姛')
+ this.selectInsOrderTemplate()
+ this.templateName = ''
+ })
+ } else {
+ this.$message.error('璇峰～鍐欐ā鏉垮悕绉�')
+ }
+ },
+ // 鏌ヨ妯℃澘
+ selectInsOrderTemplateById(e) {
+ this.$axios.post(this.$api.insOrder.selectInsOrderTemplateById + '?id=' + e).then(res => {
+ if (res.code == 201) return
+ let obj = JSON.parse(res.data)
+ this.addObj = obj.addObj;
+ this.sampleList = obj.sampleList;
+ })
+ },
+ delSampleAndProduct() {
+ this.sampleList.splice(scope.$index, 1)
+ this.productList = []
+ },
+ selectEnumByCategoryForUnit() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "鍗曚綅"
+ }).then(res => {
+ this.units = res.data
+ })
+ },
+ methodChange(val) {
+ this.$refs.sampleTable.doLayout()
+ this.getProductLoad = true
+ this.$axios.post(this.$api.standardTree.selectStandardProductList, {
+ model: this.addObj.model,
+ standardMethodListId: val
+ }, {
headers: {
'Content-Type': 'application/json'
}
- }).then(res=>{
- if(res.code==201)return
- this.templateLoading = false;
- this.templateDia = false;
- this.$message.success('淇濆瓨鎴愬姛')
- this.selectInsOrderTemplate()
- this.templateName = ''
+ }).then(res => {
+ res.data.forEach(a => {
+ a.state = 1
+ })
+ this.sampleIds.forEach(a => {
+ for (var b in this.sampleList) {
+ if (this.sampleList[b].id == a) {
+ this.sampleList[b].standardMethodListId = val
+ this.sampleList[b].insProduct = this.HaveJson(res.data)
+ }
+ }
+ })
+ this.getProductLoad = false
+ this.productList = []
+ this.$refs.sampleTable.setCurrentRow()
})
- }else{
- this.$message.error('璇峰～鍐欐ā鏉垮悕绉�')
- }
- },
- // 鏌ヨ妯℃澘
- selectInsOrderTemplateById(e){
- this.$axios.post(this.$api.insOrder.selectInsOrderTemplateById+'?id='+e).then(res=>{
- if(res.code==201)return
- let obj = JSON.parse(res.data)
- this.addObj = obj.addObj;
- this.sampleList = obj.sampleList;
- })
- },
- delSampleAndProduct(){
- this.sampleList.splice(scope.$index, 1)
- this.productList = []
- }
+ },
+ methodFocus(){
+ this.selectsStandardMethodByFLSSM()
+ }
}
}
-</script>
+</script>
\ No newline at end of file
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index dcba552..f78bd60 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -590,7 +590,6 @@
}).then(res => {
this.tableLoad = false
this.standardList = res.data.standardMethodList
- this.productList = res.data.standardProductList
})
},
getPower() {
--
Gitblit v1.9.3