From 5fa8dc320c2d2ec68fb0392f7e52cb49874b2bff Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 05 九月 2023 16:47:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.65.113:9001/r/lims-before
---
src/views/experiment/inspectionApplication/index.vue | 312 +++++++++++++++++++++++++--------------------------
1 files changed, 151 insertions(+), 161 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 78e28ef..5f63b6c 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -39,51 +39,42 @@
</el-form>
</div>
<div class="library-table">
- <div class="table-header">
- <div class="search-bar">
- <el-radio-group v-model="radioValue">
- <el-radio-button label="鍏ㄩ儴" />
- <el-radio-button label="寰呮彁浜�" />
- <el-radio-button label="宸叉彁浜�" />
- <el-radio-button label="宸蹭綔搴�" />
- </el-radio-group>
- </div>
- </div>
<div class="table-box">
- <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
- max-height="calc(100% - 50px)" :cell-style="{textAlign: 'center'}"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
+ <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;max-height: 600px;" :height="600"
+ :cell-style="{textAlign: 'left'}"
+ :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
:data="inspectionTable">
<el-table-column type="selection" min-width="30px" />
- <el-table-column prop="icode" label="鐢宠鍗曞彿" min-width="150px" />
- <el-table-column prop="type" label="妫�楠岀被鍨�" min-width="80px">
+ <el-table-column prop="icode" label="鐢宠鍗曞彿" min-width="160px" />
+ <el-table-column prop="type" label="妫�楠岀被鍨�" min-width="100px">
<template slot-scope="scope">
- <div v-if="scope.row.type === 0"><span>鍘熸潗鏂欐楠�</span></div>
- <div v-if="scope.row.type === 1"><span>濮旀墭妫�楠�</span></div>
- <div v-if="scope.row.type === 2"><span>鎴愬搧妫�楠�</span></div>
+ <div v-if="scope.row.type === 0"><el-tag type="success">鍘熸潗鏂欐楠�</el-tag></div>
+ <div v-if="scope.row.type === 2"><el-tag>濮旀墭妫�楠�</el-tag></div>
+ <div v-if="scope.row.type === 1"><el-tag type="warning">鎴愬搧妫�楠�</el-tag></div>
</template>
</el-table-column>
- <el-table-column prop="formTime" label="鏉ユ枡鏃ユ湡" min-width="80px" />
- <el-table-column prop="supplier" label="渚涘簲鍟嗗悕绉�" min-width="150px" />
- <el-table-column prop="mcode" label="鍘熸潗鏂欑紪鐮�" min-width="150px" />
- <el-table-column prop="name" label="鍘熸潗鏂欏悕绉�" min-width="80px" />
+ <el-table-column prop="formTime" label="鏉ユ枡鏃ユ湡" min-width="90px" />
+ <el-table-column prop="supplier" label="渚涘簲鍟嗗悕绉�" min-width="150px" show-overflow-tooltip />
+ <el-table-column prop="mcode" label="鍘熸潗鏂欑紪鐮�" min-width="170px" />
+ <el-table-column prop="name" label="鍘熸潗鏂欏悕绉�" min-width="90px" />
<el-table-column prop="specifications" label="瑙勬牸鍨嬪彿" min-width="160px" />
<el-table-column prop="unit" label="鍗曚綅" min-width="50px" />
<el-table-column prop="num" label="鏁伴噺" min-width="50px" />
- <el-table-column prop="createTime" label="鐧昏鏃ユ湡" min-width="80px" />
- <el-table-column prop="inspection_status" label="妫�楠岀粨鏋�" min-width="80px">
+ <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" :type="scope.row.inspection_status === 0 ? 'danger' : 'success'"
- disable-transitions>{{ scope.row.inspection_status === 0 ? '涓嶅悎鏍�' : '鍚堟牸' }}</el-tag>
+ <el-tag class="tag" effect="dark" type="danger" disable-transitions
+ v-if="scope.row.inspection_status == 0">涓嶅悎鏍�</el-tag>
+ <el-tag 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" />
- <el-table-column prop="checkdate" label="妫�楠屾棩鏈�" min-width="150px" />
- <el-table-column label="鎿嶄綔" min-width="150" fixed="right">
+ <el-table-column prop="checkdate" label="妫�楠屾棩鏈�" min-width="170px" />
+ <el-table-column label="鎿嶄綔" min-width="120" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleClick(scope.row)">鏌ョ湅</el-button>
- <!-- <el-button type="text" size="small" >鎻愪氦</el-button> -->
- <el-button type="text" size="small">浣滃簾</el-button>
+ <el-button type="text" size="small" @click="delInspect(scope.row)">浣滃簾</el-button>
</template>
</el-table-column>
</el-table>
@@ -163,7 +154,7 @@
</el-col>
<el-col :span="10">
<el-form-item label="妫�楠屾椂闂达細">
- <el-date-picker v-model="infoForm.endTime" type="daterange" range-separator="鑷�"
+ <el-date-picker v-model="infoForm.checkdate" type="daterange" range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" style="width: 300px;">
</el-date-picker>
</el-form-item>
@@ -297,7 +288,6 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="checkTypeVisible = false">鍙� 娑�</el-button>
- <!-- <el-button type="primary" @click="addInspection">纭� 瀹�</el-button> -->
<el-button type="primary" @click="QUEding">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -308,40 +298,20 @@
<el-card>
<template slot-scope="scope">
<span>鐗堟湰閫夋嫨锛�</span>
- <el-select @change="ccc" v-model="selectedValue" size="small" slot="append" style="width: 220px;">
+ <el-select @change="getProductVerison" v-model="version" size="small" slot="append" style="width: 220px;">
<el-option v-for="item in BANben" :key="item" :label="item" :value="item"></el-option>
</el-select>
</template>
</el-card>
- <el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="id" border
- height="calc(80vh - 250px)" default-expand-all ref="multipleTable"
- :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
- <el-table-column type="selection" label="搴忓彿"> </el-table-column>
+ <el-table :data="tableData" style="width: 100%; margin-bottom: 20px;overflow-y: auto;" row-key="id" border height="40vh"
+ default-expand-all ref="multipleTable" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<el-table-column type="index" width="50px" label="搴忓彿"></el-table-column>
- <el-table-column label="椤圭洰鍚嶇О" sortable>
- <template scope="scope">
- <el-tag>
- <div class="firstDiv" :style="`color: ${
- scope.row.code == '[1]' ? '#16a7ff' : '#58c173'
- }`">
- {{ scope.row.code == "[1]" ? "01" : "02" }}
- </div>
- <span style="color: black">{{ scope.row.name }}</span>
- </el-tag>
- </template>
+ <el-table-column prop="name" label="椤圭洰鍚嶇О" sortable>
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅" sortable></el-table-column>
- <el-table-column label="鏍囧噯鍊�" sortable>
- <template scope="scope">
- <el-input v-if="scope.row.edit === true || scope.row.code === '[2]'" @blur="requiredOnfocus(scope)"
- v-model="scope.row.required" placeholder="璇疯緭鍏ユ爣鍑嗗��"></el-input>
- </template>
+ <el-table-column prop="required" label="鏍囧噯鍊�" sortable>
</el-table-column>
<el-table-column prop="internal" label="鍐呮帶鍊�" sortable>
- <template scope="scope">
- <el-input v-if="scope.row.edit === true || scope.row.code === '[2]'" @blur="requiredOnfocus(scope)"
- v-model="scope.row.internal" placeholder="璇疯緭鍏ュ唴鎺у��"></el-input>
- </template>
</el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">
@@ -350,9 +320,9 @@
</span>
</el-dialog>
<!-- 鍘熸潗鏂欐楠屾ā鎬佹 -->
- <el-dialog title="鍘熸潗鏂欐楠�" :visible.sync="rawmaterialVisible" width="60%">
+ <el-dialog title="鍘熸潗鏂欐楠�" :visible.sync="rawmaterialVisible" width="60%" top="100px">
<div class="table-box">
- <el-table ref="multipleTable" :max-height="800" :cell-style="{textAlign: 'center'}"
+ <el-table ref="multipleTable" :max-height="600" :cell-style="{textAlign: 'center'}"
:header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
:data="rawMaterialTable" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column type="selection" min-width="10%" />
@@ -368,10 +338,8 @@
<el-table-column prop="surveyor" label="妫�楠屼汉" min-width="8%" />
<el-table-column prop="startTime" label="妫�楠屾棩鏈�" min-width="8%" />
<el-table-column prop="type" label="鐘舵��" min-width="8%">
- <template slot-scope="scope">
- <span :style="{ color: scope.row.state === type ? 'green' : 'red' }">
- {{ scope.row.state===1 ? '宸叉娴�':'寰呮娴�' }}
- </span>
+ <template>
+ <span style="color: red">寰呮楠�</span>
</template>
</el-table-column>
</el-table>
@@ -433,7 +401,8 @@
selectAll,
addInspect,
chooseVer,
- lookProByVer
+ lookProByVer,
+ delInspect
} from '@/api/experiment/planAssignments'
export default {
data() {
@@ -460,7 +429,7 @@
amount: '',
checkdate: []
},
- selectedValue: 1,
+ selectedValue: null,
infoForm: {},
commisionSelection: {
entrust_coding: '',
@@ -510,16 +479,14 @@
tableData: [],
tableRow: {},
BANben: [],
- select_1: [],
- aa: {}
+ version: null,
+ listdata: [],
+ ddd: {}
}
},
watch: {
$route: {
- handler(val, oldval) {
- console.log(val) // 鏂拌矾鐢变俊鎭�
- console.log(oldval) // 鑰佽矾鐢变俊鎭�
- },
+ handler(val, oldval) {},
// 娣卞害瑙傚療鐩戝惉
deep: true
}
@@ -544,23 +511,14 @@
this.commisionTable = res.data
},
async handleClick(row) {
- this.inspectionTable = row;
- this.id = row.id
- this.$router.push({
- name: 'Viewdetails',
- query: {
- id: row.id
- }
- });
- this.selectInspectsList()
+ // this.$router.push({
+ // name: 'Viewdetails',
+ // query: {
+ // id: row.id
+ // }
+ // });
+ this.$router.push(`Viewdetails/${row.id}`);
},
- // validateInput() {
- // if (this.inputValue.trim() === '') {
- // }
- // }, // 杈撳叆鍊间负绌猴紝寮瑰嚭鎻愮ず淇℃伅鎴栬繘琛屽叾浠栧鐞�
- // alert('杈撳叆鍊间笉鑳戒负绌�');
- // return;
-
//鐗堟湰搴�
async chooseVer() {
const res = await chooseVer({
@@ -568,8 +526,11 @@
name: this.tmp.name,
specifications: this.tmp.specifications
})
- this.BANben = res.data
- this.aa = this.BANben[0]
+ this.BANben = []
+ res.data.forEach(a => {
+ this.BANben.push('V ' + a)
+ })
+ this.version = this.BANben[0]
this.lookProByVer()
},
//鏍囧噯搴�
@@ -578,12 +539,12 @@
mcode: this.tmp.mcode,
name: this.tmp.name,
specifications: this.tmp.specifications,
- version: this.aa
+ version: this.version.replace('V ', '')
})
this.tableData = res.data
},
- ccc(val) {
- this.aa = val
+ getProductVerison(val) {
+ this.version = val
this.lookProByVer()
},
async selectInspectsList() {
@@ -593,14 +554,13 @@
pageSize: this.currentPage,
message: this.id
})
- // this.inspectionTable = data
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 // 鐧昏鏃ユ湡
@@ -616,11 +576,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 // 鐧昏鏃ユ湡
@@ -647,8 +607,12 @@
},
reset() {
this.countSize = 1;
- this.pageSize = 8;
- this.searchData = {};
+ this.pageSize = 10;
+ this.searchData = {
+ applicationnumber: '',
+ type: '',
+ state: '',
+ };
this.selectInspectsList();
},
//琚�変腑鐨勪俊鎭� 鍗曢��
@@ -665,6 +629,7 @@
},
handleRawMaterialSelection() {
this.infoForm = this.tmp
+ console.log(this.infoForm);
this.rawmaterialVisible = false
},
handleRadioChange() {
@@ -675,24 +640,30 @@
selectAll({
type: 0
}).then(res => {
- // var data = res.data
- // data.forEach((item)=>{
- // var checkdate = []
- // checkdate.push(item['createTime'])
- // checkdate.push(item['updateTime'])
- // item['checkdate'] = checkdate // 妫�楠屾棩鏈�
- // })
- this.rawMaterialTable = res.data
+ var data = res.data
+ data.forEach((item) => {
+ var checkdate = []
+ checkdate.push(item['createTime'])
+ checkdate.push(item['updateTime'])
+ item['checkdate'] = checkdate // 妫�楠屾棩鏈�
+ })
+ let arr = res.data.filter((val)=>{
+ return val.type === 0;
+ })
+ this.rawMaterialTable = arr
})
-
- // this.infoForm = res.data
- // this.$router.push({ name: 'ReportForInspection' });
} else if (this.type === 1) {
this.commisionVisible = true
selectAll({
type: 2
}).then(res => {
-
+ var data = res.data
+ data.forEach((item) => {
+ var checkdate = []
+ checkdate.push(item['createTime'])
+ checkdate.push(item['updateTime'])
+ item['checkdate'] = checkdate // 妫�楠屾棩鏈�
+ })
this.commisionTable = res.data
})
}
@@ -701,17 +672,24 @@
// 鏂板妫�楠�
async addInspection() {
if (this.type === 0) {
- await addInspect({
+ addInspect({
endTime: this.infoForm.checkdate[1],
- formTime: this.infoForm.dateSurvey,
- mcode: this.infoForm.materialCoding,
- name: this.infoForm.materialName,
- num: this.infoForm.quantity,
- specifications: this.infoForm.specificationsModels,
+ formTime: this.infoForm.formTime,
+ mcode: this.infoForm.mcode,
+ name: this.infoForm.name,
+ num: this.infoForm.num,
+ specifications: this.infoForm.specifications,
startTime: this.infoForm.checkdate[0],
- supplier: this.infoForm.supplierName,
+ supplier: this.infoForm.supplier,
type: this.type,
- unit: this.infoForm.unit
+ unit: this.infoForm.unit,
+ version: this.version.replace('V ', '')
+ }).then(res => {
+ this.$message({
+ message: '娣诲姞鎴愬姛锛�',
+ type: 'success'
+ });
+ this.$router.push(`Viewdetails/${res.data}`)
})
}
if (this.type === 1) {
@@ -725,7 +703,8 @@
startTime: this.commisionSelection.checkdate[0],
supplier: this.commisionSelection.supplier,
type: this.type,
- unit: this.commisionSelection.unit
+ unit: this.commisionSelection.unit,
+ version: this.version
})
}
if (this.type === 2) {
@@ -739,15 +718,17 @@
startTime: '2023-08-14',
supplier: this.finishedTable.supplier,
type: this.type,
- unit: this.finishedTable.unit
+ unit: this.finishedTable.unit,
+ version: this.version
})
}
this.type = 0
this.checkTypeVisible = false
- this.$message({
- message: '娣诲姞鎴愬姛锛�',
- type: 'success'
- });
+ // this.$message({
+ // message: '娣诲姞鎴愬姛锛�',
+ // type: 'success'
+ // });
+ // this.$router.push({name: 'Viewdetails'})
},
// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
handleSizeChange(val) {
@@ -760,33 +741,53 @@
this.currentPage = val
this.selectInspectsList()
},
+ // //琛ㄥ崟鏍￠獙
+ // validateForm(infoForm){
+ // console.log(this.infoForm);
+
+ // if (infoForm.checkdate == undefined) {
+ // alert('璇疯緭鍏ユ楠屾椂闂�');
+ // return false;
+ // }
+ // // 鏍￠獙閫氳繃
+ // return true;
+ // },
//纭畾璺宠浆
QUEding() {
- // this.tableRow = a
-
+ if (this.infoForm.checkdate[0] == undefined || this.infoForm.checkdate[1] == undefined) {
+ this.$message({
+ message: '璇烽�夋嫨妫�楠屾椂闂�',
+ type: 'warning'
+ });
+ return;
+ }
this.Standardframe = true
-
+ this.skipshow()
this.chooseVer()
-
+ },
+ //鏂板鐨勬暟鎹�
+ skipshow() {
+ const data = this.inspectionTable.at(-1)
+ this.listdata = data
},
//纰哄畾瑭虫儏闋�
- GOfrom() {
- this.Standardframe = false
- // const data = {
- // // mcode : this.tmp.mcode,
- // // name:this.tmp.name,
- // // specifications:this.tmp.specifications,
- // version:this.tmp.id
- // }
-
- this.$router.push({
- name: 'Viewdetails',
- query: {
- id: this.tmp.id
- }
- })
-
+ async GOfrom() {
+ this.addInspection()
},
+ delInspect(row){
+ this.$confirm('鎮ㄧ‘璁ゅ垹闄よ繖鏉℃暟鎹悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ delInspect({
+ id: row.id
+ }).then(()=>{
+ this.$message.success('宸蹭綔搴�')
+ this.selectInspectsList()
+ })
+ }).catch(() => {});
+ }
}
}
</script>
@@ -841,7 +842,7 @@
background: #fff;
display: flex;
justify-content: space-between;
- padding: 5px 24px 0px 24px;
+ padding: 20px 24px 0px 24px;
}
.input-form {
@@ -874,16 +875,6 @@
margin-top: 50px;
display: flex;
flex-direction: column;
-
- .table-header {
- padding: 20px;
- display: flex;
- justify-content: space-between;
-
- .el-form-item {
- margin-bottom: 30px !important;
- }
- }
.table-box {
padding: 0px 20px;
@@ -922,7 +913,6 @@
.pagination {
display: flex;
- margin-top: 20px;
justify-content: end;
}
--
Gitblit v1.9.3