From 8cdd746682b92b7aaabad790db5bafa3d57ccea7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 26 八月 2023 15:34:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/views/experiment/inspectionApplication/index.vue | 144 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 116 insertions(+), 28 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index b3fc4f1..72718de 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -180,16 +180,17 @@
title="鏂板妫�楠屽崟"
:visible.sync="checkTypeVisible"
width="50%"
+ top="10vh"
>
<div class="check-box">
<el-radio-group v-model="type" @change="handleRadioChange">
- <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="0" border >鍘熸潗鏂欐楠�</el-radio>
- <el-radio :label="1" border>濮旀墭妫�楠�</el-radio>
- <el-radio :label="2" border>鎴愬搧妫�楠�</el-radio>
+ <el-radio :style="`background-color: ${type==0?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="0" border>鍘熸潗鏂欐楠�</el-radio>
+ <el-radio :style="`background-color: ${type==1?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="1" border>濮旀墭妫�楠�</el-radio>
+ <el-radio :style="`background-color: ${type==2?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="2" border>鎴愬搧妫�楠�</el-radio>
</el-radio-group>
</div>
- <div v-if="type === 0 || type === ''">
- <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px" size="mini">
+ <div v-if="type === 0">
+ <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px" size="medium">
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
@@ -367,11 +368,86 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="checkTypeVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="addInspection">纭� 瀹�</el-button>
+ <!-- <el-button type="primary" @click="addInspection">纭� 瀹�</el-button> -->
+ <el-button type="primary" @click="QUEding">纭� 瀹�</el-button>
</span>
</el-dialog>
</div>
</div>
+
+ <!-- 纭畾璺宠浆鍩烘湰搴撳脊绐� -->
+ <el-dialog
+ title="鏍囧噯搴�"
+ :visible.sync="Standardframe"
+ width="48%"
+
+ >
+ <!-- <el-form :model="form">
+ <el-form-item label="璇烽�夋嫨瀹℃牳缁撴灉:" :label-width="formLabelWidth">
+ </el-form-item>
+ </el-form> -->
+
+ <!-- <div slot="footer" class="dialog-footer"> -->
+ <el-table
+ :data="tableData"
+ style="width: 100%; margin-bottom: 20px"
+ row-key="name"
+ border
+ height="calc(100vh - 250px)"
+ default-expand-all
+ ref="multipleTable"
+ :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+ >
+ <el-table-column type="selection" label="搴忓彿"> </el-table-column>
+ <el-table-column
+ type="index"
+ width="50px"
+ label="搴忓彿"
+ ></el-table-column>
+ <el-table-column label="椤圭洰鍚嶇О" sortable>
+ <template scope="scope">
+ <el-tag
+ ><div
+ class="firstDiv"
+ :style="`color: ${
+ scope.row.code == '[1]' ? '#16a7ff' : '#58c173'
+ }`"
+ >
+ {{ scope.row.code == "[1]" ? "01" : "02" }}
+ </div>
+ <span style="color: black">{{ scope.row.name }}</span></el-tag
+ >
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="unit"
+ label="鍗曚綅"
+ sortable
+ ></el-table-column>
+ <el-table-column label="鏍囧噯鍊�" sortable>
+ <template scope="scope">
+ <el-input
+ v-if="scope.row.edit === true || scope.row.code === '[2]'"
+ @blur="requiredOnfocus(scope)"
+ v-model="scope.row.required"
+ placeholder="璇疯緭鍏ユ爣鍑嗗��"
+ ></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="internal" label="鍐呮帶鍊�" sortable>
+ <template scope="scope">
+ <el-input
+ v-if="scope.row.edit === true || scope.row.code === '[2]'"
+ @blur="requiredOnfocus(scope)"
+ v-model="scope.row.internal"
+ placeholder="璇疯緭鍏ュ唴鎺у��"
+ ></el-input>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- </div> -->
+ </el-dialog>
+
<!-- 鍘熸潗鏂欐楠屾ā鎬佹 -->
<el-dialog
title="鍘熸潗鏂欐楠�"
@@ -491,7 +567,7 @@
/>
<el-table-column
prop="formTime"
- label="鏉ユ枡鏃ユ湡"
+ label="濮旀墭bian'ha"
min-width="10%"
/>
<el-table-column
@@ -534,13 +610,12 @@
</template>
<template v-else>
<router-view />
-
</template>
</div>
</template>
<script>
- import { selectInspectsList, selectAll, addInspect} from '@/api/experiment/planAssignments'
+ import { selectInspectsList, selectAll, addInspect,getCommisionList} from '@/api/experiment/planAssignments'
export default {
data() {
return {
@@ -588,7 +663,7 @@
amount: '',
checkdate: []
},
- infoForm:'',
+ infoForm:{},
commisionSelection:{
entrust_coding: '',
entrusted: '',
@@ -629,10 +704,12 @@
pageSize: 8, // 姣忛〉鐨勬暟鎹潯鏁�
radioValue: '鍏ㄩ儴',
checkTypeVisible: false,
- type: '', // 榛樿涓嶉�変腑鐨勭姸鎬�
+ type: 0, // 榛樿涓嶉�変腑鐨勭姸鎬�
rawmaterialVisible: false,
commisionVisible: false,
- tmp: ''
+ tmp: '',
+ Standardframe: false,
+ tableData: []
}
},
watch: {
@@ -666,6 +743,12 @@
this.id = row.id
this.$router.push({name:'Viewdetails',query: {id:row.id}});
this.selectInspectsList()
+ },
+ //濮旀墭妫�楠�
+ async getCommisionList() {
+ const res = await getCommisionList({pageNo:1,pageSize:10 })
+ this.commisionTable = res.data
+ console.log(this.commisionTable);
},
async selectInspectsList() {
// 鑾峰彇鍒嗛〉鍒楄〃
@@ -745,19 +828,20 @@
async handleRadioChange(){
if(this.type === 0){
// 鍘熸潗鏂欐姤妫�
- // this.rawmaterialVisible = true
- // const res = await selectAll({type: this.type})
- // var data = res.data
- // data.forEach((item)=>{
- // var checkdate = []
- // checkdate.push(item['createTime'])
- // checkdate.push(item['updateTime'])
- // item['checkdate'] = checkdate // 妫�楠屾棩鏈�
- // })
- this.$router.push({ name: 'ReportForInspection' });
+ this.rawmaterialVisible = true
+ const res = await selectAll({type: this.type})
+ var data = res.data
+ data.forEach((item)=>{
+ var checkdate = []
+ checkdate.push(item['createTime'])
+ checkdate.push(item['updateTime'])
+ item['checkdate'] = checkdate // 妫�楠屾棩鏈�
+ })
+ // this.infoForm = res.data
+ // this.$router.push({ name: 'ReportForInspection' });
}else if(this.type === 1){
- // this.commisionVisible = true
- // const res = await selectAll({type: this.type})
+ this.commisionVisible = true
+ const res = await getCommisionList({pageNo:1,pageSize:10})
// var data = res.data
// data.forEach((item)=>{
// var checkdate = []
@@ -766,8 +850,8 @@
// item['checkdate_'] = item['startTime'] + '~' + item['endTime']
// item['checkdate'] = checkdate // 妫�楠屾棩鏈�
// })
- // this.commisionTable = res.data
- this.$router.push({ name: 'CommissionInspection' });
+ this.commisionTable = res.data
+ // this.$router.push({ name: 'CommissionInspection' });
}
},
// 鏂板妫�楠�
@@ -811,7 +895,7 @@
type: this.type,
unit: this.finishedTable.unit })
}
- this.type = ''
+ this.type = 0
this.checkTypeVisible = false
this.$message({
message: '娣诲姞鎴愬姛锛�',
@@ -830,6 +914,10 @@
console.log(`褰撳墠椤�: ${val}`)
this.currentPage = val
this.selectInspectsList()
+ },
+ //纭畾璺宠浆
+ QUEding(){
+ this.Standardframe = true
}
}
}
@@ -854,7 +942,7 @@
}
height: auto;
font-size: 22px !important;
- padding: 20px 40px !important;
+ padding: 40px 50px !important;
::v-deep .el-radio__label{
font-size: 22px !important;
padding-left: 0px !important;
--
Gitblit v1.9.3