From 9b26870265cbbc75bcd32529e46b229a49ec30a0 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 05 九月 2023 11:29:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/inspectionManagement/commissionInspection/index.vue | 73 +++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index 8b327ee..cf60294 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <div v-if="!showDetail">
+ <div>
<div class="content-main">
<div class="top-bar">
<el-form ref="form" :inline="true" :model="searchData">
@@ -24,19 +24,19 @@
</el-form-item>
</el-form>
<el-form>
- <el-popover placement="left" width="350" trigger="click">
+ <el-popover placement="left" width="400" trigger="click">
<div class="vue_qr_div">
<el-row>
<el-col>
<el-input v-model="view" readonly size="medium" style="width: 250px;margin-right: 10px;"></el-input>
- <el-button size="small" type="primary" v-if="viewId==null" @click="viewDia=true">鐢熸垚</el-button>
- <el-button size="small" type="primary" v-else-if="viewId!=null" @click="copy">澶嶅埗</el-button>
+ <el-button size="small" type="primary" @click="viewDia=true">鐢熸垚</el-button>
+ <el-button size="small" type="primary" @click="copy">澶嶅埗</el-button>
</el-col>
</el-row>
<el-row style="margin-top: 10px;">
<el-col v-if="viewId==null">褰撳墠閾炬帴宸茶繃鏈燂紝璇风偣鍑荤敓鎴愭寜閽噸鏂扮敓鎴�</el-col>
<el-col
- v-else-if="viewId!=null">褰撳墠閾炬帴灏嗗湪{{(parseInt(viewTime)/60/60)>1?(parseInt(viewTime)/60/60).toFixed(1)+'灏忔椂':Math.round(parseInt(viewTime)/60)+'鍒嗛挓'}}鍚庤繃鏈�</el-col>
+ v-else-if="viewId!=null">褰撳墠閾炬帴灏嗗湪{{(parseInt(viewTime2)/60/60)>1?(parseInt(viewTime2)/60/60).toFixed(1)+'灏忔椂':Math.round(parseInt(viewTime2)/60)+'鍒嗛挓'}}鍚庤繃鏈�</el-col>
</el-row>
</div>
<el-button slot="reference" class="rightBtn" type="primary" @click="goToaddCommision">鏂板濮旀墭</el-button>
@@ -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%" />
@@ -71,7 +71,6 @@
<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">
@@ -98,9 +97,6 @@
</div>
</div>
</div>
- </div>
- <div v-else>
- <router-view />
</div>
<el-dialog title="閾炬帴鏃堕暱璁剧疆" :visible.sync="viewDia" width="30%">
<div>
@@ -194,7 +190,7 @@
value: '1',
label: '閮ㄩ棬1'
}],
- radioValue: 0,
+ radioValue: null,
commisionTable: [{
specifications_models: "GGXH-AAAAA",
inspectionTime: "2023-08-03",
@@ -210,15 +206,15 @@
}],
conditionsOptions: [{
label: '鍏ㄩ儴',
- value: 0
+ value: null
},
{
label: '宸叉楠�',
- value: 1
+ value: 0
},
{
label: '寰呮楠�',
- value: 2
+ value: 1
}
],
currentPage: 1,
@@ -229,7 +225,15 @@
view: null,
viewId: null,
viewTime: 1,
+ viewTime2: 1,
viewDia: false
+ }
+ },
+ watch:{
+ addReportDialog(newVal){
+ if(newVal === false){
+ this.resetForm("addInspectionForm");
+ }
}
},
created() {
@@ -255,11 +259,13 @@
},
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) {
@@ -279,6 +285,7 @@
"startTime": dateArr[0],
"supplier": val.entrusted,
"type": 2,
+ // "unit": "mm",
"version": this.addInspectionForm.version
}
this.createReport(obj);
@@ -288,10 +295,13 @@
},
//鐢熸垚鎶ユ鍗曡姹�
async createReport(param) {
- let res = await addInspect(param);
- if(res.data==null)return
- this.$message.success('鎶ユ鎴愬姛')
- this.$router.push(`/experiment/Viewdetails/${res.data}`)
+ await addInspect(param).then(res =>{
+ this.search();
+ this.$message.success('鎶ユ鎴愬姛')
+ this.$router.push(`/experiment/Viewdetails/${res.data}`)
+ }).catch(()=>{
+ this.$message.error('鎶ユ澶辫触')
+ });
},
//鐢熸垚鎶ユ鍗曟寜閽�
addReportBtn() {
@@ -328,7 +338,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;
})
},
@@ -405,8 +418,6 @@
async radioclick() {
// 澶勭悊鐐瑰嚮radio鐨勬椂闂�
if (this.radioValue === 0) {
- this.getCommisionList()
- } else {
const res = await getCommisionList({
pageNo: this.currentPage,
pageSize: this.pageSize,
@@ -414,6 +425,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();
}
},
@@ -455,7 +476,7 @@
}).then(res => {
this.view = `${this.vueIp}addCommision/${res.data.id}`
this.viewId = res.data.id
- this.viewTime = res.data.time
+ this.viewTime2 = res.data.time
})
},
getViewId() {
--
Gitblit v1.9.3