From 41e0df8413624e6034c967f3afae30da59370879 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 十二月 2023 16:20:15 +0800
Subject: [PATCH] modified: src/components/verifition/Verify/VerifyPoints.vue modified: src/const/crud/admin/sys-public-param.js modified: src/page/full-screen/fullScreenPlus.vue modified: src/page/index/logo.vue modified: src/page/index/sidebar/sidebarItem.vue modified: src/page/login/index.vue modified: src/page/login/thirdpartylogin.vue modified: src/util/elAttr.js modified: src/views/accounting/unitworkfactor/unitworkfactor-form.vue modified: src/views/accounting/unitworkfactor/updateQuota-form.vue modified: src/views/basic/discmaintenance/discmaintenance-form.vue modified: src/views/basic/log/index.vue modified: src/views/basic/part/part-form.vue modified: src/views/basic/part/print-label-form.vue modified: src/views/basic/poc/index.vue modified: src/views/basic/tabletest/index.vue modified: src/views/basic/template/index.vue modified: src/views/basic/template/template-form.vue modified: src/views/basic/workstation/workstation-form.vue modified: src/views/common/custom-table.vue modified: src/views/common/documentDetail.vue modified: src/views/common/operationParamTemplate.vue modified: src/views/common/rawMaterial-part.vue modified: src/views/common/search-select.vue modified: src/views/common/ztt-table.vue modified: src/views/huawei/code19bind/list.vue modified: src/views/huawei/code19gen/form.vue modified: src/views/huawei/grossweightcode/list.vue modified: src/views/huawei/grossweightcode/task-secret-form.vue modified: src/views/oa/JiegouModal.vue modified: src/views/oa/PeizhiModal.vue modified: src/views/oa/technology-document-new.vue modified: src/views/oa/technology-document.vue modified: src/views/plan/customer/index.vue modified: src/views/plan/customerorder/confirm-pull-customerorder.vue modified: src/views/plan/customerorder/customerorder-config-history.vue modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/customerorder-return.vue modified: src/views/plan/customerorder/customerorder-ztt-table.vue modified: src/views/plan/customerorder/index.vue modified: src/views/plan/customerorder/other-customer-order-line.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue modified: src/views/plan/customerorder/schedule-table.vue modified: src/views/plan/manufacturingorder/auto-operationtask.vue modified: src/views/plan/manufacturingorder/customerorder.vue modified: src/views/plan/manufacturingorder/customize-param-template.vue modified: src/views/plan/manufacturingorder/order-operation-form.vue modified: src/views/plan/manufacturingorder/productorder-form.vue modified: src/views/plan/manufacturingorderapply/index.vue modified: src/views/plan/masterproductionschedule/auto-manufacturingorder.vue modified: src/views/plan/operationtask/gantt.vue modified: src/views/plan/operationtask/operationtask-form.vue modified: src/views/plan/operationtask/task-material.vue modified: src/views/plan/productionschedul/index.vue modified: src/views/plan/productionschedul/template-form.vue modified: src/views/plan/schedule/gantt.vue modified: src/views/plan/schedulelookover/ganttview.vue modified: src/views/plan/segmentmerge/index.vue modified: src/views/plan/segmentmerge/operate-dialog.vue modified: src/views/plan/segmentmerge/operation-technology-form.vue modified: src/views/product/dutyrecord/index.vue modified: src/views/product/producttraceability/index.vue modified: src/views/product/producttraceability/traceability-diagram.vue modified: src/views/product/workbench/batchproductout-form-new.vue modified: src/views/product/workbench/batchproductout-form.vue modified: src/views/product/workbench/feed-form.vue modified: src/views/product/workbench/feed-pane.vue modified: src/views/product/workbench/feed-tab.vue modified: src/views/product/workbench/handymantype.vue modified: src/views/product/workbench/index.vue modified: src/views/product/workbench/mould-pane.vue modified: src/views/product/workbench/operation-task-pane.vue modified: src/views/product/workbench/product-record-form.vue modified: src/views/product/workbench/productout-form-by-batch.vue modified: src/views/product/workbench/productout-form.vue modified: src/views/product/workbench/productrecord-tab.vue modified: src/views/product/workbench/producttracking-tab.vue modified: src/views/product/workbench/shift-productout-form.vue modified: src/views/product/workbench/splitTaskForm.vue modified: src/views/product/workbench/taskinfo-pane.vue modified: src/views/quality/Packaging_ledger/pack-from.vue modified: src/views/quality/apply/index.vue modified: src/views/quality/exception/exception.vue modified: src/views/quality/exception/index.vue modified: src/views/quality/finishedProductInspection/finishedProduct-form.vue modified: src/views/quality/finishedProductInspection/finishedProduct-print.vue modified: src/views/quality/finishedProductInspection/finishedProducter-print.vue modified: src/views/quality/finishedProductInspection/index.vue modified: src/views/quality/newReport/ReportForm.vue modified: src/views/quality/processInspect/index.vue modified: src/views/quality/processInspect/processInspect-form.vue modified: src/views/quality/processconfiguration/index.vue modified: src/views/quality/processconfiguration/table-form.vue modified: src/views/quality/rawMaterial/QrcodeReader.vue modified: src/views/quality/rawMaterial/index.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue modified: src/views/quality/report/index.vue modified: src/views/quality/standardbind/standardbind-form.vue modified: src/views/quality/statistics/rateChart.vue modified: src/views/quality/testitemlayout/index.vue modified: src/views/quality/testplan/testplan-form.vue modified: src/views/quality/unqualifiedprocess/examineApproveform.vue modified: src/views/quality/unqualifiedprocess/index.vue modified: src/views/quality/unqualifiedprocess/loaction-form.vue modified: src/views/quality/unqualifiedprocess/unqualifiedprocessform.vue modified: src/views/technology/completeproductstructure/completeproductstructure-form.vue modified: src/views/technology/document/checkStandardTable.vue modified: src/views/technology/document/document-form.vue modified: src/views/technology/document/extendsOperation.vue modified: src/views/technology/document/extendsTestStandard.vue modified: src/views/technology/document/extendsTestStandardParam.vue modified: src/views/technology/document/teststandard.vue modified: src/views/technology/structure/single-structure-form.vue modified: src/views/warehouse/changestock/index.vue modified: src/views/warehouse/check/check-detail.vue modified: src/views/warehouse/pallettransports/ifslocation-form.vue modified: src/views/warehouse/pallettransports/ifsstock-form.vue modified: src/views/warehouse/pallettransports/index.vue modified: src/views/warehouse/returnstock/ifslocation-form.vue modified: src/views/warehouse/returnstock/index.vue modified: src/views/warehouse/returnstock/returnstock-form.vue modified: src/views/warehouse/returnstock/stock-part.vue modified: src/views/warehouse/stock/print-label-form.vue modified: src/views/warehouse/stock/small-print-label-form.vue modified: src/views/warehouse/stock/small-warehousing-label-form.vue modified: src/views/warehouse/stock/stock-table.vue modified: src/views/warehouse/stock/warehousing-label-form.vue modified: src/views/zte/pkgidbind/index.vue
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 274 +++++++++++++++++++++++++++++-------------------------
1 files changed, 147 insertions(+), 127 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 296b671..1d38bdc 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -21,6 +21,12 @@
label-width="110px">
<el-row>
<el-col :span="6">
+ <el-form-item label="鍘熸潗鏂欐楠岀紪鍙�" prop="rawInsNo">
+ <el-input v-model="dataForm.rawInsNo" disabled>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="闆朵欢鍙�" prop="code">
<el-input v-model="dataForm.code" :disabled="resultVal!=null && dataForm.id!=null">
<el-button
@@ -28,6 +34,11 @@
icon="el-icon-search"
:disabled="resultVal!=null && dataForm.id!=null"
@click="queryCode()"></el-button>
+ <!-- <el-button
+ slot="append"
+ icon="el-icon-full-screen"
+ :disabled="resultVal!=null && dataForm.id!=null"
+ @click="Turnonthecamera"></el-button> -->
</el-input>
</el-form-item>
</el-col>
@@ -45,17 +56,16 @@
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
disabled>
-
</el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瑙勬牸鍨嬪彿" prop="specs">
- <el-input v-model="dataForm.specs" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
+ <el-col :span="6">
+ <el-form-item label="瑙勬牸鍨嬪彿" prop="specs">
+ <el-input v-model="dataForm.specs" disabled></el-input>
+ </el-form-item>
+ </el-col>
<el-col :span="6">
<el-form-item prop="unit" label="鍗曚綅">
<el-input
@@ -74,15 +84,15 @@
<el-input v-model="dataForm.number" :disabled="resultVal!=null" />
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="6">
- <el-form-item prop="projectName" label="椤圭洰鍚嶇О">
+ <el-form-item prop="projectName" label="椤圭洰鍚嶇О" v-if="dataForm.id!=null">
<el-tooltip :disabled="dataForm.projectName==null" :content="dataForm.projectName">
<el-input v-model="dataForm.projectName" disabled ></el-input>
</el-tooltip>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="6">
<el-form-item label="鎶ユ鏃ユ湡" prop="createTime" v-if="dataForm.id!=null">
<el-input v-model="dataForm.createTime" disabled />
@@ -160,7 +170,7 @@
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
- <el-select @blur="changeState(scope.row, index)" style="width:100%" allow-create filterable default-first-option
+ <el-select @blur="changeState(scope.row, index)" style="width:100%" allow-create filterable default-first-option
:disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)"
v-model="scope.row.testValueList[index]"
placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��" @change="updateTestValue(scope.row,scope.$index)">
@@ -171,10 +181,6 @@
</div>
</template>
</el-table-column>
-
-
-
-
<el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="260">
<template slot-scope="scope">
<div v-if="!scope.row.children">
@@ -189,7 +195,7 @@
<el-table-column prop="note" label="妫�楠屾弿杩�" width="260" >
<template slot-scope="scope">
<div v-if="!scope.row.children">
- <el-input @blur="changeState(scope.row, note)" :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"></el-input>
+ <el-input @blur="changeState(scope.row, scope.$index)" :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"></el-input>
</div>
</template>
</el-table-column>
@@ -215,8 +221,6 @@
</el-col>
</el-row>
</div>
-
-
<div class="rawMaterial-result">
<el-row>
<el-col :span="24">妫�楠岀粨璁�</el-col>
@@ -261,6 +265,7 @@
<el-button type="primary" @click="submitSave()">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <!-- <qrcode :qrcode="qrcode" v-show="qrcode" :camera="camera" /> -->
</div>
</template>
@@ -273,13 +278,19 @@
updateRawInspectsById,
updateDeviceById, } from '@/api/quality/rawMaterial'
import rawMaterialPartDialog from '@/views/common/rawMaterial-part'
+ // import qrcode from './QrcodeReader.vue'
export default {
computed:{},
components:{
- rawMaterialPartDialog
+ rawMaterialPartDialog,
+ // qrcode
+ // qrcode: () => import('./QrcodeReader.vue'),
},
data(){
return{
+ qrcode: false,
+ torchActive: false,
+ camera: 'off',
userdata:[],
currentRow:[],
userlist:[],
@@ -334,7 +345,7 @@
this.$refs.table.doLayout();
})
},
- mounted(){
+ created(){
this.dataForm.id = this.$route.query.id
this.resultVal = this.$route.query.resultVal
if(this.resultVal == null){
@@ -352,17 +363,76 @@
},
},
methods:{
- changeName(index,row){
- this.projectList.forEach(item=>{
- if(row.name == item.name){
- this.list[index].unit = item.unit
- this.list[index].required = item.required
- }
- })
- },
+ // 鎵撳紑鐩告満
+ Turnonthecamera() {
+ this.qrcode = true
+ this.camera = 'rear'
+ },
+ // 鎵爜缁撴灉鍥炶皟
+ // onDecode(result) {
+ // console.log(result)
+ // this.turnCameraOff()
+ // },
+ // 鐩告満鍙嶈浆
+ // switchCamera() {
+ // switch (this.camera) {
+ // case 'front':
+ // this.camera = 'rear'
+ // break
+ // case 'rear':
+ // this.camera = 'front'
+ // break
+ // default:
+ // this.$toast('閿欒')
+ // }
+ // },
+ // 鍏抽棴鐩告満
+ // turnCameraOff() {
+ // this.camera = 'off'
+ // this.qrcode = false
+ // },
+ // 鎵撳紑鎵嬬數绛�
+ // ClickFlash() {
+ // switch (this.torchActive) {
+ // case true:
+ // this.torchActive = false
+ // break
+ // case false:
+ // this.torchActive = true
+ // break
+ // default:
+ // this.$toast('閿欒')
+ // }
+ // },
+
+ // 妫�鏌ユ槸鍚﹁皟鐢ㄦ憚鍍忓ご
+ // async onInit(promise) {
+ // try {
+ // await promise
+ // } catch (error) {
+ // if (error.name === 'StreamApiNotSupportedError') {
+ // } else if (error.name === 'NotAllowedError') {
+ // this.errorMessage = 'Hey! I need access to your camera'
+ // } else if (error.name === 'NotFoundError') {
+ // this.errorMessage = 'Do you even have a camera on your device?'
+ // } else if (error.name === 'NotSupportedError') {
+ // this.errorMessage =
+ // 'Seems like this page is served in non-secure context (HTTPS, localhost or file://)'
+ // } else if (error.name === 'NotReadableError') {
+ // this.errorMessage =
+ // "Couldn't access your camera. Is it already in use?"
+ // } else if (error.name === 'OverconstrainedError') {
+ // this.errorMessage =
+ // "Constraints don't match any installed camera. Did you asked for the front camera although there is none?"
+ // } else {
+ // this.errorMessage = 'UNKNOWN ERROR: ' + error.message
+ // }
+ // }
+ // },
// 纭鍥炶皟
selectPart(param, nodePart, index) {
if (typeof param !== 'undefined') {
+ this.dataForm.rawInsNo = param.rawInsNo
this.dataForm.code = param.code
this.dataForm.name = param.name
this.dataForm.formTime = param.formTime
@@ -385,47 +455,25 @@
}
this.showPart = true
},
-
updateDevice(row, index) {
- let rowId=JSON.stringify(row.rpId)
- updateDeviceById({ deviceId: row.deviceId, rpId: row.rpId }).then(res => {
- this.list.forEach(obj => {
- obj.children.forEach(c=>{
- if(c.rpId==rowId){
- c.testValue = ''
- c.testState = null
- c.testValueList = []
- c.note=''
- }
- })
- })
- }).catch(error => {
- console.log(error)
- })
- },
-
- // updateDevice(row,index){
- // if(this.dataForm.id != null){
- // updateDeviceById({deviceId:row.deviceId,rpId:row.rpId}).then(res=>{
- // this.inspectionItems.forEach(obj => {
- // this.list[index-1].testValue = ''
- // this.list[index-1].testState = null
- // this.list[index-1].testValueList = []
- // this.list[index-1].note = ''
-
- // })
- // }).catch(error=>{
- // console.log(error)
- // })
- // }
- // },
+ updateDeviceById({ deviceId: row.deviceId, rpId: row.rpId }).then(res => {
+ row.testValue = null
+ row.testState = null
+ row.testValueList = []
+ row.note = null
+ }).catch(error => {
+ console.log(error)
+ })
+ },
checkTestState(){
let resultVal = '1'
this.list.forEach(item=>{
if(item.children){
- if(obj.testState == 0){
- resultVal = '0'
- }
+ item.children.forEach(ele=>{
+ if(ele.testState == 0){
+ resultVal = '0'
+ }
+ })
}
})
this.resultVal = resultVal
@@ -455,13 +503,15 @@
number: this.unqualifiedNum,
}
updateRawInspectsById(data).then(res => {
- if(res.data.code == 0){
+ if(res.data.code == 0 && (res.data.data=='1'|| res.data.data=='0')){
sessionStorage.setItem("raw-resultVal-"+this.dataForm.id,res.data.data)
this.$message.success("涓婃姤鎴愬姛");
- this.dialogVisible = false
+ }else{
+ this.$message.error("涓婃姤澶辫触锛�",res.data.data);
}
+ this.dialogVisible = false
+ this.checkTestState()
});
- this.checkTestState()
},
addTeatValueColumn(){
this.empiricalValueAdd = this.empiricalValueAdd + 1;
@@ -496,8 +546,8 @@
if (arr.length > this.empiricalValueAdd) {
this.empiricalValueAdd = arr.length
}
+ })
this.list.push(ele)
- })
}else{
ele.children.push({
deviceId: null,
@@ -510,7 +560,7 @@
userName: null,
testValue: '',
testValueList: [],
- note: '',
+ note: null,
testState: ''
})
this.list.push(ele)
@@ -518,7 +568,7 @@
},
delTeatValueColumn(){
- if (this.empiricalValueAdd - 1 === 0) { } else {
+ if (this.empiricalValueAdd - 1 > 0) {
if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
this.empiricalValueAdd = this.empiricalValueAdd - 1;
this.list.forEach(i => {
@@ -527,12 +577,8 @@
}
}
},
-
updateTestValue(row,index){
- console.log(row);
if(row.rpId == null){
-
-
return
}
let val = row.testValueList.join(",");
@@ -553,12 +599,11 @@
this.$message.error(error)
})
},
-
-
init(){
if(this.dataForm.id){
getObj(this.dataForm.id).then(res=>{
let data = res.data.data
+ this.dataForm.rawInsNo = data.rawInsNo
this.dataForm.name = data.name
this.dataForm.formTime = data.formTime
this.dataForm.code = data.code
@@ -580,16 +625,18 @@
}
ele.iid = Math.random()
ele.father = item.rpFather
+ if (item.children != undefined) {
item.children.forEach(obj => {
+ let arr= []
if(obj.userName){
userNameList.push(obj.userName)
}
- let arr= []
-
if(obj.testValue){
arr = obj.testValue.split(",")
}
-
+ if (arr.length > this.empiricalValueAdd) {
+ this.empiricalValueAdd = arr.length
+ }
let o = {
deviceId: obj.deviceId,
deviceName: obj.deviceName,
@@ -607,7 +654,7 @@
ele.children.push(o)
})
this.list.push(ele)
- }
+ }}
})
this.conclusionTable = [{
code: data.code,
@@ -623,44 +670,27 @@
}
},
changeState(row, index) {
- console.log(row)
- if (row.rpId != null && row.rpId != '') {
- let val = ""
- row.testValueList.forEach(e => {
- val += e + ","
- })
-
- // if (note === undefined || note === '' || note === null) {
- // return
- // }
- console.log(val)
- val = val.slice(0, -1);
- if (val === undefined || val === '' || val === null) {
- return
- }
-
-
- let obj = {
- deviceId: row.deviceId,
- rpId: row.rpId,
- testValue: val,
- note: row.note
-
- }
- console.log(obj)
- updateRawInsProduct(obj).then(res => {
- if (res.data.code == 0) {
- this.$message.success("鏇存柊鎴愬姛")
- } else {
- this.$message.error("鏇存柊澶辫触")
- }
- this.init()
- })
+ if (row.rpId != null && row.rpId != '') {
+ let val = row.testValueList.join(",")
+ if (val === undefined || val === '' || val === null) {
+ return
}
- },
-
-
-
+ let obj = {
+ deviceId: row.deviceId,
+ rpId: row.rpId,
+ testValue: val,
+ note: row.note
+ }
+ updateRawInsProduct(obj).then(res => {
+ if (res.data.code == 0) {
+ this.$message.success("鏇存柊鎴愬姛")
+ } else {
+ this.$message.error("鏇存柊澶辫触")
+ }
+ this.init()
+ })
+ }
+ },
// 鍒犻櫎瀛愰」鐩�
delChildren(row,index,isParent) {
if(isParent){
@@ -680,7 +710,6 @@
},
//娣诲姞瀛愰」鐩�
addChildren(row){
- console.log(row);
let obj = {
deviceId: null,
deviceName: null,
@@ -698,19 +727,10 @@
row.children.push(obj)
},
save(){
-
let data = this.dataForm
- console.log('--------',data);
- console.log("-----",this.list);
this.list.forEach(item=>{
item.children.forEach(c=>{
- let arr=c.testValueList
- let val=''
- arr.forEach(a=>{
- val+=a+","
- })
- let end=val.substring(0,val.length-1)
- c.testValue=end
+ c.testValue=c.testValueList.join(",")
})
})
data.rawInsProducts = this.list
--
Gitblit v1.9.3