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 | 184 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 138 insertions(+), 46 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index a6a26d2..1c57def 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -47,7 +47,7 @@
<template>
<div>
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">鏍峰搧璇︽儏</el-col>
+ <el-col :span="12" style="padding-left: 20px;">妫�楠屽崟璇︽儏</el-col>
<el-col :span="12" style="text-align: right;">
<el-button size="small" type="primary" @click="sampleVisible=true">鏍峰搧鍒囨崲</el-button>
<el-button size="small" type="primary" @click="taskVisible=true">浠诲姟鍒囨崲</el-button>
@@ -55,31 +55,31 @@
</el-col>
</el-row>
<div class="search">
- <el-form :inline="true" :model="searchForm" class="form-inline">
+ <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,49 +87,48 @@
<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="sonLaboratory" label="妫�娴嬬姸鎬�" min-width="100" 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="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="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%">
- <el-table class="el-table" ref="productTable" :data="productList" height="100%" tooltip-effect="dark" border highlight-current-row @row-click="handleChangeTask">
- <el-table-column prop="inspectionItemSubclass" label="濮旀墭缂栧彿" 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="method" label="鏍峰搧鍚嶇О" min-min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="unit" label="绱ф�ョ▼搴�" min-width="100" show-overflow-tooltip>
- <template slot-scope="scope">
- <el-tag
- :type="scope.row.type" size="medium">{{scope.row.label}}</el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="unit" label="鐘舵��" min-width="100" show-overflow-tooltip>
- <template slot-scope="scope">
- <el-tag
- :type="scope.row.type" size="medium">{{scope.row.label}}</el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="method" label="绾﹀畾鏃堕棿" min-min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="method" label="涓嬪彂鏃堕棿" min-min-width="100" show-overflow-tooltip></el-table-column>
- </el-table>
+ size="45%">
+ <ValueTable class="value-table" ref="insOrderPlan"
+ :url="$api.insOrderPlan.selectInsOrderPlanList" :componentData="componentData"
+ :key="upIndex"/>
</el-drawer>
</div>
</template>
<script>
+ import ValueTable from '../../tool/value-table.vue'
export default {
+ props: ['sonLaboratory','orderId'],
+ components: {
+ ValueTable,
+ },
data() {
return {
sampleVisible:false,
@@ -138,19 +137,112 @@
sampleName: null,
state: null
},
- productList:[]
+ id: 0,
+ componentData: {
+ entity: {
+ sonLaboratory: null,
+ userId: 0
+ },
+ isIndex: true,
+ showSelect: true,
+ select: false,
+ selectMethod:'handleChangeTask',
+ sort: false,
+ do: [],
+ isPage:false,
+ linkEvent: {},
+ tagField: {
+ type: {
+ select: []
+ },
+ insState: {
+ select: []
+ },
+ },
+ selectField: {},
+ requiredAdd: [],
+ 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() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "绱ф�ョ▼搴�"
+ }).then(res => {
+ let data = res.data
+ data.forEach(ele => {
+ if (ele.value === '0') {
+ ele.type = 'success'
+ } else if (ele.value === '1') {
+ ele.type = 'warning'
+ } else if (ele.value === '2') {
+ ele.type = 'danger'
+ }
+ })
+ this.urgentList = data;
+ this.componentData.tagField.type.select = data
+ })
+ },
+ getInsStateDicts() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "妫�楠屼换鍔＄姸鎬�"
+ }).then(res => {
+ let data = res.data
+ data.forEach(ele => {
+ //0:寰呮楠� 1:妫�楠屼腑 2:宸叉楠� 3:寰呭鏍� 4:澶嶆牳鏈�氳繃 5:澶嶆牳閫氳繃
+ if (['2', '5'].includes(ele.value)) {
+ ele.type = 'success'
+ } else if (['1', '3'].includes(ele.value)) {
+ ele.type = 'warning'
+ } else if (['0', '4'].includes(ele.value)) {
+ ele.type = 'danger'
+ }
+ })
+ this.typeList = data
+ this.componentData.tagField.insState.select = data
+ })
+ },
+ tableRowClassName({ row, rowIndex }){
+ row.index = rowIndex + 1;
}
}
}
--
Gitblit v1.9.3