From 15ac79a640187f1bc4d52d911428786bfdc710bd Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 22 八月 2023 09:36:50 +0800
Subject: [PATCH] 新增检验功能完善
---
.env.staging | 2
.env.development | 2
src/views/experiment/reportAuditing/index.vue | 56 +++++
src/views/experiment/inspectionApplication/index.vue | 140 ++++++++------
src/router/index.js | 9
src/views/experiment/inspectionApplication/Viewdetails/index.vue | 280 +++++++++++++++++++++++++++++++
6 files changed, 416 insertions(+), 73 deletions(-)
diff --git a/.env.development b/.env.development
index e5e7b7a..8dd5cb9 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = 'http://localhost:1234/'
+VUE_APP_BASE_API = 'http://192.168.110.167:1234/'
diff --git a/.env.staging b/.env.staging
index 4b2b496..d5bc70f 100644
--- a/.env.staging
+++ b/.env.staging
@@ -5,6 +5,6 @@
# base api
# VUE_APP_BASE_API = '/stage-api'
-VUE_APP_BASE_API = 'http://192.168.110.254:1234/'
+VUE_APP_BASE_API = 'http://192.168.110.87:1234/'
diff --git a/src/router/index.js b/src/router/index.js
index 36817fd..7b83e21 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -192,10 +192,17 @@
children: [
{
path: 'inspectionApplication',
- name: 'InspectionApplication',
+ name: 'inspectionApplication',
component: () => import('@/views/experiment/inspectionApplication/index'),
meta: { title: '鏂板妫�楠�', icon: 'tree' }
},
+ {
+ path: 'Viewdetails',
+ name: 'Viewdetails',
+ hidden: true ,
+ component: () => import('@/views/experiment/inspectionApplication/Viewdetails/index'),
+ meta: { title: '璇︽儏椤�', icon: 'tree' }
+ },
{
path: 'planAssignments',
name: 'PlanAssignments',
diff --git a/src/views/experiment/inspectionApplication/Viewdetails/index.vue b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
new file mode 100644
index 0000000..dd8a167
--- /dev/null
+++ b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
@@ -0,0 +1,280 @@
+<template>
+<div>
+ <div style="overflow: hidden;">
+ <el-card style="margin: 10px;" v-model="searchData" >
+ <div slot="header" class="clearfix">
+ <span>
+ <i slot="prefix" class="el-icon-s-home" />
+ 瀹為獙绠＄悊/鍘熸潗鏂欐楠屽崟</span>
+ </div>
+ <div class="card-content">
+ <el-row :gutter="80">
+ <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-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="渚涘簲鍟嗗悕绉�:" >
+ <el-input :disabled="true" v-model="searchData.supplier"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="浜у搧缂栧彿:">
+ <el-input :disabled="true" v-model="searchData.mcode"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-form>
+ </el-row>
+ <el-row :gutter="80">
+ <el-form ref="form" :model="searchData" label-width="80px">
+ <el-col :span="6">
+ <el-form-item label="鍘熸潗鏂欏悕绉�:">
+ <el-input :disabled="true" v-model="searchData.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+
+ <el-form-item label="瑙勬牸鍨嬪彿:">
+ <el-input :disabled="true" v-model="searchData.specifications"></el-input>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="6">
+
+ <el-form-item label="鍗曚綅:">
+ <el-input :disabled="true" v-model="searchData.unit"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-form>
+ </el-row>
+ <el-row :gutter="80">
+ <el-form ref="form" :model="searchData" label-width="80px">
+ <el-col :span="6">
+ <el-form-item label="鏁伴噺:">
+ <el-input :disabled="true" v-model="searchData.num"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+
+ <el-form-item label="鐧昏鏃ユ湡:">
+ <el-input :disabled="true" v-model="searchData.end_time"></el-input>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="6">
+
+ <el-form-item label="鐧昏浜�:">
+ <el-input :disabled="true" v-model="searchData.userName"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-form>
+ </el-row>
+ </div>
+ </el-card>
+
+
+ <el-row style="margin: 5px;">
+ <el-col :span="12" style="line-height: 32px;">妫�楠岄」鐩�</el-col>
+ <el-col :span="12" style="text-align: right;">
+ <!-- <el-button ic size="medium " @click="()=>{}">淇濆瓨</el-button> -->
+ <el-button icon="el-icon-refresh-lef" size="medium " style="background-color: cornflowerblue;" @click="goback">杩斿洖</el-button>
+ </el-col>
+ </el-row>
+ <div>
+ <el-card style="margin: 10px;">
+ <el-table
+ :data="tableData"
+ border
+ style="width: 100%">
+ <el-table-column
+ label="搴忓彿"
+ type="index"
+ width="50">
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="椤圭洰"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鍗曚綅"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="kk"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="zz"
+ 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-select>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="pp"
+ 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>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ </el-card>
+ </div>
+ </div>
+</div>
+</template>
+<script>
+ import { selectInspectsList, selectAll, addInspect} 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:''
+ }
+ },
+ created(){
+ console.log(this.$route.query.icode);
+ this.id = this.$route.query.icode;
+ this.selectInspectsList()
+ },
+ methods: {
+ 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
+ },
+}
+}
+</script>
+<style lang="scss" scoped>
+
+</style>
+
\ No newline at end of file
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 219169e..80346ca 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -154,7 +154,7 @@
>
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleClick(scope.row)">鏌ョ湅</el-button>
- <el-button type="text" size="small" >鎻愪氦</el-button>
+ <!-- <el-button type="text" size="small" >鎻愪氦</el-button> -->
<el-button type="text" size="small" >浣滃簾</el-button>
</template>
</el-table-column>
@@ -164,7 +164,7 @@
<el-pagination
class="pagination"
:current-page="currentPage"
- :page-sizes="[5, 10, 20, 30]"
+ :page-sizes="[1, 10, 20, 30]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
@@ -174,6 +174,7 @@
</div>
</div>
</div>
+ <!-- 瀵硅瘽妗� -->
<div class="checkType">
<el-dialog
title="鏂板妫�楠屽崟"
@@ -182,7 +183,7 @@
>
<div class="check-box">
<el-radio-group v-model="type" @change="handleRadioChange">
- <el-radio :label="0" border>鍘熸潗鏂欐楠�</el-radio>
+ <el-radio :label="0" border >鍘熸潗鏂欐楠�</el-radio>
<el-radio :label="1" border>濮旀墭妫�楠�</el-radio>
<el-radio :label="2" border>鎴愬搧妫�楠�</el-radio>
</el-radio-group>
@@ -192,43 +193,43 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
- <el-input style="width: 300px" type="text" :value="infoForm.dateSurvey" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="infoForm.dateSurvey" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="渚涘簲鍟嗗悕绉帮細">
- <el-input style="width: 300px" type="text" :value="infoForm.supplierName" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="infoForm.supplierName" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鍘熸潗鏂欑紪鐮侊細">
- <el-input style="width: 300px" type="text" :value="infoForm.materialCoding" placeholder="璇疯緭鍏ュ師鏉愭枡缂栫爜" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="infoForm.materialCoding" placeholder="璇疯緭鍏ュ師鏉愭枡缂栫爜" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鍘熸潗鏂欏悕绉帮細">
- <el-input style="width: 300px" type="text" :value="infoForm.materialName" placeholder="璇疯緭鍏ュ師鏉愭枡鍚嶇О" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="infoForm.materialName" placeholder="璇疯緭鍏ュ師鏉愭枡鍚嶇О" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 300px" type="text" :value="infoForm.specificationsModels" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="infoForm.specificationsModels" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鍗曚綅锛�">
- <el-input style="width: 300px" type="text" :value="infoForm.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="infoForm.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏁伴噺锛�">
- <el-input style="width: 300px" type="text" :value="infoForm.quantity" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="infoForm.quantity" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
@@ -251,43 +252,43 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
- <el-input style="width: 300px" type="text" :value="commisionSelection.formTime" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="commisionSelection.formTime" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="渚涘簲鍟嗗悕绉帮細">
- <el-input style="width: 300px" type="text" :value="commisionSelection.supplier" placeholder="璇疯緭鍏ュ鎵樺崟浣�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="commisionSelection.supplier" placeholder="璇疯緭鍏ュ鎵樺崟浣�" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="濮旀墭缂栧彿锛�">
- <el-input style="width: 300px" type="text" :value="commisionSelection.mcode" placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="commisionSelection.mcode" placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="濮旀墭鍚嶇О锛�">
- <el-input style="width: 300px" type="text" :value="commisionSelection.name" placeholder="璇疯緭鍏ユ牱鍝佸悕绉�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="commisionSelection.name" placeholder="璇疯緭鍏ユ牱鍝佸悕绉�" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 300px" type="text" :value="commisionSelection.specifications" placeholder="璇疯緭鍏ュ瀷鍙疯鏍�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="commisionSelection.specifications" placeholder="璇疯緭鍏ュ瀷鍙疯鏍�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鍗曚綅锛�">
- <el-input style="width: 300px" type="text" :value="commisionSelection.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="commisionSelection.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏁伴噺锛�">
- <el-input style="width: 300px" type="text" :value="commisionSelection.num" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="commisionSelection.num" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
@@ -310,43 +311,43 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
- <el-input style="width: 300px" type="text" v-model="finishedTable.deliverydate" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" v-model="finishedTable.deliverydate" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="渚涘簲鍟嗗悕绉帮細">
- <el-input style="width: 300px" type="text" v-model="finishedTable.supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О" autocomplete="off" />
+ <el-input style="width: 300px" type="text" v-model="finishedTable.supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鍘熸潗鏂欑紪鐮侊細">
- <el-input style="width: 300px" type="text" v-model="finishedTable.code" placeholder="璇疯緭鍏ュ師鏉愭枡缂栫爜" autocomplete="off" />
+ <el-input style="width: 300px" type="text" v-model="finishedTable.code" placeholder="璇疯緭鍏ュ師鏉愭枡缂栫爜" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鍘熸潗鏂欏悕绉帮細">
- <el-input style="width: 300px" type="text" v-model="finishedTable.name" placeholder="璇疯緭鍏ュ師鏉愭枡鍚嶇О" autocomplete="off" />
+ <el-input style="width: 300px" type="text" v-model="finishedTable.name" placeholder="璇疯緭鍏ュ師鏉愭枡鍚嶇О" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 300px" type="text" v-model="finishedTable.modelandspecification" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" v-model="finishedTable.modelandspecification" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鍗曚綅锛�">
- <el-input style="width: 300px" type="text" v-model="finishedTable.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" v-model="finishedTable.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏁伴噺锛�">
- <el-input style="width: 300px" type="text" v-model="finishedTable.amount" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" v-model="finishedTable.amount" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
@@ -390,7 +391,7 @@
type="selection"
label=""
min-width="10%"
- />
+ />
<el-table-column
type="index"
label="搴忓彿"
@@ -528,15 +529,16 @@
<el-button @click="commisionVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="handleCommisionSelection">纭� 瀹�</el-button>
</span>
- </div>
+ </div>
</el-dialog>
</template>
<template v-else>
<router-view />
+
</template>
</div>
</template>
-
+
<script>
import { selectInspectsList, selectAll, addInspect} from '@/api/experiment/planAssignments'
export default {
@@ -546,8 +548,9 @@
searchData: {
applicationnumber: '',
type: '',
- state: ''
+ state: '',
},
+ icode:'',
inspectionTable: [],
rawMaterialTable: [],
commisionTable: [{
@@ -623,7 +626,7 @@
}],
currentPage: 1,
total: 20, // 鎬绘潯鏁�
- pageSize: 5, // 姣忛〉鐨勬暟鎹潯鏁�
+ pageSize: 8, // 姣忛〉鐨勬暟鎹潯鏁�
radioValue: '鍏ㄩ儴',
checkTypeVisible: false,
type: '', // 榛樿涓嶉�変腑鐨勭姸鎬�
@@ -649,9 +652,24 @@
if (this.$route.name === 'ForInspectionDetail') this.showDetail = true
},
methods: {
+ async handleClick(row){
+ // console.log(item);
+ // const res = await ddd({goodId:id})
+ // this.$message({
+ // message: '鎭枩浣狅紝杩欐槸涓�鏉℃垚鍔熸秷鎭�',
+ // type: 'success'
+ // });
+
+ // console.log(res);
+ this.inspectionTable = row;
+ console.log(row.icode);
+ this.icode = row.icode
+ this.$router.push({name:'Viewdetails',query: {icode:row.icode}});
+ this.selectInspectsList()
+ },
async selectInspectsList() {
// 鑾峰彇鍒嗛〉鍒楄〃
- const res = await selectInspectsList({ countSize: this.pageSize, pageSize: this.currentPage })
+ const res = await selectInspectsList({ countSize: this.pageSize, pageSize: this.currentPage,message:this.icode})
// this.inspectionTable = data
// console.log(res.data.row)
const data = res.data.row
@@ -703,17 +721,15 @@
this.total = this.inspectionTable.length
},
reset(){
- this.searchData = {
- applicationnumber: '',
- type: '',
- state: ''
- }
+ this.countSize = 1
+ this.searchData = { }
+ // console.log('2222');
this.selectInspectsList()
},
- //琚�変腑鐨勪俊鎭� 鍗曢��
+ //琚�変腑鐨勪俊鎭� 鍗曢��
handleSelectionChange(val) {
if (val.length > 1) {
- this.$refs.multipleTable.clearSelection();
+ this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(val.pop())
}
this.tmp = val[0]
@@ -727,31 +743,31 @@
this.rawmaterialVisible = false
},
async handleRadioChange(){
- console.log(this.type)
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.rawMaterialTable = data
+ // 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' });
}else if(this.type === 1){
- this.commisionVisible = true
- const res = await selectAll({type: this.type})
- var data = res.data
- data.forEach((item)=>{
- var checkdate = []
- checkdate.push(item['startTime'])
- checkdate.push(item['endTime'])
- item['checkdate_'] = item['startTime'] + '~' + item['endTime']
- item['checkdate'] = checkdate // 妫�楠屾棩鏈�
- })
- this.commisionTable = res.data
+ // this.commisionVisible = true
+ // const res = await selectAll({type: this.type})
+ // var data = res.data
+ // data.forEach((item)=>{
+ // var checkdate = []
+ // checkdate.push(item['startTime'])
+ // checkdate.push(item['endTime'])
+ // item['checkdate_'] = item['startTime'] + '~' + item['endTime']
+ // item['checkdate'] = checkdate // 妫�楠屾棩鏈�
+ // })
+ // this.commisionTable = res.data
+ this.$router.push({ name: 'CommissionInspection' });
}
},
// 鏂板妫�楠�
@@ -818,7 +834,7 @@
}
}
</script>
-
+
<style lang="scss" scoped>
.checkType{
.check-box{
@@ -833,7 +849,7 @@
border-color: #b3d8ff;
::v-deep .el-radio__label{
color: #333 !important;
-
+
}
}
height: auto;
@@ -876,7 +892,7 @@
display: flex;
justify-content: flex-end;
}
-
+
.getDataBtn, .createBtn {
margin-left: 10px; /* Optional: Add some space between the buttons */
}
diff --git a/src/views/experiment/reportAuditing/index.vue b/src/views/experiment/reportAuditing/index.vue
index ad3c04e..0f4b6a3 100644
--- a/src/views/experiment/reportAuditing/index.vue
+++ b/src/views/experiment/reportAuditing/index.vue
@@ -23,17 +23,21 @@
</el-dropdown-menu>
</el-dropdown>
</el-form>
- <el-form>
- <el-button class="rightBtn" type="primary">瀹℃牳</el-button>
- </el-form>
</div>
+
+
+
+
+
+
+
<div class="library-table">
<div class="table-header">
<div class="search-bar">
<el-radio-group v-model="checkStatus" @change="handleRadioChange">
<el-radio-button>鍏ㄩ儴</el-radio-button>
- <el-radio-button label="0">寰呮彁浜�</el-radio-button>
- <el-radio-button label="2">寰呴�氳繃</el-radio-button>
+ <el-radio-button label="0">寰呴�氳繃</el-radio-button>
+ <el-radio-button label="2">閫氳繃</el-radio-button>
</el-radio-group>
<el-checkbox v-model="checked" style="margin-left: 20px"
>浠呯湅鎴戠殑</el-checkbox
@@ -79,7 +83,7 @@
<template slot-scope="scope">
<span>
<el-tag type="warning">{{
- scope.row.status == 0 ? "寰呮彁浜�" : "寰呴�氳繃"
+ scope.row.status == 0 ? "寰呴�氳繃" : "閫氳繃"
}}</el-tag>
</span>
</template></el-table-column
@@ -93,8 +97,36 @@
type="text"
size="small"
@click="handleClick(scope.row)"
- >鏌ョ湅璇︾粏</el-button
- >
+ >鏌ョ湅璇︾粏
+ </el-button>
+ <el-button type="text" size="small" @click="checkskip = true">瀹℃牳</el-button>
+
+ <el-dialog
+ title="鍘熷璁板綍瀹℃牳"
+ :visible.sync="checkskip"
+ width="30%"
+ :before-close="handleClose">
+ <el-form :model="form">
+ <el-form-item label="璇烽�夋嫨瀹℃牳缁撴灉" :label-width="formLabelWidth">
+ </el-form-item>
+ <el-row :gutter="20">
+ <el-col :span="6" :offset="5">
+ <!-- <el-button type="primary" style="background-color: rgb(208, 201, 192);">閫�鍥�</el-button> -->
+ <el-button style="background-color: rgb(206, 211, 216);">閫�鍥�</el-button>
+ </el-col>
+ <el-col :span="6" :offset="3">
+ <!-- <el-button type="primary" style="background-color: rgb(181, 237, 125);">閫氳繃</el-button> -->
+ <el-button style="background-color: rgb(192, 236, 148);">閫氳繃</el-button>
+ </el-col>
+ </el-row>
+
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="checkskip = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="checkskip= false">纭� 瀹�</el-button>
+ </div>
+ </el-dialog>
+
</template>
</el-table-column>
</el-table>
@@ -127,6 +159,10 @@
total: 0,
pageSize: 10,
checked: true,
+ checkskip: false,
+ form:{},
+ handleClose:'',
+ formLabelWidth: '120px'
};
},
created() {
@@ -157,6 +193,10 @@
this.checkStatus = undefined;
this.getData();
},
+ //瀹℃牳璺宠浆
+ // checkskip() {
+
+ // },
// 鏌ヨ鍒楄〃
async getData() {
const params = {
--
Gitblit v1.9.3