From 5a15331883386cb2206acd081ee54b873a08858b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 31 八月 2023 15:42:42 +0800
Subject: [PATCH] bug修复
---
.env.development | 2
src/views/experiment/inspectionApplication/index.vue | 20 +++++-----
src/views/inspectionManagement/reportForInspection/index.vue | 41 +++++---------------
src/views/experiment/inspectionApplication/Viewdetails/index.vue | 19 +++++----
src/views/inspectionManagement/commissionInspection/addCommision.vue | 26 ++++--------
5 files changed, 41 insertions(+), 67 deletions(-)
diff --git a/.env.development b/.env.development
index b0631dd..ab9be2d 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = 'http://192.168.110.254:1234/'
+VUE_APP_BASE_API = 'http://localhost:1234/'
diff --git a/src/views/experiment/inspectionApplication/Viewdetails/index.vue b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
index 02d495a..a1d8f27 100644
--- a/src/views/experiment/inspectionApplication/Viewdetails/index.vue
+++ b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
@@ -88,7 +88,7 @@
</el-table-column>
<el-table-column prop="userName" label="璐ｄ换浜�" width="220px">
<template slot-scope="scope">
- <el-select v-model="scope.row.username" size="small" slot="append"
+ <el-select v-model="scope.row.username" slot="append"
@change="(val)=>chooseUseProId(val, scope.row)">
<el-option v-for="(item,indxe) in ZERENren" :key="indxe" :label="item.name"
:value="item.id"></el-option>
@@ -97,7 +97,9 @@
</el-table-column>
<el-table-column prop="inspectionMaterialId" label="瀹為獙璁惧" width="220px">
<template slot-scope="scope">
- <el-cascader v-model="scope.row.instrumentName" :options="devices" @change="(val)=>chooseEquipment(val, scope.row)"></el-cascader>
+ <el-cascader v-model="scope.row.instrumentName" :options="devices"
+ :props="{label: 'Name',value: 'Id',children: 'childrenList'}"
+ @change="(val)=>chooseEquipment(val, scope.row)"></el-cascader>
</template>
</el-table-column>
</el-table>
@@ -156,7 +158,8 @@
},
async selectEquipment() {
const res = await selectEquipment()
- this.getDevices = res.data
+ this.devices = JSON.parse(JSON.stringify(res.data).replaceAll('father', '').replaceAll('ins', '').replaceAll(
+ 'son', '').replaceAll('name', 'Name'))
},
//妫�楠屽崟琛�
async selectInspectsListById() {
@@ -171,15 +174,15 @@
id: row.id,
userProId: val
}).then(res => {
- this.$message.success('璐ｄ换浜哄垎閰嶆垚鍔�')
+ if (res.data) this.$message.success('璐ｄ换浜哄垎閰嶆垚鍔�')
})
},
- chooseEquipment(val, row){
- chooseUseProId({
+ chooseEquipment(val, row) {
+ chooseEquipment({
id: row.id,
- equipmentId: val
+ equipmentId: val[2]
}).then(res => {
- this.$message.success('璁惧鍒嗛厤鎴愬姛')
+ if (res.data) this.$message.success('璁惧鍒嗛厤鎴愬姛')
})
}
}
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 6ae42c8..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" />
@@ -567,11 +567,11 @@
})
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 // 鐧昏鏃ユ湡
@@ -587,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 // 鐧昏鏃ユ湡
diff --git a/src/views/inspectionManagement/commissionInspection/addCommision.vue b/src/views/inspectionManagement/commissionInspection/addCommision.vue
index 00c25ea..a68cbc8 100644
--- a/src/views/inspectionManagement/commissionInspection/addCommision.vue
+++ b/src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -22,7 +22,7 @@
<el-table-column type="index" label="搴忓彿" min-width="10%" />
<el-table-column prop="sampleNumber" label="鏍峰搧缂栧彿" min-width="8%" />
<el-table-column prop="sampleName" label="鏍峰搧鍚嶇О" min-width="10%" />
- <el-table-column prop="speName" label="瑙勬牸鍨嬪彿" min-width="10%" >
+ <el-table-column prop="speName" label="瑙勬牸鍨嬪彿" min-width="10%">
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅" min-width="8%" />
<el-table-column prop="samplesNumber" label="鏁伴噺" min-width="8%" />
@@ -262,19 +262,7 @@
experiment: [],
addway: ''
},
- experList: [{
- key: '1',
- label: '澶栬妫�鏌�'
- }, {
- key: '2',
- label: '鍔ㄤ綔鐢靛帇璇曢獙'
- }, {
- key: '3',
- label: '鐢甸樆绠℃硠婕忕數娴佽瘯楠�'
- }, {
- key: '4',
- label: '缁濈紭閮ㄥ垎浜ゆ祦鑰愬帇璇曢獙'
- }],
+ experList: [],
sampleoptions: [],
samplecodeoptions: [],
model_spe_options: [],
@@ -369,12 +357,16 @@
},
addInspection() {
let exper = this.addPointerForm.experiment[0]
- this.addPointerForm.addway = 1
for (let i = 1; i < this.addPointerForm.experiment.length; i++) {
exper += ',' + this.addPointerForm.experiment[i]
}
this.addPointerForm.experiment = exper
let tmp = this.addPointerForm
+ this.sampleoptions.forEach(a => {
+ if (a.key == tmp.sampleName) tmp.sampleName = a.value
+ })
+ tmp.speName = tmp.addway + '-' + tmp.speName
+ tmp.addway = 1
this.detectionInfo.push(tmp)
this.dialogueFormVisible = false
this.addPointerForm = {
@@ -447,8 +439,8 @@
return item.name
})
})
- this.model_sta_options.forEach(a=>{
- if(a.key == val){
+ this.model_sta_options.forEach(a => {
+ if (a.key == val) {
this.addPointerForm.speName = a.value
}
})
diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue
index 6dbbd6f..c70ac79 100644
--- a/src/views/inspectionManagement/reportForInspection/index.vue
+++ b/src/views/inspectionManagement/reportForInspection/index.vue
@@ -82,7 +82,7 @@
<el-table-column type="selection" :selectable="checkSelect" min-width="5%">
</el-table-column>
<el-table-column type="index" label="搴忓彿" min-width="8%" />
- <el-table-column prop="createTime" label="鏉ユ枡鏃ユ湡" min-width="8%" />
+ <el-table-column prop="dateSurvey" label="鏉ユ枡鏃ユ湡" min-width="8%" />
<el-table-column prop="supplierName" label="渚涘簲鍟嗗悕绉�" min-width="12%" />
<el-table-column prop="materialCoding" label="鏉愭枡缂栫爜" min-width="8%" />
<el-table-column prop="materialName" label="鏉愭枡鍚嶇О" min-width="8%" />
@@ -91,7 +91,7 @@
<el-table-column prop="quantity" label="鏁伴噺" min-width="5%" />
<el-table-column prop="inspectionDate" label="鎶ユ鏃ユ湡" min-width="8%" />
<el-table-column prop="surveyor" label="妫�楠屼汉" min-width="8%" />
- <el-table-column prop="dateSurvey" label="妫�楠屾棩鏈�" min-width="8%" />
+ <el-table-column prop="insTime" label="妫�楠屾棩鏈�" min-width="8%" />
<el-table-column prop="type" label="鐘舵��" min-width="8%">
<template slot-scope="scope">
<span :style="{ color: scope.row.type === 1 ? 'green' : 'red' }">
@@ -347,19 +347,7 @@
label: '鏈姤妫�'
}],
radioValue: null,
- inspectionTable: [{
- createTime: '2023-07-28',
- supplier_name: '鍥界綉灞变笢鐪佺數鍔涙湁闄愬叕鍙�',
- materialCoding: 'BP214274',
- materialName: '閾濆寘閽㈢粸绾�',
- specificationsModels: 'JLHA/G1A-185/30-26/7',
- unit: '鍚�',
- quantity: 21,
- dateSurvey: '2023-08-02',
- surveyor: '榛勫皬鏄�',
- inspectionDate: '2023-12-09',
- condition: 1
- }],
+ inspectionTable: [],
currentPage: 1,
pageSize: 10,
total: 20,
@@ -437,7 +425,6 @@
});
},
blurOptions(row) {
- console.log("鏇存柊", row);
},
async initNewSelection() {
const res = await selectUser();
@@ -456,7 +443,6 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- console.log(row.id);
this.deleteMaterialFun(row, index);
}).catch(() => {});
},
@@ -469,7 +455,6 @@
},
handleSelectionChange(val) {
this.checkData = val;
- console.log(val);
},
//鐢熸垚鎶ユ鍗曟寜閽�
addReportBtn() {
@@ -483,7 +468,6 @@
let name = this.checkData[0].materialName;
let specifications = this.checkData[0].specificationsModels;
this.getChooseVersionFun(mcode,name,specifications);
- console.log(this.standardLibraryData);
this.addReportDialog = true;
}
}
@@ -504,7 +488,6 @@
specifications : specifications,
version: version
}).then((res)=>{
- console.log(res);
vm.standardLibraryData = res.data;
})
@@ -548,20 +531,17 @@
"unit": val.unit,
"version": this.addInspectionForm.version
}
- // this.createReport(obj);
- this.addReportDialog = false;
- this.initNewSelection();
- this.showNewPage = true;
+ this.createReport(obj);
+ // this.addReportDialog = false;
+ // this.initNewSelection();
+ // this.showNewPage = true;
},
//鐢熸垚鎶ユ鍗�
async createReport(param) {
let res = await addInspect(param);
- const res2 = await selectInspectsListById({
- id: res.data
- });
- this.resultData = res2.data;
- this.inspectionForm = res2.data;
- this.inspectionItems = res2.data.insProducts;
+ if(res.data==null)return
+ this.$message.success('鎶ユ鎴愬姛')
+ this.$router.push(`/experiment/Viewdetails/${res.data}`)
},
// 鑾峰彇鍒嗛〉鍒楄〃鏁版嵁
async getRawMaterialList() {
@@ -597,7 +577,6 @@
this.getRawMaterialList()
},
radioclick() {
- console.log(this.inspectionTable);
if (this.radioValue === 0) {
}
--
Gitblit v1.9.3