From b155fc6663b18b9f8428529056ce16817e2caae1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 21 三月 2024 16:50:51 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/b1-ins-order/add.vue | 250 ++++++++++++++++++++++++++++---------------------
1 files changed, 142 insertions(+), 108 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index c4bc1b6..355ae0f 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -245,7 +245,7 @@
</el-table-column>
<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||active>1" placeholder="妫�楠屾爣鍑�" size="small"
+ <el-select v-model="scope.row.standardMethodListId" :disabled="scope.row.model==null" placeholder="妫�楠屾爣鍑�" size="small"
:loading="methodLoad" @change="(value)=>methodChange(value, scope.row)" @focus="methodFocus" :readonly="active>1">
<el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
</el-option>
@@ -294,7 +294,7 @@
</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" v-loading="getProductLoad">
+ :row-class-name="tableRowClassName" v-loading="getProductLoad" @select-all="handleAll">
<el-table-column type="selection" width="65" :selectable="selectable"></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"
@@ -583,7 +583,8 @@
this.selectInsOrderTemplate()
this.getAuthorizedPerson();
this.selectEnumByCategoryForUnit()
- if (this.active != 1){
+ this.selectStandardMethods()
+ if (this.active != 1) {
// 鏌ョ湅/瀹℃牳娴佺▼
// 璇锋眰鎺ュ彛锛屽洖鏄炬暟鎹�
this.$axios.post(this.$api.insOrder.getInsOrder, {
@@ -594,6 +595,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()
})
@@ -642,43 +644,32 @@
}
if (!this.addObj.type) {
this.$message.error('鏈�夋嫨绱ф�ョ▼搴�')
- return
+ } else if (this.sampleList.length < 1) {
+ 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, {
+ insOrder: this.addObj,
+ list: this.sampleList
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.saveLoad = false
+ if (res.code == 201) return
+ this.$message.success('宸叉彁浜�')
+ this.$parent.playOrder(0)
+ })
}
- if (!this.sampleList.every(m => m.sample)) {
- this.$message.error('杈撳叆鏍峰搧鍚嶇О')
- return
- }
- if (!this.sampleList.every(m => m.model)) {
- this.$message.error('杈撳叆鏍峰搧鍨嬪彿')
- return
- }
- if (!this.sampleList.every(m => m.method)) {
- this.$message.error('閫夋嫨妫�楠屾爣鍑�')
- return
- }
- if (!this.sampleList.every(m => m.unit)) {
- this.$message.error('杈撳叆鍗曚綅')
- return
- }
- if (!this.sampleList.every(m => m.isLeave!=null||m.isLeave!=undefined)) {
- this.$message.error('鏄惁鐣欐牱')
- return
- }
- 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('宸叉彁浜�')
- this.$parent.playOrder(0)
- })
},
upInsOrderOfState(state) {
this.saveLoad = true
@@ -694,17 +685,17 @@
if (res.code == 201) return
this.$message.success('鎻愪氦鎴愬姛')
// 濡傛灉绱ф�ョ▼搴︿负绱ф�ワ紝闇�瑕佺洿鎺ヤ笅鍙戜汉鍛�
- 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)
- }
+ 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)
+ }
})
},
// 涓嬪彂
@@ -810,10 +801,7 @@
this.sample.standardMethodListId = null
this.sample.insProduct = []
this.sample.id = this.count
- this.sampleList.push(this.HaveJson(this.sample)).map(m=>{
- m.isLeave = 0
- return m
- })
+ this.sampleList.push(this.HaveJson(this.sample))
this.count++
}
this.$refs.sampleTable.doLayout()
@@ -825,18 +813,20 @@
tree: this.selectTree
}).then(res => {
this.methodLoad = false
- 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
- }
+ 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() {
@@ -852,10 +842,7 @@
this.sample.standardMethodListId = null
this.sample.insProduct = []
this.sample.id = this.count
- this.sampleList.push(this.HaveJson(this.sample)).map(m=>{
- m.isLeave = 0
- return m
- })
+ this.sampleList.push(this.HaveJson(this.sample))
this.count++
}
},
@@ -944,17 +931,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
- })
+ 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,
@@ -1052,43 +1039,90 @@
})
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
- })
- },
+ 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
+ })
+ },
selectable(){
if(this.active>1){
return false
}else{
return true
}
+ },
+ handleAll(e){
+ if(e.length>0){
+ this.productList.map(m=>{
+ m.state = 1
+ return m
+ })
+ }else{
+ this.productList.map(m=>{
+ m.state = 0
+ return m
+ })
+ }
+ if(e.length>0){
+ this.sampleList.map(item => {
+ if (this.sampleIds.indexOf(item.id) > -1) {
+ item.insProduct.map(m => {
+ m.state = 1
+ return m;
+ })
+ }
+ return item
+ })
+ }else{
+ this.sampleList.map(item => {
+ if (this.sampleIds.indexOf(item.id) > -1) {
+ item.insProduct.map(m => {
+ m.state = 0
+ return m;
+ })
+ }
+ return item
+ })
+ }
+ this.$nextTick(()=>{
+ this.$refs.productTable.doLayout()
+ })
}
}
}
--
Gitblit v1.9.3