From 6cc076f3b53fbae3c286a3d1da6bc0786949da35 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 31 八月 2023 17:08:38 +0800
Subject: [PATCH] modified: src/api/inspection/commisioninspection.js modified: src/views/inspectionManagement/commissionInspection/index.vue modified: src/views/inspectionManagement/reportForInspection/index.vue
---
src/api/inspection/commisioninspection.js | 9 ++
src/views/inspectionManagement/reportForInspection/index.vue | 141 ----------------------------------
src/views/inspectionManagement/commissionInspection/index.vue | 58 +++++++------
3 files changed, 42 insertions(+), 166 deletions(-)
diff --git a/src/api/inspection/commisioninspection.js b/src/api/inspection/commisioninspection.js
index 5f49894..26fe071 100644
--- a/src/api/inspection/commisioninspection.js
+++ b/src/api/inspection/commisioninspection.js
@@ -111,4 +111,13 @@
method: 'get',
params
})
+}
+
+//鏂板鎶ユ鍗�
+export function addInspect(data){
+ return request({
+ url: '/link-basic-table/addInspect',
+ method: 'post',
+ data
+ })
}
\ No newline at end of file
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index b4bc55b..8b327ee 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -67,7 +67,7 @@
<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%" />
@@ -163,7 +163,8 @@
selectViewUUID,
delLink,
chooseVersion,
- lookProByVer
+ lookProByVer,
+ addInspect
} from '@/api/inspection/commisioninspection'
export default {
data() {
@@ -264,30 +265,33 @@
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,
+ "version": this.addInspectionForm.version
+ }
+ this.createReport(obj);
+ this.addReportDialog = false;
}
});
+ },
+ //鐢熸垚鎶ユ鍗曡姹�
+ async createReport(param) {
+ let res = await addInspect(param);
+ if(res.data==null)return
+ this.$message.success('鎶ユ鎴愬姛')
+ this.$router.push(`/experiment/Viewdetails/${res.data}`)
},
//鐢熸垚鎶ユ鍗曟寜閽�
addReportBtn() {
@@ -299,7 +303,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 +313,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);
@@ -333,7 +337,7 @@
var vm = this;
this.chooseVersion = [];
await chooseVersion({
- mcode : mCode,
+ id : id,
name : name,
specifications : specifications
}).then((res)=>{
diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue
index cf50f4f..2b88e61 100644
--- a/src/views/inspectionManagement/reportForInspection/index.vue
+++ b/src/views/inspectionManagement/reportForInspection/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="content-main">
- <div class="rawPage" v-if="!showNewPage">
+ <div class="rawPage">
<div class="top-bar">
<el-form ref="form" :inline="true" :model="searchData">
<el-form-item label="鏉愭枡缂栫爜:" position="left" class="sermargin">
@@ -137,105 +137,6 @@
<el-button type="primary" @click="confirmBtn('addInspectionForm')">纭� 瀹�</el-button>
</div>
</el-dialog>
-
- <!-- 鐢熸垚鎶ユ鍗� -->
- <div class="newPage" v-if="showNewPage">
- <!-- 鏂板椤甸潰 -->
- <div class="inspectionForm">
- <el-form :model="inspectionForm" label-position="right" label-width="100px" size="mini">
- <div class="formwrapper">
- <el-row>
- <el-col :span="8">
- <el-form-item label="鏉ユ枡鏃ユ湡锛�">
- <el-input style="width: 180px;" :value="inspectionForm.formTime" disabled autocomplete="off" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="渚涘簲鍟嗗悕绉帮細">
- <el-input style="width: 180px;" :value="inspectionForm.supplier" disabled autocomplete="off" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鏍峰搧缂栧彿锛�">
- <el-input style="width: 180px;" :value="inspectionForm.code" disabled autocomplete="off" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="8">
- <el-form-item label="鏍峰搧鍚嶇О锛�">
- <el-input style="width: 180px;" :value="inspectionForm.name" disabled autocomplete="off" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 180px;" :value="inspectionForm.specifications" disabled autocomplete="off" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鍗曚綅锛�">
- <el-input style="width: 180px;" :value="inspectionForm.unit" disabled autocomplete="off" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="8">
- <el-form-item label="鏁伴噺锛�">
- <el-input style="width: 180px;" :value="inspectionForm.num" disabled autocomplete="off" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鎶ユ鏃ユ湡锛�">
- <el-input style="width: 180px;" :value="inspectionForm.endTime" disabled autocomplete="off" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鎶ユ浜猴細">
- <el-input style="width: 180px;" :value="inspectionForm.userName" disabled autocomplete="off" />
- </el-form-item>
- </el-col>
- </el-row>
- </div>
- </el-form>
- </div>
- <div class="inspectionProject">
- <div class="header">
- <span style="font-size: 14px">妫�楠岄」鐩�</span>
- <div>
- <!-- <el-button type="primary" plain size="mini">淇濆瓨</el-button> -->
- <el-button @click="showNewPage = false" type="primary" plain size="mini" icon="el-icon-back">杩斿洖</el-button>
- </div>
- </div>
- <el-table :max-height="800" :cell-style="{textAlign: 'center'}"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
- :data="inspectionItems">
- <el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
- <el-table-column prop="name" label="椤圭洰" width="250"></el-table-column>
- <el-table-column prop="unit" label="鍗曚綅" width="125"></el-table-column>
- <el-table-column prop="required" label="鏍囧噯鍊�" width="125"></el-table-column>
- <el-table-column prop="internal" label="鍐呮祴鍊�" width="125"></el-table-column>
- <el-table-column prop="testValue" label="妫�楠屽��" width="125"></el-table-column>
- <el-table-column prop="userName" label="妫�楠屼汉">
- <template slot-scope="scope">
- <el-select @blur="blurOptions(scope.row)" v-model="scope.row.check" size="small" slot="append"
- style="width: 260px;">
- <el-option v-for="(item,index) in checkeroptions" :key="index" :value="item.id"
- :label="item.name"></el-option>
- </el-select>
- </template>
- </el-table-column>
- <el-table-column prop="device" label="璇曢獙璁惧">
- <template slot-scope="scope">
- <el-select @blur="blurOptions(scope.row)" v-model="scope.row.device" size="small" slot="append"
- style="width: 260px;">
- <el-option v-for="(item,index) in deviceoptions" :key="index" :value="item.id"
- :label="item.equipmentName"></el-option>
- </el-select>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </div>
</div>
</template>
@@ -258,8 +159,6 @@
return {
standardLibraryData:[],
chooseVersion: [],
- userName: "",
- devices: "",
addInspectionForm: {
inspectionDate: [],
version: null
@@ -315,20 +214,6 @@
value: 0,
label: '鏈姤妫�'
}],
- deviceoptions: [{
- value: 0,
- label: '鎷夊姏鏈�'
- }, {
- value: 1,
- label: '鎷栨媺鏈�'
- }],
- checkeroptions: [{
- value: 0,
- label: '榛勫皬鏄�'
- }, {
- value: 1,
- label: '寮犱笁'
- }],
radioOptions: [{
label: '鍏ㄩ儴',
value: null
@@ -345,18 +230,6 @@
pageSize: 10,
total: 20,
data: '',
- showNewPage: false,
- inspectionForm: {},
- inspectionItems: [{
- index: 1,
- name: "aaa",
- unit: "KB",
- required: "1",
- internal: "2",
- testValue: "3",
- userName: "",
- device: ""
- }],
insertRule: {
fromDate: [{
required: true,
@@ -416,14 +289,6 @@
}).catch(error => {
this.$message.error(error.message);
});
- },
- blurOptions(row) {
- },
- async initNewSelection() {
- const res = await selectUser();
- const res2 = await selectEquipment();
- this.checkeroptions = res.data;
- this.deviceoptions = res2.data;
},
resetForm(formName) {
this.addInspectionForm.inspectionDate = [],
@@ -530,10 +395,8 @@
"unit": val.unit,
"version": this.addInspectionForm.version
}
- // this.createReport(obj);
+ this.createReport(obj);
this.addReportDialog = false;
- this.initNewSelection();
- this.showNewPage = true;
}
}));
},
--
Gitblit v1.9.3