From 9a0e4f1641f41a3dc1df4453ad416fb1522bd2ea Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 18 一月 2024 17:30:49 +0800
Subject: [PATCH] modified: src/page/wel.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue
---
src/views/quality/processInspect/processInspect-form.vue | 78 ++++++++++++++++++++++++++------------
1 files changed, 53 insertions(+), 25 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 2ac9320..ba99dd7 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -24,9 +24,14 @@
</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-search"
+ :disabled="resultVal!=null"
+ @click="queryCode"></el-button> -->
<el-button
slot="append"
icon="el-icon-full-screen"
@@ -62,7 +67,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,16 +115,20 @@
</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 type="index" prop="parentIndex" label="搴忓彿" width="60">
+ <template scope="scope">
+ <span v-if="scope.row.isIndex">{{scope.row.parentIndex}}</span>
+ </template>
+ </el-table-column>
<el-table-column label="椤圭洰" prop="father" show-overflow-tooltip width="140"></el-table-column>
<el-table-column prop="iname" label="鎸囨爣" show-overflow-tooltip width="140"></el-table-column>
<el-table-column prop="iunit" label="鍗曚綅" show-overflow-tooltip width="140"></el-table-column>
@@ -251,9 +260,10 @@
<el-button type="primary" @click="deviceCode = false">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <processPart :paramObj="paramObj" :currshowlist.sync="workshop" />
</div>
</template>
-
+
<script>
import {
chooseMater,
@@ -263,21 +273,23 @@
updateProcessInsProduct,
updateProcessInspectsById,
} from '@/api/quality/processInspect'
+import processPart from '@/views/common/processinspect-part'
import { selectDevice } from '@/api/quality/processInspect'
import qrCodeApp from '@/views/common/qrCodeApp'
import { validatePositiveInteger } from '@/util/validate'
export default {
components:{
- qrCodeApp
+ qrCodeApp,processPart
},
data() {
return {
+ paramObj:{},
qrcode: false,
row: null,
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'}],
},
@@ -291,6 +303,7 @@
resultVal: null,
technologyList: [],
deviceList: [],
+ workshop:false,//杞﹂棿寮圭獥
hasChildren: true,
optionsSamplename: [],
// 娣诲姞鍒�
@@ -299,7 +312,7 @@
empiricalValueAddMaxNumber: 0,
processInspectVo: {
id: null,
- moNumber: null,
+ moNo: null,
proInsNo: null,
material: null,
materialCode: null,
@@ -335,6 +348,13 @@
this.init()
},
methods: {
+ queryCode(){
+ this.workshop = true
+ console.log(this.workshop);
+ // this.paramObj = {
+ // code: this.dataForm.code
+ // }
+ },
cancelCodeDialog(){
this.qrcode = false
},
@@ -345,7 +365,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 +395,7 @@
}
},
codeDevice(row,index){
- this.row=row
+ this.row=row
this.deviceCode =true
this.$refs.codeDeviceCompont.openCamera()
this.proIndex=index
@@ -452,7 +472,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
@@ -464,7 +484,9 @@
this.processInspectVo.unit = result.punit
this.processInspectVo.quantity = result.quantity
let userList = []
- result.children.forEach(item => {
+ result.children.forEach((item,index) => {
+ item.isIndex = true;
+ item.parentIndex = index + 1;
item.iid = Math.random()
if (item.children != undefined) {
item.children.forEach(obj => {
@@ -486,16 +508,22 @@
}
})
this.inspectionItems = result.children
- let rVal = '1'
+ let rVal = ''
+ let passNum = 0
+ let unPassNum = 0
this.inspectionItems.forEach(item => {
if (item.children) {
item.children.forEach(obj => {
- if (obj.iresult == 0) {
- rVal = '0'
+ if(obj.iresult == 0){
+ unPassNum += 1
+ }
+ if(obj.iresult == 1){
+ passNum+=1
}
})
}
})
+ rVal = (passNum+unPassNum)>0 ? unPassNum>0 ? '0' :'1' : ''
this.inspectionResultForm = [{
materialCode: result.materialCode,
material: result.material,
@@ -602,9 +630,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) {
@@ -645,7 +673,7 @@
updateProcessInsProduct(obj).then(res => {
if (res.data.code == 0) {
this.init()
- }
+ }
})
}
})
@@ -678,7 +706,7 @@
},
}
</script>
-
+
<style scoped>
.finishedProduct-detail {
width: 100%;
@@ -742,4 +770,4 @@
border-top: 0 !important;
cursor: pointer !important;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3