From 93d2defddb21068f61e4f88895f4b389b672eb46 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 31 八月 2023 15:45:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/views/experiment/inspectionApplication/index.vue | 112 ++++++++++++++++++++------------------------------------
1 files changed, 40 insertions(+), 72 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 4d98974..874e0d6 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -72,8 +72,8 @@
<el-table-column prop="createTime" label="鐧昏鏃ユ湡" min-width="80px" />
<el-table-column prop="inspection_status" label="妫�楠岀粨鏋�" min-width="80px">
<template slot-scope="scope">
- <el-tag class="tag" :type="scope.row.inspection_status === 0 ? 'danger' : 'success'"
- disable-transitions>{{ scope.row.inspection_status === 0 ? '涓嶅悎鏍�' : '鍚堟牸' }}</el-tag>
+ <el-tag class="tag" type="danger" disable-transitions v-if="scope.row.inspection_status == 0">涓嶅悎鏍�</el-tag>
+ <el-tag class="tag" type="success" disable-transitions v-else-if="scope.row.inspection_status == 1">鍚堟牸</el-tag>
</template>
</el-table-column>
<el-table-column prop="userName" label="鐧昏浜�" min-width="80px" />
@@ -81,7 +81,6 @@
<el-table-column label="鎿嶄綔" min-width="150" fixed="right">
<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>
</template>
</el-table-column>
@@ -307,41 +306,21 @@
<el-card>
<template slot-scope="scope">
<span>鐗堟湰閫夋嫨锛�</span>
- <el-select @change="ccc" v-model="selectedValue" size="small" slot="append" style="width: 220px;">
+ <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-select>
</template>
</el-card>
<el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="id" border
- height="calc(80vh - 250px)" default-expand-all ref="multipleTable"
- @select-all="selectAll" @selection-change="handleSelectionChange"
+ height="calc(40vh)" 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 prop="name" label="椤圭洰鍚嶇О" sortable>
</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 prop="required" label="鏍囧噯鍊�" sortable>
</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>
<span slot="footer" class="dialog-footer">
@@ -460,7 +439,7 @@
amount: '',
checkdate: []
},
- selectedValue: {},
+ selectedValue: null,
infoForm: {},
commisionSelection: {
entrust_coding: '',
@@ -510,8 +489,7 @@
tableData: [],
tableRow: {},
BANben: [],
- // select_1: [],
- aa: {},
+ version: null,
listdata:[],
ddd:{}
}
@@ -531,7 +509,6 @@
if (this.$route.name === 'ForInspectionDetail') this.showDetail = true
},
methods: {
-
async selectAll() {
const res = selectAll({
type: 0
@@ -545,23 +522,14 @@
this.commisionTable = res.data
},
async handleClick(row) {
- this.inspectionTable = row;
- this.id = row.id
- this.$router.push({
- name: 'Viewdetails',
- query: {
- id: row.id
- }
- });
- this.selectInspectsList()
+ // this.$router.push({
+ // name: 'Viewdetails',
+ // query: {
+ // id: row.id
+ // }
+ // });
+ this.$router.push(`Viewdetails/${row.id}`);
},
- // validateInput() {
- // if (this.inputValue.trim() === '') {
- // }
- // }, // 杈撳叆鍊间负绌猴紝寮瑰嚭鎻愮ず淇℃伅鎴栬繘琛屽叾浠栧鐞�
- // alert('杈撳叆鍊间笉鑳戒负绌�');
- // return;
-
//鐗堟湰搴�
async chooseVer() {
const res = await chooseVer({
@@ -569,23 +537,25 @@
name: this.tmp.name,
specifications: this.tmp.specifications
})
- this.BANben = res.data
- this.aa = this.BANben[0]
+ this.BANben = []
+ res.data.forEach(a=>{
+ this.BANben.push('V ' + a)
+ })
+ this.version = this.BANben[0]
this.lookProByVer()
},
-
//鏍囧噯搴�
async lookProByVer() {
const res = await lookProByVer({
mcode: this.tmp.mcode,
name: this.tmp.name,
specifications: this.tmp.specifications,
- version: this.aa
+ version: this.version.replace('V ', '')
})
this.tableData = res.data
},
- ccc(val) {
- this.aa = val
+ getProductVerison(val) {
+ this.version = val
this.lookProByVer()
},
async selectInspectsList() {
@@ -595,14 +565,13 @@
pageSize: this.currentPage,
message: this.id
})
- // this.inspectionTable = data
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 formTime = item["form_time"]
+ var startTime = item["start_time"]
+ var endTime = item["end_time"]
var checkdate = startTime + '~' + endTime
- var createTime = item["DATE_FORMAT(i"]["`create_time`,'%Y-%d')"]
+ var createTime = item["create_time"]
item['formTime'] = formTime // 鏉ユ枡鏃ユ湡
item['checkdate'] = checkdate // 妫�楠屾棩鏈�
item['createTime'] = createTime // 鐧昏鏃ユ湡
@@ -618,11 +587,11 @@
})
var 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 formTime = item["form_time"]
+ var startTime = item["start_time"]
+ var endTime = item["end_time"]
var checkdate = startTime + '~' + endTime
- var createTime = item["DATE_FORMAT(i"]["`create_time`,'%Y-%m-%d')"]
+ var createTime = item["create_time"]
item['formTime'] = formTime // 鏉ユ枡鏃ユ湡
item['checkdate'] = checkdate // 妫�楠屾棩鏈�
item['createTime'] = createTime // 鐧昏鏃ユ湡
@@ -687,9 +656,6 @@
})
this.rawMaterialTable = res.data
})
-
- // this.infoForm = res.data
- // this.$router.push({ name: 'ReportForInspection' });
} else if (this.type === 1) {
this.commisionVisible = true
selectAll({
@@ -721,9 +687,13 @@
supplier: this.infoForm.supplier,
type: this.type,
unit: this.infoForm.unit,
- version:this.BANben[1]
+ version:this.version.replace('V ', '')
}).then(res=>{
-
+ this.$message({
+ message: '娣诲姞鎴愬姛锛�',
+ type: 'success'
+ });
+ this.$router.push(`Viewdetails/${res.data}`)
})
}
if (this.type === 1) {
@@ -738,8 +708,7 @@
supplier: this.commisionSelection.supplier,
type: this.type,
unit: this.commisionSelection.unit,
- version:this.aa
-
+ version:this.version
})
}
if (this.type === 2) {
@@ -754,8 +723,7 @@
supplier: this.finishedTable.supplier,
type: this.type,
unit: this.finishedTable.unit,
- version:this.aa
-
+ version:this.version
})
}
this.type = 0
@@ -870,7 +838,7 @@
background: #fff;
display: flex;
justify-content: space-between;
- padding: 5px 24px 0px 24px;
+ padding: 20px 24px 0px 24px;
}
.input-form {
--
Gitblit v1.9.3