From a075ef6b7cbd09d727068ef3d7e08691775dbb16 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 17:58:58 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 94 +++++++++++++++++++++++++++++++---------------
1 files changed, 63 insertions(+), 31 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index a9d2fe4..1c57def 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -55,31 +55,31 @@
</el-col>
</el-row>
<div class="search">
- <el-form :inline="true" :model="searchForm" class="form-inline" label-width="90px">
+ <el-form :inline="true" :model="searchForm" class="form-inline" label-width="100px">
<el-form-item label="濮旀墭缂栧彿:">
- <el-input clearable v-model="searchForm.sampleName" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ <el-input clearable v-model="insOrder.entrustCode" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="鏍峰搧缂栧彿:">
- <el-input clearable v-model="searchForm.sampleName" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ <el-input clearable v-model="currentSample.sampleCode" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="鏍峰搧鍚嶇О:">
- <el-input clearable v-model="searchForm.sampleName" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ <el-input clearable v-model="currentSample.sample" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="鏍峰搧鏁伴噺:">
- <el-input clearable v-model="searchForm.sampleName" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ <el-input clearable v-model="sampleProduct.length" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="涓嬪彂鏃堕棿:">
- <el-input clearable v-model="searchForm.sampleName" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ <el-input clearable v-model="insOrder.sendTime" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="绱ф�ョ▼搴�:">
- <el-input clearable v-model="searchForm.sampleName" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ <el-input clearable v-model="insOrder.typeName" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="绾﹀畾鏃堕棿:">
- <el-input clearable v-model="searchForm.sampleName" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ <el-input clearable v-model="insOrder.appointed" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
- <el-form-item label="褰撳墠鏍峰搧鏁�:">
- <el-input clearable v-model="searchForm.sampleName" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
- </el-form-item>
+ <el-form-item label="褰撳墠鏍峰搧浣嶆暟:" >
+ <span v-if="currentSample.index">{{ `NO.${currentSample.index}` }}</span>
+ </el-form-item>
</el-form>
</div>
<div class="center">
@@ -87,31 +87,37 @@
<el-drawer
title="鏍峰搧鍒囨崲"
:visible.sync="sampleVisible"
- :destroy-on-close="true"
- size="55%">
- <el-table class="el-table" ref="productTable" :data="productList" height="100%" tooltip-effect="dark" border highlight-current-row @row-click="handleChangeSample">
- <el-table-column type="index" align="center" label="搴忓彿" width="70" :key="Math.random()">
+ size="50%">
+ <el-table class="el-table" ref="productTable" :data="sampleProduct" height="100%" tooltip-effect="dark" border highlight-current-row @row-click="handleChangeSample" :row-class-name="tableRowClassName">
+ <el-table-column type="index" align="center" label="搴忓彿" width="70px" :key="Math.random()">
</el-table-column>
- <el-table-column prop="inspectionItemSubclass" label="鏍峰搧缂栧彿" min-width="100"
+ <el-table-column prop="sampleCode" label="鏍峰搧缂栧彿" min-width="100px"
show-overflow-tooltip></el-table-column>
- <el-table-column prop="method" label="鏍峰搧鍨嬪彿" min-min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="sonLaboratory" label="妫�娴嬬姸鎬�" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="unit" label="鏄惁鐣欐牱" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="model" label="鏍峰搧鍨嬪彿" min-width="100px" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="insState" label="妫�娴嬬姸鎬�" min-width="100px" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <el-tag v-for="(item, i) in typeList" :key="i" v-if="item.value == scope.row.insState"
+ :type="item.type" size="medium" style="margin-right: 5px;">{{item.label}}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="isLeave" label="鏄惁鐣欐牱" min-width="100px" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <span>{{ scope.row.isLeave==0?'鍚�':'鏄�' }}</span>
+ </template>
+ </el-table-column>
<!-- 妫�楠屽崟浼氭湁涓�涓槸鍚︽湁閰嶅鏍峰搧瀛楁鎺у埗鏄剧ず -->
- <el-table-column prop="unit" label="閰嶅鏍峰搧鍨嬪彿" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="unit" label="閰嶅鏍峰搧鍚嶇О" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="unit" label="閰嶅鏍峰搧鏁伴噺" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="joinModel" label="閰嶅鏍峰搧鍨嬪彿" min-width="130px" show-overflow-tooltip v-if="insOrder.mating>0"></el-table-column>
+ <el-table-column prop="joinName" label="閰嶅鏍峰搧鍚嶇О" min-width="130px" show-overflow-tooltip v-if="insOrder.mating>0"></el-table-column>
+ <el-table-column prop="joinNum" label="閰嶅鏍峰搧鏁伴噺" min-width="130px" show-overflow-tooltip v-if="insOrder.mating>0"></el-table-column>
</el-table>
</el-drawer>
<el-drawer
title="浠诲姟鍒囨崲"
:visible.sync="taskVisible"
- :destroy-on-close="true"
- size="55%"
- :append-to-body="true">
+ size="45%">
<ValueTable class="value-table" ref="insOrderPlan"
:url="$api.insOrderPlan.selectInsOrderPlanList" :componentData="componentData"
- :key="upIndex" v-if="taskVisible"/>
+ :key="upIndex"/>
</el-drawer>
</div>
</template>
@@ -119,7 +125,7 @@
<script>
import ValueTable from '../../tool/value-table.vue'
export default {
- props: ['sonLaboratory'],
+ props: ['sonLaboratory','orderId'],
components: {
ValueTable,
},
@@ -131,7 +137,6 @@
sampleName: null,
state: null
},
- productList:[],
id: 0,
componentData: {
entity: {
@@ -159,22 +164,44 @@
requiredUp: []
},
upIndex: 0,
+ insOrder: {},
+ sampleProduct: [],
+ typeList:[],
+ urgentList:[],
+ currentSample:{},//褰撳墠鏍峰搧淇℃伅
}
},
created() {
this.componentData.entity.sonLaboratory = this.sonLaboratory;
+ this.id = this.orderId;
},
mounted() {
this.getTypeDicts()
this.getInsStateDicts()
},
+ watch:{
+ id(val){
+ this.$axios.post(this.$api.insOrderPlan.doInsOrder,{
+ id: val
+ }).then(res=>{
+ this.insOrder = res.data.insOrder;
+ this.urgentList.forEach(m=>{
+ if(m.value==this.insOrder.type){
+ this.insOrder.typeName = m.label
+ }
+ })
+ this.sampleProduct = res.data.sampleProduct
+ this.currentSample = this.sampleProduct[0]
+ })
+ }
+ },
methods: {
- handleChangeSample(row){
- console.log(1111111111,row)
+ handleChangeSample(row, column, event){
+ this.currentSample = row;
this.sampleVisible = false;
},
handleChangeTask(row){
- console.log(222222222,row)
+ this.id = row[0].id;
this.taskVisible = false;
},
getTypeDicts() {
@@ -191,6 +218,7 @@
ele.type = 'danger'
}
})
+ this.urgentList = data;
this.componentData.tagField.type.select = data
})
},
@@ -209,9 +237,13 @@
ele.type = 'danger'
}
})
+ this.typeList = data
this.componentData.tagField.insState.select = data
})
},
+ tableRowClassName({ row, rowIndex }){
+ row.index = rowIndex + 1;
+ }
}
}
</script>
--
Gitblit v1.9.3