From a2c4dc4fbd62ac4e05b9318a1e05d147c8ae4d8c Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 30 八月 2023 09:26:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/api/inspection/commisioninspection.js | 16 ++
src/views/home/index.vue | 2
src/views/experiment/inspectionApplication/index.vue | 18 -
src/views/login/index.vue | 6
src/views/inspectionManagement/reportForInspection/index.vue | 217 ++++++++++++++++-----------
src/App.vue | 5
src/api/inspection/rawmaterial.js | 16 ++
src/layout/components/Sidebar/SidebarItem.vue | 4
src/router/index.js | 8
src/views/experiment/inspectionApplication/Viewdetails/index.vue | 20 +
src/views/inspectionManagement/commissionInspection/addCommision.vue | 99 +++++++-----
src/views/inspectionManagement/commissionInspection/index.vue | 17 +
12 files changed, 266 insertions(+), 162 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 230665e..f9aafd2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,7 +6,10 @@
<script>
export default {
- name: 'App'
+ name: 'App',
+ mounted() {
+ document.title = "瑁呭鐢电紗 lims 绯荤粺"
+ }
}
</script>
diff --git a/src/api/inspection/commisioninspection.js b/src/api/inspection/commisioninspection.js
index ac22b0c..5c4b974 100644
--- a/src/api/inspection/commisioninspection.js
+++ b/src/api/inspection/commisioninspection.js
@@ -72,4 +72,20 @@
method: 'get',
params
})
+}
+
+export function getProductList(params){
+ return request({
+ url: '/link-basic/chooseProject',
+ method: 'get',
+ params
+ })
+}
+
+export function getContractsSampleInfo(params){
+ return request({
+ url: '/link-basic/getContractsSampleInfo',
+ method: 'get',
+ params
+ })
}
\ No newline at end of file
diff --git a/src/api/inspection/rawmaterial.js b/src/api/inspection/rawmaterial.js
index f32b4c3..9b975ce 100644
--- a/src/api/inspection/rawmaterial.js
+++ b/src/api/inspection/rawmaterial.js
@@ -8,3 +8,19 @@
params
})
}
+
+export function addInspect(data){
+ return request({
+ url: '/inspection/addInspect',
+ method: 'post',
+ data
+ })
+}
+
+export function selectInspectsListById(params){
+ return request({
+ url: '/inspection/selectInspectsListById',
+ method: 'get',
+ params
+ })
+}
\ No newline at end of file
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 498db1c..9c2d33b 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -4,10 +4,6 @@
<app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
<el-menu-item v-if="onlyOneChild.meta.show==false ?onlyOneChild.meta.show: true" :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
- <!-- <el-menu-item :style="{width:'0px',height:'0px'}" v-if="onlyOneChild.meta.show==false ?onlyOneChild.meta.show: true" :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}"> -->
- <!-- <template slot="title">
- <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
- </template> -->
<item :show="onlyOneChild.meta.show" :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
<span v-if="onlyOneChild.meta.title==='涓婚〉'">涓婚〉</span>
</el-menu-item>
diff --git a/src/router/index.js b/src/router/index.js
index 458100d..da562bd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -472,7 +472,13 @@
name: 'BasicDataMessage',
component: () => import('@/views/basicData/index'),
meta: { title: '鍩虹鏁版嵁', icon: 'el-icon-s-tools' }
- }
+ },
+ {
+ path: 'myBusiness',
+ name: 'MyBusiness',
+ component: () => import('@/views/personal/myBusiness/index'),
+ meta: { title: '鎴戠殑浼佷笟', icon: 'tree', show: false }
+ }
]
},
{ path: '*', redirect: '/404', hidden: true }
diff --git a/src/views/experiment/inspectionApplication/Viewdetails/index.vue b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
index 8e0fb3c..244a2d7 100644
--- a/src/views/experiment/inspectionApplication/Viewdetails/index.vue
+++ b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
@@ -1,7 +1,7 @@
<template>
<div>
<div style="overflow: hidden;">
- <el-card style="margin: 10px;" v-model="searchData" >
+ <el-card style="margin: 10px;" >
<div slot="header" class="clearfix">
<span>
<i slot="prefix" class="el-icon-s-home" />
@@ -116,7 +116,7 @@
<el-table-column prop="userName" label="缁忛獙浜�">
<template slot-scope="scope">
<el-select v-model="value" size="small" slot="append" style="width: 220px;">
- <el-option v-for="item in ZERENren" :key="item.id" :label="item.name" :value="item.name"></el-option>
+ <el-option v-for="(item,indxe) in ZERENren" :key="indxe" :label="item.name" :value="item.name"></el-option>
</el-select>
</template>
</el-table-column>
@@ -125,7 +125,7 @@
label="瀹為獙璁惧">
<template slot-scope="scope">
<el-select v-model="SHEbei" size="small" slot="append" style="width: 220px;">
- <el-option v-for="item in getDevices" :key="item.id" :label="item.name"></el-option>
+ <el-option v-for="(item,index) in getDevices" :key="index" :label="item.name"></el-option>
</el-select>
</template>
</el-table-column>
@@ -141,10 +141,20 @@
export default {
data(){
return {
- searchData:{ },
+ searchData:{
+ formTime: '',
+ supplier: '',
+ code: '',
+ name: '',
+ specifications: '',
+ unit: '',
+ num: '',
+ endTime: '',
+ userName: '',
+ },
insProducts:[],
value:'',
- SHEbei:'',
+ SHEbei:[],
aaa:{},
ZERENren:[],
// getDevices:[]
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 5616b4e..94664a1 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -50,11 +50,12 @@
</div>
</div>
<div class="table-box">
- <el-table ref="inspectionTable" :max-height="800" :cell-style="{textAlign: 'center'}"
+ <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'}"
- :data="inspectionTable" style="width: 100%">
+ :data="inspectionTable">
<el-table-column type="selection" min-width="30px" />
- <el-table-column prop="icode" label="鐢宠鍗曞彿" min-width="100px" />
+ <el-table-column prop="icode" label="鐢宠鍗曞彿" min-width="150px" />
<el-table-column prop="type" label="妫�楠岀被鍨�" min-width="80px">
<template slot-scope="scope">
<div v-if="scope.row.type === 0"><span>鍘熸潗鏂欐楠�</span></div>
@@ -62,7 +63,7 @@
<div v-if="scope.row.type === 2"><span>鎴愬搧妫�楠�</span></div>
</template>
</el-table-column>
- <el-table-column prop="formTime" label="鏉ユ枡鏃ユ湡" min-width="100px" />
+ <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" />
@@ -70,13 +71,13 @@
<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="userName" 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>
</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">
<template slot-scope="scope">
@@ -302,7 +303,6 @@
</el-dialog>
</div>
</div>
-
<!-- 纭畾璺宠浆鍩烘湰搴撳脊绐� -->
<el-dialog title="鏍囧噯搴�" :visible.sync="Standardframe" width="49%">
<el-card>
@@ -310,7 +310,6 @@
<span>鐗堟湰閫夋嫨锛�</span>
<el-select @change="ccc" v-model="selectedValue" 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>
@@ -438,7 +437,6 @@
} from '@/api/experiment/planAssignments'
export default {
data() {
-
return {
showDetail: false,
searchData: {
@@ -501,7 +499,7 @@
}],
currentPage: 1,
total: 20, // 鎬绘潯鏁�
- pageSize: 8, // 姣忛〉鐨勬暟鎹潯鏁�
+ pageSize: 10, // 姣忛〉鐨勬暟鎹潯鏁�
radioValue: '鍏ㄩ儴',
checkTypeVisible: false,
type: 0, // 榛樿涓嶉�変腑鐨勭姸鎬�
@@ -519,8 +517,6 @@
watch: {
$route: {
handler(val, oldval) {
- console.log(val) // 鏂拌矾鐢变俊鎭�
- console.log(oldval) // 鑰佽矾鐢变俊鎭�
},
// 娣卞害瑙傚療鐩戝惉
deep: true
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index aeecc96..d7201cd 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -124,7 +124,7 @@
this.getcheckProjectNum();
this.getVerifiedData();
this.getUncheckedData();
- this.getPieChart();
+ this.getPieChart();
},
methods: {
cell({ row, column, rowIndex, columnIndex }) {
diff --git a/src/views/inspectionManagement/commissionInspection/addCommision.vue b/src/views/inspectionManagement/commissionInspection/addCommision.vue
index d3888f7..8fe270d 100644
--- a/src/views/inspectionManagement/commissionInspection/addCommision.vue
+++ b/src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -15,20 +15,17 @@
style="width: 200px;"
>
</el-input>-->
- <el-button type="primary" size="small" style="background-color: rgb(1, 102, 226);">閲嶇疆</el-button>
</div>
<el-table ref="detectionInfo" :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="detectionInfo" style="width: 100%;margin-bottom: 20px;">
<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="specificationsModels" label="瑙勬牸鍨嬪彿" min-width="10%" />
<el-table-column prop="unit" label="鍗曚綅" min-width="8%" />
<el-table-column prop="samplesNumber" label="鏁伴噺" min-width="8%" />
- <el-table-column prop="addway" label="娣诲姞鏂瑰紡" min-width="8%">
+ <!-- <el-table-column prop="addway" label="娣诲姞鏂瑰紡" min-width="8%">
<template slot-scope="scope">
<div v-if="scope.row.addway === 0">
<el-tag type="success" disable-transitions>鎵弿</el-tag>
@@ -38,12 +35,12 @@
</div>
<div v-else></div>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column prop="remarks" label="澶囨敞" min-width="8%" />
<el-table-column label="鎿嶄綔" min-width="8%">
<template slot-scope="scope">
- <el-button type="text" size="small">淇敼</el-button>
- <el-button type="text" size="small" @click="deleteRow(scope.row)">鍒犻櫎</el-button>
+ <el-button type="text" size="small"
+ @click.native.prevent="deleteRow(scope.$index, detectionInfo)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -103,8 +100,8 @@
<el-col :span="5">
<el-form-item label="閫佹牱鏂瑰紡锛�">
<el-select style="width: 200px;" v-model="infoForm.way" size="small" placeholder="閫佹牱">
- <el-option v-for="options in sampleDeliveryMode" :key="options.key"
- :value="options.value">{{ options.value }}</el-option>
+ <el-option v-for="options in sampleDeliveryMode" :key="options.key" :value="options.key"
+ :label="options.value">{{ options.value }}</el-option>
</el-select>
</el-form-item>
</el-col>
@@ -176,15 +173,15 @@
</el-col>
<el-col :span="11">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-select v-model="addPointerForm.specificationsModels" size="small" placeholder="璇峰厛閫夋嫨鏍峰搧鍚嶇О">
- <el-option v-for="options in model_sta_options" :value="options.value"
+ <el-select v-model="addPointerForm.specificationsModels" size="small" placeholder="璇峰厛閫夋嫨鏍峰搧鍚嶇О"
+ @change="getProductList">
+ <el-option v-for="options in model_sta_options" :value="options.key" :label="options.value"
:key="options.key">{{ options.value }}</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="50">
-
<el-col :span="11">
<el-form-item label="鏍峰搧鍗曚綅锛�">
<el-input type="text" v-model="addPointerForm.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
@@ -197,15 +194,15 @@
</el-col>
</el-row>
<el-row :gutter="50">
- <el-col :span="9">
+ <el-col :span="11">
<el-form-item label="娣诲姞椤圭洰锛�">
<el-checkbox-group v-model="addPointerForm.experiment" style="display: flex; flex-direction: column;">
- <el-checkbox v-for="expers in experList" :label="expers.label"
- :key="expers.key">{{ expers.label }}</el-checkbox>
+ <el-checkbox v-for="(expers, ai) in productList" :label="expers"
+ :key="ai">{{ expers }}</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
- <el-col :span="41">
+ <el-col :span="11">
<el-form-item label="澶囨敞锛�">
<el-input type="textarea" :autosize="{ minRows: 4, maxRows: 20}" style="width: 200px;"
v-model="addPointerForm.remarks" placeholder="璇疯緭鍏ュ娉�" autocomplete="off" />
@@ -230,6 +227,7 @@
getlink,
addInspection,
isIfViewUUID,
+ getProductList,
getContractsSampleInfo
} from '@/api/inspection/commisioninspection'
export default {
@@ -275,17 +273,8 @@
key: '4',
label: '缁濈紭閮ㄥ垎浜ゆ祦鑰愬帇璇曢獙'
}],
- sampleoptions: [{
- key: '1',
- value: '閫夐」1'
- }, {
- key: '2',
- value: '閫夐」2'
- }],
- samplecodeoptions: [{
- key: '1',
- value: ''
- }],
+ sampleoptions: [],
+ samplecodeoptions: [],
model_spe_options: [],
model_sta_options: [],
model_options: [],
@@ -298,18 +287,19 @@
}],
dialogueFormVisible: false,
showDetail: false,
- viewId: null
+ viewId: null,
+ productList: []
}
},
watch: {
addPointerForm: {
handler: function(val) {
- if(val.addway!=""){
+ if (val.addway != "") {
this.model_sta_options = []
- this.model_options.forEach(a=>{
- if(a.specificationsName==val.addway){
- this.model_sta_options = a.children.map(item=>{
- return{
+ this.model_options.forEach(a => {
+ if (a.specificationsName == val.addway) {
+ this.model_sta_options = a.children.map(item => {
+ return {
key: item.modelId,
value: item.modelName
}
@@ -343,6 +333,8 @@
if (!res.data) {
this.$message.error('褰撳墠閾炬帴涓嶅湪鏈夋晥鏈熷唴,绯荤粺鑷姩鍏抽棴')
this.$router.push('/404')
+ } else {
+ this.getContractsSampleInfo()
}
})
},
@@ -378,8 +370,6 @@
for (let i = 1; i < this.addPointerForm.experiment.length; i++) {
exper += ',' + this.addPointerForm.experiment[i]
}
-
- // console.log(exper)
this.addPointerForm.experiment = exper
let tmp = this.addPointerForm
this.detectionInfo.push(tmp)
@@ -419,11 +409,9 @@
this.infoForm.commisioncode = res.data
if (res.data) {
this.$message({
- message: '鎭枩浣�!',
+ message: '娣诲姞鎴愬姛!',
type: 'success'
})
- // 璺宠浆椤甸潰
- this.$router.push('/inspectionManagement/commissionInspection')
this.showDetail = true
} else {
this.$message.error(res.message)
@@ -435,8 +423,8 @@
handleCurrentChange(pageNo) {
this.pageParams.pageNo = pageNo
},
- deleteRow(row) {
-
+ deleteRow(index, rows) {
+ rows.splice(index, 1);
},
upMaterialName(val) {
this.sampleoptions.forEach(a => {
@@ -445,6 +433,37 @@
}
})
this.getModelSpecification(val)
+ },
+ getProductList(val) {
+ getProductList({
+ modelId: val
+ }).then(res => {
+ this.productList = res.data.map(item => {
+ return item.name
+ })
+ })
+ },
+ getContractsSampleInfo() {
+ getContractsSampleInfo({
+ viewId: this.viewId
+ }).then(res => {
+ this.infoForm = {
+ commisioncode: res.data.entrustCoding,
+ deadline: res.data.completionDeadline,
+ address: res.data.contactAddress,
+ tel: res.data.contactNumber,
+ contacter: res.data.contacts,
+ other: res.data.entrustRemarks,
+ department: res.data.entrusted,
+ time: res.data.inspectionTime,
+ detectionInfo: res.data.linkDetectionList,
+ num: res.data.reportNumber,
+ way: '' + res.data.sampleDeliveryMode,
+ sendertel: res.data.sampleDeliveryPhone,
+ sender: res.data.sampleSender
+ }
+ this.detectionInfo = res.data.linkDetectionList
+ })
}
}
}
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index 129e1c9..dadc02c 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -65,20 +65,20 @@
<el-table-column type="index" label="搴忓彿" min-width="10%" />
<el-table-column prop="entrust_coding" label="濮旀墭缂栧彿" min-width="10%" />
<el-table-column prop="entrusted" label="濮旀墭鍗曚綅" min-width="12%" />
- <el-table-column prop="samples_number" label="鏍峰搧缂栧彿" min-width="8%" />
+ <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="dateSurvey" label="閫佽揪鏃堕棿" min-width="8%" />
+ <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="inspectionTime" 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 === 1">
- <span style="color: green;">宸叉娴�</span>
+ <div v-if="scope.row.inspection_status === 0">
+ <span style="color: green;">宸叉姤妫�</span>
</div>
<div v-else>
- <span style="color: red;">寰呮娴�</span>
+ <span style="color: red;">鏈姤妫�</span>
</div>
</template>
</el-table-column>
@@ -327,12 +327,15 @@
if (document.execCommand('copy')) {
this.$message.success('宸插鍒跺埌鍓创鏉�')
}
+ },
+ handleClick(row){
+ console.log(row);
}
}
}
</script>
-<style scoped>
+<style scoped lang="scss">
.top-bar {
margin: -25px -15px;
background: #fff;
diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue
index 2526f59..292601a 100644
--- a/src/views/inspectionManagement/reportForInspection/index.vue
+++ b/src/views/inspectionManagement/reportForInspection/index.vue
@@ -40,9 +40,33 @@
<el-form-item>
<el-button type="primary" @click="search">鏌ヨ</el-button>
<el-button type="primary" plain @click="reset">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-plus" @click="addReportVisible = true">鏂板</el-button>
</el-form-item>
</el-form>
</div>
+ <el-dialog
+ title="鏂板鍘熸潗鏂欐姤妫�"
+ :visible.sync="addReportVisible"
+ width="40%">
+ <el-form v-model="insertData" label-position="left" label-width="80px">
+ <el-form-item label="鏍囧噯绫诲瀷">
+ <el-input v-model="insertData.materialName" />
+ </el-form-item>
+ <el-form-item label="鐗╂枡鍚嶇О">
+ <el-input v-model="insertData.materialName" />
+ </el-form-item>
+ <el-form-item label="鎵ц鏍囧噯">
+ <el-input v-model="insertData.standardName" />
+ </el-form-item>
+ <el-form-item label="瑙勬牸鍨嬪彿">
+ <el-input v-model="insertData.specificationsName" />
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="addReportVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="insert()">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
<div class="library-table">
<div class="table-header">
<div class="search-bar">
@@ -51,8 +75,9 @@
</el-radio-group>
</div>
<div class="generateInsp">
- <el-button @click="showNewPage = true" type="primary" size="mini" icon="el-icon-document" style="background-color: rgb(1, 102, 226);">鐢熸垚鎶ユ鍗�</el-button>
+ <el-button @click="addReportBtn" type="primary" size="mini" icon="el-icon-document" style="background-color: rgb(1, 102, 226);">鐢熸垚鎶ユ鍗�</el-button>
</div>
+
</div>
<div class="table-box">
<el-table
@@ -62,11 +87,13 @@
:header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
:data="inspectionTable"
style="width: 100%"
+ @selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
- min-width="10%"
- />
+ :selectable="checkSelect"
+ min-width="5%">
+ </el-table-column>
<el-table-column
type="index"
label="搴忓彿"
@@ -129,9 +156,16 @@
>
<template slot-scope="scope">
<span :style="{ color: scope.row.type === 1 ? 'green' : 'red' }">
- {{ scope.row.type === 1 ? '宸叉娴�':'鏈娴�' }}
+ {{ scope.row.type === 1 ? '宸叉姤妫�':'鏈姤妫�' }}
</span>
</template>
+ </el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ min-width="8%">
+ <template slot-scope="scope">
+ <el-button type="text" size="small" @click="removeFun(scope.row)">鍒犻櫎</el-button>
+ </template>
</el-table-column>
</el-table>
<!-- 鍒嗛〉鍣� -->
@@ -159,28 +193,28 @@
<el-row>
<el-col :span="8">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
- <el-input style="width: 180px;" :value="inspectionForm.createTime" disabled autocomplete="off" />
+ <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_name" disabled autocomplete="off" /> </el-form-item>
+ <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.materialCoding" disabled autocomplete="off" />
+ <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.materialName" disabled autocomplete="off" />
+ <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.specificationsModels" disabled autocomplete="off" />
+ <el-input style="width: 180px;" :value="inspectionForm.specifications" disabled autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -192,17 +226,17 @@
<el-row >
<el-col :span="8">
<el-form-item label="鏁伴噺锛�" >
- <el-input style="width: 180px;" :value="inspectionForm.quantity" disabled autocomplete="off" />
+ <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.dateSurvey" disabled autocomplete="off" />
+ <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.surveyor" disabled autocomplete="off" />
+ <el-input style="width: 180px;" :value="inspectionForm.userName" disabled autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
@@ -213,7 +247,7 @@
<div class="header">
<span style="font-size: 14px">妫�楠岄」鐩�</span>
<div>
- <el-button type="primary" plain size="mini">淇濆瓨</el-button>
+ <!-- <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>
@@ -223,22 +257,22 @@
: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="project" label="椤圭洰" width="250"></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="standardVal" label="鏍囧噯鍊�" width="125"></el-table-column>
- <el-table-column prop="controlVal" label="鍐呮祴鍊�" width="125"></el-table-column>
- <el-table-column prop="detectionVal" label="妫�楠屽��" width="125"></el-table-column>
- <el-table-column prop="checker" label="妫�楠屼汉">
+ <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 v-model="scope.row.checker" size="small" slot="append" style="width: 260px;">
- <el-option v-for="item in checkeroptions" :key="item.value" :label="item.label">{{ item.label }}</el-option>
+ <el-option v-for="(item,index) in checkeroptions" :key="index" :value="item.value" :label="item.label">{{ item.label }}</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="device" label="璇曢獙璁惧">
<template slot-scope="scope">
<el-select v-model="scope.row.device" size="small" slot="append" style="width: 260px;">
- <el-option v-for="item in deviceoptions" :key="item.value" :label="item.label">{{ item.label }}</el-option>
+ <el-option v-for="(item,index) in deviceoptions" :key="index" :value="item.value" :label="item.label">{{ item.label }}</el-option>
</el-select>
</template>
</el-table-column>
@@ -249,10 +283,17 @@
</template>
<script>
-import { getRawMaterialList } from '@/api/inspection/rawmaterial'
+import { getRawMaterialList,addInspect,selectInspectsListById } from '@/api/inspection/rawmaterial'
export default {
data() {
return {
+ insertData:{
+
+ },
+ addReportVisible: false,
+ checked: false,
+ resultData : {},
+ checkData:[],
form: [],
searchData: {
code: '',
@@ -313,80 +354,82 @@
total:20,
data: '',
showNewPage: false,
- inspectionForm:{
- 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',
- },
- inspectionItems:[{
- project:'瀵肩嚎澶栧緞',
- unit: 'mm',
- standardVal: '30.0',
- controlVal: '30.0',
- detectionVal: '30.0',
- device:'',
- checker: '',
- },{
- project:'瀵肩嚎澶栧緞',
- unit: 'mm',
- standardVal: '30.0',
- controlVal: '30.0',
- detectionVal: '30.0',
- device:'',
- checker: ''
- },{
- project:'瀵肩嚎澶栧緞',
- unit: 'mm',
- standardVal: '30.0',
- controlVal: '30.0',
- detectionVal: '30.0',
- device:'',
- checker: ''
- },{
- project:'瀵肩嚎澶栧緞',
- unit: 'mm',
- standardVal: '30.0',
- controlVal: '30.0',
- detectionVal: '30.0',
- device:'',
- checker: ''
- },{
- project:'瀵肩嚎澶栧緞',
- unit: 'mm',
- standardVal: '30.0',
- controlVal: '30.0',
- detectionVal: '30.0',
- device:'',
- checker: ''
- },{
- project:'瀵肩嚎澶栧緞',
- unit: 'mm',
- standardVal: '30.0',
- controlVal: '30.0',
- detectionVal: '30.0',
- device:'',
- checker: ''
- }]
+ inspectionForm:{},
+ inspectionItems:[]
}
},
created(){
this.getRawMaterialList()
},
methods: {
+ removeFun(row){
+ this.$confirm('纭鍒犻櫎璇ユ暟鎹悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ this.$message({
+ type: 'success',
+ message: '鍒犻櫎鎴愬姛!'
+ });
+ }).catch(() => {});
+ },
+ checkSelect(row,index){
+ if(row.type === 1){
+ return false;
+ }else{
+ return true;
+ }
+ },
+ handleSelectionChange(val){
+ this.checkData = val;
+ console.log(val);
+ },
+ //鐢熸垚鎶ユ鍗曟寜閽�
+ addReportBtn(){
+ let arr = this.checkData;
+ if(arr.length < 1){
+ this.$message.error("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }else{
+ if(arr.length > 1){
+ this.$message.error("鏈�澶氶�夋嫨涓�鏉℃暟鎹�!");
+ }else{
+ //娣诲姞鎶ユ鍗�
+ let val = arr[0];
+ let obj = {
+ "endTime": val.dateSurvey,
+ "experiment": "",
+ "formTime": val.createTime,
+ "id": val.id,
+ "mcode": val.materialCoding,
+ "name": val.materialName,
+ "num": val.quantity,
+ "specifications": val.specificationsModels,
+ "startTime": val.inspectionDate,
+ "supplier": val.supplierName,
+ "type": val.type,
+ "unit": val.unit,
+ "version": val.version
+ }
+ this.createReport(obj);
+ this.showNewPage = true;
+ }
+ }
+ },
+ //鐢熸垚鎶ヤ环鍗�
+ async createReport(param){
+ await addInspect(param);
+ const res2 = await selectInspectsListById({ id : 59});
+ this.resultData = res2.data;
+ this.inspectionForm = res2.data;
+ this.inspectionItems = res2.data.insProducts;
+
+ },
// 鑾峰彇鍒嗛〉鍒楄〃鏁版嵁
async getRawMaterialList(){
const res = await getRawMaterialList({pageNo: this.currentPage,pageSize:this.pageSize})
- // console.log(res)
this.inspectionTable = res.data.row
this.data = res.data.row
- console.log(res.data.row);
this.total = res.data.total
},
async search(){
@@ -398,7 +441,6 @@
pageNo: this.currentPage,
pageSize: this.pageSize
})
- // console.log(res)
this.inspectionTable = res.data.row
this.data = res.data.row
this.total = res.data.total
@@ -414,7 +456,6 @@
},
radioclick(){
this.searchData.state = this.radioValue
- // console.log(this.radioValue)
this.inspectionTable = this.data.filter((item)=>{
return item.condition === this.radioValue
})
@@ -425,13 +466,11 @@
},
// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
handleSizeChange(val) {
- console.log(`姣忛〉 ${val} 鏉)
this.pageSize = val
this.getRawMaterialList({pageNo: this.currentPage,pageSize:this.pageSize})
},
// 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
handleCurrentChange(val) {
- console.log(`褰撳墠椤�: ${val}`)
this.currentPage = val
this.getRawMaterialList({pageNo: this.currentPage,pageSize:this.pageSize})
}
@@ -439,7 +478,7 @@
}
</script>
-<style scoped>
+<style scoped lang="scss">
.content-main{
height: 100%;
.top-bar{
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index e50cf91..1d73885 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -135,9 +135,9 @@
</el-form>
<div class="sao">寰俊鎵爜鐧诲綍</div>
<div class="copyright">
- <p>姹熶笢閲戝叿璁惧鏈夐檺鍏徃</p>
- <p>鐗堟潈鎵�鏈塁opyright 漏锔� 2012-2021 ZTT.All Rights Reserved.</p>
- <p>[鑻廔CP澶�10047815鍙�-1]</p>
+ <!-- <p>鏈夐檺鍏徃</p>
+ <p>鐗堟潈鎵�鏈塁opyright 漏锔� </p>
+ <p>[鑻廔CP澶�10047815鍙�-1]</p> -->
</div>
</div>
</div>
--
Gitblit v1.9.3