From 4e2bb29096ac63837f8d2c5e25766ee094f45d6c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 27 十二月 2023 14:35:49 +0800
Subject: [PATCH] modified: src/page/index/top/index.vue modified: src/views/common/part.vue modified: src/views/equipment/equipment/index.vue modified: src/views/equipment/metering/index.vue modified: src/views/plan/manufacturingorder/auto-operationtask.vue modified: src/views/plan/operationtask/operationtask-form.vue modified: src/views/quality/Packaging_ledger/index.vue modified: src/views/quality/packageinspect/index.vue modified: src/views/quality/processconfiguration/index.vue modified: src/views/quality/teststandard/index.vue modified: vue.config.js
---
src/views/quality/processInspect/processInspect-form.vue | 257 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 181 insertions(+), 76 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 9a3454a..01a072a 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -8,13 +8,13 @@
<h2 v-else>缂栬緫-杩囩▼妫�楠屽崟</h2>
</div>
<div class="btn-group header-right">
- <el-button @click="addTestProject" v-if="processInspectVo.id == null">鐢熸垚妫�楠岄」鐩�</el-button>
+ <el-button type="primary" @click="addTestProject" v-if="processInspectVo.id == null">鐢熸垚妫�楠岄」鐩�</el-button>
</div>
</div>
<div class="page-main">
<div class="finishedProduct-basic">
<el-form :model="processInspectVo" ref="addInspectionform" class="l-mes" label-position="right"
- label-width="120px" style="width: 100%" size="small">
+ label-width="120px" style="width: 100%" size="small" :rules="rules">
<div class="formwrapper">
<el-row>
<el-col :span="6">
@@ -24,13 +24,14 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="璁㈠崟鍙凤細">
+ <el-form-item label="璁㈠崟鍙凤細" prop="orderNumber">
<el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
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="璇烽�夋嫨浜у搧鍚嶇О">
@@ -38,11 +39,12 @@
:label="item.material" :value="item.materialCode">
</el-option>
</el-select>
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="浜у搧缂栫爜锛�">
- <el-input disabled v-model="processInspectVo.materialCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�"
+ <el-form-item label="浜у搧缂栧彿锛�">
+ <el-input disabled v-model="processInspectVo.materialCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -50,8 +52,10 @@
<el-row>
<el-col :span="6">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input disabled v-model="processInspectVo.specs" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
+ <el-tooltip class="item" effect="dark" :content="processInspectVo.specs">
+ <el-input disabled v-model="processInspectVo.specs"
autocomplete="off" />
+ </el-tooltip>
</el-form-item>
</el-col>
@@ -100,20 +104,20 @@
default-expand-all style="width: 100%"
ref="table"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
- <el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
- <el-table-column label="椤圭洰" prop="father" width="240"></el-table-column>
- <el-table-column prop="iname" label="鎸囨爣" width="240"></el-table-column>
- <el-table-column prop="iunit" label="鍗曚綅" width="240"></el-table-column>
- <el-table-column prop="required" label="鏍囧噯鍊�" width="240"></el-table-column>
+ <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>
+ <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>
+ <el-table-column prop="required" label="鏍囧噯鍊�" width="140"></el-table-column>
<el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index"
- label="妫�娴嬪��" width="240" style="text-align: center;">
+ label="妫�娴嬪��" width="140" style="text-align: center;">
<template slot-scope="scope">
<el-col v-if="scope.row.itype === '1'">
<el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
<el-input :disabled="scope.row.eId == null"
v-model="scope.row.empiricalValueAddss[index]"
- @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ @blur="changeState(scope.row,true)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
<span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.empiricalValueAddss[index]"></span>
</el-tooltip>
@@ -121,10 +125,7 @@
<el-col v-else>
<el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
- <!-- <el-input :disabled="scope.row.eId == null"
- v-model="scope.row.empiricalValueAddss[index]"
- @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input> -->
- <el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="璇烽�夋嫨">
+ <el-select style="width: 100%;" @change="changeState(scope.row)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="璇烽�夋嫨">
<el-option v-for="item in dataVal" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
@@ -135,47 +136,38 @@
</el-col>
</template>
</el-table-column>
- <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="250">
+ <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="200">
<template slot-scope="scope">
<span v-if="resultVal != null && scope.row.iname != null"
v-text="scope.row.ename"></span>
<div v-else>
- <el-select style="width:100%" v-model="scope.row.eId" v-if="scope.row.iname != null"
+ <el-select style="width:60%" v-model="scope.row.eId" v-if="scope.row.iname != null"
filterable @change="updateDevice(scope.row, scope.$index)">
<el-option v-for="(item, index) in deviceList" :key="index" :value="item.id"
:label="item.code + '-' + item.name"></el-option>
</el-select>
+ <el-button
+ size="small"
+ slot="append"
+ icon="el-icon-full-screen"
+ v-if="scope.row.iname != null"
+ @click="codeDevice(scope.row,scope.$index)"></el-button>
</div>
</template>
</el-table-column>
- <el-table-column
- label="妫�楠屾弿杩�" width="240" style="text-align: center;">
+ <el-table-column show-overflow-tooltip
+ label="妫�楠屾弿杩�" width="140" style="text-align: center;">
<template slot-scope="scope">
- <el-col v-if="scope.row.itype === '1'">
+ <el-col>
<el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
<el-input :disabled="scope.row.eId == null"
v-model="scope.row.inote"
- @blur="changeState(scope.row, inote)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
+ @blur="changeState(scope.row)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
<span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.inote"></span>
</el-tooltip>
</el-col>
- <el-col v-else>
- <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
- class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
- <el-input :disabled="scope.row.eId == null"
- v-model="scope.row.inote"
- @blur="changeState(scope.row, inote)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
- <!-- <el-select style="width: 100%;" @change="changeState(scope.row, inote)" :disabled="scope.row.eId == null" v-model="scope.row.inote" placeholder="璇烽�夋嫨">
- <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
- :value="item.value">
- </el-option>
- </el-select> -->
- <span v-if="resultVal != null && processInspectVo.id != null"
- v-text="scope.row.inote"></span>
- </el-tooltip>
- </el-col>
</template>
</el-table-column>
<el-table-column label="缁撹" fixed="right" min-width="100">
@@ -200,8 +192,8 @@
<el-table border height="90" :data="inspectionResultForm"
:header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
:cell-style="{ textAlign: 'center' }">
- <el-table-column prop="materialCode" label="鐗╂枡缂栧彿"></el-table-column>
- <el-table-column prop="material" label="鐗╂枡鍚嶇О"></el-table-column>
+ <el-table-column prop="materialCode" width="200" show-overflow-tooltip label="鐗╂枡缂栧彿"></el-table-column>
+ <el-table-column prop="material" width="200" show-overflow-tooltip label="鐗╂枡鍚嶇О"></el-table-column>
<el-table-column prop="userName" label="妫�楠屽憳"></el-table-column>
<el-table-column prop="result" label="妫�楠岀粨璁�">
<template slot-scope="scope">
@@ -220,6 +212,18 @@
</el-row>
</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>
</div>
</template>
@@ -233,9 +237,19 @@
updateProcessInspectsById,
} from '@/api/quality/processInspect'
import { selectDevice } from '@/api/quality/processInspect'
+import qrCodeApp from '@/views/common/qrCodeApp'
export default {
+ components:{
+ qrCodeApp
+ },
data() {
return {
+ row: null,
+ proIndex: 0,
+ deviceCode: false,
+ rules: {
+ orderNumber: [{required:true,message:'璁㈠崟鍙蜂笉鑳戒负绌�',trigger:'blur'}]
+ },
dataVal: [{
label: '鏄�',
value: '鏄�'
@@ -257,7 +271,7 @@
proInsNo: null,
material: null,
materialCode: null,
- orderNumber: "ZTTIC20230001",
+ orderNumber: null,
quantity: null,
specs: null,
unit: null,
@@ -279,14 +293,42 @@
mounted() {
this.getDeviceList()
this.processInspectVo.id = this.$route.query.id
- this.resultVal = this.$route.query.resultVal
+ this.resultVal = this.$route.params.resultVal
if (this.resultVal == null) {
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(){
+ 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: '鏈瘑鍒嚭浜屼綅鐮佽閲忓櫒鍏蜂俊鎭紒',
+ type: 'warning'
+ });
+ }
+ },
+ codeDevice(row,index){
+ this.row=row
+ console.log("row",row);
+ this.deviceCode =true
+ this.$refs.codeDeviceCompont.openCamera()
+ this.proIndex=index
+ },
submitSave() {
let pro = 0
this.inspectionItems.forEach(item => {
@@ -297,6 +339,11 @@
pro += arr.length
}
})
+ let obj = {
+ id: this.processInspectVo.id,
+ number: 0,
+ result: this.inspectionResultForm[0].result
+ }
if (pro > 0) {
this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
confirmButtonText: '纭畾',
@@ -304,11 +351,8 @@
inputPattern: /^\d+$/,
inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
}).then(({ value }) => {
- let data = {
- id: this.processInspectVo.id,
- number: value
- }
- updateProcessInspectsById(data).then(res => {
+ obj.number = value
+ updateProcessInspectsById(obj).then(res => {
let data = res.data.data
if (data) {
if (data.indexOf("鎴愬姛") > 0) {
@@ -322,7 +366,7 @@
});
}).catch(() => { });
} else {
- updateProcessInspectsById({ id: this.processInspectVo.id, number: 0 }).then(res => {
+ updateProcessInspectsById(obj).then(res => {
let data = res.data.data
if (data) {
if (data.indexOf("鎴愬姛") > 0) {
@@ -378,9 +422,9 @@
arr = obj.inspectionValue.split(",")
}
obj.empiricalValueAddss = arr
- if(obj.note){
- snote=obj.inote
- }
+ if(!obj.inote){
+ obj.inote = null
+ }
if (arr.length > this.empiricalValueAdd) {
this.empiricalValueAdd = arr.length
}
@@ -388,11 +432,21 @@
}
})
this.inspectionItems = result.children
+ let rVal = '1'
+ this.inspectionItems.forEach(item => {
+ if (item.children) {
+ item.children.forEach(obj => {
+ if (obj.iresult == 0) {
+ rVal = '0'
+ }
+ })
+ }
+ })
this.inspectionResultForm = [{
materialCode: result.materialCode,
material: result.material,
userName: Array.from(new Set(userList)).join(","),
- result: this.resultVal == null ? '' : this.resultVal,
+ result: this.resultVal == null ? rVal : this.resultVal,
}]
}).catch(error => {
console.log(error)
@@ -432,7 +486,22 @@
this.processInspectVo.material = sample.material
this.technologyList = sample.children
},
- changeState(row, index) {
+ changeState(row,isChecked) {
+ const _than = this
+ if(isChecked){
+ let isNumber = true
+ for(var i=0;i<row.empiricalValueAddss.length;i++){
+ let val = row.empiricalValueAddss[i]
+ if(!/(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/.test(val)){
+ row.empiricalValueAddss[i] = null
+ _than.$message.error("璇疯緭鍏ユ暟瀛�")
+ isNumber = false
+ }
+ }
+ if(!isNumber){
+ return
+ }
+ }
if (row.iid != null && row.iid != '') {
let str = ""
row.empiricalValueAddss.forEach(e => {
@@ -442,13 +511,11 @@
if (str === undefined || str === '' || str === null) {
return
}
-
let obj = {
devideId: row.eId,
ppid: row.iid,
inspectionValue: str,
note : row.inote
-
}
updateProcessInsProduct(obj).then(res => {
if (res.data.code == 0) {
@@ -462,20 +529,23 @@
},
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.inspectionItems = proList
+ _than.inspectionItems = proList
}).catch(error => {
console.log(error);
})
@@ -485,32 +555,67 @@
})
},
selectInfoByOrderId() {
- chooseMater({
- orderNumber: this.processInspectVo.orderNumber
- }).then(res => {
- if (res.data.data != null) {
- this.optionsSamplename = res.data.data.children
- } else {
- this.$message({
- message: '娌℃湁璇ヨ鍗曞彿锛�',
- type: 'warning'
- });
- this.optionsSamplename = []
- this.processInspectVo.materialCode = null
- this.processInspectVo.material = null
- this.processInspectVo.specs = null
- this.processInspectVo.unit = null
+ this.$refs.addInspectionform.validate(valid=>{
+ if(valid){
+ chooseMater({
+ orderNumber: this.processInspectVo.orderNumber
+ }).then(res => {
+ if (res.data.data != null) {
+ this.optionsSamplename = res.data.data.children
+ } else {
+ this.$message({
+ message: '娌℃湁璇ヨ鍗曞彿锛�',
+ type: 'warning'
+ });
+ this.optionsSamplename = []
+ this.processInspectVo.materialCode = null
+ this.processInspectVo.material = null
+ this.processInspectVo.specs = null
+ this.processInspectVo.unit = null
+ }
+ })
}
})
},
+ changeRowResult(){
+ if(this.inspectionItems){
+ this.inspectionItems.forEach(e=>{
+ if(e.children){
+ e.children.forEach(i=>{
+ if(i.empiricalValueAddss.length>1){
+ let arr = i.inspectionValue.split(",")
+ arr.splice((arr.length-1),1)
+ let obj = {
+ devideId: i.eId,
+ ppid: i.iid,
+ inspectionValue: arr.join(","),
+ note : i.inote
+ }
+ updateProcessInsProduct(obj).then(res => {
+ if (res.data.code == 0) {
+ this.init()
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+ },
// 鍒犻櫎妫�楠屽�煎垪
clickDeleteInspectionColumn() {
- if (this.empiricalValueAdd - 1 === 0) {
+ const _than = this
+ if (_than.empiricalValueAdd - 1 === 0) {
} else {
- if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
- this.empiricalValueAdd = this.empiricalValueAdd - 1;
- this.inspectionItems.forEach(i => {
- i.empiricalValueAddss.splice(this.empiricalValueAdd, 1);
+ if (_than.empiricalValueAddMaxNumber != _than.empiricalValueAdd - 1) {
+ _than.empiricalValueAdd = _than.empiricalValueAdd - 1;
+ _than.changeRowResult()
+ _than.inspectionItems.forEach(i => {
+ if(i.children){
+ i.children.forEach(ele=>{
+ ele.empiricalValueAddss.splice(_than.empiricalValueAdd, 1);
+ })
+ }
});
}
}
--
Gitblit v1.9.3