From 030a0935854e9f65df1cd724498b2c2fe52ea9d8 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期六, 10 八月 2024 16:46:37 +0800
Subject: [PATCH] 修改特殊值输入
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 795a6f6..85c477c 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -828,7 +828,7 @@
<td style="text-align: left;">
<el-checkbox-group
v-model="getDataIndex" :max="item.child[0].maxNum">
- <el-checkbox v-for="(n,j) in item.child[0].arr" :label="j" :key="j+'ppppppppp'">{{n}}</el-checkbox>
+ <el-checkbox v-for="(n,j) in item.child[0].arr" :label="j" :key="j">{{n}}</el-checkbox>
</el-checkbox-group>
</td>
</tr>
@@ -837,7 +837,7 @@
<td style="text-align: left;">
<el-checkbox-group
v-model="getDataIndex" :max="m.maxNum">
- <el-checkbox v-for="(n,j) in m.arr" :label="j" :key="j+'bbbbbbbbbbbbbb'">{{n}}</el-checkbox>
+ <el-checkbox v-for="(n,j) in m.arr" :label="j" :key="j">{{n}}</el-checkbox>
</el-checkbox-group>
</td>
</tr>
@@ -856,7 +856,7 @@
import file from '../../../util/file'
import excelFunction from '../../../util/excelFountion'
export default {
- props: ['sonLaboratory', 'orderId', 'state'],
+ props: ['sonLaboratory', 'orderId', 'state','inspectorList'],
components: {
ValueTable,
},
@@ -1310,8 +1310,14 @@
child:[]
}
for(let j in data[i]){
+ let str0 = ''
+ if(i==j){
+ str0 = i+','
+ }else{
+ str0 = i+','+j
+ }
if(j!='frequency'&&data[i][j]&&typeof data[i][j].result == 'string'){
- this.dataAcquisitionInfo[i+','+j] = {
+ this.dataAcquisitionInfo[str0] = {
value:data[i][j].result,
frequency:data[i].frequency
}
@@ -1319,7 +1325,6 @@
list.forEach((item,index)=>{
let num0 = 0;
let str = ''
- let str0 = i+','+j
item.forEach(m=>{
if(m.v.ps&&(m.v.ps.value=='妫�楠屽瓙椤�'||m.v.ps.value=='妫�楠岄」')){
if(m.v.ps&&m.v.ps.value=='妫�楠岄」'){
@@ -1342,7 +1347,12 @@
})
})
}else if(j!='frequency'&&data[i][j]&&Array.isArray(data[i][j].result)){
- let str0 = i+','+j
+ let str0 = ''
+ if(i==j){
+ str0 = i+','
+ }else{
+ str0 = i+','+j
+ }
let list = this.tableList[0].arr
let maxNum = 0
list.forEach((item,index)=>{
@@ -1378,6 +1388,13 @@
}
})
})
+ // let arr3 = []
+ // for (let l=0 ;i<data[i][j].result.length;i++){
+ // arr3.push({
+ // id:,
+ // value:
+ // })
+ // }
let obj0 = {
name:j,
arr:data[i][j].result,
@@ -1387,7 +1404,7 @@
if(data[i][j].result&&Array.isArray(data[i][j].result)&&data[i][j].result.length>maxNum){
obj.child.push(obj0)
}else{
- this.dataAcquisitionInfo[i+','+j] = {
+ this.dataAcquisitionInfo[str0] = {
value:data[i][j].result
}
}
@@ -1399,6 +1416,7 @@
}
if(this.getData.length>0){
this.dataGetDia = true
+ this.getDataIndex = []
}else{
try {
// 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
@@ -2632,6 +2650,7 @@
} catch (e) {}
try {
let equipName = JSON.parse(a.insProductResult.equipName)
+ // console.log(2222222,equipName)
if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))){
this.param[a.id].equipName = []
for (let i = 0; i < equipName.length; i++) {
@@ -2643,7 +2662,8 @@
}
}
for (let i = 0; i < equipName.length; i++) {
- if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁崌璇曢獙鍘熷璁板綍妯℃澘')){
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))){
+ console.log(2222222,equipName)
// 娓╁害寰幆璧嬪��
this.$set(this.equipForm,`value`+i,equipName[i].v)
this.param[a.id].equipName[i].v.v = equipName[i].v
@@ -3250,9 +3270,9 @@
getAuthorizedPerson() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
let data = []
- let userName = JSON.parse(localStorage.getItem("user")).name;
+ // let userName = JSON.parse(localStorage.getItem("user")).name;
res.data.forEach(a => {
- if(a.name !== userName) {
+ if(!this.inspectorList.includes(a.name)) {
data.push({
label: a.name,
value: a.id
--
Gitblit v1.9.3