From b6504ec5c24d63b6995bed991073b677392d166a Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 30 八月 2023 18:02:36 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
.env.development | 2
src/api/inspection/commisioninspection.js | 8 ++
src/views/experiment/inspectionApplication/index.vue | 190 +++++++++++++++++++++++++++-------------------
src/views/experiment/inspectionApplication/Viewdetails/index.vue | 7 -
src/views/inspectionManagement/commissionInspection/addCommision.vue | 22 +++--
5 files changed, 133 insertions(+), 96 deletions(-)
diff --git a/.env.development b/.env.development
index ab9be2d..d00c942 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = 'http://localhost:1234/'
+VUE_APP_BASE_API = 'http://192.168.110.107:1234/'
diff --git a/src/api/inspection/commisioninspection.js b/src/api/inspection/commisioninspection.js
index d986bb3..95df195 100644
--- a/src/api/inspection/commisioninspection.js
+++ b/src/api/inspection/commisioninspection.js
@@ -88,3 +88,11 @@
params
})
}
+
+export function getSpecificationsName(params){
+ return request({
+ url: '/link-basic-table/getSpecificationsName',
+ method: 'get',
+ params
+ })
+}
\ No newline at end of file
diff --git a/src/views/experiment/inspectionApplication/Viewdetails/index.vue b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
index 244a2d7..04d49ea 100644
--- a/src/views/experiment/inspectionApplication/Viewdetails/index.vue
+++ b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
@@ -185,12 +185,7 @@
this.ZERENren = res.data
console.log(this.ZERENren);
},
- //璁惧
- // getDevices() {
- // get(this.$url.chooseinstum).then(res => {
- // this.devices = res.data
- // })
- // },
+
async chooseinstum(){
const res = await chooseinstum()
this.getDevices = res.data
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 94664a1..53d5292 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -163,7 +163,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>
@@ -314,36 +314,37 @@
</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-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>
- <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>
- <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>
+ height="calc(80vh - 250px)" default-expand-all ref="multipleTable"
+ @select-all="selectAll" @selection-change="handleSelectionChange"
+ :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+ <!-- <el-table-column type="selection" label="搴忓彿"> </el-table-column> -->
+ <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>
+ <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>
+ <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">
<el-button @click="Standardframe = false">鍙� 娑�</el-button>
<el-button type="primary" @click="GOfrom">纭� 瀹�</el-button>
@@ -433,7 +434,7 @@
selectAll,
addInspect,
chooseVer,
- lookProByVer
+ lookProByVer,
} from '@/api/experiment/planAssignments'
export default {
data() {
@@ -460,7 +461,7 @@
amount: '',
checkdate: []
},
- selectedValue: 1,
+ selectedValue: {},
infoForm: {},
commisionSelection: {
entrust_coding: '',
@@ -510,8 +511,10 @@
tableData: [],
tableRow: {},
BANben: [],
- select_1: [],
- aa: {}
+ // select_1: [],
+ aa: {},
+ listdata:[],
+ ddd:{}
}
},
watch: {
@@ -529,6 +532,7 @@
if (this.$route.name === 'ForInspectionDetail') this.showDetail = true
},
methods: {
+
async selectAll() {
const res = selectAll({
type: 0
@@ -570,6 +574,7 @@
this.aa = this.BANben[0]
this.lookProByVer()
},
+
//鏍囧噯搴�
async lookProByVer() {
const res = await lookProByVer({
@@ -663,6 +668,7 @@
},
handleRawMaterialSelection() {
this.infoForm = this.tmp
+ console.log(this.infoForm);
this.rawmaterialVisible = false
},
handleRadioChange() {
@@ -673,13 +679,13 @@
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 // 妫�楠屾棩鏈�
- // })
+ var data = res.data
+ data.forEach((item)=>{
+ var checkdate = []
+ checkdate.push(item['createTime'])
+ checkdate.push(item['updateTime'])
+ item['checkdate'] = checkdate // 妫�楠屾棩鏈�
+ })
this.rawMaterialTable = res.data
})
@@ -690,26 +696,35 @@
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
})
}
}, 100)
},
// 鏂板妫�楠�
- async addInspection() {
+ 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.BANben[1]
+ }).then(res=>{
+
})
}
if (this.type === 1) {
@@ -723,7 +738,9 @@
startTime: this.commisionSelection.checkdate[0],
supplier: this.commisionSelection.supplier,
type: this.type,
- unit: this.commisionSelection.unit
+ unit: this.commisionSelection.unit,
+ version:this.aa
+
})
}
if (this.type === 2) {
@@ -737,15 +754,18 @@
startTime: '2023-08-14',
supplier: this.finishedTable.supplier,
type: this.type,
- unit: this.finishedTable.unit
+ unit: this.finishedTable.unit,
+ version:this.aa
+
})
}
this.type = 0
this.checkTypeVisible = false
- this.$message({
- message: '娣诲姞鎴愬姛锛�',
- type: 'success'
- });
+ // this.$message({
+ // message: '娣诲姞鎴愬姛锛�',
+ // type: 'success'
+ // });
+ // this.$router.push({name: 'Viewdetails'})
},
// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
handleSizeChange(val) {
@@ -758,33 +778,45 @@
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.addInspect()
+ this.addInspection()
+ // this.kk = res.data
+ console.log(this.kk)
+ // this.$router.push({name: 'Viewdetails',query: {id: res.data}})
+ // console.log(res);
+
+ }
}
}
</script>
diff --git a/src/views/inspectionManagement/commissionInspection/addCommision.vue b/src/views/inspectionManagement/commissionInspection/addCommision.vue
index 306bafb..00c25ea 100644
--- a/src/views/inspectionManagement/commissionInspection/addCommision.vue
+++ b/src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -22,10 +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="specificationsModels" label="瑙勬牸鍨嬪彿" min-width="10%" >
- <template slot-scope="scope">
-
- </template>
+ <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%" />
@@ -232,7 +229,8 @@
addInspection,
isIfViewUUID,
getProductList,
- getContractsSampleInfo
+ getContractsSampleInfo,
+ getSpecificationsName
} from '@/api/inspection/commisioninspection'
export default {
data() {
@@ -387,7 +385,8 @@
samplesNumber: '',
remarks: '',
experiment: [],
- addway: ''
+ addway: '',
+ speName: ''
}
},
async submitInspection() {
@@ -409,7 +408,8 @@
reportNumber: parseInt(this.infoForm.num),
sampleDeliveryMode: sampledeliveryway,
sampleDeliveryPhone: this.infoForm.sendertel,
- sampleSender: this.infoForm.sender
+ sampleSender: this.infoForm.sender,
+ speName: this.infoForm.speName
})
this.infoForm.commisioncode = res.data
if (res.data) {
@@ -447,6 +447,11 @@
return item.name
})
})
+ this.model_sta_options.forEach(a=>{
+ if(a.key == val){
+ this.addPointerForm.speName = a.value
+ }
+ })
},
getContractsSampleInfo() {
getContractsSampleInfo({
@@ -471,9 +476,6 @@
this.detectionInfo = res.data.linkDetectionList
})
},
- getSpeName(id){
- return name
- }
}
}
</script>
--
Gitblit v1.9.3