From d8eddaa039c163ebf0d902034fddaed21e8d9040 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 21 三月 2024 15:04:16 +0800
Subject: [PATCH] 功能调整
---
src/components/do/b1-ins-order/add.vue | 150 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 102 insertions(+), 48 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index e7e2a54..0c3f585 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -211,7 +211,7 @@
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 prop="sample" label="鏍峰搧鍚嶇О" align="center" min-width="100">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.sample" clearable></el-input>
</template>
@@ -221,38 +221,39 @@
<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 prop="factory" label="宸ュ巶" align="center" min-width="100">
</el-table-column>
- <el-table-column prop="laboratory" label="瀹為獙瀹�" align="center" show-overflow-tooltip min-width="100">
+ <el-table-column prop="laboratory" label="瀹為獙瀹�" align="center" min-width="100">
</el-table-column>
- <el-table-column prop="sampleType" label="鏍峰搧绫诲瀷" align="center" show-overflow-tooltip min-width="100">
+ <el-table-column prop="sampleType" label="鏍峰搧绫诲瀷" align="center" min-width="100">
</el-table-column> -->
- <el-table-column prop="model" label="鏍峰搧鍨嬪彿" align="center" show-overflow-tooltip min-width="100">
+ <el-table-column prop="model" label="鏍峰搧鍨嬪彿" align="center" min-width="100">
<template slot-scope="scope">
<el-select v-model="scope.row.model" filterable allow-create default-first-option placeholder="鏍峰搧鍨嬪彿"
- size="small">
+ size="small" @change="handleChangeModel">
<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">
+ <el-table-column prop="standardMethodListId" label="妫�楠屾爣鍑�" align="center" 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-select v-model="scope.row.standardMethodListId" :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">
+ <el-table-column prop="unit" label="鍗曚綅" align="center" 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">
+ <el-table-column prop="isLeave" label="鏄惁鐣欐牱" align="center" min-width="100">
<template slot-scope="scope">
<el-select v-model="scope.row.isLeave" size="small">
<el-option label="鐣欐牱" :value="1"></el-option>
@@ -303,7 +304,7 @@
<el-table-column prop="ask" label="瑕佹眰鍊�" min-width="220px">
<template slot-scope="scope">
<el-input size="small" placeholder="瑕佹眰鍊�" v-model="scope.row.ask" clearable type="textarea"
- :autosize="{ minRows: 1, maxRows: 3}"></el-input>
+ :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row)"></el-input>
</template>
</el-table-column>
</el-table>
@@ -576,9 +577,8 @@
this.selectInsOrderTemplate()
this.getAuthorizedPerson();
this.selectEnumByCategoryForUnit()
- if (this.active == 1) {
- // 涓嬪崟娴佺▼
- } else {
+ this.selectStandardMethods()
+ if (this.active != 1) {
// 鏌ョ湅/瀹℃牳娴佺▼
// 璇锋眰鎺ュ彛锛屽洖鏄炬暟鎹�
this.$axios.post(this.$api.insOrder.getInsOrder, {
@@ -589,6 +589,7 @@
};
this.addObj.type = String(this.addObj.type)
this.sampleList = this.HaveJson(res.data.sampleProduct);
+ this.addObj.sampleNum = this.sampleList.length
this.$nextTick(() => {
this.$refs.sampleTable.doLayout()
})
@@ -637,8 +638,14 @@
this.$message.error('鏈�夋嫨绱ф�ョ▼搴�')
} else if (this.sampleList.length < 1) {
this.$message.error('璇锋坊鍔犱竴涓牱鍝�')
- } else if (!this.sampleList.every(m => m.sampleCode)) {
- this.$message.error('杈撳叆鏍峰搧缂栧彿')
+ } else if (!this.sampleList.every(m => m.sample)) {
+ this.$message.error('璇疯緭鍏ユ牱鍝佸悕绉�')
+ } else if (!this.sampleList.every(m => m.model)) {
+ this.$message.error('璇疯緭鍏ユ牱鍝佸瀷鍙�')
+ } else if (!this.sampleList.every(m => m.standardMethodListId)) {
+ this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
+ } else if (!this.sampleList.every(m => m.unit)) {
+ this.$message.error('璇疯緭鍏ユ牱鍝佺殑鍗曚綅')
} else {
this.saveLoad = true
this.$axios.post(this.$api.insOrder.addInsOrder, {
@@ -652,20 +659,7 @@
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)
- }
+ this.$parent.playOrder(0)
})
}
},
@@ -682,7 +676,18 @@
this.saveLoad = false
if (res.code == 201) return
this.$message.success('鎻愪氦鎴愬姛')
- this.$parent.playOrder(0)
+ // 濡傛灉绱ф�ョ▼搴︿负绱ф�ワ紝闇�瑕佺洿鎺ヤ笅鍙戜汉鍛�
+ if (this.addObj.type == 2) {
+ this.issuedDialogVisible = true;
+ this.$axios.post(this.$api.insOrder.selectOrderManDay, {
+ id: this.currentId
+ }).then(ress => {
+ this.distributeData.orderId = this.currentId
+ this.distributeData.appointed = ress.data
+ })
+ } else {
+ this.$parent.playOrder(0)
+ }
})
},
// 涓嬪彂
@@ -698,7 +703,6 @@
this.upLoad = true;
this.$axios.post(this.$api.insOrder.upInsOrder, {
orderId: this.distributeData.orderId,
- sampleId: this.distributeData.sampleId,
appointed: this.distributeData.appointed,
userId: this.distributeData.userId
}).then(res => {
@@ -793,7 +797,7 @@
this.count++
}
this.$refs.sampleTable.doLayout()
- this.selectsStandardMethodByFLSSM()
+ // this.selectsStandardMethodByFLSSM()
},
selectsStandardMethodByFLSSM() {
this.methodLoad = true
@@ -801,7 +805,20 @@
tree: this.selectTree
}).then(res => {
this.methodLoad = false
- this.methods = res.data.standardMethodList
+ try {
+ if (res.data.standardMethodList.length == 0 && this.selectTree.split('-').length == 5) {
+ let arr = this.selectTree.split('-')
+ let arr0 = arr.slice(0, arr.length - 1)
+ let selectTree = arr0.join('-').substring(0, arr0.join('-').length - 1)
+ this.$axios.post(this.$api.standardTree.selectsStandardMethodByFLSSM, {
+ tree: selectTree
+ }).then(ress => {
+ this.methods = ress.data.standardMethodList
+ })
+ } else {
+ this.methods = res.data.standardMethodList
+ }
+ } catch (e) {}
})
},
addStandardTree() {
@@ -906,6 +923,17 @@
},
upProductSelect(selection, row) {
row.state = row.state == 1 ? 0 : 1
+ this.sampleList.map(item => {
+ if (this.sampleIds.indexOf(item.id) > -1) {
+ item.insProduct.map(m => {
+ if (m.id == row.id) {
+ m.state = row.state;
+ }
+ return m;
+ })
+ }
+ return item
+ })
},
tableRowClassName({
row,
@@ -988,8 +1016,7 @@
this.units = res.data
})
},
- methodChange(val) {
- this.$refs.sampleTable.doLayout()
+ methodChange(val, row) {
this.getProductLoad = true
this.$axios.post(this.$api.standardTree.selectStandardProductList, {
model: this.addObj.model,
@@ -1002,21 +1029,48 @@
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)
- }
- }
- })
+ row.insProduct = this.HaveJson(res.data)
this.getProductLoad = false
- this.productList = []
- this.$refs.sampleTable.setCurrentRow()
+ this.productList = row.insProduct
+ this.$refs.sampleTable.setCurrentRow(row)
+ setTimeout(() => {
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ }, 200)
})
},
- methodFocus(){
+ methodFocus() {
this.selectsStandardMethodByFLSSM()
+ },
+ handleChangeModel(e) {
+ let num = this.selectTree.split('-').length;
+ if (num == 4) {
+ this.selectTree = this.selectTree + ' - ' + e
+ } else {
+ let arr = this.selectTree.split('-')
+ let arr0 = arr.slice(0, arr.length - 1)
+ this.selectTree = arr0.join('-') + '- ' + e
+ }
+ },
+ // 瑕佹眰鍊煎彉鍖栨椂
+ requestChange(e, row) {
+ this.sampleList.map(item => {
+ if (this.sampleIds.indexOf(item.id) > -1) {
+ item.insProduct.map(m => {
+ if (m.id == row.id) {
+ m.ask = e;
+ }
+ return m;
+ })
+ }
+ return item
+ })
+ },
+ selectStandardMethods() {
+ this.$axios.get(this.$api.standardTree.selectStandardMethodEnum).then(res => {
+ this.methods = res.data
+ })
}
}
}
--
Gitblit v1.9.3