From e7accdd06b7d3796a028daafbed116c47abecafc Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 29 十二月 2023 16:59:28 +0800
Subject: [PATCH] 产品检验查询修改
---
src/views/basic/workstation/workstation-form.vue | 20 ++++++++++----------
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 34 ++++++----------------------------
2 files changed, 16 insertions(+), 38 deletions(-)
diff --git a/src/views/basic/workstation/workstation-form.vue b/src/views/basic/workstation/workstation-form.vue
index f9f8c9e..7d8be50 100644
--- a/src/views/basic/workstation/workstation-form.vue
+++ b/src/views/basic/workstation/workstation-form.vue
@@ -92,7 +92,7 @@
type="card"
v-model="activeTabName"
ref="tabs"
- style="height: 400px"
+ style="height: 320px"
>
<el-tab-pane label="璁惧" name="equip">
<el-transfer
@@ -138,7 +138,7 @@
>
</el-transfer>
</el-tab-pane> -->
- <!-- <el-tab-pane label="浜у嚭涓嶅悎鏍煎簱浣�" name="disqualified">
+ <el-tab-pane label="浜у搧涓嶅悎鏍煎簱浣�" name="disqualified">
<el-transfer
filterable
v-model="disqualifiedLocationIds"
@@ -149,7 +149,7 @@
>
</el-transfer>
</el-tab-pane>
- <el-tab-pane label="浜у嚭鍚堟牸搴撲綅" name="qualified">
+ <el-tab-pane label="浜у搧鍚堟牸搴撲綅" name="qualified">
<el-transfer
filterable
v-model="qualifiedLocationIds"
@@ -159,7 +159,7 @@
@change="handleChangeQualifiedLocation"
>
</el-transfer>
- </el-tab-pane> -->
+ </el-tab-pane>
<!-- <el-tab-pane label="妫�楠屽緟澶勭悊搴撲綅" name="pending">
<el-transfer
filterable
@@ -335,12 +335,12 @@
}
},
handleChangeQualifiedLocation(value, direction, movedKeys) {
- // if (value && value.length > 1) {
- // this.qualifiedLocationIds = this.myQualifiedLocation
- // this.$message.warning('璇ュ簱浣嶅彧鑳藉瓨鍦ㄤ竴涓�')
- // } else {
- this.myQualifiedLocation = value
- // }
+ if (value && value.length > 1) {
+ this.qualifiedLocationIds = this.myQualifiedLocation
+ this.$message.warning('璇ュ簱浣嶅彧鑳藉瓨鍦ㄤ竴涓�')
+ } else {
+ this.myQualifiedLocation = value
+ }
},
handleChangeDisqualifiedLocation(value, direction, movedKeys) {
if (value && value.length > 1) {
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index 1dbc295..f90cdbf 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -90,13 +90,9 @@
</el-form-item>
</el-col>
<el-col :span="6" v-if="processInspectVo.id != null">
- <el-form-item label="浜у搧鍚堟牸搴撲綅锛�" prop="locationId">
- <el-select @change="changeLocation" clearable style="width:100%"
- v-model="processInspectVo.locationId" placeholder="璇烽�夋嫨鍚堟牸搴撲綅"
- :disabled="resultVal!=null && processInspectVo.id!=null" autocomplete="off">
- <el-option v-for="(item,i) in locationList" :key="i"
- :label="item.locName+'-'+item.locNo" :value="item.id"></el-option>
- </el-select>
+ <el-form-item label="浜у搧鍚堟牸搴撲綅锛�" prop="locName">
+ <el-input v-model="processInspectVo.locName" clearable style="width:100%" placeholder="璇烽�夋嫨鍚堟牸搴撲綅" disabled autocomplete="off">
+ </el-input>
</el-form-item>
</el-col>
</el-row>
@@ -289,7 +285,7 @@
// 缂栬緫鏃跺瓨鍌ㄦ渶闀跨殑鍒楁暟瀛楋紝鍋氬垹闄ゅ垽鏂�
empiricalValueAddMaxNumber: 0,
processInspectRules: {
- locationId: [{required: true,message:'璇烽�夋嫨搴撲綅鍙�',trigger:'blur'}]
+ locName: [{required: true,message:'璇烽�夋嫨搴撲綅鍙�',trigger:'blur'}]
},
processInspectVo: {
id: null,
@@ -306,7 +302,7 @@
technologyId: null,
documentId: null,
outBatchNo: null,
- locationId: null,
+ locName: null,
},
inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
inspectionResultForm: [],
@@ -359,19 +355,6 @@
this.$refs.codeDeviceCompont.openCamera()
this.proIndex=index
},
- changeLocation(val){
- if(val){
- let obj = {
- id: this.processInspectVo.id,
- locationId: val
- }
- updateLocationIdById(obj).then(res=>{
- if(res.status===200){
- this.$message.success("鏇存柊鍚堟牸搴撲綅鎴愬姛")
- }
- })
- }
- },
getIfsLocation(){
getIfsLocationByGroupCopyAll({locationGroup: '1'}).then(res=>{
if(res.status===200){
@@ -382,11 +365,6 @@
})
},
submitSave(){
- let locationId = this.processInspectVo.locationId
- if(locationId==null){
- this.$message.error("璇烽�夋嫨浜у搧鍚堟牸搴撲綅")
- return
- }
let pro = 0
this.inspectionItems.forEach(item => {
if(item.children){
@@ -461,7 +439,7 @@
this.processInspectVo.quantity = result.quantity
this.processInspectVo.documentId = result.documentId
this.processInspectVo.outBatchNo = result.outBatchNo
- this.processInspectVo.locationId = result.locationId
+ this.processInspectVo.locName = result.locName
let userList = []
result.children.forEach(item=>{
item.iid = Math.random()
--
Gitblit v1.9.3