From aecdfb8c9f8c5f20dc9adb61adf0a9c1385b9f14 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 17 一月 2024 09:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/processInspect/processInspect-form.vue | 288 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 181 insertions(+), 107 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 01a072a..d0d066d 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -18,65 +18,85 @@
<div class="formwrapper">
<el-row>
<el-col :span="6">
- <el-form-item label="杩囩▼妫�楠岀紪鍙凤細">
- <el-input @blur="selectInfoByOrderId" disabled
- v-model="processInspectVo.proInsNo" autocomplete="off" />
+ <el-form-item label="杩囩▼妫�楠岀紪鍙�">
+ <el-input disabled
+ v-model="processInspectVo.proInsNo" placeholder="杩囩▼妫�楠岀紪鍙�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="璁㈠崟鍙凤細" prop="orderNumber">
+ <el-form-item label="杞﹂棿璁㈠崟鍙�" prop="moNo">
<el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
- v-model="processInspectVo.orderNumber" 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"
+ :disabled="resultVal!=null"
+ @click="Turnonthecamera"></el-button>
+ </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="浜у搧鍚嶇О锛�">
+ <el-form-item label="閿�鍞鍗曞彿" prop="orderNumber">
+ <el-input disabled
+ v-model="processInspectVo.orderNumber" placeholder="閿�鍞鍗曞彿" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="浜у搧鍚嶇О">
<el-tooltip class="item" effect="dark" :content="processInspectVo.material">
- <el-select style="width: 100%" @change="changeOptionsSamplename"
- :disabled="processInspectVo.id != null" v-model="processInspectVo.material"
- size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
- <el-option v-for="(item, index) in optionsSamplename" :key="index"
- :label="item.material" :value="item.materialCode">
- </el-option>
- </el-select>
+ <el-input v-model="processInspectVo.material" disabled placeholder="浜у搧鍚嶇О"></el-input>
</el-tooltip>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="浜у搧缂栧彿锛�">
- <el-input disabled v-model="processInspectVo.materialCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�"
- autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="瑙勬牸鍨嬪彿锛�">
+ <el-form-item label="浜у搧缂栧彿">
+ <el-input disabled v-model="processInspectVo.materialCode" placeholder="浜у搧缂栧彿" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瑙勬牸鍨嬪彿">
<el-tooltip class="item" effect="dark" :content="processInspectVo.specs">
- <el-input disabled v-model="processInspectVo.specs"
- autocomplete="off" />
+ <el-input disabled v-model="processInspectVo.specs" placeholder="瑙勬牸鍨嬪彿" autocomplete="off" />
</el-tooltip>
</el-form-item>
</el-col>
-
+
<el-col :span="6">
- <el-form-item label="宸ュ簭鍚嶇О">
+ <el-form-item label="宸ュ崟" prop="operationTaskId">
<el-select style="width: 100%" :disabled="processInspectVo.id != null"
- v-model="processInspectVo.technologyOperationId" size="small" placeholder="璇烽�夋嫨宸ュ簭">
- <el-option v-for="(item, index) in technologyList" :key="index" :label="item.name"
- :value="item.technologyOperationId">
+ v-model="processInspectVo.operationTaskId" size="small" placeholder="璇烽�夋嫨宸ュ崟">
+ <el-option v-for="(item, index) in technologyList" :key="index" :label="item.name+'-'+item.optaskNo"
+ :value="item.operationTaskId">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍗曚綅锛�">
- <el-input disabled v-model="processInspectVo.unit" placeholder="璇疯緭鍏ュ崟浣�"
- autocomplete="off" />
+ <el-form-item label="鍗曚綅">
+ <el-input disabled v-model="processInspectVo.unit" placeholder="鍗曚綅" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="customerName">
+ <el-input v-model="processInspectVo.customerName" placeholder="瀹㈡埛鍚嶇О" autocomplete="off" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏁伴噺锛�">
+ <el-form-item label="宸ョ▼鍚嶇О" prop="projectName">
+ <el-input v-model="processInspectVo.projectName" placeholder="宸ョ▼鍚嶇О" autocomplete="off" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏁伴噺" prop="quantity">
<el-input v-model="processInspectVo.quantity" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off"
:disabled="processInspectVo.id != null" />
</el-form-item>
@@ -95,14 +115,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>
@@ -213,20 +233,33 @@
</div>
</div>
<el-dialog
- title="璁惧鎵弿"
- :visible.sync="deviceCode"
- width="60%">
- <div style="height: 100vh;width: 100%;">
- <qr-code-app ref="codeDeviceCompont" @ok="getDeviceResultInfo" @cancelCodeDialog="cancelDeviceCodeDialog"></qr-code-app>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="deviceCode = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="deviceCode = false">纭� 瀹�</el-button>
- </span>
-</el-dialog>
+ title="鎵弿"
+ :visible.sync="qrcode"
+ width="60%">
+ <div style="height: 100vh;width: 100%;">
+ <qr-code-app ref="codeCompont" @ok="getResultInfo" @cancelCodeDialog="cancelCodeDialog"></qr-code-app>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="qrcode = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="qrcode = false">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog
+ title="璁惧鎵弿"
+ :visible.sync="deviceCode"
+ width="60%">
+ <div style="height: 100vh;width: 100%;">
+ <qr-code-app ref="codeDeviceCompont" @ok="getDeviceResultInfo" @cancelCodeDialog="cancelDeviceCodeDialog"></qr-code-app>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="deviceCode = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="deviceCode = false">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <processPart :paramObj="paramObj" :currshowlist.sync="workshop" />
</div>
</template>
-
+
<script>
import {
chooseMater,
@@ -236,19 +269,25 @@
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: {
- orderNumber: [{required:true,message:'璁㈠崟鍙蜂笉鑳戒负绌�',trigger:'blur'}]
+ moNo: [{required:true,message:'杞﹂棿璁㈠崟鍙蜂笉鑳戒负绌�',trigger:'blur'}],
+ quantity: [{required:true,validator: validatePositiveInteger,trigger:'blur'}],
+ operationTaskId: [{required:true,message: '璇烽�夋嫨宸ュ崟',trigger:'change'}],
},
dataVal: [{
label: '鏄�',
@@ -260,6 +299,7 @@
resultVal: null,
technologyList: [],
deviceList: [],
+ workshop:false,//杞﹂棿寮圭獥
hasChildren: true,
optionsSamplename: [],
// 娣诲姞鍒�
@@ -268,6 +308,7 @@
empiricalValueAddMaxNumber: 0,
processInspectVo: {
id: null,
+ moNo: null,
proInsNo: null,
material: null,
materialCode: null,
@@ -275,7 +316,9 @@
quantity: null,
specs: null,
unit: null,
- technologyOperationId: null
+ operationTaskId: null,
+ customerName: null,
+ projectName: null
},
inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
inspectionResultForm: [],
@@ -298,33 +341,58 @@
let val = sessionStorage.getItem("process-resultVal-" + this.processInspectVo.id);
val == undefined ? this.resultVal = null : this.resultVal = val
}
- console.log(this.resultVal);
this.init()
},
methods: {
- cancelDeviceCodeDialog(){
+ queryCode(){
+ console.log("llll");
+ this.workshop = true
+ console.log(this.workshop);
+ // this.paramObj = {
+ // code: this.dataForm.code
+ // }
+ },
+ cancelCodeDialog(){
+ this.qrcode = false
+ },
+ getResultInfo(data){
+ if(!data.includes("moNo")){
+ this.$message.warning('鏈瘑鍒嚭杞﹂棿璁㈠崟鍙蜂俊鎭紒');
+ }
+ let obj=JSON.parse(data)
+ let info={"code":obj["moNo"]}
+ if(info.code){
+ this.processInspectVo.moNo = obj["moNo"]
+ this.selectInfoByOrderId()
+ }else{
+ this.$message.warning('鏈瘑鍒嚭杞﹂棿璁㈠崟鍙蜂俊鎭紒');
+ }
+ },
+ // 鎵撳紑鐩告満
+ Turnonthecamera() {
+ this.qrcode = true
+ this.$refs.codeCompont.openCamera()
+ },
+ cancelDeviceCodeDialog(){
this.deviceCode = false
},
getDeviceResultInfo(val){
- console.log("鎵弿鍚庢暟鎹�",val);
let id=val.split("id@")[1]
if(id!=undefined&&id!=''&&id!=null){
let filterData=this.deviceList.filter(item=>{
return item.id==id
})[0]
- console.log(filterData);
this.row.eId=Number(id)
this.updateDevice(this.row)
}else{
this.$message({
- message: '鏈瘑鍒嚭浜屼綅鐮佽閲忓櫒鍏蜂俊鎭紒',
+ message: '鏈瘑鍒嚭璁￠噺鍣ㄥ叿淇℃伅锛�',
type: 'warning'
});
}
},
codeDevice(row,index){
- this.row=row
- console.log("row",row);
+ this.row=row
this.deviceCode =true
this.$refs.codeDeviceCompont.openCamera()
this.proIndex=index
@@ -401,11 +469,14 @@
if (id != null) {
queryById(id).then(res => {
let result = res.data.data
+ this.processInspectVo.moNo = result.moNo
+ this.processInspectVo.operationTaskId = result.technologyOperationName
this.processInspectVo.proInsNo = result.proInsNo
+ this.processInspectVo.projectName = result.projectName
+ this.processInspectVo.customerName = result.customerName
this.processInspectVo.orderNumber = result.orderNumber
this.processInspectVo.materialCode = result.materialCode
this.processInspectVo.material = result.material
- this.processInspectVo.technologyOperationId = result.technologyOperationName
this.processInspectVo.specs = result.specs
this.processInspectVo.unit = result.punit
this.processInspectVo.quantity = result.quantity
@@ -432,16 +503,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,
@@ -474,17 +551,6 @@
}).catch(error => {
console.log(error)
})
- },
- //浜у搧鍚嶇О锛岄�夋嫨
- changeOptionsSamplename(val) {
- let sample = this.optionsSamplename.filter(o => {
- return o.materialCode == val
- })[0]
- this.processInspectVo.materialCode = sample.materialCode
- this.processInspectVo.specs = sample.specs
- this.processInspectVo.unit = sample.unit
- this.processInspectVo.material = sample.material
- this.technologyList = sample.children
},
changeState(row,isChecked) {
const _than = this
@@ -530,52 +596,60 @@
addTestProject() {
let val = this.processInspectVo
const _than = this
- addProcess(val).then(res => {
- let id = res.data.data
- if (id != null) {
- _than.processInspectVo.id = id
- queryById(id).then(response => {
- let proList = response.data.data.children
- proList.forEach(item => {
- item.iid = Math.random();
- if (item.children != undefined) {
- item.children.forEach(obj => {
- obj.inote = null
- obj.empiricalValueAddss = []
+ this.$refs.addInspectionform.validate(valid=>{
+ if(valid){
+ addProcess(val).then(res => {
+ let id = res.data.data
+ if (id != null) {
+ _than.processInspectVo.id = id
+ queryById(id).then(response => {
+ let proList = response.data.data.children
+ proList.forEach(item => {
+ item.iid = Math.random();
+ if (item.children != undefined) {
+ item.children.forEach(obj => {
+ obj.inote = null
+ obj.empiricalValueAddss = []
+ })
+ }
})
- }
- })
- _than.inspectionItems = proList
+ _than.inspectionItems = proList
+ }).catch(error => {
+ console.log(error);
+ })
+ }
}).catch(error => {
- console.log(error);
+ console.log(error)
})
}
- }).catch(error => {
- console.log(error)
})
},
selectInfoByOrderId() {
- this.$refs.addInspectionform.validate(valid=>{
- if(valid){
- chooseMater({
- orderNumber: this.processInspectVo.orderNumber
+ if(this.processInspectVo.moNo){
+ chooseMater({
+ moNo: this.processInspectVo.moNo
}).then(res => {
- if (res.data.data != null) {
- this.optionsSamplename = res.data.data.children
+ let data = res.data.data
+ if (data) {
+ this.technologyList = data.children
+ this.processInspectVo.materialCode = data.materialCode
+ this.processInspectVo.orderNumber = data.orderNumber
+ this.processInspectVo.projectName = data.projectName
+ this.processInspectVo.customerName = data.customerName
+ this.processInspectVo.material = data.material
+ this.processInspectVo.specs = data.specs
+ this.processInspectVo.unit = data.unit
} else {
- this.$message({
- message: '娌℃湁璇ヨ鍗曞彿锛�',
- type: 'warning'
- });
- this.optionsSamplename = []
+ this.$message.warning('娌℃湁璇ヨ溅闂磋鍗曞彿锛�');
+ this.technologyList = []
this.processInspectVo.materialCode = null
+ this.processInspectVo.orderNumber = null
this.processInspectVo.material = null
this.processInspectVo.specs = null
this.processInspectVo.unit = null
}
})
- }
- })
+ }
},
changeRowResult(){
if(this.inspectionItems){
@@ -594,7 +668,7 @@
updateProcessInsProduct(obj).then(res => {
if (res.data.code == 0) {
this.init()
- }
+ }
})
}
})
@@ -627,7 +701,7 @@
},
}
</script>
-
+
<style scoped>
.finishedProduct-detail {
width: 100%;
@@ -691,4 +765,4 @@
border-top: 0 !important;
cursor: pointer !important;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3