From aca7c994977ecb1cc8fb3b7740a04192135a40a9 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 04 九月 2023 15:04:20 +0800
Subject: [PATCH] modified: .env.development modified: src/views/CNAS/nonConformanceManage/index.vue modified: src/views/CNAS/reviewAnnualPlan/index.vue modified: src/views/CNAS/satisfactionSurveys/index.vue modified: src/views/experiment/checkTheReport/index.vue modified: src/views/experiment/inspectionApplication/index.vue modified: src/views/experiment/nonConformanceReview/index.vue modified: src/views/experiment/nonConformingFeedback/index.vue modified: src/views/experiment/reportAuditing/index.vue modified: src/views/inspectionManagement/commissionInspection/index.vue modified: src/views/inspectionManagement/reportForInspection/index.vue modified: src/views/laboratory/ledger/index.vue modified: src/views/laboratory/measure/index.vue modified: src/views/laboratory/personnel/index.vue modified: src/views/laboratory/role/index.vue modified: src/views/message/toDo/index.vue
---
src/views/inspectionManagement/commissionInspection/index.vue | 100 ++++++++++++++++++++++++++++++--------------------
1 files changed, 60 insertions(+), 40 deletions(-)
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index b4bc55b..b6dec7b 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -58,8 +58,8 @@
</div>
</div>
<div class="table-box">
- <el-table ref="commisionTable" :max-height="800" :cell-style="{textAlign: 'center'}"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
+ <el-table ref="commisionTable" :max-height="800" :cell-style="{textAlign: 'left'}"
+ :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
:data="commisionTable" @selection-change="handleSelectionChange" style="width: 100%">
<el-table-column type="selection" :selectable="checkSelect" min-width="10%" />
<el-table-column type="index" label="搴忓彿" min-width="10%" />
@@ -67,11 +67,10 @@
<el-table-column prop="entrusted" label="濮旀墭鍗曚綅" min-width="12%" />
<el-table-column prop="samples_number" label="鏍峰搧鏁伴噺" min-width="8%" />
<el-table-column prop="sample_name" label="鏍峰搧鍚嶇О" min-width="8%" />
- <el-table-column prop="specifications_models" label="瑙勬牸鍨嬪彿" min-width="12%" />
+ <el-table-column prop="speName" label="瑙勬牸鍨嬪彿" min-width="12%" />
<el-table-column prop="inspectionTime" label="閫佹牱鏃堕棿" min-width="8%" />
<el-table-column prop="completionDeadline" label="瀹屾垚鏈熼檺" min-width="8%" />
<el-table-column prop="contacts" label="濮旀墭缂栧埗浜�" min-width="8%" />
- <el-table-column prop="insTime" label="妫�楠屾棩鏈�" min-width="8%" />
<el-table-column prop="inspection_status" label="鐘舵��" min-width="8%">
<template slot-scope="scope">
<div v-if="scope.row.inspection_status === 0">
@@ -163,7 +162,8 @@
selectViewUUID,
delLink,
chooseVersion,
- lookProByVer
+ lookProByVer,
+ addInspect
} from '@/api/inspection/commisioninspection'
export default {
data() {
@@ -193,7 +193,7 @@
value: '1',
label: '閮ㄩ棬1'
}],
- radioValue: 0,
+ radioValue: null,
commisionTable: [{
specifications_models: "GGXH-AAAAA",
inspectionTime: "2023-08-03",
@@ -209,15 +209,15 @@
}],
conditionsOptions: [{
label: '鍏ㄩ儴',
- value: 0
+ value: null
},
{
label: '宸叉楠�',
- value: 1
+ value: 0
},
{
label: '寰呮楠�',
- value: 2
+ value: 1
}
],
currentPage: 1,
@@ -254,39 +254,48 @@
},
handleSelectionChange(val) {
if (val.length > 1) {
+ let data = val.pop();
this.$refs.commisionTable.clearSelection();
- this.$refs.commisionTable.toggleRowSelection(val.pop())
+ this.$refs.commisionTable.toggleRowSelection(data);
+ this.checkData = data;
+ }else{
+ this.checkData = val;
}
- this.checkData = val;
- console.log(this.checkData);
},
//鐢熸垚鎶ユ鍗曠‘璁ゆ寜閽�
confirmBtn(formName) {
this.$refs[formName].validate((valid)=>{
if(valid){
- // let dateArr = this.addInspectionForm.inspectionDate;
- // //娣诲姞鎶ユ鍗�
- // let val = this.checkData[0];
- // let obj = {
- // "endTime": dateArr[1],
- // "experiment": "",
- // "formTime": val.createTime,
- // "id": val.id,
- // "mcode": val.materialCoding,
- // "name": val.materialName,
- // "num": val.quantity,
- // "specifications": val.specificationsModels,
- // "startTime": dateArr[0],
- // "supplier": val.supplierName,
- // "type": val.type,
- // "unit": val.unit,
- // "version": this.addInspectionForm.version
- // }
- // // this.createReport(obj);
- // this.addReportDialog = false;
- // this.initNewSelection();
- // this.showNewPage = true;
+ let dateArr = this.addInspectionForm.inspectionDate;
+ //娣诲姞鎶ユ鍗�
+ let val = this.checkData[0];
+ let obj = {
+ "endTime": dateArr[1],
+ "mcode":"mcode",
+ "formTime": val.inspectionTime,
+ "id": val.id,
+ "name": val.sample_name,
+ "num": val.samples_number,
+ "specifications": val.speName,
+ "startTime": dateArr[0],
+ "supplier": val.entrusted,
+ "type": 2,
+ // "unit": "mm",
+ "version": this.addInspectionForm.version
}
+ this.createReport(obj);
+ this.addReportDialog = false;
+ }
+ });
+ },
+ //鐢熸垚鎶ユ鍗曡姹�
+ async createReport(param) {
+ await addInspect(param).then(res =>{
+ this.search();
+ this.$message.success('鎶ユ鎴愬姛')
+ this.$router.push(`/experiment/Viewdetails/${res.data}`)
+ }).catch(()=>{
+ this.$message.error('鎶ユ澶辫触')
});
},
//鐢熸垚鎶ユ鍗曟寜閽�
@@ -299,7 +308,7 @@
} else {
let mcode = this.checkData[0].entrust_coding;
let name = this.checkData[0].sample_name;
- let specifications = this.checkData[0].specifications_models;
+ let specifications = this.checkData[0].speName;
let id = this.checkData[0].id;
this.getChooseVersionFun(mcode,name,specifications,id);
this.addReportDialog = true;
@@ -309,7 +318,7 @@
changeVersionFun(){
let mCode = this.checkData[0].entrust_coding;
let name = this.checkData[0].sample_name;
- let specifications = this.checkData[0].specifications_models;
+ let specifications = this.checkData[0].speName;
let version = this.addInspectionForm.version;
let id = this.checkData[0].id;
this.getProByVersion(mCode,name,specifications,version,id);
@@ -324,7 +333,10 @@
specifications : specifications,
version: version
}).then((res)=>{
- console.log(res);
+ var data = res.data;
+ for(var i=0;i<data.length;i++){
+ data[i].id = "0" + i;
+ }
vm.standardLibraryData = res.data;
})
},
@@ -333,7 +345,7 @@
var vm = this;
this.chooseVersion = [];
await chooseVersion({
- mcode : mCode,
+ id : id,
name : name,
specifications : specifications
}).then((res)=>{
@@ -401,8 +413,6 @@
async radioclick() {
// 澶勭悊鐐瑰嚮radio鐨勬椂闂�
if (this.radioValue === 0) {
- this.getCommisionList()
- } else {
const res = await getCommisionList({
pageNo: this.currentPage,
pageSize: this.pageSize,
@@ -410,6 +420,16 @@
})
this.commisionTable = res.data.row
this.total = res.data.total
+ } else if(this.radioValue === 1) {
+ const res = await getCommisionList({
+ pageNo: this.currentPage,
+ pageSize: this.pageSize,
+ inspectionStatus: this.radioValue
+ })
+ this.commisionTable = res.data.row
+ this.total = res.data.total
+ }else{
+ this.getCommisionList();
}
},
--
Gitblit v1.9.3