From 154ef0e4c3dbb483d55e9b2b242021f627bee451 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 26 十二月 2023 09:45:16 +0800
Subject: [PATCH] modified: src/views/technology/document/index.vue modified: src/views/technology/routing/index.vue
---
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 140 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 112 insertions(+), 28 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index c9e9c33..dccb95c 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -8,7 +8,7 @@
<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">
@@ -26,53 +26,58 @@
<el-col :span="6">
<el-form-item label="璁㈠崟鍙凤細">
<el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
- v-model="processInspectVo.orderNumber" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
+ v-model="processInspectVo.orderNumber" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎶ュ伐鍗曞彿锛�">
+ <el-input disabled v-model="processInspectVo.productNo" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="瀹㈡埛鍚嶇О锛�">
- <el-input disabled v-model="processInspectVo.prname"
- placeholder="璇疯緭鍏ュ鎴峰悕绉�" autocomplete="off" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="宸ョ▼鍚嶇О锛�">
- <el-input disabled v-model="processInspectVo.sname"
- placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" autocomplete="off" />
+ <el-input disabled v-model="processInspectVo.prname" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
+ <el-form-item label="宸ョ▼鍚嶇О锛�">
+ <el-input disabled v-model="processInspectVo.sname" 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-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="浜у搧缂栫爜锛�">
- <el-input disabled v-model="processInspectVo.mcode"
- placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
+ <el-form-item label="浜у搧缂栧彿锛�">
+ <el-input disabled v-model="processInspectVo.mcode" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input disabled v-model="processInspectVo.specificationsModel"
- placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" autocomplete="off" />
+ <el-tooltip class="item" effect="dark" :content="processInspectVo.specificationsModel">
+ <el-input disabled v-model="processInspectVo.specificationsModel" autocomplete="off" />
+ </el-tooltip>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="6">
<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="鏁伴噺锛�">
<el-input v-model="processInspectVo.quantity" placeholder="璇疯緭鍏ユ暟閲�"
@@ -88,7 +93,7 @@
<el-form-item label="浜у搧鍚堟牸搴撲綅锛�" prop="locationId">
<el-select @change="changeLocation" clearable style="width:100%"
v-model="processInspectVo.locationId" placeholder="璇烽�夋嫨鍚堟牸搴撲綅"
- autocomplete="off">
+ :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>
@@ -147,15 +152,21 @@
<template slot-scope="scope">
<span v-if="resultVal!=null && processInspectVo.id!=null" v-text="scope.row.ename"></span>
<div v-else>
- <el-select style="width:100%" v-model="scope.row.eId"
+ <el-select style="width:80%" v-model="scope.row.eId"
v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row)">
<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 prop="inspectionValue">
+ <el-table-column prop="inspectionValue"
label="妫�楠屾弿杩�" width="240" style="text-align: center;">
<template slot-scope="scope">
<el-col v-if="scope.row.itype === '1'">
@@ -223,6 +234,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>
@@ -239,9 +262,16 @@
} from '@/api/quality/finishedProduct'
import { getIfsLocationByGroupCopyAll } from '@/api/warehouse/location'
import { remote } from '@/api/admin/dict'
+ import qrCodeApp from '@/views/common/qrCodeApp'
export default {
+ components:{
+ qrCodeApp
+ },
data() {
return {
+ row: null,
+ proIndex: 0,
+ deviceCode: false,
locationList: [],
dataVal: [{
label: '鏄�',
@@ -294,7 +324,7 @@
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("finished-resultVal-"+this.processInspectVo.id);
val == undefined ? this.resultVal=null : this.resultVal = val
@@ -303,6 +333,33 @@
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
+ },
changeLocation(val){
if(val){
let obj = {
@@ -340,6 +397,11 @@
pro+=arr.length
}
})
+ let obj = {
+ id: this.processInspectVo.id,
+ number: 0,
+ result: this.inspectionResultForm[0].result
+ }
if (pro > 0) {
this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
confirmButtonText: '纭畾',
@@ -347,11 +409,8 @@
inputPattern: /^\d+$/,
inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
}).then(({ value }) => {
- let data = {
- id: this.processInspectVo.id,
- number: value
- }
- updateFinishedInspectById(data).then(res => {
+ obj.number = value
+ updateFinishedInspectById(obj).then(res => {
if(res.data.data.indexOf("鎴愬姛") > 0){
this.$message.success("涓婃姤鎴愬姛");
this.checkTestState()
@@ -361,7 +420,7 @@
});
}).catch(() => {});
}else{
- updateFinishedInspectById({id:this.processInspectVo.id,number:0}).then(res => {
+ updateFinishedInspectById(obj).then(res => {
if(res.data.data.indexOf("鎴愬姛") > 0){
this.$message.success("涓婃姤鎴愬姛");
this.checkTestState()
@@ -515,7 +574,6 @@
let id = res.data.data
if(id != null){
queryById(id).then(response=>{
- console.log(response.data.data.children)
let proList = response.data.data.children
proList.forEach(item=>{
item.iid = Math.random();
@@ -558,12 +616,38 @@
}
})
},
+ 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,
+ fpid: row.iid,
+ inspectionValue: arr.join(","),
+ note : i.inote
+ }
+ updateFinishedInsProduct(obj).then(res => {
+ if (res.data.code == 0) {
+ this.init()
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+ },
// 鍒犻櫎妫�楠屽�煎垪
clickDeleteInspectionColumn() {
if (this.empiricalValueAdd - 1 === 0) {
} else {
if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
this.empiricalValueAdd = this.empiricalValueAdd - 1;
+ this.changeRowResult()
this.inspectionItems.forEach(i => {
i.empiricalValueAddss.splice(this.empiricalValueAdd, 1);
});
--
Gitblit v1.9.3