From 275d9a3c158173842449782201b9be2c243dd58b Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 九月 2023 18:00:43 +0800
Subject: [PATCH] modified: .env.development modified: src/main.js new file: src/styles/fonts/element-icons.ttf new file: src/styles/fonts/element-icons.woff new file: src/styles/icon.css modified: src/views/inspectionManagement/commissionInspection/addCommision.vue modified: src/views/laboratory/organizational/index.vue
---
src/views/experiment/inspectionApplication/index.vue | 163 +++++++++++++++++++++++++++++-------------------------
1 files changed, 88 insertions(+), 75 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index bcce505..31f2a90 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -5,35 +5,35 @@
<div class="top-bar">
<el-form ref="form" :inline="true" :model="searchData">
<el-form-item label="鐢宠鍗曞彿:">
- <el-input v-model="searchData.applicationnumber" class="input-form" placeholder="璇疯緭鍏ョ敵璇峰崟鍙�"
+ <el-input size="small" v-model="searchData.applicationnumber" class="input-form" placeholder="璇疯緭鍏ョ敵璇峰崟鍙�"
style="width: 200px; margin-right: 20px;">
<i slot="prefix" class="el-input__icon el-icon-search" />
</el-input>
</el-form-item>
- <el-form-item label="妫�楠岀被鍨�:">
- <el-select v-model="searchData.type" placeholder="鍏ㄩ儴" style="width: 100px;margin-right: 20px;">
+ <el-form-item label="妫�楠岀被鍨�:" width="200">
+ <el-select size="small" v-model="searchData.type" placeholder="鍏ㄩ儴" style="width: 100px;margin-right: 20px;">
<el-option v-for="item in typeoptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="妫�楠岀粨鏋�:" style="margin-right: 20px;">
- <el-select v-model="searchData.state" placeholder="鍏ㄩ儴" style="width: 100px;margin-right: 20px;">
+ <el-form-item label="妫�楠岀粨鏋�:" width="200">
+ <el-select size="small" v-model="searchData.state" placeholder="鍏ㄩ儴" style="width: 100px;margin-right: 20px;">
<el-option v-for="item in stateoptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="searchInspections">鏌ヨ</el-button>
- <el-button type="primary" plain @click="reset">閲嶇疆</el-button>
+ <el-button size="small" type="primary" @click="searchInspections">鏌ヨ</el-button>
+ <el-button size="small" type="primary" plain @click="reset">閲嶇疆</el-button>
</el-form-item>
</el-form>
<el-form class="rightBtn">
<el-form-item class="createBtn">
- <el-button type="primary" icon="el-icon-document-add" @click="checkTypeVisible = true"
+ <el-button size="small" type="primary" icon="el-icon-plus" @click="checkTypeVisible = true"
style="background-color: rgb(1, 102, 226);">鏂板妫�楠屽崟</el-button>
</el-form-item>
<el-form-item class="getDataBtn">
- <el-button type="primary" icon="el-icon-download"
+ <el-button size="small" type="primary" icon="el-icon-download"
style="background-color: rgb(1, 102, 226);">瀵煎嚭妫�楠屽崟</el-button>
</el-form-item>
</el-form>
@@ -41,8 +41,8 @@
<div class="library-table">
<div class="table-box">
<el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;max-height: 600px;" :height="600"
- :cell-style="{textAlign: 'center'}"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
+ :cell-style="{textAlign: 'left'}"
+ :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
:data="inspectionTable">
<el-table-column type="selection" min-width="30px" />
<el-table-column prop="icode" label="鐢宠鍗曞彿" min-width="160px" />
@@ -105,14 +105,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
- <!-- <el-input style="width: 300px" type="text" :value="infoForm.startTime" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" /> -->
- <el-date-picker style="width: 300px" v-model="infoForm.formTime" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker style="width: 300px" disabled v-model="infoForm.formTime" type="date" placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="渚涘簲鍟嗗悕绉帮細">
- <el-input style="width: 300px" type="text" :value="infoForm.supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О"
+ <el-input style="width: 300px" type="text" disabled :value="infoForm.supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -120,13 +119,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鍘熸潗鏂欑紪鐮侊細">
- <el-input style="width: 300px" type="text" :value="infoForm.mcode" placeholder="璇疯緭鍏ュ師鏉愭枡缂栫爜"
+ <el-input style="width: 300px" type="text" disabled :value="infoForm.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="infoForm.name" placeholder="璇疯緭鍏ュ師鏉愭枡鍚嶇О"
+ <el-input style="width: 300px" type="text" disabled :value="infoForm.name" placeholder="璇疯緭鍏ュ師鏉愭枡鍚嶇О"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -134,13 +133,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 300px" type="text" :value="infoForm.specifications" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
+ <el-input style="width: 300px" type="text" disabled :value="infoForm.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="infoForm.unit" placeholder="璇疯緭鍏ュ崟浣�"
+ <el-input style="width: 300px" type="text" disabled :value="infoForm.unit" placeholder="璇疯緭鍏ュ崟浣�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -148,7 +147,7 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏁伴噺锛�">
- <el-input style="width: 300px" type="text" :value="infoForm.num" placeholder="璇疯緭鍏ユ暟閲�"
+ <el-input style="width: 300px" type="text" disabled :value="infoForm.num" placeholder="璇疯緭鍏ユ暟閲�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -168,13 +167,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="濮旀墭缂栧彿">
- <el-input style="width: 300px" type="text" :value="commisionSelection.entrust_coding"
+ <el-input style="width: 300px" type="text" disabled :value="commisionSelection.entrust_coding"
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"
+ <el-input style="width: 300px" type="text" disabled :value="commisionSelection.supplier"
placeholder="璇疯緭鍏ュ鎵樺崟浣�" autocomplete="off" />
</el-form-item>
</el-col>
@@ -182,13 +181,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏍峰搧缂栧彿">
- <el-input style="width: 300px" type="text" :value="commisionSelection.mcode" placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�"
+ <el-input style="width: 300px" type="text" disabled :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="璇疯緭鍏ユ牱鍝佸悕绉�"
+ <el-input style="width: 300px" type="text" disabled :value="commisionSelection.name" placeholder="璇疯緭鍏ユ牱鍝佸悕绉�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -196,13 +195,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 300px" type="text" :value="commisionSelection.specifications"
+ <el-input style="width: 300px" type="text" disabled :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.supplier"
+ <el-input style="width: 300px" type="text" disabled :value="commisionSelection.supplier"
placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
</el-form-item>
</el-col>
@@ -210,7 +209,7 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="瀹屾垚鏈熼檺">
- <el-input style="width: 300px" type="text" :value="commisionSelection.completionDeadline"
+ <el-input style="width: 300px" type="text" disabled :value="commisionSelection.completionDeadline"
placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
</el-form-item>
</el-col>
@@ -243,14 +242,14 @@
</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="璇疯緭鍏ュ師鏉愭枡缂栫爜"
+ <el-form-item label="鎴愬搧缂栫爜锛�">
+ <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="璇疯緭鍏ュ師鏉愭枡鍚嶇О"
+ <el-form-item label="鎴愬搧鍚嶇О锛�">
+ <el-input style="width: 300px" type="text" v-model="finishedTable.name" placeholder="璇疯緭鍏ユ垚鍝佸悕绉�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -299,7 +298,7 @@
<template slot-scope="scope">
<span>鐗堟湰閫夋嫨锛�</span>
<el-select @change="getProductVerison" v-model="version" size="small" slot="append" style="width: 220px;">
- <el-option v-for="item in BANben" :key="item" :label="item" :value="item"></el-option>
+ <el-option v-for="(item,index) in BANben" :key="index" :label="item.label" :value="item.value"></el-option>
</el-select>
</template>
</el-card>
@@ -338,10 +337,8 @@
<el-table-column prop="surveyor" label="妫�楠屼汉" min-width="8%" />
<el-table-column prop="startTime" label="妫�楠屾棩鏈�" min-width="8%" />
<el-table-column prop="type" label="鐘舵��" min-width="8%">
- <template slot-scope="scope">
- <span :style="{ color: scope.row.state === type ? 'green' : 'red' }">
- {{ scope.row.state===1 ? '宸叉娴�':'寰呮娴�' }}
- </span>
+ <template>
+ <span style="color: red">寰呮楠�</span>
</template>
</el-table-column>
</el-table>
@@ -473,7 +470,7 @@
pageSize: 10, // 姣忛〉鐨勬暟鎹潯鏁�
radioValue: '鍏ㄩ儴',
checkTypeVisible: false,
- type: 0, // 榛樿涓嶉�変腑鐨勭姸鎬�
+ type: 2, // 榛樿涓嶉�変腑鐨勭姸鎬�
rawmaterialVisible: false,
commisionVisible: false,
tmp: {},
@@ -526,28 +523,31 @@
const res = await chooseVer({
mcode: this.tmp.mcode,
name: this.tmp.name,
- specifications: this.tmp.specifications
+ specifications: this.tmp.specificationsId
})
this.BANben = []
res.data.forEach(a => {
- this.BANben.push('V ' + a)
+ this.BANben.push({
+ label: "V" + a,
+ value: a
+ })
})
- this.version = this.BANben[0]
- this.lookProByVer()
+ this.version = this.BANben[0].value;
+ this.lookProByVerFun()
},
//鏍囧噯搴�
- async lookProByVer() {
+ async lookProByVerFun() {
const res = await lookProByVer({
mcode: this.tmp.mcode,
name: this.tmp.name,
- specifications: this.tmp.specifications,
- version: this.version.replace('V ', '')
+ specifications: this.tmp.specificationsId,
+ version: this.version
})
this.tableData = res.data
},
getProductVerison(val) {
this.version = val
- this.lookProByVer()
+ this.lookProByVerFun()
},
async selectInspectsList() {
// 鑾峰彇鍒嗛〉鍒楄〃
@@ -609,8 +609,12 @@
},
reset() {
this.countSize = 1;
- this.pageSize = 8;
- this.searchData = {};
+ this.pageSize = 10;
+ this.searchData = {
+ applicationnumber: '',
+ type: '',
+ state: '',
+ };
this.selectInspectsList();
},
//琚�変腑鐨勪俊鎭� 鍗曢��
@@ -645,7 +649,10 @@
checkdate.push(item['updateTime'])
item['checkdate'] = checkdate // 妫�楠屾棩鏈�
})
- this.rawMaterialTable = res.data
+ let arr = res.data.filter((val)=>{
+ return val.type === 0;
+ })
+ this.rawMaterialTable = arr
})
} else if (this.type === 1) {
this.commisionVisible = true
@@ -666,29 +673,25 @@
},
// 鏂板妫�楠�
async addInspection() {
+ let obj = {};
if (this.type === 0) {
- addInspect({
+ obj = {
endTime: this.infoForm.checkdate[1],
formTime: this.infoForm.formTime,
mcode: this.infoForm.mcode,
name: this.infoForm.name,
num: this.infoForm.num,
specifications: this.infoForm.specifications,
+ specificationId: this.infoForm.specificationsId,
startTime: this.infoForm.checkdate[0],
supplier: this.infoForm.supplier,
type: this.type,
unit: this.infoForm.unit,
- version: this.version.replace('V ', '')
- }).then(res => {
- this.$message({
- message: '娣诲姞鎴愬姛锛�',
- type: 'success'
- });
- this.$router.push(`Viewdetails/${res.data}`)
- })
+ version: this.version
+ }
}
if (this.type === 1) {
- const res = await addInspect({
+ obj = {
endTime: this.commisionSelection.checkdate[1],
formTime: this.commisionSelection.formTime,
mcode: this.commisionSelection.mcode,
@@ -700,30 +703,34 @@
type: this.type,
unit: this.commisionSelection.unit,
version: this.version
- })
+ }
}
if (this.type === 2) {
- const res = await addInspect({
- endTime: '2023-08-15',
+ obj = {
+ endTime: this.finishedTable.checkdate[1],
formTime: this.finishedTable.deliverydate,
mcode: this.finishedTable.code,
name: this.finishedTable.name,
num: parseInt(this.finishedTable.amount),
specifications: this.finishedTable.modelandspecification,
- startTime: '2023-08-14',
+ startTime: this.finishedTable.checkdate[1],
supplier: this.finishedTable.supplier,
type: this.type,
unit: this.finishedTable.unit,
version: this.version
- })
+ }
}
- this.type = 0
- this.checkTypeVisible = false
- // this.$message({
- // message: '娣诲姞鎴愬姛锛�',
- // type: 'success'
- // });
- // this.$router.push({name: 'Viewdetails'})
+ addInspect(obj).then(res => {
+ this.$message({
+ message: '娣诲姞鎴愬姛锛�',
+ type: 'success'
+ });
+ this.type = 2
+ this.checkTypeVisible = false
+ this.$router.push(`Viewdetails/${res.data}`)
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
},
// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
handleSizeChange(val) {
@@ -770,12 +777,18 @@
this.addInspection()
},
delInspect(row){
- delInspect({
- id: row.id
- }).then(res=>{
- this.$message.success('宸蹭綔搴�')
- this.selectInspectsList()
- })
+ this.$confirm('鎮ㄧ‘璁ゅ垹闄よ繖鏉℃暟鎹悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ delInspect({
+ id: row.id
+ }).then(()=>{
+ this.$message.success('宸蹭綔搴�')
+ this.selectInspectsList()
+ })
+ }).catch(() => {});
}
}
}
--
Gitblit v1.9.3