From c8ec099f3bf0d9cdc7e670ea2223c71e333d1e34 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 08 九月 2023 17:31:44 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/lims-before
---
src/views/experiment/reportAuditing/index.vue | 16 ++------
src/api/basicData/index.js | 7 +++
src/views/experiment/inspectionApplication/index.vue | 8 ++--
src/views/standardLibrary/index.vue | 55 +++++++++++++++------------
src/views/experiment/nonConformingFeedback/index.vue | 4 +-
5 files changed, 47 insertions(+), 43 deletions(-)
diff --git a/src/api/basicData/index.js b/src/api/basicData/index.js
index 4e00b7a..878b84c 100644
--- a/src/api/basicData/index.js
+++ b/src/api/basicData/index.js
@@ -9,7 +9,14 @@
selectproductModelById: "/productModel/selectproductModelById", // 鏍规嵁id鏌ヨ
updateProductModel: "/productModel/writeproductModel", // 鏇存柊鏍囧噯 -->缂栬緫
deleteList: "/productModel/delAllproductModel", // 鎵归噺鍒犻櫎
+ getSample: "/material/getSample" //鑾峰彇鍩虹鏁版嵁鏍峰搧鍚嶇О
+}
+export function getSample() {
+ return request({
+ url: Api.getSample,
+ method: 'get'
+ })
}
export function addStandardProjectGroupApi() {
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index b1ad99c..c977d79 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -63,10 +63,10 @@
<el-table-column prop="createTime" label="鐧昏鏃ユ湡" min-width="90px" />
<el-table-column prop="inspection_status" label="妫�楠岀粨鏋�" min-width="95px">
<template slot-scope="scope">
- <el-tag class="tag" effect="dark" type="success" disable-transitions
- v-if="scope.row.inspection_status == 1">鍚堟牸</el-tag>
- <el-tag class="tag" effect="dark" type="danger" disable-transitions
- v-else>涓嶅悎鏍�</el-tag>
+ <el-tag style="text-align: center;" class="tag" effect="dark" type="danger" disable-transitions
+ v-if="scope.row.inspection_status == 0">涓嶅悎鏍�</el-tag>
+ <el-tag style="text-align: center;" class="tag" effect="dark" 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" />
diff --git a/src/views/experiment/nonConformingFeedback/index.vue b/src/views/experiment/nonConformingFeedback/index.vue
index e89b8a9..be7ad14 100644
--- a/src/views/experiment/nonConformingFeedback/index.vue
+++ b/src/views/experiment/nonConformingFeedback/index.vue
@@ -14,7 +14,7 @@
<el-form-item>
<el-button type="primary" size="small" @click="getData()">鏌ヨ</el-button>
<el-button type="primary" size="small" plain @click="resetData()">閲嶇疆</el-button>
- <el-dropdown style="margin-left: 7px;">
+ <!-- <el-dropdown style="margin-left: 7px;">
<span class="el-dropdown-link">
楂樼骇鎼滅储<i class="el-icon-arrow-down el-icon--right"></i>
</span>
@@ -25,7 +25,7 @@
<el-dropdown-item disabled>鍙岀毊濂�</el-dropdown-item>
<el-dropdown-item divided>铓典粩鐓�</el-dropdown-item>
</el-dropdown-menu>
- </el-dropdown>
+ </el-dropdown> -->
</el-form-item>
</el-form>
<el-form style="margin-top: 10px;">
diff --git a/src/views/experiment/reportAuditing/index.vue b/src/views/experiment/reportAuditing/index.vue
index 6ebb875..5fb6550 100644
--- a/src/views/experiment/reportAuditing/index.vue
+++ b/src/views/experiment/reportAuditing/index.vue
@@ -63,7 +63,7 @@
</span>
</template></el-table-column
>
- <el-table-columne
+ <el-table-column
prop="materialName"
label="鏍峰搧鍚嶇О"
min-width="10%"
@@ -134,7 +134,7 @@
reportTable: [],
page: 1,
total: 0,
- pageSize: 8,
+ pageSize: 10,
checkskipvisible: false,
form:{},
formLabelWidth: '120px',
@@ -182,11 +182,6 @@
this.reportTable[this.tableRow.$index].status=1
this.transmitData(this.tableRow.row.id,1)
this.checkskipvisible= false
- this.$message({
- message: '閫氳繃鎴愬姛',
- type: 'success'
- });
- this.getData();
},
//涓嶉�氳繃
nocheckskip(row) {
@@ -194,16 +189,12 @@
this.reportTable[this.tableRow.$index].status=0
this.transmitData(this.tableRow.row.id,2)
this.checkskipvisible= false
- this.$message({
- message: '寰呴�氳繃',
- type: 'warning'
- });
- this.getData();
},
//瀹℃牳
async transmitData(id, result) {
let param={"id":id,"result":result}
let data = await checkApi(param)
+ await this.getData();
},
// 鏌ヨ鍒楄〃
async getData() {
@@ -214,6 +205,7 @@
status: this.checkStatus ? this.checkStatus : undefined,
};
const { data } = await selectAllReportCheck(params);
+ console.log(data);
this.reportTable = data.row;
this.total = data.total;
},
diff --git a/src/views/standardLibrary/index.vue b/src/views/standardLibrary/index.vue
index c515bee..d09e80c 100644
--- a/src/views/standardLibrary/index.vue
+++ b/src/views/standardLibrary/index.vue
@@ -7,8 +7,7 @@
<el-input size="small" clearable v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"></el-input>
</el-col>
<el-col :span="5">
- <el-button size="small" type="primary" icon="el-icon-plus"
- @click="addTreeFormVisible = true"></el-button>
+ <el-button size="small" type="primary" icon="el-icon-plus" @click="addSdantard()"></el-button>
</el-col>
</el-row>
<el-button size="small" type="text">鍏ㄩ儴</el-button>
@@ -73,12 +72,17 @@
</div>
<el-dialog class="addTree" title="娣诲姞鏍囧噯鎸囨爣" width="28%" :visible.sync="addTreeFormVisible">
<el-form v-model="addTreeForm" label-position="top">
- <el-form-item label="鏍囧噯绫诲瀷">
+ <el-form-item :required="true" label="鏍囧噯绫诲瀷">
<el-cascader v-model="addTreeForm.addTypeArr" :options="formTypeOptions"
:props="{ ...defaultProps, checkStrictly: true }" clearable @change="changeCascader" />
</el-form-item>
- <el-form-item v-show="addTreeForm.addTypeArr.length < 2" label="鐗╂枡鍚嶇О">
- <el-input @change="changeSample" v-model="addTreeForm.materialName" />
+ <el-form-item :required="true" v-show="addTreeForm.addTypeArr.length < 2" label="鐗╂枡鍚嶇О">
+ <el-select style="width: 100%;" @blur="changeSample" v-model="addTreeForm.materialName"
+ placeholder="璇烽�夋嫨">
+ <el-option v-for="item in materialList" :key="item.material" :label="item.material"
+ :value="item.material">
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item v-show="addTreeForm.addTypeArr.length < 3" label="鎵ц鏍囧噯">
<el-input v-model="addTreeForm.standardName" />
@@ -138,6 +142,7 @@
} from "@/api/standardLibrary";
import {
addStandardProjectGroupApi,
+ getSample
} from "@/api/basicData/index";
export default {
data() {
@@ -187,7 +192,8 @@
specificationsName: "",
materialName: "",
standardName: "",
- }
+ },
+ materialList: []
};
},
watch: {
@@ -221,6 +227,11 @@
},
methods: {
+ async addSdantard() {
+ this.addTreeFormVisible = true
+ let res = await getSample()
+ this.materialList = res.data
+ },
querySearch(queryString, cb) {
var restaurants = []
this.projectGroupingOptions.forEach(a => {
@@ -245,22 +256,15 @@
this.addTreeForm.standardName = ''
},
changeSample() {
- let selectType = this.standardTree.filter(item => {
- return item.id === this.addTreeForm.addTypeArr[0]
- })[0];
- if (this.addTreeForm.addTypeArr.length == 1) {
- let samples = selectType.children.filter(item => {
- return item.name === this.addTreeForm.materialName
- })[0]
- if (samples === undefined || samples === []) {
- this.$message({
- message: '璇峰厛鍦ㄥ熀纭�鏁版嵁涓坊鍔犺銆�' + this.addTreeForm.materialName + '銆戞牱鍝�',
- type: 'warning'
- });
- return false;
- }
+ if (this.addTreeForm.materialName != null && this.addTreeForm.materialName != '') {
+ return true
+ } else {
+ this.$message({
+ message: '璇峰厛閫夋嫨鐗╂枡锛�',
+ type: 'warning'
+ });
+ return false
}
- return true
},
oneSize() { },
twoSize() {
@@ -464,14 +468,15 @@
});
return
}
- let handelerSample = this.changeSample()
- if (!handelerSample) {
- return;
- }
let res = null;
+ // return;
try {
switch (this.addTreeForm.addTypeArr.length) {
case 1:
+ let handelerSample = this.changeSample()
+ if (!handelerSample) {
+ return;
+ }
res = await addMaterial({
...this.addTreeForm,
type: this.addTreeForm.addTypeArr[0],
--
Gitblit v1.9.3