From 70bf5f310d85c3a0700d75a7a877f5a1e403d83f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 28 三月 2024 09:09:51 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/b1-ins-order/add.vue | 245 +++++++++++++++++++++++++++++++------------------
1 files changed, 155 insertions(+), 90 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index e70fb5c..201c3e4 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -80,6 +80,13 @@
.ins_order_add .el-table .warning-row .cell {
color: #bababa;
}
+
+ .el-select .is-disabled{
+ background: transparent !important;
+ }
+ .el-select .is-disabled .el-input__inner{
+ background: transparent !important;
+ }
</style>
<template>
@@ -122,7 +129,7 @@
<div class="search_input">
<el-input readonly size="small" v-model="addObj.custom">
<template slot="append"><el-button slot="append" icon="el-icon-search"
- @click="selectUserDia = true"></el-button></template>
+ @click="selectUserDia = true" :disabled="active>1"></el-button></template>
</el-input>
</div>
</el-col>
@@ -135,7 +142,7 @@
<el-col class="search_thing" :span="6">
<div class="search_label"><span class="required-span">* </span>绱ф�ョ▼搴︼細</div>
<div class="search_input">
- <el-select size="small" style="width: 100%;" clearable v-model="addObj.type">
+ <el-select size="small" style="width: 100%;" clearable v-model="addObj.type" :disabled="active>1">
<el-option v-for="(a, ai) in type" :key="ai" :value="a.value" :label="a.label"></el-option>
</el-select>
</div>
@@ -145,7 +152,7 @@
<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>
+ @click="selectStandardTree = true" :disabled="active>1"></el-button></template>
</el-input>
</div>
</el-col>
@@ -165,13 +172,13 @@
<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>
+ style="width: 65%;" @change="addStandardTree" :readonly="active>1"></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-select v-model="addObj.unit" clearable size="small" style="width: 100%;" :disabled="active>1">
<el-option v-for="(a, i) in units" :key="i" :label="a.label" :value="a.value"></el-option>
</el-select>
</div>
@@ -179,13 +186,13 @@
<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>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.otcCode" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
<div class="search_label" style="width: 175px;">鏄惁娑夊強閰嶅鏍峰搧锛�</div>
<div class="search_input" style="width: calc(100% - 175px);">
- <el-radio-group v-model="addObj.mating" @change="$refs.sampleTable.doLayout()">
+ <el-radio-group v-model="addObj.mating" @change="$refs.sampleTable.doLayout()" :disabled="active>1">
<el-radio :label="1">鏄�</el-radio>
<el-radio :label="0">鍚�</el-radio>
</el-radio-group>
@@ -195,7 +202,7 @@
<div class="search_label">澶囨敞锛�</div>
<div class="search_input">
<el-input type="textarea" :autosize="{ minRows: 2, maxRows: 2}" size="small" clearable
- v-model="addObj.remark"></el-input>
+ v-model="addObj.remark" :readonly="active>1"></el-input>
</div>
</el-col>
</el-row>
@@ -208,17 +215,17 @@
</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;">
- <el-table-column type="selection" width="60"></el-table-column>
+ border @selection-change="selectSample" highlight-current-row @row-click="rowClick" style="margin-top: 10px;" >
+ <el-table-column type="selection" width="60" :selectable="selectable" v-if="active==1"></el-table-column>
<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></el-input>
+ <el-input size="small" v-model="scope.row.sample" clearable :readonly="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="涓嶅～鍐欏垯绯荤粺鑷姩鐢熸垚"></el-input>
+ <el-input size="small" v-model="scope.row.sampleCode" clearable placeholder="涓嶅～鍐欏垯绯荤粺鑷姩鐢熸垚" :readonly="active>1"></el-input>
</template>
</el-table-column>
<!-- <el-table-column prop="factory" label="宸ュ巶" align="center" min-width="100">
@@ -230,7 +237,7 @@
<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" @change="handleChangeModel">
+ size="small" @change="handleChangeModel" :disabled="active>1">
<el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -238,8 +245,8 @@
</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" 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||active>1" 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>
</el-select>
@@ -247,14 +254,14 @@
</el-table-column>
<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-select v-model="scope.row.unit" clearable size="small" style="width: 100%;" :disabled="active>1">
<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" min-width="100">
<template slot-scope="scope">
- <el-select v-model="scope.row.isLeave" size="small">
+ <el-select v-model="scope.row.isLeave" size="small" :disabled="active>1">
<el-option label="鐣欐牱" :value="1"></el-option>
<el-option label="涓嶇暀鏍�" :value="0"></el-option>
</el-select>
@@ -287,8 +294,8 @@
</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">
- <el-table-column type="selection" width="65"></el-table-column>
+ :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="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140"
show-overflow-tooltip></el-table-column>
@@ -410,9 +417,9 @@
<el-button type="primary" @click="onSample()" :loading="getProductLoad">纭� 瀹�</el-button>
</span>
</el-dialog>
- <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>
+ <el-dialog title="淇濆瓨妯℃澘" :visible.sync="templateDia" width="400px">
+ <div class="body" style="display: flex;align-items: center;" v-if="templateDia">
+ <div class="search_label" style="width: 90px;"><span class="required-span">* </span>妯℃澘鍚嶇О锛�</div>
<div class="search_input">
<el-input size="small" clearable v-model="templateName"></el-input>
</div>
@@ -576,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, {
@@ -587,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()
})
@@ -631,20 +640,20 @@
save() {
if (!this.addObj.custom) {
this.$message.error('鏈�夋嫨涓嬪崟瀹㈡埛')
- } else if (!this.addObj.type) {
+ return
+ }
+ if (!this.addObj.type) {
this.$message.error('鏈�夋嫨绱ф�ョ▼搴�')
} 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.method)) {
- this.$message.error('閫夋嫨妫�楠屾爣鍑�')
- }else if (!this.sampleList.every(m => m.unit)) {
- this.$message.error('杈撳叆鍗曚綅')
- }else if (!this.sampleList.every(m => m.isLeave)) {
- this.$message.error('鏄惁鐣欐牱')
+ 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, {
@@ -658,7 +667,7 @@
this.saveLoad = false
if (res.code == 201) return
this.$message.success('宸叉彁浜�')
- this.$parent.playOrder(0)
+ this.$parent.playOrder(0)
})
}
},
@@ -676,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)
+ }
})
},
// 涓嬪彂
@@ -804,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() {
@@ -920,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,
@@ -1028,35 +1039,89 @@
})
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
+ 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{
- let arr = this.selectTree.split('-')
- let arr0 = arr.slice(0,arr.length-1)
- this.selectTree = arr0.join('-')+ '- '+ e
+ return true
}
},
- // 瑕佹眰鍊煎彉鍖栨椂
- 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
+ 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