From 9f0386489b0282f2291c11dca7530ef0f0259e25 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 26 八月 2023 17:53:48 +0800
Subject: [PATCH] modified: src/api/experiment/checkTheReport.js modified: src/components/experiment/checkTheReport/index.vue modified: src/views/experiment/checkTheReport/index.vue modified: src/views/inspectionManagement/reportForInspection/index.vue
---
src/views/experiment/inspectionApplication/Viewdetails/index.vue | 177 ++++++++++++----------------------------------------------
1 files changed, 37 insertions(+), 140 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/Viewdetails/index.vue b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
index dd8a167..e61c489 100644
--- a/src/views/experiment/inspectionApplication/Viewdetails/index.vue
+++ b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
@@ -12,7 +12,7 @@
<el-form ref="form" :model="searchData" label-width="80px">
<el-col :span="6">
<el-form-item label="鏉ユ枡鏃ユ湡:" >
- <el-input :disabled="true" v-model="searchData.from_time"></el-input>
+ <el-input :disabled="true" v-model="searchData.formTime"></el-input>
</el-form-item>
</el-col>
@@ -23,7 +23,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="浜у搧缂栧彿:">
- <el-input :disabled="true" v-model="searchData.mcode"></el-input>
+ <el-input :disabled="true" v-model="searchData.code"></el-input>
</el-form-item>
</el-col>
</el-form>
@@ -60,7 +60,7 @@
<el-col :span="6">
<el-form-item label="鐧昏鏃ユ湡:">
- <el-input :disabled="true" v-model="searchData.end_time"></el-input>
+ <el-input :disabled="true" v-model="searchData.endTime"></el-input>
</el-form-item>
</el-col>
@@ -86,7 +86,7 @@
<div>
<el-card style="margin: 10px;">
<el-table
- :data="tableData"
+ :data="insProducts"
border
style="width: 100%">
<el-table-column
@@ -95,52 +95,37 @@
width="50">
</el-table-column>
<el-table-column
- prop="date"
+ prop="name"
label="椤圭洰"
width="180">
</el-table-column>
<el-table-column
- prop="name"
+ prop="unit"
label="鍗曚綅"
width="180">
</el-table-column>
<el-table-column
- prop="kk"
+ prop="internal"
label="鏍囧噯鍊�">
</el-table-column>
<el-table-column
- prop="zz"
+ prop="required"
label="鍐呮帶鍊�">
</el-table-column>
- <el-table-column
- prop="oo"
- wight="200"
- label="缁忛獙浜�">
- <template>
- <el-select v-model="value" placeholder="榛勬檽鏄�">
- <el-option
- v-for="item in cities"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- <span style="float: left">{{ item.label }}</span>
- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
- </el-option>
+ <el-table-column prop="userName" label="缁忛獙浜�">
+ <template slot-scope="scope">
+ <el-select v-model="value" size="small" slot="append" style="width: 220px;">
+ <el-option v-for="item in ZERENren" :key="item.id" :label="item.name" :value="item.name"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
- prop="pp"
+ prop="inspectionMaterialId"
label="瀹為獙璁惧">
<template>
- <el-select v-model="value" placeholder="鎷夊姏鏈�">
- <el-option
- v-for="item in cities"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
+ <!-- <el-select v-model="scope.row.checker" size="small" slot="append" style="width: 260px;">
+ <el-option v-for="item in checkeroptions" :key="item.value" :label="item.label">{{ item.label }}</el-option>
+ </el-select> -->
</template>
</el-table-column>
</el-table>
@@ -151,126 +136,38 @@
</div>
</template>
<script>
- import { selectInspectsList, selectAll, addInspect} from '@/api/experiment/planAssignments'
+ import { selectInspectsListById,selectUser} from '@/api/experiment/planAssignments'
export default {
data(){
return {
- searchData:{
- from_time:'',
- supplier:'',
- mcode:'',
- name:'',
- specifications:'',
- unit:'',
- num:'',
- userName:'',
- end_time:'',
-
- },
- value:{},
- cities:[{
- value: 'Beijing',
- label: '榛勫皬鏄�'
- }, {
- value: 'Shanghai',
- label: '榛勫皬鏄�'
- }, {
- }],
- tableData:[{
- date: '瀵肩嚎',
- name: 'mm',
- kk:'30.0',
- zz:'30.0',
- oo:'榛勬檽鏄�',
- pp:'鎷夊姏鏈�',
- },{
- date: '瀵肩嚎',
- name: 'mm',
- kk:'30.0',
- zz:'30.0',
- oo:'榛勬檽鏄�',
- pp:'鎷夊姏鏈�',
- },{
- date: '瀵肩嚎',
- name: 'mm',
- kk:'30.0',
- zz:'30.0',
- oo:'榛勬檽鏄�',
- pp:'鎷夊姏鏈�',
- },{
- date: '瀵肩嚎',
- name: 'mm',
- kk:'30.0',
- zz:'30.0',
- oo:'榛勬檽鏄�',
- pp:'鎷夊姏鏈�',
- },{
- date: '瀵肩嚎',
- name: 'mm',
- kk:'30.0',
- zz:'30.0',
- oo:'榛勬檽鏄�',
- pp:'鎷夊姏鏈�',
- }],
- currentPage:1,
- pageSize:8,
- id:''
+ searchData:{ },
+ insProducts:[],
+ uu:'',
+ value:''
}
},
created(){
- console.log(this.$route.query.icode);
- this.id = this.$route.query.icode;
- this.selectInspectsList()
+ this.uu = this.$route.query.id;
+ this.selectInspectsListById()
+ this.selectUser()
},
methods: {
- async goback(){
-
+ //杩斿洖
+ async goback(){
this.$router.push({name:'inspectionApplication'})
},
- async selectInspectsList() {
-
- // 鑾峰彇鍒嗛〉鍒楄〃
- const res = await selectInspectsList({ countSize: this.pageSize, pageSize: this.currentPage ,message:this.id})
- // this.inspectionTable = data
- console.log(res)
-
- // res.data.forEach((item) => {
- // var formTime = item["DATE_FORMAT(`form_time`,'%Y-%m-%d')"]
- // var startTime = item["DATE_FORMAT(i"]["`start_time`,'%Y-%m-%d')"]
- // var endTime = item["DATE_FORMAT(i"]["`end_time`,'%Y-%m-%d')"]
- // var checkdate = startTime + '~' + endTime
- // var createTime = item["DATE_FORMAT(i"]["`create_time`,'%Y-%m-%d')"]
- // item['formTime'] = formTime // 鏉ユ枡鏃ユ湡
- // item['checkdate'] = checkdate // 妫�楠屾棩鏈�
- // item['createTime'] = createTime // 鐧昏鏃ユ湡
- // })
- this.searchData.mcode = res.data.row[0].mcode
- this.searchData.supplier = res.data.row[0].supplier
- this.searchData.from_time = res.data.row[0]["DATE_FORMAT(`form_time`,'%Y-%m-%d')"]
- this.searchData.name = res.data.row[0].name
- this.searchData.specifications = res.data.row[0].specifications
- this.searchData.unit = res.data.row[0].unit
- this.searchData.num = res.data.row[0].num
- this.searchData.end_time = res.data.row[0]["DATE_FORMAT(i"]["`end_time`,'%Y-%m-%d')"]
- this.searchData.userName = res.data.row[0].userName
-
-
-
-
- const data = res.data.row
- data.forEach((item) => {
- var formTime = item["DATE_FORMAT(`form_time`,'%Y-%m-%d')"]
- var startTime = item["DATE_FORMAT(i"]["`start_time`,'%Y-%m-%d')"]
- var endTime = item["DATE_FORMAT(i"]["`end_time`,'%Y-%m-%d')"]
- var checkdate = startTime + '~' + endTime
- var createTime = item["DATE_FORMAT(i"]["`create_time`,'%Y-%m-%d')"]
- item['formTime'] = formTime // 鏉ユ枡鏃ユ湡
- item['checkdate'] = checkdate // 妫�楠屾棩鏈�
- item['createTime'] = createTime // 鐧昏鏃ユ湡
- })
- this.inspectionTable = data
- this.total = res.data.total
+ //妫�楠屽崟璐ｄ换浜�
+ async selectUser(){
+ const res = await selectUser()
+ this.ZERENren = res.data
+ // console.log(this.ZERENren);
},
+ //妫�楠屽崟琛�
+ async selectInspectsListById() {
+ const res = await selectInspectsListById({id:this.uu})
+ this.searchData = res.data
+ this.insProducts = res.data.insProducts
+ }
}
}
</script>
--
Gitblit v1.9.3