From e04fbe73f7785155bffe3db30a7ead37f9200f06 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 19 四月 2024 16:09:32 +0800
Subject: [PATCH] 对接测试项目统计接口
---
src/components/do/b1-ins-order/add.vue | 133 ++++++++++++++++++++++++++++++++------------
1 files changed, 97 insertions(+), 36 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 355ae0f..5f39d99 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -107,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>
@@ -216,7 +217,7 @@
</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" :selectable="selectable"></el-table-column>
+ <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">
@@ -245,7 +246,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.standardMethodListId" :disabled="scope.row.model==null" placeholder="妫�楠屾爣鍑�" size="small"
+ <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>
@@ -295,12 +296,16 @@
<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" @select-all="handleAll">
- <el-table-column type="selection" width="65" :selectable="selectable"></el-table-column>
+ <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="method" label="璇曢獙鏂规硶" min-width="120" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <span>{{scope.row.method.replace('[','').replace(']','').replaceAll('"','')}}</span>
+ </template>
+ </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>
@@ -417,9 +422,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>
@@ -441,7 +446,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">
@@ -455,6 +460,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>
@@ -567,7 +590,10 @@
units: [],
models: [],
methods: [],
- methodLoad: false
+ methodLoad: false,
+ noDialogVisible:false,
+ tell:'',
+ noLoading:false
}
},
watch: {
@@ -672,31 +698,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() {
@@ -704,7 +742,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
}
@@ -723,7 +761,7 @@
this.issuedDialogVisible = false
this.$parent.playOrder(0)
}).catch(e => {
- this.$message.error('淇敼澶辫触')
+ this.$message.error('鎻愪氦澶辫触')
this.upLoad = false
})
},
@@ -1123,6 +1161,29 @@
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)
+ })
}
}
}
--
Gitblit v1.9.3