From 0b89c49a1e3ab87368b689d985e28a977a9bb84e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 13:08:20 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b1-inspection-order.vue | 66 +++++++++++++++++++--------------
1 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 4ad89cb..f513eef 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -54,7 +54,7 @@
border-radius: 8px 0 0 8px;
}
- .tab li:nth-child(4) {
+ .tab li:nth-child(5) {
border-radius: 0 8px 8px 0;
}
@@ -86,9 +86,9 @@
v-model="componentData.entity.entrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing">
- <div class="search_label">鏍峰搧鍚嶇О锛�</div>
+ <div class="search_label">鏍峰搧绫诲瀷锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.sample" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="padding-left: 30px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
@@ -155,7 +155,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-show="distributeData.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">
@@ -217,8 +217,8 @@
componentData: {
entity: {
entrustCode: null,
- sample: null,
- state: 1,
+ sampleType: null,
+ state: 0,
orderBy: {
field: 'id',
order: 'asc'
@@ -241,7 +241,7 @@
type: 'text',
method: 'download',
disabFun: (row, index) => {
- return row.state != 1
+ return row.state != 1 || row.reportId == null
}
}, {
id: 'verify',
@@ -255,19 +255,22 @@
id: 'quash',
font: '鎾ら攢',
type: 'text',
- method: 'handlEquash'
+ method: 'handlEquash',
+ disabFun: (row, index) => {
+ return row.state == 2 || row.state == 3
+ }
}, {
- font: '涓嬪彂',
+ font: '鍒嗛厤',
type: 'text',
method: 'handleIssued',
disabFun: (row, index) => {
return row.state != 1 || row.sendTime != null
}
}],
- linkEvent:{
- entrustCode:{
- method:'selectAllByOne'
- }
+ linkEvent: {
+ entrustCode: {
+ method: 'selectAllByOne'
+ }
},
tagField: {
type: {
@@ -330,12 +333,15 @@
addPower: true,
upLoad: false,
tabList: [{
- label: '妫�楠屽鐞�',
+ label: '寰呭鏍�',
+ value: 0
+ }, {
+ label: '寰呮楠�',
value: 1
},
{
- label: '寰呭鏍�',
- value: 0
+ label: '宸叉楠�',
+ value: 4
},
{
label: '閫�鍥�',
@@ -347,8 +353,8 @@
},
],
tabIndex: 0,
- active: 0,//1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍�
- currentId:null
+ active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍�
+ currentId: null
}
},
mounted() {
@@ -412,27 +418,26 @@
},
// 璇︽儏
selectAllByOne(row) {
- this.active = 2;
+ this.active = 2;
// console.log(row);
// //鎵撳紑寮规
// this.dialogVisible = true;
// //row = 鐐瑰嚮瀵瑰簲琛屽��
// //澶嶅埗缁檉ormData
// this.formData = this.HaveJson(row);
- this.currentId = row.id
+ this.currentId = row.id
},
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
this.dataDialogVisible = true;
},
// 涓嬭浇鎶ュ憡
- download(row) {
- },
+ download(row) {},
// 瀹℃牳
handleVerify(row) {
// this.verifyDialogVisible = true;
- this.active = 3;
- this.currentId = row.id
+ this.active = 3;
+ this.currentId = row.id
},
// 鎾ら攢
handlEquash(row) {
@@ -441,19 +446,24 @@
// 涓嬪彂
handleIssued(row) {
this.issuedDialogVisible = true;
- this.$axios.post(this.$api.insOrder.selectOrderManDay,{
- id: row.sampleId
- }).then(res=>{
+ this.$axios.post(this.$api.insOrder.selectOrderManDay, {
+ id: row.id
+ }).then(res => {
this.distributeData.orderId = row.id
this.distributeData.sampleId = row.sampleId
this.distributeData.appointed = res.data
+ this.distributeData.type = row.type
})
},
submitForm2() {
- if(this.distributeData.appointed==null||this.distributeData.appointed==''){
+ if (this.distributeData.appointed == null || this.distributeData.appointed == '') {
this.$message.error('绾﹀畾鏃堕棿鏈～鍐�')
return
}
+ if(this.distributeData.type==2&&(this.distributeData.userId==null||this.distributeData.userId=='')){
+ this.$message.error('鎸囨淳浜哄憳鏈～鍐�')
+ return
+ }
this.upLoad = true;
this.$axios.post(this.$api.insOrder.upInsOrder, {
orderId: this.distributeData.orderId,
--
Gitblit v1.9.3