From dce1a39a7c7c52d36007e2b134def3d2bfb85ce0 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 04 一月 2024 13:58:13 +0800
Subject: [PATCH] 质检模块修改
---
src/views/basic/workstation/workstation-form.vue | 4 ++--
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 6 ++++--
src/views/quality/processInspect/processInspect-form.vue | 38 +++++++++++++++++++-------------------
3 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/src/views/basic/workstation/workstation-form.vue b/src/views/basic/workstation/workstation-form.vue
index 7d8be50..7ffc2aa 100644
--- a/src/views/basic/workstation/workstation-form.vue
+++ b/src/views/basic/workstation/workstation-form.vue
@@ -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"
@@ -148,7 +148,7 @@
@change="handleChangeDisqualifiedLocation"
>
</el-transfer>
- </el-tab-pane>
+ </el-tab-pane> -->
<el-tab-pane label="浜у搧鍚堟牸搴撲綅" name="qualified">
<el-transfer
filterable
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index f90cdbf..0ca060a 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -303,6 +303,7 @@
documentId: null,
outBatchNo: null,
locName: null,
+ productNo: null,
},
inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
inspectionResultForm: [],
@@ -349,7 +350,7 @@
}
},
codeDevice(row,index){
- this.row=row
+ this.row=row
console.log("row",row);
this.deviceCode =true
this.$refs.codeDeviceCompont.openCamera()
@@ -440,6 +441,7 @@
this.processInspectVo.documentId = result.documentId
this.processInspectVo.outBatchNo = result.outBatchNo
this.processInspectVo.locName = result.locName
+ this.processInspectVo.productNo = result.productNo
let userList = []
result.children.forEach(item=>{
item.iid = Math.random()
@@ -626,7 +628,7 @@
updateFinishedInsProduct(obj).then(res => {
if (res.data.code == 0) {
this.init()
- }
+ }
})
}
})
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index fb3a6dd..7695830 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -24,9 +24,9 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="杞﹂棿璁㈠崟鍙�" prop="moNumber">
+ <el-form-item label="杞﹂棿璁㈠崟鍙�" prop="moNo">
<el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
- v-model="processInspectVo.moNumber" placeholder="璇疯緭鍏ヨ溅闂磋鍗曞彿" autocomplete="off" >
+ v-model="processInspectVo.moNo" placeholder="璇疯緭鍏ヨ溅闂磋鍗曞彿" autocomplete="off" >
<el-button
slot="append"
icon="el-icon-full-screen"
@@ -62,7 +62,7 @@
</el-tooltip>
</el-form-item>
</el-col>
-
+
<el-col :span="6">
<el-form-item label="宸ュ崟" prop="operationTaskId">
<el-select style="width: 100%" :disabled="processInspectVo.id != null"
@@ -110,14 +110,14 @@
</el-row>
<el-row style="width:100%;">
<el-col :span="24">
- <el-table border
- :data="inspectionItems"
+ <el-table border
+ :data="inspectionItems"
height="400"
:header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
- :cell-style="{ textAlign: 'center' }"
- row-key="iid"
+ :cell-style="{ textAlign: 'center' }"
+ row-key="iid"
default-expand-all style="width: 100%"
- ref="table"
+ ref="table"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<el-table-column type="index" label="搴忓彿" show-overflow-tooltip width="60"></el-table-column>
<el-table-column label="椤圭洰" prop="father" show-overflow-tooltip width="140"></el-table-column>
@@ -253,7 +253,7 @@
</el-dialog>
</div>
</template>
-
+
<script>
import {
chooseMater,
@@ -277,7 +277,7 @@
proIndex: 0,
deviceCode: false,
rules: {
- moNumber: [{required:true,message:'杞﹂棿璁㈠崟鍙蜂笉鑳戒负绌�',trigger:'blur'}],
+ moNo: [{required:true,message:'杞﹂棿璁㈠崟鍙蜂笉鑳戒负绌�',trigger:'blur'}],
quantity: [{required:true,validator: validatePositiveInteger,trigger:'blur'}],
operationTaskId: [{required:true,message: '璇烽�夋嫨宸ュ崟',trigger:'change'}],
},
@@ -299,7 +299,7 @@
empiricalValueAddMaxNumber: 0,
processInspectVo: {
id: null,
- moNumber: null,
+ moNo: null,
proInsNo: null,
material: null,
materialCode: null,
@@ -345,7 +345,7 @@
let obj=JSON.parse(data)
let info={"code":obj["moNo"]}
if(info.code){
- this.processInspectVo.moNumber = obj["moNo"]
+ this.processInspectVo.moNo = obj["moNo"]
this.selectInfoByOrderId()
}else{
this.$message.warning('鏈瘑鍒嚭杞﹂棿璁㈠崟鍙蜂俊鎭紒');
@@ -375,7 +375,7 @@
}
},
codeDevice(row,index){
- this.row=row
+ this.row=row
this.deviceCode =true
this.$refs.codeDeviceCompont.openCamera()
this.proIndex=index
@@ -452,7 +452,7 @@
if (id != null) {
queryById(id).then(res => {
let result = res.data.data
- this.processInspectVo.moNumber = result.moNumber
+ this.processInspectVo.moNo = result.moNo
this.processInspectVo.operationTaskId = result.technologyOperationName
this.processInspectVo.proInsNo = result.proInsNo
this.processInspectVo.projectName = result.projectName
@@ -608,9 +608,9 @@
})
},
selectInfoByOrderId() {
- if(this.processInspectVo.moNumber){
+ if(this.processInspectVo.moNo){
chooseMater({
- moNo: this.processInspectVo.moNumber
+ moNo: this.processInspectVo.moNo
}).then(res => {
let data = res.data.data
if (data) {
@@ -651,7 +651,7 @@
updateProcessInsProduct(obj).then(res => {
if (res.data.code == 0) {
this.init()
- }
+ }
})
}
})
@@ -684,7 +684,7 @@
},
}
</script>
-
+
<style scoped>
.finishedProduct-detail {
width: 100%;
@@ -748,4 +748,4 @@
border-top: 0 !important;
cursor: pointer !important;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3