From 94e2f78c6ff8eb51ce9b0a8c7a85062872cacb0c Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 22 四月 2024 17:25:48 +0800
Subject: [PATCH] 检验模板调整
---
src/components/do/b1-ins-order/add.vue | 224 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 167 insertions(+), 57 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 0c3f585..6a358af 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>
@@ -100,6 +107,7 @@
<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>
@@ -122,7 +130,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 +143,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 +153,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 +173,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 +187,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 +203,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 +216,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 +238,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,9 +246,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.standardMethodListId" :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>
@@ -248,14 +255,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>
@@ -288,13 +295,14 @@
</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>
<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="methodS" 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>
@@ -411,9 +419,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>
@@ -435,7 +443,7 @@
</div>
</el-col>
<el-col class="search_thing" :span="22">
- <div class="search_label"><span class="required-span">* </span>鎸囨淳浜哄憳锛�</div>
+ <div class="search_label"><span class="required-span" v-if="addObj.type == 2">* </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">
@@ -449,6 +457,24 @@
<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="noDialogVisible" 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-input v-model="tell" size="small" placeholder="璇疯緭鍏ヤ笉閫氳繃鍘熷洜"></el-input>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-row>
+ <el-button @click="noDialogVisible=false,tell=''">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitTell" :loading="noLoading">纭� 瀹�</el-button>
</el-row>
</span>
</el-dialog>
@@ -561,7 +587,10 @@
units: [],
models: [],
methods: [],
- methodLoad: false
+ methodLoad: false,
+ noDialogVisible:false,
+ tell:'',
+ noLoading:false
}
},
watch: {
@@ -634,7 +663,9 @@
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('璇锋坊鍔犱竴涓牱鍝�')
@@ -650,7 +681,7 @@
this.saveLoad = true
this.$axios.post(this.$api.insOrder.addInsOrder, {
insOrder: this.addObj,
- list: this.sampleList
+ list: JSON.stringify(this.sampleList)
}, {
headers: {
'Content-Type': 'application/json'
@@ -664,31 +695,43 @@
}
},
upInsOrderOfState(state) {
- this.saveLoad = true
- this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
- state,
- id: this.currentId
- }, {
- 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: this.currentId
- }).then(ress => {
- this.distributeData.orderId = this.currentId
- this.distributeData.appointed = ress.data
- })
- } else {
- this.$parent.playOrder(0)
- }
- })
+ if(state == 1){
+ this.saveLoad = true
+ this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
+ state,
+ id: this.currentId
+ }, {
+ 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: this.currentId
+ // }).then(ress => {
+ // this.distributeData.orderId = this.currentId
+ // this.distributeData.appointed = ress.data
+ // })
+ // } else {
+ // this.$parent.playOrder(0)
+ // }
+ 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.noDialogVisible = true
+ }
},
// 涓嬪彂
submitForm2() {
@@ -696,7 +739,7 @@
this.$message.error('绾﹀畾鏃堕棿鏈～鍐�')
return
}
- if (this.distributeData.userId == null || this.distributeData.userId == '') {
+ if (this.addObj.type == 2&&(this.distributeData.userId == null || this.distributeData.userId == '')) {
this.$message.error('鎸囨淳浜哄憳鏈～鍐�')
return
}
@@ -715,7 +758,7 @@
this.issuedDialogVisible = false
this.$parent.playOrder(0)
}).catch(e => {
- this.$message.error('淇敼澶辫触')
+ this.$message.error('鎻愪氦澶辫触')
this.upLoad = false
})
},
@@ -1071,7 +1114,74 @@
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()
+ })
+ },
+ submitTell(){
+ if (!this.tell) {
+ this.$message.error('璇疯緭鍏ヤ笉閫氳繃鍘熷洜')
+ return
+ }
+ this.noLoading = true;
+ this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
+ state:2,
+ id: this.currentId,
+ tell:this.tell
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.noLoading = false;
+ this.tell = '';
+ if (res.code == 201) return
+ this.$message.success('鎻愪氦鎴愬姛')
+ this.issuedDialogVisible = false;
+ this.$parent.playOrder(0)
+ })
+ }
}
}
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3